reline 0.2.8.pre.6 → 0.2.8.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161818586702ae2834bf5e6490adf5dcec415256925ffd83339ffe6ef3c13012
-  data.tar.gz: 3ab65900ed4022e1baa2213d560938339711264e3188597c4eb98bc1891c81a8
+  metadata.gz: cdcb3b1edc046520bc5be9cbddb21a4ba498fd1111319c90b05f76b066155eaa
+  data.tar.gz: f5a5af7fb221dc0fb21aac67baa20af7c159f22ee792b5f9264badb1ff8b6ba4
 SHA512:
-  metadata.gz: 610c5367d68b627fb7e0a7bef7919d147b5a19539725f9a2d184bbed69b0988c613acf1f001d2f05857fce2490e7309e666a4327f1f15cd0541e3bb7db5089ec
-  data.tar.gz: b567f8283fe5637161e21536f500f6824d9a92aadf940e10386d27cf4df29940d3e3d6cb95a7a4fff6e711ac33c73f870ee419b45d44274184160b37354d9d77
+  metadata.gz: a40a42eb7fe33b39dbf8d56eae76708caee116462bbe35b537e36b39e0edb8263cd5854f48b8c7ef440b686c5dabb7e34c72ec844c2ab79661797c23a28a9f0f
+  data.tar.gz: 9937033c4b7509a3ef39522bc82e574cd6049cfa6204463625bf89ad427ff7c21e36ca3e0a94b11e3b36dfb1cacb2b3a357a3a115e80b13e94eb9512697aea1e

data/lib/reline/ansi.rb

@@ -33,11 +33,16 @@ class Reline::ANSI
       config.add_default_key_binding_by_keymap(:vi_insert, key, func)
       config.add_default_key_binding_by_keymap(:vi_command, key, func)
     end
+    {
+      [27, 91, 90] => :completion_journey_up, # S-Tab
+    }.each_pair do |key, func|
+      config.add_default_key_binding_by_keymap(:emacs, key, func)
+      config.add_default_key_binding_by_keymap(:vi_insert, key, func)
+    end
     {
       # default bindings
       [27, 32] => :em_set_mark,             # M-<space>
       [24, 24] => :em_exchange_mark,        # C-x C-x
-      [27, 91, 90] => :completion_journey_up, # S-Tab
     }.each_pair do |key, func|
       config.add_default_key_binding_by_keymap(:emacs, key, func)
     end
@@ -126,8 +131,8 @@ class Reline::ANSI
     unless @@buf.empty?
       return @@buf.shift
     end
-    until c = @@input.raw(intr: true, &:getbyte)
-      sleep 0.1
+    until c = @@input.raw(intr: true) { select([@@input], [], [], 0.1) && @@input.getbyte }
+      Reline.core.line_editor.resize
     end
     (c == 0x16 && @@input.raw(min: 0, tim: 0, &:getbyte)) || c
   rescue Errno::EIO

data/lib/reline/config.rb

@@ -50,6 +50,7 @@ class Reline::Config
     @additional_key_bindings[:emacs] = {}
     @additional_key_bindings[:vi_insert] = {}
     @additional_key_bindings[:vi_command] = {}
+    @oneshot_key_bindings = {}
     @skip_section = nil
     @if_stack = nil
     @editing_mode_label = :emacs
@@ -75,6 +76,7 @@ class Reline::Config
     @additional_key_bindings.keys.each do |key|
       @additional_key_bindings[key].clear
     end
+    @oneshot_key_bindings.clear
     reset_default_key_bindings
   end
 
@@ -128,8 +130,12 @@ class Reline::Config
     return home_rc_path
   end
 
+  private def default_inputrc_path
+    @default_inputrc_path ||= inputrc_path
+  end
+
   def read(file = nil)
-    file ||= inputrc_path
+    file ||= default_inputrc_path
     begin
       if file.respond_to?(:readlines)
         lines = file.readlines
@@ -148,8 +154,19 @@ class Reline::Config
   end
 
   def key_bindings
