reline 0.2.8.pre.5 → 0.2.8.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fca2b6f76f8c59a18589d6d730f7f159e25b95e639ae7d6866f772e9bb2655ab
-  data.tar.gz: 61b69c3d01f74b957c6a2d646e58021cad4b49031d4fdf6437f2303d417d5f36
+  metadata.gz: 161818586702ae2834bf5e6490adf5dcec415256925ffd83339ffe6ef3c13012
+  data.tar.gz: 3ab65900ed4022e1baa2213d560938339711264e3188597c4eb98bc1891c81a8
 SHA512:
-  metadata.gz: 561ffdbf39c095852f0a642178d5328329cea072fdc91c32bd11edfdcecb4846414006961b6fe7adbf63c825022a8634d5a563fdeb574d127088b536967e1f9c
-  data.tar.gz: 07e62e55ca7a45d3b747724823b26af09d109f9620ba82914cfaf7e6100251bb76bd0de7b01b9829b51e41248a32b028bbbb3617c7d4eedfc2c1d05ab701a236
+  metadata.gz: 610c5367d68b627fb7e0a7bef7919d147b5a19539725f9a2d184bbed69b0988c613acf1f001d2f05857fce2490e7309e666a4327f1f15cd0541e3bb7db5089ec
+  data.tar.gz: b567f8283fe5637161e21536f500f6824d9a92aadf940e10386d27cf4df29940d3e3d6cb95a7a4fff6e711ac33c73f870ee419b45d44274184160b37354d9d77

data/lib/reline/general_io.rb

@@ -24,6 +24,7 @@ class Reline::GeneralIO
   end
 
   @@buf = []
+  @@input = STDIN
 
   def self.input=(val)
     @@input = val

data/lib/reline/line_editor.rb

@@ -575,13 +575,16 @@ class Reline::LineEditor
   end
 
   DIALOG_HEIGHT = 20
-  DIALOG_WIDTH = 40
   private def render_dialog(cursor_column)
     @dialogs.each do |dialog|
       render_each_dialog(dialog, cursor_column)
     end
   end
 
+  private def padding_space_with_escape_sequences(str, width)
+    str + (' ' * (width - calculate_width(str, true)))
+  end
+
   private def render_each_dialog(dialog, cursor_column)
     if @in_pasting
       dialog.contents = nil
@@ -589,26 +592,7 @@ class Reline::LineEditor
     end
     dialog.set_cursor_pos(cursor_column, @first_line_started_from + @started_from)
     dialog_render_info = dialog.call
-    dialog.width = dialog_render_info.width if dialog_render_info and dialog_render_info.width
-    old_dialog = dialog.clone
-    if dialog_render_info and dialog_render_info.contents and not dialog_render_info.contents.empty?
-      height = dialog_render_info.height || DIALOG_HEIGHT
-      pointer = dialog_render_info.pointer
-      dialog.contents = dialog_render_info.contents
-      if dialog.contents.size > height
-        if dialog_render_info.pointer
-          if dialog_render_info.pointer < 0
-            dialog.scroll_top = 0
-          elsif (dialog_render_info.pointer - dialog.scroll_top) >= (height - 1)
-            dialog.scroll_top = dialog_render_info.pointer - (height - 1)
-          elsif (dialog_render_info.pointer - dialog.scroll_top) < 0
-            dialog.scroll_top = dialog_render_info.pointer
-          end
-          pointer = dialog_render_info.pointer - dialog.scroll_top
-        end
-        dialog.contents = dialog.contents[dialog.scroll_top, height]
-      end
-    else
+    if dialog_render_info.nil? or dialog_render_info.contents.nil? or dialog_render_info.contents.empty?
       dialog.lines_backup = {
         lines: modify_lines(whole_lines),
         line_index: @line_index,
@@ -620,6 +604,25 @@ class Reline::LineEditor
       dialog.contents = nil
       return
     end
+    old_dialog = dialog.clone
+    dialog.width = dialog_render_info.width if dialog_render_info.width
+    height = dialog_render_info.height || DIALOG_HEIGHT
+    pointer = dialog_render_info.pointer
+    dialog.contents = dialog_render_info.contents
+    height = dialog.contents.size if dialog.contents.size < height
+    if dialog.contents.size > height
+      if dialog_render_info.pointer
+        if dialog_render_info.pointer < 0
+          dialog.scroll_top = 0
+        elsif (dialog_render_info.pointer - dialog.scroll_top) >= (height - 1)
+          dialog.scroll_top = dialog_render_info.pointer - (height - 1)
+        elsif (dialog_render_info.pointer - dialog.scroll_top) < 0
+          dialog.scroll_top = dialog_render_info.pointer
+        end
+        pointer = dialog_render_info.pointer - dialog.scroll_top
+      end
+      dialog.contents = dialog.contents[dialog.scroll_top, height]
+    end
     upper_space = @first_line_started_from - @started_from
     lower_space = @highest_in_all - @first_line_started_from - @started_from - 1
     dialog.column = dialog_render_info.pos.x
@@ -630,7 +633,7 @@ class Reline::LineEditor
     if (lower_space + @rest_height - dialog_render_info.pos.y) >= height
       dialog.vertical_offset = dialog_render_info.pos.y + 1
     elsif upper_space >= height
-      dialog.vertical_offset = dialog_render_info.pos.y + -(height + 1)
+      dialog.vertical_offset = dialog_render_info.pos.y - height
     else
       if (lower_space + @rest_height - dialog_render_info.pos.y) < height
         scroll_down(height + dialog_render_info.pos.y)
@@ -652,7 +655,8 @@ class Reline::LineEditor
           bg_color = '46'
         end
       end
-      @output.write "\e[#{bg_color}m%-#{dialog.width}s\e[49m" % Reline::Unicode.take_range(item, 0, dialog.width)
+      str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, dialog.width), dialog.width)
+      @output.write "\e[#{bg_color}m#{str}\e[49m"
       Reline::IOGate.move_cursor_column(dialog.column)
       move_cursor_down(1) if i < (dialog.contents.size - 1)
     end
