reline 0.2.8.pre.4 → 0.2.8.pre.8

data/lib/reline/unicode.rb

@@ -101,9 +101,9 @@ class Reline::Unicode
 
   def self.get_mbchar_width(mbchar)
     ord = mbchar.ord
-    if (0x00 <= ord and ord <= 0x1F)
+    if (0x00 <= ord and ord <= 0x1F) # in EscapedPairs
       return 2
-    elsif (0x20 <= ord and ord <= 0x7E)
+    elsif (0x20 <= ord and ord <= 0x7E) # printable ASCII chars
       return 1
     end
     m = mbchar.encode(Encoding::UTF_8).match(MBCharWidthRE)
@@ -185,10 +185,10 @@ class Reline::Unicode
     [lines, height]
   end
 
-  # Take a chunk of a String with escape sequences.
-  def self.take_range(str, col, length, encoding = str.encoding)
+  # Take a chunk of a String cut by width with escape sequences.
+  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.4'
+  VERSION = '0.2.8.pre.8'
 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,9 +16,28 @@ 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)
+      if key.instance_of?(Reline::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)
+      elsif key.is_a?(Integer) or key.is_a?(Symbol)
+        if not combined_char.nil? and combined_char == key
+          true
+        elsif combined_char.nil? and not char.nil? and char == key
+          true
+        else
+          false
+        end
+      else
+        false
+      end
+    end
+    alias_method :==, :match?
+  end
   CursorPos = Struct.new(:x, :y)
-  DialogRenderInfo = Struct.new(:pos, :contents, :pointer, :bg_color, :height, keyword_init: true)
+  DialogRenderInfo = Struct.new(:pos, :contents, :pointer, :bg_color, :width, :height, :scrollbar, keyword_init: true)
 
   class Core
     ATTR_READER_NAMES = %i(
@@ -194,8 +213,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
@@ -206,7 +225,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)
@@ -222,7 +241,7 @@ module Reline
         context.clear
         context.push(cursor_pos_to_render, result, pointer, dialog)
       end
-      DialogRenderInfo.new(pos: cursor_pos_to_render, contents: result, pointer: pointer, height: 15)
+      DialogRenderInfo.new(pos: cursor_pos_to_render, contents: result, pointer: pointer, scrollbar: true, height: 15)
     }
     Reline::DEFAULT_DIALOG_CONTEXT = Array.new
 
@@ -362,25 +381,9 @@ module Reline
           break
         when :matching
           if buffer.size == 1
-            begin
-              succ_c = nil
-              Timeout.timeout(keyseq_timeout / 1000.0) {
-                succ_c = Reline::IOGate.getc
-              }
-            rescue Timeout::Error # cancel matching only when first byte
-              block.([Reline::Key.new(c, c, false)])
-              break
-            else
-              if key_stroke.match_status(buffer.dup.push(succ_c)) == :unmatched
-                if c == "\e".ord
-                  block.([Reline::Key.new(succ_c, succ_c | 0b10000000, true)])
-                else
-                  block.([Reline::Key.new(c, c, false), Reline::Key.new(succ_c, succ_c, false)])
-                end
-                break
-              else
-                Reline::IOGate.ungetc(succ_c)
-              end
+            case read_2nd_character_of_key_sequence(keyseq_timeout, buffer, c, block)
+            when :break then break
+            when :next  then next
             end
           end
         when :unmatched
@@ -397,6 +400,38 @@ module Reline
       end
     end
 
+    private def read_2nd_character_of_key_sequence(keyseq_timeout, buffer, c, block)
+      begin
+        succ_c = nil
+        Timeout.timeout(keyseq_timeout / 1000.0) {
+          succ_c = Reline::IOGate.getc
+        }
+      rescue Timeout::Error # cancel matching only when first byte
+        block.([Reline::Key.new(c, c, false)])
+        return :break
+      else
+        case key_stroke.match_status(buffer.dup.push(succ_c))
+        when :unmatched
+          if c == "\e".ord
+            block.([Reline::Key.new(succ_c, succ_c | 0b10000000, true)])
+          else
+            block.([Reline::Key.new(c, c, false), Reline::Key.new(succ_c, succ_c, false)])
+          end
+          return :break
+        when :matching
+          Reline::IOGate.ungetc(succ_c)
+          return :next
+        when :matched
+          buffer << succ_c
+          expanded = key_stroke.expand(buffer).map{ |expanded_c|
+            Reline::Key.new(expanded_c, expanded_c, false)
+          }
+          block.(expanded)
+          return :break
+        end
+      end
+    end
+
     private def read_escaped_key(keyseq_timeout, c, block)
       begin
         escaped_c = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.2.8.pre.4
+  version: 0.2.8.pre.8
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-06 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