-    # override @key_actors[@editing_mode_label].default_key_bindings with @additional_key_bindings[@editing_mode_label]
-    @key_actors[@editing_mode_label].default_key_bindings.merge(@additional_key_bindings[@editing_mode_label])
+    # The key bindings for each editing mode will be overwritten by the user-defined ones.
+    kb = @key_actors[@editing_mode_label].default_key_bindings.dup
+    kb.merge!(@additional_key_bindings[@editing_mode_label])
+    kb.merge!(@oneshot_key_bindings)
+    kb
+  end
+
+  def add_oneshot_key_binding(keystroke, target)
+    @oneshot_key_bindings[keystroke] = target
+  end
+
+  def reset_oneshot_key_bindings
+    @oneshot_key_bindings.clear
   end
 
   def add_default_key_binding_by_keymap(keymap, keystroke, target)

data/lib/reline/key_actor/emacs.rb

@@ -43,7 +43,7 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
     #  20 ^T
     :ed_transpose_chars,
     #  21 ^U
-    :em_kill_line,
+    :ed_kill_line,
     #  22 ^V
     :ed_quoted_insert,
     #  23 ^W

data/lib/reline/key_stroke.rb

@@ -1,38 +1,87 @@
 class Reline::KeyStroke
-  using Module.new {
-    refine Array do
-      def start_with?(other)
-        other.size <= size && other == self.take(other.size)
+  def initialize(config)
+    @config = config
+  end
+
+  def compress_meta_key(ary)
+    ary.inject([]) { |result, key|
+      if result.size > 0 and result.last == "\e".ord
+        result[result.size - 1] = Reline::Key.new(key, key | 0b10000000, true)
+      else
+        result << key
       end
+      result
+    }
+  end
 
-      def bytes
-        self
+  def start_with?(me, other)
+    compressed_me = compress_meta_key(me)
+    compressed_other = compress_meta_key(other)
+    i = 0
+    loop do
+      my_c = compressed_me[i]
+      other_c = compressed_other[i]
+      other_is_last = (i + 1) == compressed_other.size
+      me_is_last = (i + 1) == compressed_me.size
+      if my_c != other_c
+        if other_c == "\e".ord and other_is_last and my_c.is_a?(Reline::Key) and my_c.with_meta
+          return true
+        else
+          return false
+        end
+      elsif other_is_last
+        return true
+      elsif me_is_last
+        return false
       end
+      i += 1
     end
-  }
+  end
 
-  def initialize(config)
-    @config = config
+  def equal?(me, other)
+    case me
+    when Array
+      compressed_me = compress_meta_key(me)
+      compressed_other = compress_meta_key(other)
+      compressed_me.size == compressed_other.size and [compressed_me, compressed_other].transpose.all?{ |i| equal?(i[0], i[1]) }
+    when Integer
+      if other.is_a?(Reline::Key)
+        if other.combined_char == "\e".ord
+          false
+        else
+          other.combined_char == me
+        end
+      else
+        me == other
+      end
+    when Reline::Key
+      if other.is_a?(Integer)
+        me.combined_char == other
+      else
+        me == other
+      end
+    end
   end
 
   def match_status(input)
     key_mapping.keys.select { |lhs|
-      lhs.start_with? input
+      start_with?(lhs, input)
     }.tap { |it|
-      return :matched  if it.size == 1 && (it.max_by(&:size)&.size&.== input.size)
-      return :matching if it.size == 1 && (it.max_by(&:size)&.size&.!= input.size)
+      return :matched  if it.size == 1 && equal?(it[0], input)
+      return :matching if it.size == 1 && !equal?(it[0], input)
       return :matched  if it.max_by(&:size)&.size&.< input.size
       return :matching if it.size > 1
     }
     key_mapping.keys.select { |lhs|
-      input.start_with? lhs
+      start_with?(input, lhs)
     }.tap { |it|
       return it.size > 0 ? :matched : :unmatched
     }
   end
 
   def expand(input)
-    lhs = key_mapping.keys.select { |item| input.start_with? item }.sort_by(&:size).reverse.first
+    input = compress_meta_key(input)
+    lhs = key_mapping.keys.select { |item| start_with?(input, item) }.sort_by(&:size).last
     return input unless lhs
     rhs = key_mapping[lhs]
 

data/lib/reline/line_editor.rb

@@ -5,6 +5,7 @@ require 'tempfile'
 
 class Reline::LineEditor
   # TODO: undo
+  # TODO: Use "private alias_method" idiom after drop Ruby 2.5.
   attr_reader :line
   attr_reader :byte_pointer
   attr_accessor :confirm_multiline_termination_proc
