reline 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47cc0525de297744dff41dc87b9a4ac5c9ff1cad21da7f60a41aa4b17bd1b0e
-  data.tar.gz: '04681f2a2dc431f65fa9f2df68c8b7aa1955a7a4032b8d6d5483984e236d4c9b'
+  metadata.gz: 985d3ce68260542cce79b3d3291c29ca30ee82250e50089c2de7bb16f60d755d
+  data.tar.gz: d3444d9e894a66fd2a0e5be4fddd5d36b9b254f0aaff7ed1d590fec26c13b3f6
 SHA512:
-  metadata.gz: ad38bf76659bc7553ebf084fd4aeedf6aba7cba1a2860fc78af0683222109216d59bdb3b4bf66962ce9a640b9033d21f707442151834e9ccc21c6fc8d115347b
-  data.tar.gz: 95d9d943870e64897076cdc97750f6110817bc4ad14e958755164aa862785d7e48399465f7997f900547f797e6304cf48d6761f78612651ebe7aa6dca505fab3
+  metadata.gz: 9a5651134aeb6d0eba7e33b4fa6e85c2ac43677432a7b94e8aa24d1c9f05326126c81669aa297f9cb03bea7f92c2ee8600364205c8a8eafa7c6185441472f9d1
+  data.tar.gz: 63cc8b0b0b936e8ac1a490c9a1c849631b2c4c33c520eb2dd666b9b93b641417f3640542067de4f64ff2e28fd4dd883ed3821c7704bb82a64485ee52d5273c3b

data/lib/reline.rb

@@ -16,12 +16,6 @@ module Reline
   CursorPos = Struct.new(:x, :y)
 
   class Core
