reline 0.2.8.pre.3 → 0.2.8.pre.7

data/lib/reline/unicode.rb

@@ -186,9 +186,9 @@ class Reline::Unicode
   end
 
   # Take a chunk of a String with escape sequences.
-  def self.take_range(str, col, length, encoding = str.encoding)
+  def self.take_range(str, start_col, max_width, encoding = str.encoding)
     chunk = String.new(encoding: encoding)
-    width = 0
+    total_width = 0
     rest = str.encode(Encoding::UTF_8)
     in_zero_width = false
     rest.scan(WIDTH_SCANNER) do |gc|
@@ -206,9 +206,10 @@ class Reline::Unicode
         if in_zero_width
           chunk << gc
         else
-          width = get_mbchar_width(gc)
-          break if (width + length) <= col
-          chunk << gc if col <= width
+          mbchar_width = get_mbchar_width(gc)
+          total_width += mbchar_width
+          break if (start_col + max_width) < total_width
+          chunk << gc if start_col < total_width
         end
       end
     end

data/lib/reline/version.rb

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

data/lib/reline/windows.rb

@@ -226,6 +226,8 @@ class Reline::Windows
     # no char, only control keys
     return if key.char_code == 0 and key.control_keys.any?
 
+    @@output_buf.push("\e".ord) if key.control_keys.include?(:ALT)
+
     @@output_buf.concat(key.char.bytes)
   end
 

data/lib/reline.rb

@@ -16,8 +16,15 @@ module Reline
 
   class ConfigEncodingConversionError < StandardError; end
 
-  Key = Struct.new('Key', :char, :combined_char, :with_meta)
+  Key = Struct.new('Key', :char, :combined_char, :with_meta) do
+    def match?(key)
+      (key.char.nil? or char.nil? or char == key.char) and
+      (key.combined_char.nil? or combined_char.nil? or combined_char == key.combined_char) and
+      (key.with_meta.nil? or with_meta.nil? or with_meta == key.with_meta)
+    end
+  end
   CursorPos = Struct.new(:x, :y)
+  DialogRenderInfo = Struct.new(:pos, :contents, :pointer, :bg_color, :width, :height, keyword_init: true)
 
   class Core
     ATTR_READER_NAMES = %i(
@@ -193,8 +200,8 @@ module Reline
         # Auto complete starts only when edited
         return nil
       end
-      pre, target, post= retrieve_completion_block(true)
-      if target.nil? or target.empty?# or target.size <= 3
+      pre, target, post = retrieve_completion_block(true)
+      if target.nil? or target.empty? or target.size <= 3
         return nil
       end
       if completion_journey_data and completion_journey_data.list
@@ -205,7 +212,7 @@ module Reline
         result = call_completion_proc_with_checking_args(pre, target, post)
         pointer = nil
       end
-      if result and result.size == 1 and result[0] == target
+      if result and result.size == 1 and result[0] == target and pointer != 0
         result = nil
       end
       target_width = Reline::Unicode.calculate_width(target)
@@ -219,9 +226,9 @@ module Reline
       cursor_pos_to_render = Reline::CursorPos.new(x, y)
       if context and context.is_a?(Array)
         context.clear
-        context.push(cursor_pos_to_render, result, pointer)
+        context.push(cursor_pos_to_render, result, pointer, dialog)
       end
-      [cursor_pos_to_render, result, pointer, nil]
+      DialogRenderInfo.new(pos: cursor_pos_to_render, contents: result, pointer: pointer, height: 15)
     }
     Reline::DEFAULT_DIALOG_CONTEXT = Array.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.2.8.pre.3
+  version: 0.2.8.pre.7
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -47,6 +47,7 @@ files:
 - lib/reline/key_stroke.rb
 - lib/reline/kill_ring.rb
 - lib/reline/line_editor.rb
+- lib/reline/line_editor.rb.orig
 - lib/reline/sibori.rb
 - lib/reline/terminfo.rb
 - lib/reline/unicode.rb