Suppress crashing when auto_indent_proc returns broken indent info

aycabta · JuanitoFatas · aycabta · commit 7c24276275f1 · 2021-01-06T02:59:58.000+09:00
Co-authored-by: Juanito Fatas &lt;me@juanitofatas.com&gt;
diff --git a/bin/multiline_repl b/bin/multiline_repl
@@ -22,6 +22,9 @@ opt.on('--dynamic-prompt') {
     }
   }
 }
+opt.on('--auto-indent') {
+  AutoIndent.new
+}
 opt.parse!(ARGV)
 
 begin
diff --git a/bin/termination_checker.rb b/bin/termination_checker.rb
@@ -16,3 +16,15 @@ def terminated?(code)
     end
   end
 end
+
+class AutoIndent < RubyLex
+  def initialize
+    set_input(self)
+    context = Struct.new(:auto_indent_mode).new(true)
+    set_auto_indent(context)
+  end
+
+  def auto_indent(&block)
+    Reline.auto_indent_proc = block
+  end
+end
diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
@@ -1131,6 +1131,7 @@ def call_completion_proc
       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
@@ -637,6 +637,20 @@ def test_update_cursor_correctly_when_just_cursor_moving
       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

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ opt.on('--dynamic-prompt') {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
	`25`	`+opt.on('--auto-indent') {`
	`26`	`+ AutoIndent.new`
	`27`	`+}`
`25`	`28`	`opt.parse!(ARGV)`
`26`	`29`
`27`	`30`	`begin`