-    if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-      IS_WINDOWS = true
-    else
-      IS_WINDOWS = false
-    end
-
     ATTR_READER_NAMES = %i(
       completion_append_character
       basic_word_break_characters
@@ -90,22 +84,22 @@ module Reline
     end
 
     def completion_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @completion_proc = p
     end
 
     def output_modifier_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @output_modifier_proc = p
     end
 
     def prompt_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @prompt_proc = p
     end
 
     def auto_indent_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @auto_indent_proc = p
     end
 
@@ -114,7 +108,7 @@ module Reline
     end
 
     def dig_perfect_match_proc=(p)
-      raise ArgumentError unless p.is_a?(Proc)
+      raise ArgumentError unless p.respond_to?(:call)
       @dig_perfect_match_proc = p
     end
 
@@ -166,7 +160,7 @@ module Reline
       inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
 
       whole_buffer = line_editor.whole_buffer.dup
-      whole_buffer.taint
+      whole_buffer.taint if RUBY_VERSION < '2.7'
       if add_hist and whole_buffer and whole_buffer.chomp.size > 0
         Reline::HISTORY << whole_buffer
       end
@@ -179,7 +173,7 @@ module Reline
       inner_readline(prompt, add_hist, false)
 
       line = line_editor.line.dup
-      line.taint
+      line.taint if RUBY_VERSION < '2.7'
       if add_hist and line and line.chomp.size > 0
         Reline::HISTORY << line.chomp
       end
@@ -260,7 +254,10 @@ module Reline
         result = key_stroke.match_status(buffer)
         case result
         when :matched
-          block.(key_stroke.expand(buffer).map{ |c| Reline::Key.new(c, c, false) })
+          expanded = key_stroke.expand(buffer).map{ |expanded_c|
+            Reline::Key.new(expanded_c, expanded_c, false)
+          }
+          block.(expanded)
           break
         when :matching
           if buffer.size == 1
@@ -287,16 +284,19 @@ module Reline
           end
         when :unmatched
           if buffer.size == 1 and c == "\e".ord
-            read_escaped_key(keyseq_timeout, buffer, block)
+            read_escaped_key(keyseq_timeout, c, block)
           else
-            block.(buffer.map{ |c| Reline::Key.new(c, c, false) })
+            expanded = buffer.map{ |expanded_c|
+              Reline::Key.new(expanded_c, expanded_c, false)
+            }
+            block.(expanded)
           end
           break
         end
       end
     end
 
-    private def read_escaped_key(keyseq_timeout, buffer, block)
+    private def read_escaped_key(keyseq_timeout, c, block)
       begin
         escaped_c = nil
         Timeout.timeout(keyseq_timeout / 1000.0) {
@@ -319,7 +319,7 @@ module Reline
 
     private def may_req_ambiguous_char_width
       @ambiguous_width = 2 if Reline::IOGate == Reline::GeneralIO or STDOUT.is_a?(File)
-      return if @ambiguous_width
+      return if ambiguous_width
       Reline::IOGate.move_cursor_column(0)
       print "\u{25bd}"
       @ambiguous_width = Reline::IOGate.cursor_pos.x
@@ -342,6 +342,7 @@ module Reline
   def_single_delegators :core, :vi_editing_mode, :emacs_editing_mode
   def_single_delegators :core, :readline
   def_instance_delegators self, :readline
+  private :readline
 
 
   #--------------------------------------------------------
@@ -369,6 +370,7 @@ module Reline
 
   def_single_delegators :core, :readmultiline
   def_instance_delegators self, :readmultiline
+  private :readmultiline
 
   def self.core
     @core ||= Core.new { |core|
@@ -392,9 +394,15 @@ module Reline
   HISTORY = History.new(core.config)
 end
 
-if Reline::Core::IS_WINDOWS
+if RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
   require 'reline/windows'
-  Reline::IOGate = Reline::Windows
+  if Reline::Windows.get_screen_size == [0, 0]
+    # Maybe Mintty on Cygwin
+    require 'reline/ansi'
+    Reline::IOGate = Reline::ANSI
+  else
+    Reline::IOGate = Reline::Windows
+  end
 else
   require 'reline/ansi'
   Reline::IOGate = Reline::ANSI

data/lib/reline/ansi.rb

@@ -7,7 +7,11 @@ class Reline::ANSI
     [27, 91, 51, 126] => :key_delete,     # Del
     [27, 91, 49, 126] => :ed_move_to_beg, # Home
     [27, 91, 52, 126] => :ed_move_to_end, # End
-  }.each_key(&:freeze).freeze
+    [27, 91, 72] => :ed_move_to_beg,      # Home
+    [27, 91, 70] => :ed_move_to_end,      # End
+    [27, 32] => :em_set_mark,             # M-<space>
+    [24, 24] => :em_exchange_mark,        # C-x C-x TODO also add Windows
+  }
 
   @@input = STDIN
   def self.input=(val)
@@ -24,20 +28,22 @@ class Reline::ANSI
     unless @@buf.empty?
       return @@buf.shift
     end
-    c = nil
-    loop do
-      result = select([@@input], [], [], 0.1)
-      next if result.nil?
-      c = @@input.read(1)
-      break
-    end
-    c&.ord
+    @@input.getbyte
   end
 
   def self.ungetc(c)
     @@buf.unshift(c)
   end
 
+  def self.retrieve_keybuffer
+      result = select([@@input], [], [], 0.001)
+      return if result.nil?
+      str = @@input.read_nonblock(1024)
+      str.bytes.each do |c|
+        @@buf.push(c)
+      end
+  end
+
   def self.get_screen_size
     @@input.winsize
   rescue Errno::ENOTTY
@@ -112,12 +118,17 @@ class Reline::ANSI
   end
 
   def self.prep
+    retrieve_keybuffer
     int_handle = Signal.trap('INT', 'IGNORE')
     otio = `stty -g`.chomp
     setting = ' -echo -icrnl cbreak'
-    if /-parenb\b/ =~ `stty -a`
+    stty = `stty -a`
+    if /-parenb\b/ =~ stty
       setting << ' pass8'
     end
+    if /\bdsusp *=/ =~ stty
+      setting << ' dsusp undef'
+    end
     setting << ' -ixoff'
     `stty #{setting}`
     Signal.trap('INT', int_handle)
@@ -126,7 +137,7 @@ class Reline::ANSI
 
   def self.deprep(otio)
     int_handle = Signal.trap('INT', 'IGNORE')
-    `stty #{otio}`
+    system("stty #{otio}", err: File::NULL)
     Signal.trap('INT', int_handle)
     Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler
   end

data/lib/reline/general_io.rb

@@ -1,7 +1,7 @@
 require 'timeout'
 
 class Reline::GeneralIO
-  RAW_KEYSTROKE_CONFIG = {}.freeze
+  RAW_KEYSTROKE_CONFIG = {}
 
   @@buf = []
 

data/lib/reline/key_actor/vi_command.rb

@@ -55,7 +55,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
     #  26 ^Z
     :ed_unassigned,
     #  27 ^[
-    :em_meta_next,
+    :ed_unassigned,
     #  28 ^\
     :ed_ignore,
     #  29 ^]

data/lib/reline/key_actor/vi_insert.rb

@@ -37,7 +37,7 @@ class Reline::KeyActor::ViInsert < Reline::KeyActor::Base
     #  17 ^Q
     :ed_ignore,
     #  18 ^R
-    :ed_insert,
+    :ed_search_prev_history,
     #  19 ^S
     :ed_ignore,
     #  20 ^T

data/lib/reline/key_stroke.rb

@@ -32,7 +32,7 @@ class Reline::KeyStroke
   end
 
   def expand(input)
-    lhs = key_mapping.keys.select { |lhs| input.start_with? lhs }.sort_by(&:size).reverse.first
+    lhs = key_mapping.keys.select { |item| input.start_with? item }.sort_by(&:size).reverse.first
     return input unless lhs
     rhs = key_mapping[lhs]
 

data/lib/reline/line_editor.rb

@@ -60,14 +60,35 @@ class Reline::LineEditor
     reset_variables
   end
 
+  private def check_multiline_prompt(buffer, prompt)
+    if @vi_arg
+      prompt = "(arg: #{@vi_arg}) "
+      @rerender_all = true
+    elsif @searching_prompt
+      prompt = @searching_prompt
+      @rerender_all = true
+    else
+      prompt = @prompt
+    end
+    if @prompt_proc
+      prompt_list = @prompt_proc.(buffer)
+      prompt_list.map!{ prompt } if @vi_arg or @searching_prompt
+      prompt = prompt_list[@line_index]
+      prompt_width = calculate_width(prompt, true)
+      [prompt, prompt_width, prompt_list]
+    else
+      prompt_width = calculate_width(prompt, true)
+      [prompt, prompt_width, nil]
+    end
+  end
+
   def reset(prompt = '', encoding = Encoding.default_external)
     @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
     @screen_size = Reline::IOGate.get_screen_size
     reset_variables(prompt, encoding)
     @old_trap = Signal.trap('SIGINT') {
-      scroll_down(@highest_in_all - @first_line_started_from)
-      Reline::IOGate.move_cursor_column(0)
       @old_trap.call if @old_trap.respond_to?(:call) # can also be string, ex: "DEFAULT"
+      raise Interrupt
     }
     Reline::IOGate.set_winch_handler do
       @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
@@ -77,28 +98,9 @@ class Reline::LineEditor
         @rerender_all = true
         rerender
       else
-        special_prompt = nil
-        if @vi_arg
-          prompt = "(arg: #{@vi_arg}) "
-          prompt_width = calculate_width(prompt)
-          special_prompt = prompt
-        elsif @searching_prompt
-          prompt = @searching_prompt
-          prompt_width = calculate_width(prompt)
-          special_prompt = prompt
-        else
-          prompt = @prompt
-          prompt_width = calculate_width(prompt, true)
-        end
         back = 0
         new_buffer = whole_lines
-        prompt_list = nil
-        if @prompt_proc
-          prompt_list = @prompt_proc.(new_buffer)
-          prompt_list[@line_index] = special_prompt if special_prompt
-          prompt = prompt_list[@line_index]
-          prompt_width = calculate_width(prompt, true)
-        end
+        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)
@@ -111,9 +113,7 @@ class Reline::LineEditor
           if @line_index.zero?
             0
           else
-            @buffer_of_lines[0..(@line_index - 1)].inject(0) { |result, line|
-              result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list
-            }
+            calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list)
           end
         if @prompt_proc
           prompt = prompt_list[@line_index]
@@ -138,6 +138,7 @@ class Reline::LineEditor
 
   def reset_variables(prompt = '', encoding = Encoding.default_external)
     @prompt = prompt
+    @mark_pointer = nil
     @encoding = encoding
     @is_multiline = false
     @finished = false
@@ -186,6 +187,16 @@ class Reline::LineEditor
     @is_multiline = false
   end
 
+  private def calculate_height_by_lines(lines, prompt_list)
+    result = 0
+    lines.each_with_index { |line, i|
+      prompt = ''
+      prompt = prompt_list[i] if prompt_list and prompt_list[i]
+      result += calculate_height_by_width(calculate_width(prompt, true) + calculate_width(line))
+    }
+    result
+  end
+
   private def insert_new_line(cursor_line, next_line)
     @line = cursor_line
     @buffer_of_lines.insert(@line_index + 1, String.new(next_line, encoding: @encoding))
@@ -306,36 +317,18 @@ class Reline::LineEditor
       @menu_info.list.each do |item|
         Reline::IOGate.move_cursor_column(0)
         @output.print item
+        @output.flush
         scroll_down(1)
       end
       scroll_down(@highest_in_all - 1)
       move_cursor_up(@highest_in_all - 1 - @first_line_started_from)
       @menu_info = nil
     end
-    special_prompt = nil
-    if @vi_arg
-      prompt = "(arg: #{@vi_arg}) "
-      prompt_width = calculate_width(prompt)
-      special_prompt = prompt
-    elsif @searching_prompt
-      prompt = @searching_prompt
-      prompt_width = calculate_width(prompt)
-      special_prompt = prompt
-    else
-      prompt = @prompt
-      prompt_width = calculate_width(prompt, true)
-    end
+    prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt)
     if @cleared
       Reline::IOGate.clear_screen
       @cleared = false
       back = 0
-      prompt_list = nil
-      if @prompt_proc
-        prompt_list = @prompt_proc.(whole_lines)
-        prompt_list[@line_index] = special_prompt if special_prompt
-        prompt = prompt_list[@line_index]
-        prompt_width = calculate_width(prompt, true)
-      end
       modify_lines(whole_lines).each_with_index do |line, index|
         if @prompt_proc
           pr = prompt_list[index]
@@ -361,16 +354,8 @@ class Reline::LineEditor
       else
         new_lines = whole_lines
       end
-      prompt_list = nil
-      if @prompt_proc
-        prompt_list = @prompt_proc.(new_lines)
-        prompt_list[@line_index] = special_prompt if special_prompt
-        prompt = prompt_list[@line_index]
-        prompt_width = calculate_width(prompt, true)
-      end
-      all_height = new_lines.inject(0) { |result, line|
-        result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list
-      }
+      prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, prompt)
+      all_height = calculate_height_by_lines(new_lines, prompt_list)
       diff = all_height - @highest_in_all
       move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1)
       if diff > 0
@@ -410,9 +395,7 @@ class Reline::LineEditor
         if @line_index.zero?
           0
         else
-          @buffer_of_lines[0..(@line_index - 1)].inject(0) { |result, line|
-            result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list
-          }
+          calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list)
         end
       if @prompt_proc
         prompt = prompt_list[@line_index]
@@ -431,13 +414,7 @@ class Reline::LineEditor
       Reline::IOGate.move_cursor_column(0)
       back = 0
       new_buffer = whole_lines
-      prompt_list = nil
-      if @prompt_proc
-        prompt_list = @prompt_proc.(new_buffer)
-        prompt_list[@line_index] = special_prompt if special_prompt
-        prompt = prompt_list[@line_index]
-        prompt_width = calculate_width(prompt, true)
-      end
+      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)
@@ -477,9 +454,7 @@ class Reline::LineEditor
         if @line_index.zero?
           0
         else
-          new_buffer[0..(@line_index - 1)].inject(0) { |result, line|
-            result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list
-          }
+          calculate_height_by_lines(new_buffer[0..(@line_index - 1)], prompt_list)
         end
       @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
       move_cursor_down(@first_line_started_from + @started_from)
@@ -489,13 +464,7 @@ class Reline::LineEditor
     end
     line = modify_lines(whole_lines)[@line_index]
     if @is_multiline
