@@ -1,25 +1,66 @@ class Motion < Treetop::Runtime::SyntaxNode def eval (mode = nil) - r = eval_simple(motion) - mode_part = { - nil => 'move ', - :command => '', - :selection => 'select ', - }[mode] - [[text_value, "#{mode_part}#{r}"]] + @text = motion.text_value + @translation = Motion.translation(@text) + + @name = get_name(@translation) + begin + @how_many_times = quantity.text_value + rescue + @how_many_times = nil + end + + result = apply_quantity + result = apply_mode(result, text_value, mode) + end + +private + def pluralize(what, how_many) + return what + (how_many != 1 ? 's' : '') + end + + def apply_quantity + if (@how_many_times.nil? || @how_many_times.empty?) + return @name; + end + if (@how_many_times.to_i != 0) + quantity_value = @how_many_times.to_i + if (@text == '^') + q = '' #ignore count + elsif (@text == '$') + # special count + q = " that is #{quantity_value - 1} lines below" if quantity_value > 1 + else + q = ", #{@how_many_times} #{pluralize('time', @how_many_times)}" if quantity_value > 1 + end + return "#{@name}#{q}" + else + quantity_value = { + 'a' => 'a', + 'i' => 'inner' + }[@how_many_times] + return "#{quantity_value} #{@translation[1][:special_count]}" + end + end + + def get_name(translation) + translation && (translation.respond_to? :flatten) ? translation[0] : translation end - - def motion_name(motion) - names = { - 'w' => ['to the begining of the next word', 'word'], - 'W' => ['to the begining of the next space-separated word', 'word'], - 'b' => ['to the begining of the previous word', 'word'], - 'B' => ['backwards one space-separated-word', 'word'], - 'e' => ['to the end of the next word', 'word'], - 'E' => ['to the end of the next space-separated-word', 'word'], - 'ge' => ['to the end of the previous word', 'word'], - 'gE' => ['to the end of the previous space-separated-word', 'word'], + def self.translation(motion_text) + word_motions_translations = { + 'w' => ['to the begining of the next word'], + 'W' => ['to the begining of the next space-separated word'], + 'b' => ['to the begining of the previous word'], + 'B' => ['backwards one space-separated-word'], + 'e' => ['to the end of the next word'], + 'E' => ['to the end of the next space-separated-word'], + 'ge' => ['to the end of the previous word'], + 'gE' => ['to the end of the previous space-separated-word'], + } + word_motions_translations.each_pair{|key, motion| motion[1] = { :special_count => "word" }} + + translations = { '0' => 'to the begining of the line', '^' => 'to the begining of the line (not blank character)', '$' => 'to the end of the line', @@ -38,45 +79,27 @@ class Motion < Treetop::Runtime::SyntaxNode 'l' => 'one character to the right', '<RIGHT>' => 'one character to the right', + + ';' => ['repeat last character find', {:modes => { nil => '' }}], } - return names[motion] + translations = translations.merge(word_motions_translations) + translations[motion_text] end - - # TODO move to a special class - def eval_simple(motion) - text = motion.text_value - motion_name = motion_name(text) - motion_name = motion_name[0] if motion_name.respond_to? :flatten - begin - quantity_text = quantity.text_value - rescue - nil - end - result = motion_name - if (quantity_text.nil? || quantity_text.empty?) - return result - end - - if (quantity_text.to_i != 0) - quantity_value = quantity_text.to_i - if (text == '^') - q = '' #ignore count - elsif (text == '$') - # special count - q = " that is #{quantity_value - 1} lines below" if quantity_value > 1 - else - q = ", #{quantity_text} #{pluralize('time', quantity_text)}" if quantity_value > 1 - end - "#{motion_name}#{q}" - else - quantity_value = {'a' => 'a', 'i' => 'inner'}[quantity_text] - "#{quantity_value} #{motion_name(text)[1]}" - end - end + def apply_mode(result, text, mode) + modes = { + nil => 'move ', + :command => '', + :selection => 'select ', + }.merge(get_mode(@translation)) + [[text, "#{modes[mode]}#{result}"]] + end -private - def pluralize(what, how_many) - return what + (how_many != 1 ? 's' : '') + def get_mode(translation) + if (translation.respond_to? :flatten) && translation[1] && translation[1][:modes] + translation[1][:modes] + else + {} + end end end lib/grammar/motion.rb @@ -9,8 +9,9 @@ class ParametricMotion < Treetop::Runtime::SyntaxNode names = { 'f' => 'move on the next #{character}', 'F' => 'move on the previous #{character}', - 't' => 'move to the next #{character}', - 'T' => 'move to the previous #{character}', + 't' => 'move before the next #{character}', + 'T' => 'move before the previous #{character}', + ';' => 'repeat the last character find', } return names[motion] end lib/grammar/parametric_motion.rb @@ -171,6 +171,7 @@ grammar Vim quantity:motion_counter? motion:( 'h' / '<LEFT>' / 'j' / '<DOWN>' / 'k' / '<UP>' / 'l' / '<RIGHT>' / + ';' / [wWbeBE] / 'g' [eE] / [$^] / '(' lib/grammar/vim.treetop @@ -22,17 +22,19 @@ describe 'motions' do include Assertions { 'fy' => 'move on the next y', - '2fy' => 'move on the next y, 2 times', 'Fy' => 'move on the previous y', - '2Fy' => 'move on the previous y, 2 times', - 'ty' => 'move to the next y', - '2ty' => 'move to the next y, 2 times', - 'Ty' => 'move to the previous y', - '2Ty' => 'move to the previous y, 2 times', + 'ty' => 'move before the next y', + 'Ty' => 'move before the previous y', + ';' => 'repeat last character find', }.each_pair do |vim, result| it "should parse #{vim} and translate correctly" do vim.should parse_to(parser, [[vim, result]]) end + + it "should parse 2#{vim} and translate correctly" do + vim = "2#{vim}" + vim.should parse_to(parser, [[vim, "#{result}, 2 times"]]) + end end end @@ -97,11 +99,11 @@ describe 'motions' do '3G' => 'move to line 3', 'gg' => 'move to first line (beginning of file)', '15gg' => 'move to line 15', - # TODO %90 = 90% - # TODO H - home, M - middle, L - last - # CTRL+U scroll down 50%, CTRL+D scroll up 50%, - # CTRL+E scroll up 1 line, CTRL+Y scroll down 1 line, - # CTRL+F scroll forward screen, CTRL+B scroll backword screen + #TODO %90 = 90% + #TODO H - home, M - middle, L - last + #CTRL+U scroll down 50%, CTRL+D scroll up 50%, + #CTRL+E scroll up 1 line, CTRL+Y scroll down 1 line, + #CTRL+F scroll forward screen, CTRL+B scroll backword screen }.each_pair do |vim, result| it "should parse #{vim} and translate correctly" do vim.should parse_to(parser, [[vim, result]]) test/motions_test.rb 45185e5134dd72895eb228ebe38230a30867bb4e Irina Dumitrascu irina2000d@yahoo.com http://github.com/dira/vimmish/commit/bf15b579abf63ea58569a879747feed7bda0d972 bf15b579abf63ea58569a879747feed7bda0d972 2009-04-19T11:47:19-07:00 2009-04-19T10:32:31-07:00 added ; and refactoring 7e8cb03df68f2ea0dfe5d29ac6f1e0ca774efa7d Irina Dumitrascu irina2000d@yahoo.com