[ruby/reline] Fix the cause of test_yamatanooroti randomly failing

(ruby/reline#474) * Add repeated input-delete test that fails on HEAD * Use raw mode while readmultiline
hsbt · Feb 27, 2023 · a1db25b · a1db25b
1 parent ef5facf
commit a1db25b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 12 deletions.
diff --git a/lib/reline.rb b/lib/reline.rb
@@ -266,19 +266,21 @@ def get_screen_size
     Reline::DEFAULT_DIALOG_CONTEXT = Array.new
 
     def readmultiline(prompt = '', add_hist = false, &confirm_multiline_termination)
-      unless confirm_multiline_termination
-        raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
-      end
-      inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
+      Reline::IOGate.with_raw_input do
+        unless confirm_multiline_termination
+          raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
+        end
+        inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
 
-      whole_buffer = line_editor.whole_buffer.dup
-      whole_buffer.taint if RUBY_VERSION < '2.7'
-      if add_hist and whole_buffer and whole_buffer.chomp("\n").size > 0
-        Reline::HISTORY << whole_buffer
-      end
+        whole_buffer = line_editor.whole_buffer.dup
+        whole_buffer.taint if RUBY_VERSION < '2.7'
+        if add_hist and whole_buffer and whole_buffer.chomp("\n").size > 0
+          Reline::HISTORY << whole_buffer
+        end
 
-      line_editor.reset_line if line_editor.whole_buffer.nil?
-      whole_buffer
+        line_editor.reset_line if line_editor.whole_buffer.nil?
+        whole_buffer
+      end
     end
 
     def readline(prompt = '', add_hist = false)

diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb
@@ -143,6 +143,10 @@ def self.output=(val)
     @@output = val
   end
 
+  def self.with_raw_input
+    @@input.raw { yield }
+  end
+
   @@buf = []
   def self.inner_getc
     unless @@buf.empty?

diff --git a/lib/reline/general_io.rb b/lib/reline/general_io.rb
@@ -31,6 +31,10 @@ def self.input=(val)
     @@input = val
   end
 
+  def self.with_raw_input
+    yield
+  end
+
   def self.getc
     unless @@buf.empty?
       return @@buf.shift

diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
@@ -457,7 +457,7 @@ def rerender
         new_lines = whole_lines
       end
       modify_lines(new_lines).each_with_index do |line, index|
-        @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\n"
+        @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\r\n"
         Reline::IOGate.erase_after_cursor
       end
       @output.flush

diff --git a/lib/reline/windows.rb b/lib/reline/windows.rb
@@ -291,6 +291,10 @@ def self.check_input_event
     end
   end
 
+  def self.with_raw_input
+    yield
+  end
+
   def self.getc
     check_input_event
     @@output_buf.shift

diff --git a/test/reline/yamatanooroti/test_rendering.rb b/test/reline/yamatanooroti/test_rendering.rb
@@ -1425,6 +1425,16 @@ def test_bracket_newline_indent
       EOC
     end
 
+    def test_repeated_input_delete
+      start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
+      write("a\C-h" * 4000)
+      close
+      assert_screen(<<~'EOC')
+        Multiline REPL.
+        prompt>
+      EOC
+    end
+
     def write_inputrc(content)
       File.open(@inputrc_file, 'w') do |f|
         f.write content