reline 0.2.8.pre.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f03d46c602265d3a197f00021df365a9686e4fd0b5d0ef2a037a9ad25143b91
-  data.tar.gz: e97bfb610d3c9498e651b25de97e87380e624b56ea970ab7048b25dca7be9488
+  metadata.gz: 2e8c2181e5eb21934546d6b768715cb47eab6e1ea1edb2fd2300f43af62dc2b1
+  data.tar.gz: 99a61e2729d4b5d150f6f59d99d6de235ea4f1aab6ac262c92fff6a77101b85f
 SHA512:
-  metadata.gz: be1a180b58930985ea7ba5d63be81b62c8ffb0b960daf33c5ad984652fa6021151519cc1fa41055c240d7675d628c6749ab69ca67c2c2bfa306a9deab8200c56
-  data.tar.gz: 68be299c9815a350c8afec2c5b27aa02905c8fcc04c6fbba331aded2aded1d0dc160d2e8b01be58a91f308b1ad1dd880209e237de770002422910c6014ddc51a
+  metadata.gz: 96ceefe0bf71e7e44ccd2a5970b35fc44019af9d7da4d2e04ac1d827eb6bc6a201e679a5e40c4db976554159286f16e39cdeac68bcf69c2c5abeb00a2045e563
+  data.tar.gz: 251c2029df6b3073010ad6a591fb216990124ed4f9e00f533e79461be66c6a2383ea56c1554dd273e4af3cfc9358dee37b76a1b4bff25a1867972201bfebace3

data/lib/reline/ansi.rb

@@ -4,6 +4,19 @@ require 'timeout'
 require_relative 'terminfo'
 
 class Reline::ANSI
+  CAPNAME_KEY_BINDINGS = {
+    'khome' => :ed_move_to_beg,
+    'kend'  => :ed_move_to_end,
+    'kcuu1' => :ed_prev_history,
+    'kcud1' => :ed_next_history,
+    'kcuf1' => :ed_next_char,
+    'kcub1' => :ed_prev_char,
+    'cuu' => :ed_prev_history,
+    'cud' => :ed_next_history,
+    'cuf' => :ed_next_char,
+    'cub' => :ed_prev_char,
+  }
+
   if Reline::Terminfo.enabled?
     Reline::Terminfo.setupterm(0, 2)
   end
@@ -33,31 +46,39 @@ 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
   end
 
   def self.set_default_key_bindings_terminfo(config)
-    {
-      Reline::Terminfo.tigetstr('khome').bytes => :ed_move_to_beg,
-      Reline::Terminfo.tigetstr('kend').bytes => :ed_move_to_end,
-      Reline::Terminfo.tigetstr('kcuu1').bytes => :ed_prev_history,
-      Reline::Terminfo.tigetstr('kcud1').bytes => :ed_next_history,
-      Reline::Terminfo.tigetstr('kcuf1').bytes => :ed_next_char,
-      Reline::Terminfo.tigetstr('kcub1').bytes => :ed_prev_char,
-      # Escape sequences that omit the move distance and are set to defaults
-      # value 1 may be sometimes sent by pressing the arrow-key.
-      Reline::Terminfo.tigetstr('cuu').sub(/%p1%d/, '').bytes => :ed_prev_history,
-      Reline::Terminfo.tigetstr('cud').sub(/%p1%d/, '').bytes => :ed_next_history,
-      Reline::Terminfo.tigetstr('cuf').sub(/%p1%d/, '').bytes => :ed_next_char,
-      Reline::Terminfo.tigetstr('cub').sub(/%p1%d/, '').bytes => :ed_prev_char,
-    }.each_pair do |key, func|
+    key_bindings = CAPNAME_KEY_BINDINGS.map do |capname, key_binding|
+      begin
+        key_code = Reline::Terminfo.tigetstr(capname)
+        case capname
+        # Escape sequences that omit the move distance and are set to defaults
+        # value 1 may be sometimes sent by pressing the arrow-key.
+        when 'cuu', 'cud', 'cuf', 'cub'
+          [ key_code.sub(/%p1%d/, '').bytes, key_binding ]
+        else
+          [ key_code.bytes, key_binding ]
+        end
+      rescue Reline::Terminfo::TerminfoError
+        # capname is undefined
+      end
+    end.compact.to_h
+
+    key_bindings.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)
       config.add_default_key_binding_by_keymap(:vi_command, key, func)
@@ -126,8 +147,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) { @@input.wait_readable(0.1) && @@input.getbyte }
+      Reline.core.line_editor.resize
     end
     (c == 0x16 && @@input.raw(min: 0, tim: 0, &:getbyte)) || c
   rescue Errno::EIO
@@ -261,7 +282,7 @@ class Reline::ANSI
 
   def self.move_cursor_up(x)
     if x > 0
-      @@output.write "\e[#{x}A" if x > 0
+      @@output.write "\e[#{x}A"
     elsif x < 0
       move_cursor_down(-x)
     end
@@ -269,7 +290,7 @@ class Reline::ANSI
 
   def self.move_cursor_down(x)
     if x > 0
-      @@output.write "\e[#{x}B" if x > 0
+      @@output.write "\e[#{x}B"
     elsif x < 0
       move_cursor_up(-x)
     end
@@ -277,7 +298,11 @@ class Reline::ANSI
 
   def self.hide_cursor
     if Reline::Terminfo.enabled?
-      @@output.write Reline::Terminfo.tigetstr('civis')
+      begin
+        @@output.write Reline::Terminfo.tigetstr('civis')
+      rescue Reline::Terminfo::TerminfoError
+        # civis is undefined
+      end
     else
       # ignored
     end
@@ -285,7 +310,11 @@ class Reline::ANSI
 
   def self.show_cursor
     if Reline::Terminfo.enabled?
-      @@output.write Reline::Terminfo.tigetstr('cnorm')
+      begin
+        @@output.write Reline::Terminfo.tigetstr('cnorm')
+      rescue Reline::Terminfo::TerminfoError
+        # cnorm is undefined
+      end
     else
       # ignored
     end
@@ -316,8 +345,6 @@ class Reline::ANSI
   end
 
   def self.deprep(otio)
-    int_handle = Signal.trap('INT', 'IGNORE')
-    Signal.trap('INT', int_handle)
     Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler
   end
 end

data/lib/reline/config.rb

@@ -67,6 +67,7 @@ class Reline::Config
     @keyseq_timeout = 500
     @test_mode = false
     @autocompletion = false
+    @convert_meta = true if seven_bit_encoding?(Reline::IOGate.encoding)
   end
 
   def reset
@@ -154,8 +155,11 @@ 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]).merge(@oneshot_key_bindings)
+    # 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)
@@ -384,4 +388,8 @@ class Reline::Config
     end
     ret
   end
+
+  private def seven_bit_encoding?(encoding)
+    encoding == Encoding::US_ASCII
+  end
 end

data/lib/reline/general_io.rb

@@ -1,4 +1,5 @@
 require 'timeout'
+require 'io/wait'
 
 class Reline::GeneralIO
   def self.reset(encoding: nil)
@@ -36,7 +37,7 @@ class Reline::GeneralIO
     end
     c = nil
     loop do
-      result = select([@@input], [], [], 0.1)
+      result = @@input.wait_readable(0.1)
       next if result.nil?
       c = @@input.read(1)
       break

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,90 +1,88 @@
 class Reline::KeyStroke
-  using Module.new {
-    refine Integer do
-      def ==(other)
-        if other.is_a?(Reline::Key)
-          if other.combined_char == "\e".ord
-            false
-          else
-            other.combined_char == self
-          end
+  def initialize(config)
+    @config = config
+  end
+
+  def compress_meta_key(ary)
+    return ary unless @config.convert_meta
+    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 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
-          super
+          return false
         end
+      elsif other_is_last
+        return true
+      elsif me_is_last
+        return false
       end
+      i += 1
     end
+  end
 
-    refine Array do
-      def start_with?(other)
-        compressed_me = compress_meta_key
-        compressed_other = other.compress_meta_key
-        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
+  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
-
-      def ==(other)
-        compressed_me = compress_meta_key
-        compressed_other = other.compress_meta_key
-        compressed_me.size == compressed_other.size and [compressed_me, compressed_other].transpose.all?{ |i| i[0] == i[1] }
-      end
-
-      def compress_meta_key
-        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
+    when Reline::Key
+      if other.is_a?(Integer)
+        me.combined_char == other
+      else
+        me == other
       end
     end
-  }
-
-  def initialize(config)
-    @config = config
   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[0] == input)
-      return :matching if it.size == 1 && (it[0] != input)
+      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)
-    input = input.compress_meta_key
-    lhs = key_mapping.keys.select { |item| input.start_with? item }.sort_by(&:size).last
+    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]