kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/reline] Key strokes like 2dl should behave d2l

Browse source 
Key strokes, vi arg, operator, and motion should be treated as operator, vi
arg, and motion.

https://github.com/ruby/reline/commit/d1a7e74aa4
This commit is contained in:
aycabta 2020-11-14 22:52:38 +09:00
parent 21f26018d2
commit c85035363f
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/reline/line_editor.rb
View file

@ -179,6 +179,7 @@ class Reline::LineEditor
@vi_arg = nil
@waiting_proc = nil
@waiting_operator_proc = nil
@waiting_operator_vi_arg = nil
@completion_journey_data = nil
@completion_state = CompletionState::NORMAL
@perfect_matched = nil
@ -698,6 +699,7 @@ class Reline::LineEditor
if @waiting_operator_proc
if VI_MOTIONS.include?(method_symbol)
old_cursor, old_byte_pointer = @cursor, @byte_pointer
@vi_arg = @waiting_operator_vi_arg if @waiting_operator_vi_arg > 1
block.(true)
unless @waiting_proc
cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
@ -721,6 +723,8 @@ class Reline::LineEditor
block.(false)
end
@waiting_operator_proc = nil
@waiting_operator_vi_arg = nil
@vi_arg = nil
else
block.(false)
end
@ -2088,7 +2092,7 @@ class Reline::LineEditor
@cursor = 0
end
private def vi_change_meta(key)
private def vi_change_meta(key, arg: 1)
@waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
if byte_pointer_diff > 0
@line, cut = byteslice!(@line, @byte_pointer, byte_pointer_diff)
@ -2101,9 +2105,10 @@ class Reline::LineEditor
@byte_pointer += byte_pointer_diff if byte_pointer_diff < 0
@config.editing_mode = :vi_insert
}
@waiting_operator_vi_arg = arg
end
private def vi_delete_meta(key)
private def vi_delete_meta(key, arg: 1)
@waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
if byte_pointer_diff > 0
@line, cut = byteslice!(@line, @byte_pointer, byte_pointer_diff)
@ -2115,9 +2120,10 @@ class Reline::LineEditor
@cursor_max -= cursor_diff.abs
@byte_pointer += byte_pointer_diff if byte_pointer_diff < 0
}
@waiting_operator_vi_arg = arg
end
private def vi_yank(key)
private def vi_yank(key, arg: 1)
@waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
if byte_pointer_diff > 0
cut = @line.byteslice(@byte_pointer, byte_pointer_diff)
@ -2126,6 +2132,7 @@ class Reline::LineEditor
end
copy_for_vi(cut)
}
@waiting_operator_vi_arg = arg
end
private def vi_list_or_eof(key)

6
test/reline/test_key_actor_vi.rb
View file

@ -1234,11 +1234,11 @@ class Reline::KeyActor::ViInsert::Test < Reline::TestCase
assert_cursor(8)
assert_cursor_max(11)
assert_line('aaa bbb ccc')
input_keys('2dl') # TODO This should delete 2 chars.
input_keys('2dl')
assert_byte_pointer_size('aaa bbb ')
assert_cursor(8)
assert_cursor_max(10)
assert_line('aaa bbb cc')
assert_cursor_max(9)
assert_line('aaa bbb c')
end
def test_vi_change_meta