-      prompt_list = nil
-      if @prompt_proc
-        prompt_list = @prompt_proc.(whole_lines)
-        prompt_list[@line_index] = special_prompt if special_prompt
-        prompt = prompt_list[@line_index]
-        prompt_width = calculate_width(prompt, true)
-      end
+      prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt)
       if finished?
         # Always rerender on finish because output_modifier_proc may return a different output.
         render_partial(prompt, prompt_width, line)
@@ -541,6 +510,7 @@ class Reline::LineEditor
         next
       end
       @output.print line
+      @output.flush
       if @first_prompt
         @first_prompt = false
         @pre_input_hook&.call
@@ -683,9 +653,9 @@ class Reline::LineEditor
         else
           old_waiting_proc = @waiting_proc
           old_waiting_operator_proc = @waiting_operator_proc
-          @waiting_proc = proc { |key|
+          @waiting_proc = proc { |k|
             old_cursor, old_byte_pointer = @cursor, @byte_pointer
-            old_waiting_proc.(key)
+            old_waiting_proc.(k)
             cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
             @cursor, @byte_pointer = old_cursor, old_byte_pointer
             @waiting_operator_proc.(cursor_diff, byte_pointer_diff)
@@ -796,7 +766,7 @@ class Reline::LineEditor
   end
 
   def input_key(key)
-    if key.nil? or key.char.nil?
+    if key.char.nil?
       if @first_char
         @line = nil
       end
@@ -836,6 +806,26 @@ class Reline::LineEditor
 
   private def process_auto_indent
     return if not @check_new_auto_indent and @previous_line_index # move cursor up or down
+    if @check_new_auto_indent and @previous_line_index and @previous_line_index > 0 and @line_index > @previous_line_index
+      # Fix indent of a line when a newline is inserted to the next
+      new_lines = whole_lines(index: @previous_line_index, line: @line)
+      new_indent = @auto_indent_proc.(new_lines[0..-3].push(''), @line_index - 1, 0, true)
+      md = @line.match(/\A */)
+      prev_indent = md[0].count(' ')
+      @line = ' ' * new_indent + @line.lstrip
+
+      new_indent = nil
+      (new_lines[-2].size + 1).times do |n|
+        result = @auto_indent_proc.(new_lines[0..-2], @line_index - 1, n, false)
+        if result
+          new_indent = result
+          break
+        end
+      end
+      if new_indent&.>= 0
+        @line = ' ' * new_indent + @line.lstrip
+      end
+    end
     if @previous_line_index
       new_lines = whole_lines(index: @previous_line_index, line: @line)
     else
@@ -1027,8 +1017,8 @@ class Reline::LineEditor
       end
       width
     else
-      str.encode(Encoding::UTF_8).grapheme_clusters.inject(0) { |width, gc|
-        width + Reline::Unicode.get_mbchar_width(gc)
+      str.encode(Encoding::UTF_8).grapheme_clusters.inject(0) { |w, gc|
+        w + Reline::Unicode.get_mbchar_width(gc)
       }
     end
   end
@@ -1049,6 +1039,8 @@ class Reline::LineEditor
     end
   end
 
+  private def ed_unassigned(key) end # do nothing
+
   private def ed_insert(key)
     if key.instance_of?(String)
       width = Reline::Unicode.get_mbchar_width(key)
@@ -1153,7 +1145,11 @@ class Reline::LineEditor
   alias_method :end_of_line, :ed_move_to_end
 
   private def ed_search_prev_history(key)
-    @line_backup_in_history = @line
+    if @is_multiline
+      @line_backup_in_history = whole_buffer
+    else
+      @line_backup_in_history = @line
+    end
     searcher = Fiber.new do
       search_word = String.new(encoding: @encoding)
       multibyte_buf = String.new(encoding: 'ASCII-8BIT')
@@ -1188,18 +1184,32 @@ class Reline::LineEditor
           end
         end
         if hit
-          @searching_prompt = "(reverse-i-search)`%s': %s" % [search_word, hit]
-          @line = hit
+          if @is_multiline
+            @buffer_of_lines = hit.split("\n")
+            @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
+            @line_index = @buffer_of_lines.size - 1
+            @line = @buffer_of_lines.last
+            @rerender_all = true
+            @searching_prompt = "(reverse-i-search)`%s'" % [search_word]
+          else
+            @line = hit
+            @searching_prompt = "(reverse-i-search)`%s': %s" % [search_word, hit]
+          end
           last_hit = hit
         else
-          @searching_prompt = "(failed reverse-i-search)`%s': %s" % [search_word, last_hit]
+          if @is_multiline
+            @rerender_all = true
+            @searching_prompt = "(failed reverse-i-search)`%s'" % [search_word]
+          else
+            @searching_prompt = "(failed reverse-i-search)`%s': %s" % [search_word, last_hit]
+          end
         end
       end
     end
     searcher.resume
     @searching_prompt = "(reverse-i-search)`': "
-    @waiting_proc = ->(key) {
-      case key
+    @waiting_proc = ->(k) {
+      case k
       when "\C-j".ord, "\C-?".ord
         if @history_pointer
           @line = Reline::HISTORY[@history_pointer]
@@ -1219,14 +1229,25 @@ class Reline::LineEditor
         @cursor_max = calculate_width(@line)
         @cursor = @byte_pointer = 0
       else
-        chr = key.is_a?(String) ? key : key.chr(Encoding::ASCII_8BIT)
-        if chr.match?(/[[:print:]]/)
-          searcher.resume(key)
+        chr = k.is_a?(String) ? k : k.chr(Encoding::ASCII_8BIT)
+        if chr.match?(/[[:print:]]/) or k == "\C-h".ord or k == 127
+          searcher.resume(k)
         else
           if @history_pointer
-            @line = Reline::HISTORY[@history_pointer]
+            line = Reline::HISTORY[@history_pointer]
           else
-            @line = @line_backup_in_history
+            line = @line_backup_in_history
+          end
+          if @is_multiline
+            @line_backup_in_history = whole_buffer
+            @buffer_of_lines = line.split("\n")
+            @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
+            @line_index = @buffer_of_lines.size - 1
+            @line = @buffer_of_lines.last
+            @rerender_all = true
+          else
+            @line_backup_in_history = @line
+            @line = line
           end
           @searching_prompt = nil
           @waiting_proc = nil
@@ -1279,7 +1300,7 @@ class Reline::LineEditor
         @line = Reline::HISTORY[@history_pointer]
       end
     end
-    if @config.editing_mode_is?(:emacs)
+    if @config.editing_mode_is?(:emacs, :vi_insert)
       @cursor_max = @cursor = calculate_width(@line)
       @byte_pointer = @line.bytesize
     elsif @config.editing_mode_is?(:vi_command)
@@ -1326,7 +1347,7 @@ class Reline::LineEditor
       end
     end
     @line = '' unless @line
-    if @config.editing_mode_is?(:emacs)
+    if @config.editing_mode_is?(:emacs, :vi_insert)
       @cursor_max = @cursor = calculate_width(@line)
       @byte_pointer = @line.bytesize
     elsif @config.editing_mode_is?(:vi_command)
@@ -1863,13 +1884,13 @@ class Reline::LineEditor
   end
 
   private def vi_replace_char(key, arg: 1)
-    @waiting_proc = ->(key) {
+    @waiting_proc = ->(k) {
       if arg == 1
         byte_size = Reline::Unicode.get_next_mbchar_size(@line, @byte_pointer)
         before = @line.byteslice(0, @byte_pointer)
         remaining_point = @byte_pointer + byte_size
         after = @line.byteslice(remaining_point, @line.size - remaining_point)
-        @line = before + key.chr + after
+        @line = before + k.chr + after
         @cursor_max = calculate_width(@line)
         @waiting_proc = nil
       elsif arg > 1
@@ -1880,7 +1901,7 @@ class Reline::LineEditor
         before = @line.byteslice(0, @byte_pointer)
         remaining_point = @byte_pointer + byte_size
         after = @line.byteslice(remaining_point, @line.size - remaining_point)
-        replaced = key.chr * arg
+        replaced = k.chr * arg
         @line = before + replaced + after
         @byte_pointer += replaced.bytesize
         @cursor += calculate_width(replaced)
@@ -1941,4 +1962,20 @@ class Reline::LineEditor
     arg -= 1
     vi_join_lines(key, arg: arg) if arg > 0
   end
+
+  private def em_set_mark(key)
+    @mark_pointer = [@byte_pointer, @line_index]
+  end
+  alias_method :set_mark, :em_set_mark
+
+  private def em_exchange_mark(key)
+    new_pointer = [@byte_pointer, @line_index]
+    @previous_line_index = @line_index
+    @byte_pointer, @line_index = @mark_pointer
+    @byte_pointer, @line_index = @mark_pointer
+    @cursor = calculate_width(@line.byteslice(0, @byte_pointer))
+    @cursor_max = calculate_width(@line)
+    @mark_pointer = new_pointer
+  end
+  alias_method :exchange_point_and_mark, :em_exchange_mark
 end

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.0.2'
+  VERSION = '0.0.7'
 end

data/lib/reline/windows.rb

@@ -9,47 +9,61 @@ class Reline::Windows
     [224, 83] => :key_delete,      # Del
     [224, 71] => :ed_move_to_beg,  # Home
     [224, 79] => :ed_move_to_end,  # End
-  }.each_key(&:freeze).freeze
-
-  class Win32API
-    DLL = {}
-    TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
-    POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
-
-    WIN32_TYPES = "VPpNnLlIi"
-    DL_TYPES = "0SSI"
-
-    def initialize(dllname, func, import, export = "0", calltype = :stdcall)
-      @proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
-      import = @proto.chars.map {|win_type| TYPEMAP[win_type.tr(WIN32_TYPES, DL_TYPES)]}
-      export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
-      calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
-
-      handle = DLL[dllname] ||=
-               begin
-                 Fiddle.dlopen(dllname)
-               rescue Fiddle::DLError
-                 raise unless File.extname(dllname).empty?
-                 Fiddle.dlopen(dllname + ".dll")
-               end
-
-      @func = Fiddle::Function.new(handle[func], import, export, calltype)
-    rescue Fiddle::DLError => e
-      raise LoadError, e.message, e.backtrace
-    end
+    [  0, 41] => :ed_unassigned,   # input method on/off
+    [  0, 72] => :ed_prev_history, # ↑
+    [  0, 80] => :ed_next_history, # ↓
+    [  0, 77] => :ed_next_char,    # →
+    [  0, 75] => :ed_prev_char,    # ←
+    [  0, 83] => :key_delete,      # Del
+    [  0, 71] => :ed_move_to_beg,  # Home
+    [  0, 79] => :ed_move_to_end   # End
+  }
+
+  if defined? JRUBY_VERSION
+    require 'win32api'
+  else
+    class Win32API
+      DLL = {}
+      TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
+      POINTER_TYPE = Fiddle::SIZEOF_VOIDP == Fiddle::SIZEOF_LONG_LONG ? 'q*' : 'l!*'
+
+      WIN32_TYPES = "VPpNnLlIi"
+      DL_TYPES = "0SSI"
+
+      def initialize(dllname, func, import, export = "0", calltype = :stdcall)
+        @proto = [import].join.tr(WIN32_TYPES, DL_TYPES).sub(/^(.)0*$/, '\1')
+        import = @proto.chars.map {|win_type| TYPEMAP[win_type.tr(WIN32_TYPES, DL_TYPES)]}
+        export = TYPEMAP[export.tr(WIN32_TYPES, DL_TYPES)]
+        calltype = Fiddle::Importer.const_get(:CALL_TYPE_TO_ABI)[calltype]
+
+        handle = DLL[dllname] ||=
+                 begin
+                   Fiddle.dlopen(dllname)
+                 rescue Fiddle::DLError
+                   raise unless File.extname(dllname).empty?
+                   Fiddle.dlopen(dllname + ".dll")
+                 end
+
+        @func = Fiddle::Function.new(handle[func], import, export, calltype)
+      rescue Fiddle::DLError => e
+        raise LoadError, e.message, e.backtrace
+      end
 
-    def call(*args)
-      import = @proto.split("")
-      args.each_with_index do |x, i|
-        args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
-        args[i], = [x].pack("I").unpack("i") if import[i] == "I"
+      def call(*args)
+        import = @proto.split("")
+        args.each_with_index do |x, i|
+          args[i], = [x == 0 ? nil : x].pack("p").unpack(POINTER_TYPE) if import[i] == "S"
+          args[i], = [x].pack("I").unpack("i") if import[i] == "I"
+        end
+        ret, = @func.call(*args)
+        return ret || 0
       end
-      ret, = @func.call(*args)
-      return ret || 0
     end
   end
 
   VK_MENU = 0x12
+  VK_LMENU = 0xA4
+  VK_CONTROL = 0x11
   VK_SHIFT = 0x10
   STD_INPUT_HANDLE = -10
   STD_OUTPUT_HANDLE = -11
@@ -66,23 +80,33 @@ class Reline::Windows
   @@hConsoleInputHandle = @@GetStdHandle.call(STD_INPUT_HANDLE)
   @@GetNumberOfConsoleInputEvents = Win32API.new('kernel32', 'GetNumberOfConsoleInputEvents', ['L', 'P'], 'L')
   @@ReadConsoleInput = Win32API.new('kernel32', 'ReadConsoleInput', ['L', 'P', 'L', 'P'], 'L')
-  @@buf = []
+  @@input_buf = []
+  @@output_buf = []
 
   def self.getwch
+    unless @@input_buf.empty?
+      return @@input_buf.shift
+    end
     while @@kbhit.call == 0
       sleep(0.001)
     end
-    result = []
     until @@kbhit.call == 0
       ret = @@getwch.call
+      if ret == 0 or ret == 0xE0
+        @@input_buf << ret
+        ret = @@getwch.call
+        @@input_buf << ret
+        return @@input_buf.shift
+      end
       begin
-        result.concat(ret.chr(Encoding::UTF_8).encode(Encoding.default_external).bytes)
+        bytes = ret.chr(Encoding::UTF_8).encode(Encoding.default_external).bytes
+        @@input_buf.push(*bytes)
       rescue Encoding::UndefinedConversionError
-        result << ret
-        result << @@getwch.call if ret == 224
+        @@input_buf << ret
+        @@input_buf << @@getwch.call if ret == 224
       end
     end
-    result
+    @@input_buf.shift
   end
 
   def self.getc
@@ -97,44 +121,44 @@ class Reline::Windows
         end
       end
     end
-    unless @@buf.empty?
-      return @@buf.shift
+    unless @@output_buf.empty?
+      return @@output_buf.shift
     end
     input = getwch
-    alt = (@@GetKeyState.call(VK_MENU) & 0x80) != 0
-    shift_enter = (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0 && input.first == 0x0D
-    if shift_enter
+    meta = (@@GetKeyState.call(VK_LMENU) & 0x80) != 0
+    control = (@@GetKeyState.call(VK_CONTROL) & 0x80) != 0
+    shift = (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0
+    force_enter = !input.instance_of?(Array) && (control or shift) && input == 0x0D
+    if force_enter
       # It's treated as Meta+Enter on Windows
-      @@buf.concat(["\e".ord])
-      @@buf.concat(input)
-    elsif input.size > 1
-      @@buf.concat(input)
-    else # single byte
-      case input[0]
+      @@output_buf.push("\e".ord)
+      @@output_buf.push(input)
+    else
+      case input
       when 0x00
-        getwch
-        alt = false
+        meta = false
+        @@output_buf.push(input)
         input = getwch
-        @@buf.concat(input)
+        @@output_buf.push(*input)
       when 0xE0
-        @@buf.concat(input)
+        @@output_buf.push(input)
         input = getwch
-        @@buf.concat(input)
+        @@output_buf.push(*input)
       when 0x03
-        @@buf.concat(input)
+        @@output_buf.push(input)
       else
-        @@buf.concat(input)
+        @@output_buf.push(input)
       end
     end
-    if alt
+    if meta
       "\e".ord
     else
-      @@buf.shift
+      @@output_buf.shift
     end
   end
 
   def self.ungetc(c)
-    @@buf.unshift(c)
+    @@output_buf.unshift(c)
   end
 
   def self.get_screen_size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - aycabta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler