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] Keep operator proc as a local variable in the scope

Browse source 
The proc variable will be used later so the instance variable will be changes.

https://github.com/ruby/reline/commit/496c4361f6
This commit is contained in:
aycabta 2020-11-02 14:48:44 +09:00
parent 564aadce62
commit faf8f216be
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/reline/line_editor.rb
View file

@ -706,12 +706,13 @@ class Reline::LineEditor
else else
old_waiting_proc = @waiting_proc old_waiting_proc = @waiting_proc
old_waiting_operator_proc = @waiting_operator_proc old_waiting_operator_proc = @waiting_operator_proc
current_waiting_operator_proc = @waiting_operator_proc
@waiting_proc = proc { |k| @waiting_proc = proc { |k|
old_cursor, old_byte_pointer = @cursor, @byte_pointer old_cursor, old_byte_pointer = @cursor, @byte_pointer
old_waiting_proc.(k) old_waiting_proc.(k)
cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
@cursor, @byte_pointer = old_cursor, old_byte_pointer @cursor, @byte_pointer = old_cursor, old_byte_pointer
@waiting_operator_proc.(cursor_diff, byte_pointer_diff) current_waiting_operator_proc.(cursor_diff, byte_pointer_diff)
@waiting_operator_proc = old_waiting_operator_proc @waiting_operator_proc = old_waiting_operator_proc
} }
end end

13
test/reline/test_key_actor_vi.rb
View file

@ -1215,6 +1215,19 @@ class Reline::KeyActor::ViInsert::Test < Reline::TestCase
assert_line('aaa ddd eee') assert_line('aaa ddd eee')
end end
def test_vi_delete_meta_with_vi_next_char
input_keys("aaa bbb ccc ___ ddd\C-[02w")
assert_byte_pointer_size('aaa bbb ')
assert_cursor(8)
assert_cursor_max(19)
assert_line('aaa bbb ccc ___ ddd')
input_keys('df_')
assert_byte_pointer_size('aaa bbb ')
assert_cursor(8)
assert_cursor_max(15)
assert_line('aaa bbb ___ ddd')
end
def test_vi_change_meta def test_vi_change_meta
input_keys("aaa bbb ccc ddd eee\C-[02w") input_keys("aaa bbb ccc ddd eee\C-[02w")
assert_byte_pointer_size('aaa bbb ') assert_byte_pointer_size('aaa bbb ')