@@ -150,7 +151,7 @@ class Reline::LineEditor
     @screen_size = Reline::IOGate.get_screen_size
     @screen_height = @screen_size.first
     reset_variables(prompt, encoding: encoding)
-    @old_trap = Signal.trap(:INT) {
+    @old_trap = Signal.trap('INT') {
       clear_dialog
       if @scroll_partial_screen
         move_cursor_down(@screen_height - (@line_index - @scroll_partial_screen) - 1)
@@ -170,47 +171,65 @@ class Reline::LineEditor
         @old_trap.call
       end
     }
+    begin
+      @old_tstp_trap = Signal.trap('TSTP') {
+        Reline::IOGate.ungetc("\C-z".ord)
+        @old_tstp_trap.call if @old_tstp_trap.respond_to?(:call)
+      }
+    rescue ArgumentError
+    end
     Reline::IOGate.set_winch_handler do
-      @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
-      old_screen_size = @screen_size
-      @screen_size = Reline::IOGate.get_screen_size
-      @screen_height = @screen_size.first
-      if old_screen_size.last < @screen_size.last # columns increase
-        @rerender_all = true
-        rerender
-      else
-        back = 0
-        new_buffer = whole_lines
-        prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, prompt)
-        new_buffer.each_with_index do |line, index|
-          prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc
-          width = prompt_width + calculate_width(line)
-          height = calculate_height_by_width(width)
-          back += height
-        end
-        @highest_in_all = back
-        @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
-        @first_line_started_from =
-          if @line_index.zero?
-            0
-          else
-            calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
-          end
-        if @prompt_proc
-          prompt = prompt_list[@line_index]
-          prompt_width = calculate_width(prompt, true)
+      @resized = true
+    end
+    @block_elem_width = Reline::Unicode.calculate_width('█')
+  end
+
+  def resize
+    return unless @resized
+    @resized = false
+    @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
+    old_screen_size = @screen_size
+    @screen_size = Reline::IOGate.get_screen_size
+    @screen_height = @screen_size.first
+    if old_screen_size.last < @screen_size.last # columns increase
+      @rerender_all = true
+      rerender
+    else
+      back = 0
+      new_buffer = whole_lines
+      prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, prompt)
+      new_buffer.each_with_index do |line, index|
+        prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc
+        width = prompt_width + calculate_width(line)
+        height = calculate_height_by_width(width)
+        back += height
+      end
+      @highest_in_all = back
+      @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
+      @first_line_started_from =
+        if @line_index.zero?
+          0
+        else
+          calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
         end
-        calculate_nearest_cursor
-        @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
-        Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-        @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
-        @rerender_all = true
+      if @prompt_proc
+        prompt = prompt_list[@line_index]
+        prompt_width = calculate_width(prompt, true)
       end
+      calculate_nearest_cursor
+      @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
+      Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
+      @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
+      @rerender_all = true
     end
   end
 
   def finalize
-    Signal.trap('SIGINT', @old_trap)
+    Signal.trap('INT', @old_trap)
+    begin
+      Signal.trap('TSTP', @old_tstp_trap)
+    rescue ArgumentError
+    end
   end
 
   def eof?
@@ -251,6 +270,8 @@ class Reline::LineEditor
     @in_pasting = false
     @auto_indent_proc = nil
     @dialogs = []
+    @last_key = nil
+    @resized = false
     reset_line
   end
 
@@ -512,6 +533,14 @@ class Reline::LineEditor
       @cursor_pos.y = row
     end
 
+    def set_key(key)
+      @key = key
+    end
+
+    def key
+      @key
+    end
+
     def cursor_pos
       @cursor_pos
     end
@@ -539,13 +568,15 @@ class Reline::LineEditor
 
   class Dialog
     attr_reader :name, :contents, :width
-    attr_accessor :scroll_top, :column, :vertical_offset, :lines_backup
+    attr_accessor :scroll_top, :scrollbar_pos, :pointer, :column, :vertical_offset, :lines_backup, :trap_key
 
-    def initialize(name, proc_scope)
+    def initialize(name, config, proc_scope)
       @name = name
+      @config = config
       @proc_scope = proc_scope
       @width = nil
       @scroll_top = 0
+      @trap_key = nil
     end
 
     def set_cursor_pos(col, row)
@@ -563,15 +594,28 @@ class Reline::LineEditor
       end
     end
 
-    def call
+    def call(key)
       @proc_scope.set_dialog(self)
-      @proc_scope.call
+      @proc_scope.set_key(key)
+      dialog_render_info = @proc_scope.call
+      if @trap_key
+        if @trap_key.any?{ |i| i.is_a?(Array) } # multiple trap
+          @trap_key.each do |t|
+            @config.add_oneshot_key_binding(t, @name)
+          end
+        elsif @trap_key.is_a?(Array)
+          @config.add_oneshot_key_binding(@trap_key, @name)
+        elsif @trap_key.is_a?(Integer) or @trap_key.is_a?(Reline::Key)
+          @config.add_oneshot_key_binding([@trap_key], @name)
+        end
+      end
+      dialog_render_info
     end
   end
 
   def add_dialog_proc(name, p, context = nil)
     return if @dialogs.any? { |d| d.name == name }
-    @dialogs << Dialog.new(name, DialogProcScope.new(self, @config, p, context))
+    @dialogs << Dialog.new(name, @config, DialogProcScope.new(self, @config, p, context))
   end
 
   DIALOG_HEIGHT = 20
@@ -588,10 +632,11 @@ class Reline::LineEditor
   private def render_each_dialog(dialog, cursor_column)
     if @in_pasting
       dialog.contents = nil
+      dialog.trap_key = nil
       return
     end
     dialog.set_cursor_pos(cursor_column, @first_line_started_from + @started_from)
-    dialog_render_info = dialog.call
+    dialog_render_info = dialog.call(@last_key)
     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),
@@ -602,27 +647,41 @@ class Reline::LineEditor
       }
       clear_each_dialog(dialog)
       dialog.contents = nil
+      dialog.trap_key = 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
+    pointer = dialog.pointer
+    if dialog_render_info.width
+      dialog.width = dialog_render_info.width
+    else
+      dialog.width = dialog.contents.map { |l| calculate_width(l, true) }.max
+    end
+    height = dialog_render_info.height || DIALOG_HEIGHT
     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
+      if dialog.pointer
+        if dialog.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
+        elsif (dialog.pointer - dialog.scroll_top) >= (height - 1)
+          dialog.scroll_top = dialog.pointer - (height - 1)
+        elsif (dialog.pointer - dialog.scroll_top) < 0
+          dialog.scroll_top = dialog.pointer
         end
-        pointer = dialog_render_info.pointer - dialog.scroll_top
+        pointer = dialog.pointer - dialog.scroll_top
       end
       dialog.contents = dialog.contents[dialog.scroll_top, height]
     end
+    if dialog_render_info.scrollbar and dialog_render_info.contents.size > height
+      bar_max_height = height * 2
+      moving_distance = (dialog_render_info.contents.size - height) * 2
+      position_ratio = dialog.scroll_top.zero? ? 0.0 : ((dialog.scroll_top * 2).to_f / moving_distance)
+      bar_height = (bar_max_height * ((dialog.contents.size * 2).to_f / (dialog_render_info.contents.size * 2))).floor.to_i
+      dialog.scrollbar_pos = ((bar_max_height - bar_height) * position_ratio).floor.to_i
+    else
+      dialog.scrollbar_pos = nil
+    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
@@ -642,6 +701,7 @@ class Reline::LineEditor
       dialog.vertical_offset = dialog_render_info.pos.y + 1
     end
     Reline::IOGate.hide_cursor
+    dialog.width += @block_elem_width if dialog.scrollbar_pos
     reset_dialog(dialog, old_dialog)
     move_cursor_down(dialog.vertical_offset)
     Reline::IOGate.move_cursor_column(dialog.column)
@@ -655,8 +715,23 @@ class Reline::LineEditor
           bg_color = '46'
         end
       end
-      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"
+      str_width = dialog.width - (dialog.scrollbar_pos.nil? ? 0 : @block_elem_width)
+      str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, str_width), str_width)
+      @output.write "\e[#{bg_color}m#{str}"
+      if dialog.scrollbar_pos and (dialog.scrollbar_pos != old_dialog.scrollbar_pos or dialog.column != old_dialog.column)
+        @output.write "\e[37m"
+        if dialog.scrollbar_pos <= (i * 2) and (i * 2 + 1) < (dialog.scrollbar_pos + bar_height)
+          @output.write '█'
+        elsif dialog.scrollbar_pos <= (i * 2) and (i * 2) < (dialog.scrollbar_pos + bar_height)
+          @output.write '▀'
+          str += ''
+        elsif dialog.scrollbar_pos <= (i * 2 + 1) and (i * 2) < (dialog.scrollbar_pos + bar_height)
+          @output.write '▄'
+        else
+          @output.write ' ' * @block_elem_width
+        end
+      end
+      @output.write "\e[0m"
       Reline::IOGate.move_cursor_column(dialog.column)
       move_cursor_down(1) if i < (dialog.contents.size - 1)
     end
@@ -697,12 +772,12 @@ class Reline::LineEditor
       line_num.times do |i|
         Reline::IOGate.move_cursor_column(old_dialog.column)
         if visual_lines[start + i].nil?
-          s = ' ' * dialog.width
+          s = ' ' * old_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)
+          s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, old_dialog.width)
+          s = padding_space_with_escape_sequences(s, old_dialog.width)
         end
-        @output.write "\e[39m\e[49m#{s}\e[39m\e[49m"
+        @output.write "\e[0m#{s}\e[0m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff)
@@ -715,12 +790,12 @@ class Reline::LineEditor
       line_num.times do |i|
         Reline::IOGate.move_cursor_column(old_dialog.column)
         if visual_lines[start + i].nil?
-          s = ' ' * dialog.width
+          s = ' ' * old_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)
+          s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, old_dialog.width)
+          s = padding_space_with_escape_sequences(s, old_dialog.width)
         end
-        @output.write "\e[39m\e[49m#{s}\e[39m\e[49m"
+        @output.write "\e[0m#{s}\e[0m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(dialog.vertical_offset + dialog.contents.size + line_num - 1 - y_diff)
@@ -739,7 +814,7 @@ class Reline::LineEditor
           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#{s}\e[39m\e[49m"
+        @output.write "\e[0m#{s}\e[0m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff)
@@ -759,7 +834,7 @@ class Reline::LineEditor
           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#{s}\e[39m\e[49m"
+        @output.write "\e[0m#{s}\e[0m"
         move_cursor_down(1) if i < (line_num - 1)
       end
       move_cursor_up(old_dialog.vertical_offset + line_num - 1 + y_diff)
@@ -774,6 +849,7 @@ class Reline::LineEditor
   end
 
   private def clear_each_dialog(dialog)
+    dialog.trap_key = nil
     return unless dialog.contents
     prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines], prompt)
     visual_lines = []
@@ -798,10 +874,10 @@ class Reline::LineEditor
         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"
+        @output.write "\e[0m#{str}\e[0m"
       else
         Reline::IOGate.move_cursor_column(dialog.column)
-        @output.write "\e[39m\e[49m#{' ' * dialog.width}\e[39m\e[49m"
+        @output.write "\e[0m#{' ' * dialog.width}\e[0m"
       end
       move_cursor_down(1) if i < (dialog_vertical_size - 1)
     end
@@ -1151,7 +1227,7 @@ class Reline::LineEditor
         height = render_partial(prompt, prompt_width, line, back, with_control: false)
       end
       if index < (@buffer_of_lines.size - 1)
-        move_cursor_down(height)
+        move_cursor_down(1)
         back += height
       end
     end
@@ -1334,7 +1410,10 @@ class Reline::LineEditor
       end
       @waiting_operator_proc = nil
       @waiting_operator_vi_arg = nil
-      @vi_arg = nil
+      if @vi_arg
+        @rerender_all = true
+        @vi_arg = nil
+      end
     else
       block.(false)
     end
@@ -1385,7 +1464,10 @@ class Reline::LineEditor
         wrap_method_call(method_symbol, method_obj, key) if method_obj
       end
       @kill_ring.process
-      @vi_arg = nil
+      if @vi_arg
+        @rerender_al = true
+        @vi_arg = nil
+      end
     elsif @vi_arg
       if key.chr =~ /[0-9]/
         ed_argument_digit(key)
@@ -1402,7 +1484,10 @@ class Reline::LineEditor
           ed_insert(key) unless @config.editing_mode_is?(:vi_command)
         end
         @kill_ring.process
-        @vi_arg = nil
+        if @vi_arg
+          @rerender_all = true
+          @vi_arg = nil
+        end
       end
     elsif @waiting_proc
       @waiting_proc.(key)
@@ -1460,6 +1545,13 @@ class Reline::LineEditor
   end
 
   def input_key(key)
+    @last_key = key
+    @config.reset_oneshot_key_bindings
+    @dialogs.each do |dialog|
+      if key.char.instance_of?(Symbol) and key.char == dialog.name
+        return
+      end
+    end
     @just_cursor_moving = nil
     if key.char.nil?
       if @first_char
@@ -1834,6 +1926,8 @@ class Reline::LineEditor
     end
   end
 
+  # Editline:: +ed-unassigned+ This  editor command always results in an error.
+  # GNU Readline:: There is no corresponding macro.
   private def ed_unassigned(key) end # do nothing
 
   private def process_insert(force: false)
@@ -1851,6 +1945,19 @@ class Reline::LineEditor
     @continuous_insertion_buffer.clear
   end
 
+  # Editline:: +ed-insert+ (vi input: almost all; emacs: printable characters)
+  #            In insert mode, insert the input character left of the cursor
+  #            position. In replace mode, overwrite the character at the
+  #            cursor and move the cursor to the right by one character
+  #            position. Accept an argument to do this repeatedly. It is an
+  #            error if the input character is the NUL character (+Ctrl-@+).
+  #            Failure to enlarge the edit buffer also results in an error.
+  # Editline:: +ed-digit+ (emacs: 0 to 9) If in argument input mode, append
+  #            the input digit to the argument being read. Otherwise, call
+  #            +ed-insert+. It is an error if the input character is not a
+  #            digit or if the existing argument is already greater than a
+  #            million.
+  # GNU Readline:: +self-insert+ (a, b, A, 1, !, …) Insert yourself.
   private def ed_insert(key)
     str = nil
     width = nil
@@ -1901,6 +2008,8 @@ class Reline::LineEditor
       arg.times do
         if key == "\C-j".ord or key == "\C-m".ord
           key_newline(key)
+        elsif key == 0
+          # Ignore NUL.
         else
           ed_insert(key)
         end
@@ -2335,6 +2444,7 @@ class Reline::LineEditor
     arg -= 1
     ed_prev_history(key, arg: arg) if arg > 0
   end
+  alias_method :previous_history, :ed_prev_history
 
   private def ed_next_history(key, arg: 1)
     if @is_multiline and @line_index < (@buffer_of_lines.size - 1)
@@ -2382,6 +2492,7 @@ class Reline::LineEditor
     arg -= 1
     ed_next_history(key, arg: arg) if arg > 0
   end
+  alias_method :next_history, :ed_next_history
 
   private def ed_newline(key)
     process_insert(force: true)
@@ -2416,7 +2527,7 @@ class Reline::LineEditor
     end
   end
 
-  private def em_delete_prev_char(key)
+  private def em_delete_prev_char(key, arg: 1)
     if @is_multiline and @cursor == 0 and @line_index > 0
       @buffer_of_lines[@line_index] = @line
       @cursor = calculate_width(@buffer_of_lines[@line_index - 1])
@@ -2434,9 +2545,16 @@ class Reline::LineEditor
       @cursor -= width
       @cursor_max -= width
     end
+    arg -= 1
+    em_delete_prev_char(key, arg: arg) if arg > 0
   end
   alias_method :backward_delete_char, :em_delete_prev_char
 
+  # Editline:: +ed-kill-line+ (vi command: +D+, +Ctrl-K+; emacs: +Ctrl-K+,
+  #            +Ctrl-U+) + Kill from the cursor to the end of the line.
+  # GNU Readline:: +kill-line+ (+C-k+) Kill the text from point to the end of
+  #                the line. With a negative numeric argument, kill backward
+  #                from the cursor to the beginning of the current line.
   private def ed_kill_line(key)
     if @line.bytesize > @byte_pointer
       @line, deleted = byteslice!(@line, @byte_pointer, @line.bytesize - @byte_pointer)
@@ -2453,8 +2571,14 @@ class Reline::LineEditor
       @rest_height += 1
     end
   end
+  alias_method :kill_line, :ed_kill_line
 
-  private def em_kill_line(key)
+  # Editline:: +vi-kill-line-prev+ (vi: +Ctrl-U+) Delete the string from the
+  #            beginning  of the edit buffer to the cursor and save it to the
+  #            cut buffer.
+  # GNU Readline:: +unix-line-discard+ (+C-u+) Kill backward from the cursor
+  #                to the beginning of the current line.
+  private def vi_kill_line_prev(key)
     if @byte_pointer > 0
       @line, deleted = byteslice!(@line, 0, @byte_pointer)
       @byte_pointer = 0
