reline 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5871c5fe137b41dce9b91a8c3507c871c00440393af055c1d546a17e2613fc1b
-  data.tar.gz: d6add41c6538d3cd07b813eab3b8998f57759209f821bf7950bf1a69d1f33966
+  metadata.gz: 05acbc99c317aaa7f46d205bf73a13cc482bcfba9f6f05562f189f91082b4fd7
+  data.tar.gz: d785c8da605eba1b1440110ccbf197b1c5c654cce78dd18b17192e6686aa62f6
 SHA512:
-  metadata.gz: 105ed33c513bc997c46f6167da553f098f372272fe026b24afd2b472776dd840484afc0f284cd9d973b3db35940d84d99b4110b3d135d16944269c306ba33003
-  data.tar.gz: d28e6fe88b8a16022febeba31ead5a4e533f2a50fa65ed93328f35e5c0b2634b01b0e0b35efa278f6bbfd96b4fd42adee2d8e15e3f9d3092de5da2b61b1ef550
+  metadata.gz: 4d964d8b085973dd17da51e8359c93377c5356b01db720258b3a0a27c3b03b34e77c099d290f2f2fa41d2f8f6da1dd5cdcdcca4f7a18e1bbb199e9a755f6caca
+  data.tar.gz: 8c93e1e261d29ff6e27f0544bf6ddfe3eb41ac573111c59cc68869f508363a109880909c2893ebdc9b281b50d78fe795925667f63a7b4e5e1e26a91f93019adf

data/lib/reline.rb

@@ -166,7 +166,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 +179,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 +260,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
@@ -289,7 +292,10 @@ module Reline
           if buffer.size == 1 and c == "\e".ord
             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
@@ -319,7 +325,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 +348,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 +376,7 @@ module Reline
 
   def_single_delegators :core, :readmultiline
   def_instance_delegators self, :readmultiline
+  private :readmultiline
 
   def self.core
     @core ||= Core.new { |core|

data/lib/reline/ansi.rb

@@ -7,6 +7,8 @@ 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
+    [27, 32] => :em_set_mark,             # M-<space>
+    [24, 24] => :em_exchange_mark,        # C-x C-x TODO also add Windows
   }
 
   @@input = STDIN

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

@@ -113,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]
@@ -140,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
@@ -188,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 + 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))
@@ -346,9 +355,7 @@ class Reline::LineEditor
         new_lines = whole_lines
       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
-      }
+      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
@@ -388,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]
@@ -449,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)
@@ -650,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)
@@ -994,8 +997,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
@@ -1185,8 +1188,8 @@ class Reline::LineEditor
     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]
@@ -1206,9 +1209,9 @@ 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:]]/) or key == "\C-h".ord or key == 127
-          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]
@@ -1861,13 +1864,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
@@ -1878,7 +1881,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)
@@ -1939,4 +1942,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.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - aycabta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.