1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/reline] Fix vi_yank or vi_delete_meta copies nil bug

Browse Source 
(https://github.com/ruby/reline/pull/726)

https://github.com/ruby/reline/commit/46b30b07c9
This commit is contained in:
tomoya ishida 2024-06-18 23:57:15 +09:00 committed by git
parent b499356307
commit c2e2c5975d
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/reline/line_editor.rb
View File

@ -2259,9 +2259,11 @@ class Reline::LineEditor
line, cut = byteslice!(current_line, @byte_pointer, byte_pointer_diff)
elsif byte_pointer_diff < 0
line, cut = byteslice!(current_line, @byte_pointer + byte_pointer_diff, -byte_pointer_diff)
else
return
end
copy_for_vi(cut)
set_current_line(line || '', @byte_pointer + (byte_pointer_diff < 0 ? byte_pointer_diff : 0))
set_current_line(line, @byte_pointer + (byte_pointer_diff < 0 ? byte_pointer_diff : 0))
end
private def vi_yank(key, arg: nil)
@ -2280,6 +2282,8 @@ class Reline::LineEditor
cut = current_line.byteslice(@byte_pointer, byte_pointer_diff)
elsif byte_pointer_diff < 0
cut = current_line.byteslice(@byte_pointer + byte_pointer_diff, -byte_pointer_diff)
else
return
end
copy_for_vi(cut)
end

14
test/reline/test_key_actor_vi.rb
View File

@ -738,6 +738,13 @@ class Reline::ViInsertTest < Reline::TestCase
assert_line_around_cursor('aaa ', 'ddd eee')
end
def test_vi_delete_meta_nothing
input_keys("foo\C-[0")
assert_line_around_cursor('', 'foo')
input_keys('dhp')
assert_line_around_cursor('', 'foo')
end
def test_vi_delete_meta_with_vi_next_word_at_eol
input_keys("foo bar\C-[0w")
assert_line_around_cursor('foo ', 'bar')
@ -848,6 +855,13 @@ class Reline::ViInsertTest < Reline::TestCase
assert_line_around_cursor('foofofoofoo barba', 'ro barbar')
end
def test_vi_yank_nothing
input_keys("foo\C-[0")
assert_line_around_cursor('', 'foo')
input_keys('yhp')
assert_line_around_cursor('', 'foo')
end
def test_vi_end_word_with_operator
input_keys("foo bar\C-[0")
assert_line_around_cursor('', 'foo bar')