reline 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5978554d657a91d17e199389ec2bf7dd1a505436bf0ea9c73478973c202d08c7
-  data.tar.gz: cd5b28a0094e1af15c09617b8093550a81ed841ea1e9c9f3db9131eaca694217
+  metadata.gz: 5871c5fe137b41dce9b91a8c3507c871c00440393af055c1d546a17e2613fc1b
+  data.tar.gz: d6add41c6538d3cd07b813eab3b8998f57759209f821bf7950bf1a69d1f33966
 SHA512:
-  metadata.gz: 2d21a0ee4c7a28ef7b7d32db350646b369719b2778d04cb4158cac1583a1f8c41010f55c1e8a81aa1954dce207e2048526cbfcbbebcb8624a3037ff18b0851e9
-  data.tar.gz: f1d58c640a8cf6190c65a9bcf0898ecec70d9825f76fc68a28bcfe4300387eb6223f13d226689ecbd7d0fb248365e81a8df8fc8247452519abb163121684f4b3
+  metadata.gz: 105ed33c513bc997c46f6167da553f098f372272fe026b24afd2b472776dd840484afc0f284cd9d973b3db35940d84d99b4110b3d135d16944269c306ba33003
+  data.tar.gz: d28e6fe88b8a16022febeba31ead5a4e533f2a50fa65ed93328f35e5c0b2634b01b0e0b35efa278f6bbfd96b4fd42adee2d8e15e3f9d3092de5da2b61b1ef550

data/lib/reline/ansi.rb

@@ -7,7 +7,7 @@ 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
+  }
 
   @@input = STDIN
   def self.input=(val)

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_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/line_editor.rb

@@ -60,6 +60,28 @@ 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
@@ -76,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)
@@ -312,30 +315,11 @@ class Reline::LineEditor
       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,13 +345,7 @@ 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
+      prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, prompt)
       all_height = new_lines.inject(0) { |result, line|
         result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list
       }
@@ -431,13 +409,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)
@@ -489,13 +461,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)
@@ -1156,7 +1122,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')
@@ -1191,11 +1161,25 @@ 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
@@ -1223,13 +1207,24 @@ class Reline::LineEditor
         @cursor = @byte_pointer = 0
       else
         chr = key.is_a?(String) ? key : key.chr(Encoding::ASCII_8BIT)
-        if chr.match?(/[[:print:]]/)
+        if chr.match?(/[[:print:]]/) or key == "\C-h".ord or key == 127
           searcher.resume(key)
         else
           if @history_pointer
-            @line = Reline::HISTORY[@history_pointer]
+            line = Reline::HISTORY[@history_pointer]
+          else
+            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 = @line_backup_in_history
+            @line_backup_in_history = @line
+            @line = line
           end
           @searching_prompt = nil
           @waiting_proc = nil

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/reline/windows.rb

@@ -9,7 +9,15 @@ 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
+    [  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'
@@ -54,6 +62,8 @@ class Reline::Windows
   end
 
   VK_MENU = 0x12
+  VK_LMENU = 0xA4
+  VK_CONTROL = 0x11
   VK_SHIFT = 0x10
   STD_INPUT_HANDLE = -10
   STD_OUTPUT_HANDLE = -11
@@ -82,6 +92,12 @@ class Reline::Windows
     end
     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
         bytes = ret.chr(Encoding::UTF_8).encode(Encoding.default_external).bytes
         @@input_buf.push(*bytes)
@@ -109,17 +125,19 @@ class Reline::Windows
       return @@output_buf.shift
     end
     input = getwch
-    alt = (@@GetKeyState.call(VK_MENU) & 0x80) != 0
-    shift_enter = !input.instance_of?(Array) && (@@GetKeyState.call(VK_SHIFT) & 0x80) != 0 && input == 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
       @@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
         @@output_buf.push(*input)
       when 0xE0
@@ -132,7 +150,7 @@ class Reline::Windows
         @@output_buf.push(input)
       end
     end
-    if alt
+    if meta
       "\e".ord
     else
       @@output_buf.shift

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - aycabta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler