archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-24 05:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

^D on non-empty line in vi mode behaves like Enter

Browse source
This commit is contained in:
aycabta 2019-12-25 09:29:46 +09:00
parent 8e6d51e09a
commit 622e47a1db
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/reline/line_editor.rb
View file

@ -1938,9 +1938,11 @@ class Reline::LineEditor
@eof = true @eof = true
finish finish
else else
# TODO: list ed_newline(key)
end end
end end
alias_method :vi_end_of_transmission, :vi_list_or_eof
alias_method :vi_eof_maybe, :vi_list_or_eof
private def ed_delete_next_char(key, arg: 1) private def ed_delete_next_char(key, arg: 1)
byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer) byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)

19
test/reline/test_key_actor_vi.rb
View file

@ -812,16 +812,19 @@ class Reline::KeyActor::ViInsert::Test < Reline::TestCase
end end
def test_vi_list_or_eof def test_vi_list_or_eof
input_keys('a') input_keys("\C-d") # quit from inputing
assert_byte_pointer_size('a') assert_line(nil)
assert_cursor(1) assert(@line_editor.finished?)
assert_cursor_max(1) end
def test_vi_list_or_eof_with_non_empty_line
input_keys('ab')
assert_byte_pointer_size('ab')
assert_cursor(2)
assert_cursor_max(2)
refute(@line_editor.finished?) refute(@line_editor.finished?)
input_keys("\C-d") input_keys("\C-d")
assert_line('a') assert_line('ab')
refute(@line_editor.finished?)
input_keys("\C-h\C-d")
assert_line(nil)
assert(@line_editor.finished?) assert(@line_editor.finished?)
end end