diff options
author | aycabta <aycabta@gmail.com> | 2021-01-05 18:22:00 +0900 |
---|---|---|
committer | aycabta <aycabta@gmail.com> | 2021-01-08 13:25:18 +0900 |
commit | 88af5085dbf61dcd815e66aa9fe96c7d612c9747 (patch) | |
tree | c2c4bb0356d717be36e0793748c384dd4498fa8b | |
parent | e356b71d35bf3746bec7fa1a309338151dbde43a (diff) |
[ruby/reline] Suppress crashing when auto_indent_proc returns broken indent info
Co-authored-by: Juanito Fatas <me@juanitofatas.com>
https://github.com/ruby/reline/commit/7c24276275
-rw-r--r-- | lib/reline/line_editor.rb | 1 | ||||
-rw-r--r-- | test/reline/yamatanooroti/test_rendering.rb | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 10c94db753..bf2732823b 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1131,6 +1131,7 @@ class Reline::LineEditor new_lines = whole_lines end new_indent = @auto_indent_proc.(new_lines, @line_index, @byte_pointer, @check_new_auto_indent) + new_indent = @cursor_max if new_indent&.> @cursor_max if new_indent&.>= 0 md = new_lines[@line_index].match(/\A */) prev_indent = md[0].count(' ') diff --git a/test/reline/yamatanooroti/test_rendering.rb b/test/reline/yamatanooroti/test_rendering.rb index 7950b562b2..ce8c4cec24 100644 --- a/test/reline/yamatanooroti/test_rendering.rb +++ b/test/reline/yamatanooroti/test_rendering.rb @@ -637,6 +637,20 @@ begin EOC end + def test_suppress_auto_indent_just_after_pasted + start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/bin/multiline_repl --auto-indent}, startup_message: 'Multiline REPL.') + write("def hoge\n [[\n 3]]\ned") + write("\C-bn") + close + assert_screen(<<~EOC) + Multiline REPL. + prompt> def hoge + prompt> [[ + prompt> 3]] + prompt> end + EOC + end + private def write_inputrc(content) File.open(@inputrc_file, 'w') do |f| f.write content |