@@ -2463,7 +2587,22 @@ class Reline::LineEditor
       @cursor = 0
     end
   end
-  alias_method :kill_line, :em_kill_line
+  alias_method :unix_line_discard, :vi_kill_line_prev
+
+  # Editline:: +em-kill-line+ (not bound) Delete the entire contents of the
+  #            edit buffer and save it to the cut buffer. +vi-kill-line-prev+
+  # GNU Readline:: +kill-whole-line+ (not bound) Kill all characters on the
+  #                current line, no matter where point is.
+  private def em_kill_line(key)
+    if @line.size > 0
+      @kill_ring.append(@line.dup, true)
+      @line.clear
+      @byte_pointer = 0
+      @cursor_max = 0
+      @cursor = 0
+    end
+  end
+  alias_method :kill_whole_line, :em_kill_line
 
   private def em_delete(key)
     if (not @is_multiline and @line.empty?) or (@is_multiline and @line.empty? and @buffer_of_lines.size == 1)
@@ -2968,7 +3107,14 @@ class Reline::LineEditor
 
   private def ed_argument_digit(key)
     if @vi_arg.nil?
-      unless key.chr.to_i.zero?
+      if key.chr.to_i.zero?
+        if key.anybits?(0b10000000)
+          unescaped_key = key ^ 0b10000000
+          unless unescaped_key.chr.to_i.zero?
+            @vi_arg = unescaped_key.chr.to_i
+          end
+        end
+      else
         @vi_arg = key.chr.to_i
       end
     else

data/lib/reline/terminfo.rb

@@ -71,7 +71,7 @@ module Reline::Terminfo
   def self.setupterm(term, fildes)
     errret_int = String.new("\x00" * 8, encoding: 'ASCII-8BIT')
     ret = @setupterm.(term, fildes, errret_int)
-    errret = errret_int.unpack('i')[0]
+    errret = errret_int.unpack1('i')
     case ret
     when 0 # OK
       0

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,7 +185,7 @@ class Reline::Unicode
     [lines, height]
   end
 
-  # Take a chunk of a String with escape sequences.
+  # 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)
     total_width = 0

data/lib/reline/version.rb

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

data/lib/reline/windows.rb

@@ -184,7 +184,7 @@ class Reline::Windows
     #     DWORD FileNameLength;
     #     WCHAR FileName[1];
     #   } FILE_NAME_INFO
-    len = p_buffer[0, 4].unpack("L")[0]
+    len = p_buffer[0, 4].unpack1("L")
     name = p_buffer[4, len].encode(Encoding::UTF_8, Encoding::UTF_16LE, invalid: :replace)
 
     # Check if this could be a MSYS2 pty pipe ('\msys-XXXX-ptyN-XX')
@@ -226,28 +226,31 @@ 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
 
   def self.check_input_event
     num_of_events = 0.chr * 8
     while @@output_buf.empty? #or true
+      Reline.core.line_editor.resize
       next if @@WaitForSingleObject.(@@hConsoleInputHandle, 100) != 0 # max 0.1 sec
-      next if @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) == 0 or num_of_events.unpack('L').first == 0
+      next if @@GetNumberOfConsoleInputEvents.(@@hConsoleInputHandle, num_of_events) == 0 or num_of_events.unpack1('L') == 0
       input_record = 0.chr * 18
       read_event = 0.chr * 4
       if @@ReadConsoleInputW.(@@hConsoleInputHandle, input_record, 1, read_event) != 0
-        event = input_record[0, 2].unpack('s*').first
+        event = input_record[0, 2].unpack1('s*')
         case event
         when WINDOW_BUFFER_SIZE_EVENT
           @@winch_handler.()
         when KEY_EVENT
