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

Check encoding when Readline completion

Browse source
This commit is contained in:
aycabta 2019-05-14 04:08:23 +09:00
parent 29dde62605
commit 1e65196b54
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/reline/line_editor.rb
View file

@ -405,7 +405,10 @@ class Reline::LineEditor
private def complete_internal_proc(list, is_menu) private def complete_internal_proc(list, is_menu)
preposing, target, postposing = @retrieve_completion_block.(@line, @byte_pointer) preposing, target, postposing = @retrieve_completion_block.(@line, @byte_pointer)
list = list.select { |i| i&.start_with?(target) } list = list.select { |i|
raise Encoding::CompatibilityError if i and i.encoding != @encoding
i&.start_with?(target)
}
if is_menu if is_menu
menu(target, list) menu(target, list)
return nil return nil

7
test/reline/test_key_actor_emacs.rb
View file

@ -4,8 +4,9 @@ class Reline::KeyActor::Emacs::Test < Reline::TestCase
def setup def setup
@prompt = '> ' @prompt = '> '
@config = Reline::Config.new # Emacs mode is default @config = Reline::Config.new # Emacs mode is default
@encoding = (RELINE_TEST_ENCODING rescue Encoding.default_external)
@line_editor = Reline::LineEditor.new(@config) @line_editor = Reline::LineEditor.new(@config)
@line_editor.reset(@prompt, (RELINE_TEST_ENCODING rescue Encoding.default_external)) @line_editor.reset(@prompt, @encoding)
@line_editor.retrieve_completion_block = Reline.method(:retrieve_completion_block) @line_editor.retrieve_completion_block = Reline.method(:retrieve_completion_block)
end end
@ -1054,6 +1055,8 @@ class Reline::KeyActor::Emacs::Test < Reline::TestCase
foo_bar foo_bar
foo_baz foo_baz
qux qux
}.map { |i|
i.encode(@encoding)
} }
} }
input_keys('fo') input_keys('fo')
@ -1096,6 +1099,8 @@ class Reline::KeyActor::Emacs::Test < Reline::TestCase
foo_bar foo_bar
foo_baz foo_baz
qux qux
}.map { |i|
i.encode(@encoding)
} }
} }
input_keys('abcde fo ABCDE') input_keys('abcde fo ABCDE')