diff options
author | aycabta <aycabta@gmail.com> | 2020-01-06 01:20:24 +0900 |
---|---|---|
committer | aycabta <aycabta@gmail.com> | 2020-01-06 01:20:24 +0900 |
commit | 439e1ccd088a2b8d7b965a46db0212db24b40fc4 (patch) | |
tree | e138f018d3baf35545a92b96ceaebec0fa03258d | |
parent | da028a4fbf879144a09192c5cc4a0020c69048e0 (diff) |
Complete indented and quoted string correctly
def foo
''.upca[TAB]
This will be completed to be:
def foo
''.upcase
The indent was gone. This commit fixes the bug.
-rw-r--r-- | lib/reline/line_editor.rb | 8 | ||||
-rw-r--r-- | test/reline/test_key_actor_emacs.rb | 41 |
2 files changed, 42 insertions, 7 deletions
diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index b46eddf31a..475f76fd65 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -905,7 +905,6 @@ class Reline::LineEditor quote = nil i += 1 rest = nil - break_pointer = nil elsif quote and slice.start_with?(escaped_quote) # skip i += 2 @@ -915,7 +914,7 @@ class Reline::LineEditor closing_quote = /(?!\\)#{Regexp.escape(quote)}/ escaped_quote = /\\#{Regexp.escape(quote)}/ i += 1 - break_pointer = i + break_pointer = i - 1 elsif not quote and slice =~ word_break_regexp rest = $' i += 1 @@ -937,6 +936,11 @@ class Reline::LineEditor end else preposing = '' + if break_pointer + preposing = @line.byteslice(0, break_pointer) + else + preposing = '' + end target = before end [preposing.encode(@encoding), target.encode(@encoding), postposing.encode(@encoding)] diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb index 120f51453e..6de448fa03 100644 --- a/test/reline/test_key_actor_emacs.rb +++ b/test/reline/test_key_actor_emacs.rb @@ -1325,6 +1325,37 @@ class Reline::KeyActor::Emacs::Test < Reline::TestCase assert_line('foo_ba') end + def test_completion_with_indent + @line_editor.completion_proc = proc { |word| + %w{ + foo_foo + foo_bar + foo_baz + qux + }.map { |i| + i.encode(@encoding) + } + } + input_keys(' fo') + assert_byte_pointer_size(' fo') + assert_cursor(4) + assert_cursor_max(4) + assert_line(' fo') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + input_keys("\C-i", false) + assert_byte_pointer_size(' foo_') + assert_cursor(6) + assert_cursor_max(6) + assert_line(' foo_') + assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) + input_keys("\C-i", false) + assert_byte_pointer_size(' foo_') + assert_cursor(6) + assert_cursor_max(6) + assert_line(' foo_') + assert_equal(%w{foo_foo foo_bar foo_baz}, @line_editor.instance_variable_get(:@menu_info).list) + end + def test_completion_with_indent_and_completer_quote_characters @line_editor.completion_proc = proc { |word| %w{ @@ -1336,11 +1367,11 @@ class Reline::KeyActor::Emacs::Test < Reline::TestCase i.encode(@encoding) } } - input_keys(' "".foo_') - assert_byte_pointer_size(' "".foo_') - assert_cursor(9) - assert_cursor_max(9) - assert_line(' "".foo_') + input_keys(' "".fo') + assert_byte_pointer_size(' "".fo') + assert_cursor(7) + assert_cursor_max(7) + assert_line(' "".fo') assert_equal(nil, @line_editor.instance_variable_get(:@menu_info)) input_keys("\C-i", false) assert_byte_pointer_size(' "".foo_') |