@@ -696,8 +700,9 @@ class Reline::LineEditor
           s = ' ' * dialog.width
         else
           s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, dialog.width)
+          s = padding_space_with_escape_sequences(s, dialog.width)
         end
-        @output.write "\e[39m\e[49m%-#{dialog.width}s\e[39m\e[49m" % s
+        @output.write "\e[39m\e[49m#{s}\e[39m\e[49m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff)
@@ -713,8 +718,9 @@ class Reline::LineEditor
           s = ' ' * dialog.width
         else
           s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, dialog.width)
+          s = padding_space_with_escape_sequences(s, dialog.width)
         end
-        @output.write "\e[39m\e[49m%-#{dialog.width}s\e[39m\e[49m" % s
+        @output.write "\e[39m\e[49m#{s}\e[39m\e[49m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(dialog.vertical_offset + dialog.contents.size + line_num - 1 - y_diff)
@@ -731,8 +737,9 @@ class Reline::LineEditor
           s = ' ' * width
         else
           s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, width)
+          s = padding_space_with_escape_sequences(s, dialog.width)
         end
-        @output.write "\e[39m\e[49m%-#{width}s\e[39m\e[49m" % s
+        @output.write "\e[39m\e[49m#{s}\e[39m\e[49m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff)
@@ -749,9 +756,10 @@ class Reline::LineEditor
           s = ' ' * width
         else
           s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column + dialog.width, width)
+          s = padding_space_with_escape_sequences(s, dialog.width)
         end
         Reline::IOGate.move_cursor_column(dialog.column + dialog.width)
-        @output.write "\e[39m\e[49m%-#{width}s\e[39m\e[49m" % s
+        @output.write "\e[39m\e[49m#{s}\e[39m\e[49m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(old_dialog.vertical_offset + line_num - 1 + y_diff)
@@ -787,13 +795,14 @@ class Reline::LineEditor
     dialog_vertical_size = dialog.contents.size
     dialog_vertical_size.times do |i|
       if i < visual_lines_under_dialog.size
-        Reline::IOGate.move_cursor_column(0)
-        @output.write "\e[39m\e[49m%-#{dialog.width}s\e[39m\e[49m" % visual_lines_under_dialog[i]
+        Reline::IOGate.move_cursor_column(dialog.column)
+        str = Reline::Unicode.take_range(visual_lines_under_dialog[i], dialog.column, dialog.width)
+        str = padding_space_with_escape_sequences(str, dialog.width)
+        @output.write "\e[39m\e[49m#{str}\e[39m\e[49m"
       else
         Reline::IOGate.move_cursor_column(dialog.column)
         @output.write "\e[39m\e[49m#{' ' * dialog.width}\e[39m\e[49m"
       end
-      Reline::IOGate.erase_after_cursor
       move_cursor_down(1) if i < (dialog_vertical_size - 1)
     end
     move_cursor_up(dialog_vertical_size - 1 + dialog.vertical_offset)
@@ -1287,8 +1296,10 @@ class Reline::LineEditor
       end
     end
     completed = @completion_journey_data.list[@completion_journey_data.pointer]
-    @line = @completion_journey_data.preposing + completed + @completion_journey_data.postposing
-    line_to_pointer = @completion_journey_data.preposing + completed
+    new_line = (@completion_journey_data.preposing + completed + @completion_journey_data.postposing).split("\n")[@line_index]
+    @line = new_line.nil? ? String.new(encoding: @encoding) : new_line
+    line_to_pointer = (@completion_journey_data.preposing + completed).split("\n").last
+    line_to_pointer = String.new(encoding: @encoding) if line_to_pointer.nil?
     @cursor_max = calculate_width(@line)
     @cursor = calculate_width(line_to_pointer)
     @byte_pointer = line_to_pointer.bytesize

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.2.8.pre.5'
+  VERSION = '0.2.8.pre.6'
 end

data/lib/reline.rb

@@ -194,7 +194,7 @@ module Reline
         # Auto complete starts only when edited
         return nil
       end
-      pre, target, post= retrieve_completion_block(true)
+      pre, target, post = retrieve_completion_block(true)
       if target.nil? or target.empty?# or target.size <= 3
         return nil
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.2.8.pre.5
+  version: 0.2.8.pre.6
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console