From b2fb33bf0466e5107a08519f3986b7cedd025b68 Mon Sep 17 00:00:00 2001
From: tompng <tomoyapenguin@gmail.com>
Date: Tue, 30 Apr 2024 02:18:03 +0900
Subject: [PATCH] Fix completion dialog position when completed part is
 wordwrapped

---
 lib/reline.rb                               | 13 +++++----
 test/reline/yamatanooroti/test_rendering.rb | 31 ++++++++++++++++++++-
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/lib/reline.rb b/lib/reline.rb
index f0060f5c9c..0a266b9c58 100644
--- a/lib/reline.rb
+++ b/lib/reline.rb
@@ -225,17 +225,20 @@ def get_screen_size
       journey_data = completion_journey_data
       return unless journey_data
 
-      target = journey_data.list[journey_data.pointer]
+      target = journey_data.list.first
+      completed = journey_data.list[journey_data.pointer]
       result = journey_data.list.drop(1)
       pointer = journey_data.pointer - 1
-      return if target.empty? || (result == [target] && pointer < 0)
+      return if completed.empty? || (result == [completed] && pointer < 0)
 
       target_width = Reline::Unicode.calculate_width(target)
-      x = cursor_pos.x - target_width
-      if x < 0
-        x = screen_width + x
+      completed_width = Reline::Unicode.calculate_width(completed)
+      if cursor_pos.x <= completed_width - target_width
+        # When target is rendered on the line above cursor position
+        x = screen_width - completed_width
         y = -1
       else
+        x = [cursor_pos.x - completed_width, 0].max
         y = 0
       end
       cursor_pos_to_render = Reline::CursorPos.new(x, y)
diff --git a/test/reline/yamatanooroti/test_rendering.rb b/test/reline/yamatanooroti/test_rendering.rb
index 7b96e7b6a6..cfaf85a486 100644
--- a/test/reline/yamatanooroti/test_rendering.rb
+++ b/test/reline/yamatanooroti/test_rendering.rb
@@ -1173,7 +1173,36 @@ def test_autocomplete_target_is_wrapped
       assert_screen(<<~'EOC')
         Multiline REPL.
         prompt>           St
-        r             String
+        r
+        String
+        Struct
+      EOC
+    end
+
+    def test_autocomplete_target_at_end_of_line
+      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
+      write('         ')
+      write('Str')
+      write("\C-i")
+      close
+      assert_screen(<<~'EOC')
+        Multiline REPL.
+        prompt>          Str
+        ing           String
+                      Struct
+      EOC
+    end
+
+    def test_autocomplete_completed_input_is_wrapped
+      start_terminal(20, 20, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
+      write('        ')
+      write('Str')
+      write("\C-i")
+      close
+      assert_screen(<<~'EOC')
+        Multiline REPL.
+        prompt>         Stri
+        ng            String
                       Struct
       EOC
     end