-          key_down = input_record[4, 4].unpack('l*').first
-          repeat_count = input_record[8, 2].unpack('s*').first
-          virtual_key_code = input_record[10, 2].unpack('s*').first
-          virtual_scan_code = input_record[12, 2].unpack('s*').first
-          char_code = input_record[14, 2].unpack('S*').first
-          control_key_state = input_record[16, 2].unpack('S*').first
+          key_down = input_record[4, 4].unpack1('l*')
+          repeat_count = input_record[8, 2].unpack1('s*')
+          virtual_key_code = input_record[10, 2].unpack1('s*')
+          virtual_scan_code = input_record[12, 2].unpack1('s*')
+          char_code = input_record[14, 2].unpack1('S*')
+          control_key_state = input_record[16, 2].unpack1('S*')
           is_key_down = key_down.zero? ? false : true
           if is_key_down
             process_key_event(repeat_count, virtual_key_code, virtual_scan_code, char_code, control_key_state)
@@ -289,8 +292,8 @@ class Reline::Windows
   def self.cursor_pos
     csbi = 0.chr * 22
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
-    x = csbi[4, 2].unpack('s*').first
-    y = csbi[6, 2].unpack('s*').first
+    x = csbi[4, 2].unpack1('s*')
+    y = csbi[6, 2].unpack1('s*')
     Reline::CursorPos.new(x, y)
   end
 
@@ -322,7 +325,7 @@ class Reline::Windows
   def self.erase_after_cursor
     csbi = 0.chr * 24
     @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi)
-    cursor = csbi[4, 4].unpack('L').first
+    cursor = csbi[4, 4].unpack1('L')
     written = 0.chr * 4
     @@FillConsoleOutputCharacter.call(@@hConsoleHandle, 0x20, get_screen_size.last - cursor_pos.x, cursor, written)
     @@FillConsoleOutputAttribute.call(@@hConsoleHandle, 0, get_screen_size.last - cursor_pos.x, cursor, written)
@@ -341,8 +344,8 @@ class Reline::Windows
   def self.clear_screen
     csbi = 0.chr * 22
     return if @@GetConsoleScreenBufferInfo.call(@@hConsoleHandle, csbi) == 0
-    buffer_width = csbi[0, 2].unpack('S').first
-    attributes = csbi[8, 2].unpack('S').first
+    buffer_width = csbi[0, 2].unpack1('S')
+    attributes = csbi[8, 2].unpack1('S')
     _window_left, window_top, _window_right, window_bottom = *csbi[10,8].unpack('S*')
     fill_length = buffer_width * (window_bottom - window_top + 1)
     screen_topleft = window_top * 65536

data/lib/reline.rb

@@ -16,9 +16,24 @@ 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?(other)
+      case other
+      when Reline::Key
+        (other.char.nil? or char.nil? or char == other.char) and
+        (other.combined_char.nil? or combined_char.nil? or combined_char == other.combined_char) and
+        (other.with_meta.nil? or with_meta.nil? or with_meta == other.with_meta)
+      when Integer, Symbol
+        (combined_char and combined_char == other) or
+        (combined_char.nil? and char and char == other)
+      else
+        false
+      end
+    end
+    alias_method :==, :match?
+  end
   CursorPos = Struct.new(:x, :y)
-  DialogRenderInfo = Struct.new(:pos, :contents, :pointer, :bg_color, :width, :height, keyword_init: true)
+  DialogRenderInfo = Struct.new(:pos, :contents, :bg_color, :width, :height, :scrollbar, keyword_init: true)
 
   class Core
     ATTR_READER_NAMES = %i(
@@ -195,7 +210,7 @@ module Reline
         return nil
       end
       pre, target, post = retrieve_completion_block(true)
-      if target.nil? or target.empty?# or target.size <= 3
+      if target.nil? or target.empty? or (completion_journey_data&.pointer == -1 and target.size <= 3)
         return nil
       end
       if completion_journey_data and completion_journey_data.list
@@ -206,7 +221,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 +237,8 @@ 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)
+      dialog.pointer = pointer
+      DialogRenderInfo.new(pos: cursor_pos_to_render, contents: result, scrollbar: true, height: 15)
     }
     Reline::DEFAULT_DIALOG_CONTEXT = Array.new
 
@@ -362,25 +378,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 +397,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
@@ -448,7 +480,7 @@ module Reline
   #--------------------------------------------------------
 
   (Core::ATTR_READER_NAMES).each { |name|
-    def_single_delegators :core, "#{name}", "#{name}="
+    def_single_delegators :core, :"#{name}", :"#{name}="
   }
   def_single_delegators :core, :input=, :output=
   def_single_delegators :core, :vi_editing_mode, :emacs_editing_mode

metadata

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