Macros/find_current_keyword.tmMacro Macros/prev_find_selected_keyword.tmMacro @@ -10,6 +10,14 @@ <dict> <key>completionCommand</key> <string>#!/usr/bin/env ruby +require 'yaml' + +Dir.glob("#{ENV["TM_PROJECT_DIRECTORY"]}/spec/fixtures/*.yml").each { |file_name| + puts "*" + data = YAML.load_file(file_name) + puts data.values.map { |n| n.keys }.flatten.select { |e| e.include?(ENV["TM_CURRENT_WORD"].to_s) } +} + open("#{ENV["HOME"]}/.easyopen_tmbundle#{ENV["TM_PROJECT_DIRECTORY"]}/def_index.dump", "r") { |io| def_index = Marshal.load(io) puts def_index[:name_locationIds].keys.select { |e| e.include?(ENV["TM_CURRENT_WORD"].to_s) } Preferences/completionCommand.tmPreferences @@ -6,10 +6,10 @@ module EasyOpen name = m[2].split(".").last pre = m[1].sub(/#{Regexp.escape("#{name}")}$/, "") - { :name => m[1].split(".").last, + { :name => m[1].split(".").last.strip, :column => pre.size + 1, :more_info => line } - elsif m = /^([\s]*)(.*):\s*function.*$/.match(line) + elsif m = /^([\s]*)(\S*)\s*:\s*function.*$/.match(line) { :name => m[2], :column => m[1].size + 1, Support/lib/easyopen/extension/javascript_token.rb @@ -2,10 +2,11 @@ module EasyOpen module Extension class RubyToken def tokenize(line) + # ruby if m = /(^\s*(class|def|module)\s*)([\w:\.]*)(.*)$/.match(line) if mm = m[3].match(/([^\.]+)\.([^\.]+)/) # static method name = mm[2] - { :column => (m[1] + mm[1]).size + 2, + return { :column => (m[1] + mm[1]).size + 2, :name => name, :more_info => line } else @@ -13,7 +14,7 @@ module EasyOpen pre_first_str = m[1] colum = pre_first_str.size + 1 - names.map do |name| + return names.map do |name| current = colum colum += name.size + "::".size { :name => name, @@ -22,6 +23,13 @@ module EasyOpen end.last end end + #rails + if m =/(^\s*(alias_attribute|belongs_to|has_many)[\s:]*)([\w]*)(.*)$/.match(line) + return { + :column => (m[1].size) + 1, + :name => m[3], + :more_info => line } + end end end end Support/lib/easyopen/extension/ruby_token.rb @@ -24,6 +24,8 @@ module EasyOpen sort_by { |f| File.mtime(f) }. reverse[0..10]. reject { |e| e == @current_file }. + reject { |e| !!e.match(/.*\.log$/) }. + reject { |e| !!e.match(/.*\.sqlite3$/) }. map { |e| { :file => e, Support/lib/easyopen/open_recent.rb @@ -6,6 +6,14 @@ module EasyOpen::Extension @token = JavaScriptToken.new end + it "should tokinize ' color : function(string, color) {'" do + line = ' color : function(string, color) {' + result = @token.tokenize(line) + result[:name].should == "color" + result[:column].should == " ".size + 1 + result[:more_info].should == line + end + it "should tokenize ' be_empty: {'" do line = ' be_empty: {' result = @token.tokenize(line) @@ -37,7 +45,15 @@ module EasyOpen::Extension result[:column].should == " JSSpec.".size + 1 result[:more_info].should == line end - + + it "should tokeninze ' to = function(matcher) {'" do + line = ' to = function(matcher) {' + result = @token.tokenize(line) + result[:name].should == "to" + result[:column].should == " ".size + 1 + result[:more_info].should == line + end + it "should tokeninze 'JSSpec.Executor = function (target, onSuccess, onException) {'" do result = @token.tokenize('JSSpec.Executor = function (target, onSuccess, onException) {') result[:name].should == "Executor" Support/spec/easyopen/extension/javascript_token_spec.rb @@ -5,13 +5,37 @@ module EasyOpen::Extension before(:each) do @token = RubyToken.new end - + + it "should tokeinze ' has_many :name'" do + line = ' has_many :name' + result = @token.tokenize(line) + result[:name].should == "name" + result[:column].should == " has_many :".size + 1 + result[:more_info].should == line + end + + it "should tokeinze ' belongs_to :name'" do + line = ' belongs_to :name' + result = @token.tokenize(line) + result[:name].should == "name" + result[:column].should == " belongs_to :".size + 1 + result[:more_info].should == line + end + + it "should tokeinze ' alias_attribute :alias_name, :collumn_name'" do + line = ' alias_attribute :alias_name, :collumn_name' + result = @token.tokenize(line) + result[:name].should == "alias_name" + result[:column].should == " alias_attribute :".size + 1 + result[:more_info].should == line + end + it "should tokenize ' def Parse.html_to_text s'" do line = ' def Parse.html_to_text s' result = @token.tokenize(line) result[:name].should == "html_to_text" result[:column].should == " def Parse.".size + 1 - result[:more_info].should == line + result[:more_info].should == line end it "should tokenize ' def self.hogefuga(hoge, foo)'" do @@ -21,7 +45,7 @@ module EasyOpen::Extension result[:column].should == " def self.".size + 1 result[:more_info].should == line end - + it "should tokenize ' def open(hoge, foo)'" do line = " def open(hoge, foo)" result = @token.tokenize(line) @@ -29,7 +53,7 @@ module EasyOpen::Extension result[:column].should == " def ".size + 1 result[:name].should == "open" end - + it "should tokenize 'module Hoge::Hogeogeoge'" do line = 'module Hoge::Hogeogeoge' result = @token.tokenize(line) @@ -37,7 +61,7 @@ module EasyOpen::Extension result[:name].should == "Hogeogeoge" result[:more_info].should == line end - + it "should tokenize return nil if not include def module class" do line = ' ' @token.tokenize(line).should be_nil Support/spec/easyopen/extension/ruby_token_spec.rb @@ -10,11 +10,13 @@ <string>F79EF9CA-6D4D-45D9-807C-F7183BE855E6</string> <string>1E135F00-FE33-4BDE-AA2C-31A6C3B3943D</string> <string>------------------------------------</string> + <string>E065B750-38D6-45BC-A3DE-C6ABCD29225A</string> + <string>EE021D5D-1400-4629-A83F-AC10D68A07A5</string> + <string>------------------------------------</string> <string>71C114BE-105F-4BF0-AE8E-050E919711F5</string> <string>60415A72-E2EA-42D1-8A71-FEC60644BECD</string> <string>71B53E07-8F2B-4074-8CAF-B2B454AF09F7</string> <string>------------------------------------</string> - <string>0F2DB92A-0D23-4A98-9056-5437285D518D</string> <string>5C05808F-1680-4237-9026-A2EFD0CD263F</string> <string>------------------------------------</string> <string>B5701FBA-C60D-4216-B5E5-D22829649FB2</string> @@ -26,12 +28,17 @@ <string>EasyOpen</string> <key>ordering</key> <array> + <string>E065B750-38D6-45BC-A3DE-C6ABCD29225A</string> + <string>EE021D5D-1400-4629-A83F-AC10D68A07A5</string> <string>4F261511-9691-422A-8894-088A10B99061</string> <string>301C8785-9A97-4E24-A313-2AC89FF7403F</string> <string>F79EF9CA-6D4D-45D9-807C-F7183BE855E6</string> <string>1E135F00-FE33-4BDE-AA2C-31A6C3B3943D</string> <string>5C05808F-1680-4237-9026-A2EFD0CD263F</string> <string>B5701FBA-C60D-4216-B5E5-D22829649FB2</string> + <string>71C114BE-105F-4BF0-AE8E-050E919711F5</string> + <string>71B53E07-8F2B-4074-8CAF-B2B454AF09F7</string> + <string>60415A72-E2EA-42D1-8A71-FEC60644BECD</string> </array> <key>uuid</key> <string>A586D61A-96C6-491D-9BD9-E2C6AB7F26FF</string> info.plist fb03bd5a9697eccf85450d9cfee6adc89f343617 d675b8e6d7643c525b02d7e4b6198328877c8aab Thomas Aylott oblivious+git@subtlegradient.com http://github.com/subtleGradient/easy-open-tmbundle/commit/eb812db1f032a3cddcafc012d3e37a7fcb8f5c49 eb812db1f032a3cddcafc012d3e37a7fcb8f5c49 2009-06-15T08:27:45-07:00 2009-06-15T08:27:45-07:00 Merge branch 'master' of git@github.com:subtleGradient/easy-open-tmbundle eefc6729053dbd8667ed48549dd936292428e11e Thomas Aylott oblivious+git@subtlegradient.com