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

Support disable-completion

Browse Source
This commit is contained in:
aycabta 2019-12-04 22:32:12 +09:00
parent ad8fbf444a
commit e3587ed849
2 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/reline/line_editor.rb
View File

@ -776,20 +776,24 @@ class Reline::LineEditor
@first_char = false @first_char = false
completion_occurs = false completion_occurs = false
if @config.editing_mode_is?(:emacs, :vi_insert) and key.char == "\C-i".ord if @config.editing_mode_is?(:emacs, :vi_insert) and key.char == "\C-i".ord
result = retrieve_completion_block unless @config.disable_completion
slice = result[1] result = retrieve_completion_block
result = @completion_proc.(slice) if @completion_proc and slice slice = result[1]
if result.is_a?(Array) result = @completion_proc.(slice) if @completion_proc and slice
completion_occurs = true if result.is_a?(Array)
complete(result) completion_occurs = true
complete(result)
end
end end
elsif @config.editing_mode_is?(:vi_insert) and ["\C-p".ord, "\C-n".ord].include?(key.char) elsif not @config.disable_completion and @config.editing_mode_is?(:vi_insert) and ["\C-p".ord, "\C-n".ord].include?(key.char)
result = retrieve_completion_block unless @config.disable_completion
slice = result[1] result = retrieve_completion_block
result = @completion_proc.(slice) if @completion_proc and slice slice = result[1]
if result.is_a?(Array) result = @completion_proc.(slice) if @completion_proc and slice
completion_occurs = true if result.is_a?(Array)
move_completed_list(result, "\C-p".ord == key.char ? :up : :down) completion_occurs = true
move_completed_list(result, "\C-p".ord == key.char ? :up : :down)
end
end end
elsif Symbol === key.char and respond_to?(key.char, true) elsif Symbol === key.char and respond_to?(key.char, true)
process_key(key.char, key.char) process_key(key.char, key.char)

39
test/reline/test_key_actor_vi.rb
View File

@ -988,6 +988,45 @@ class Reline::KeyActor::ViInsert::Test < Reline::TestCase
assert_line('abcde foo_bar_baz ABCDE') assert_line('abcde foo_bar_baz ABCDE')
end end
def test_completion
@line_editor.completion_proc = proc { |word|
%w{
foo_bar
foo_bar_baz
}
}
input_keys('foo')
assert_byte_pointer_size('foo')
assert_cursor(3)
assert_cursor_max(3)
assert_line('foo')
input_keys("\C-i")
assert_byte_pointer_size('foo_bar')
assert_cursor(7)
assert_cursor_max(7)
assert_line('foo_bar')
end
def test_completion_with_disable_completion
@config.disable_completion = true
@line_editor.completion_proc = proc { |word|
%w{
foo_bar
foo_bar_baz
}
}
input_keys('foo')
assert_byte_pointer_size('foo')
assert_cursor(3)
assert_cursor_max(3)
assert_line('foo')
input_keys("\C-i")
assert_byte_pointer_size('foo')
assert_cursor(3)
assert_cursor_max(3)
assert_line('foo')
end
def test_vi_first_print def test_vi_first_print
input_keys("abcde\C-[^") input_keys("abcde\C-[^")
assert_byte_pointer_size('') assert_byte_pointer_size('')