summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraycabta <[email protected]>2021-03-24 14:25:06 +0900
committeraycabta <[email protected]>2021-03-24 15:43:34 +0900
commit89caf51d9346343156d5b9f1659131414c055ebd ()
tree76b14d832e530b5cea65a521e016425deebcd53e
parent758f2b35f93478c481902d9d3f8876216a5dcc4d (diff)
[ruby/reline] Suppress crashing when completer_{quote,word_break}_characters is empty
https://.com/ruby/reline/commit/c6f1164942
-rw-r--r--lib/reline/line_editor.rb16
-rw-r--r--test/reline/test_reline.rb4
2 files changed, 16 insertions, 4 deletions
@@ -1224,8 +1224,16 @@ class Reline::LineEditor
end
def retrieve_completion_block(set_completion_quote_character = false)
- word_break_regexp = /\A[#{Regexp.escape(Reline.completer_word_break_characters)}]/
- quote_characters_regexp = /\A[#{Regexp.escape(Reline.completer_quote_characters)}]/
before = @line.byteslice(0, @byte_pointer)
rest = nil
break_pointer = nil
@@ -1246,14 +1254,14 @@ class Reline::LineEditor
elsif quote and slice.start_with?(escaped_quote)
# skip
i += 2
- elsif slice =~ quote_characters_regexp # find new "
rest = $'
quote = $&
closing_quote = /(?!\\)#{Regexp.escape(quote)}/
escaped_quote = /\\#{Regexp.escape(quote)}/
i += 1
break_pointer = i - 1
- elsif not quote and slice =~ word_break_regexp
rest = $'
i += 1
before = @line.byteslice(i, @byte_pointer - i)
@@ -65,6 +65,8 @@ class Reline::Test < Reline::TestCase
Reline.completer_word_break_characters = "[".encode(Encoding::ASCII)
assert_equal("[", Reline.completer_word_break_characters)
assert_equal(get_reline_encoding, Reline.completer_word_break_characters.encoding)
ensure
Reline.completer_word_break_characters = completer_word_break_characters
end
@@ -89,6 +91,8 @@ class Reline::Test < Reline::TestCase
Reline.completer_quote_characters = "`".encode(Encoding::ASCII)
assert_equal("`", Reline.completer_quote_characters)
assert_equal(get_reline_encoding, Reline.completer_quote_characters.encoding)
ensure
Reline.completer_quote_characters = completer_quote_characters
end