reline 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f055454b502262f43495a2d8de12ba033259287a4c09e7c93afeb0462c9c33
-  data.tar.gz: 6c6f081e14d699faed9ac7ba08001dac978318535f58458fd2c777db56b57b50
+  metadata.gz: 981888e54748ace72084309bf4d0b832503970956188b3865629da1c577b5edb
+  data.tar.gz: 11815b8b07d66ef247ab83e37d6c8884fdc4745e681b298237e2e32b631c4cbb
 SHA512:
-  metadata.gz: 6bd17793312ff9f2996ce08ebada091005c7efd9ff1d0ef007ea982ee5e74ee03a83fb0bb7c975c6da747db712a3837d14c108fd7de087094f1db37e051876aa
-  data.tar.gz: 148dd6767b1aae9a295d334445957b64e6f6a46b8941a10517e5d4567a29eac369fe3843c6c8c1bb5fd66d1165c82988316b030eb05080517bb7105bc5174281
+  metadata.gz: 8b9df7fa6a4e7196773314b8e5287021fbdfcdd81372740c0c32d60c03cc4aed8fda02f5b14e337c428c160b1ff5a2c4144f5a5866af8f57e50fcb25b51b9099
+  data.tar.gz: 50920eaeb2ef94d831c4eb4d798e41ccf9c7a826f237b1fc3343969e6af2ea05332cb38e4638c2fa439a29231a3789b0f4d0ee731d3106aaa6f6d08b12cbcb39

data/lib/reline/line_editor.rb

@@ -179,6 +179,7 @@ class Reline::LineEditor
     @vi_arg = nil
     @waiting_proc = nil
     @waiting_operator_proc = nil
+    @waiting_operator_vi_arg = nil
     @completion_journey_data = nil
     @completion_state = CompletionState::NORMAL
     @perfect_matched = nil
@@ -186,6 +187,7 @@ class Reline::LineEditor
     @first_prompt = true
     @searching_prompt = nil
     @first_char = true
+    @add_newline_to_end_of_buffer = false
     @eof = false
     @continuous_insertion_buffer = String.new(encoding: @encoding)
     reset_line
@@ -351,7 +353,22 @@ class Reline::LineEditor
     end
     new_highest_in_this = calculate_height_by_width(prompt_width + calculate_width(@line.nil? ? '' : @line))
     # FIXME: end of logical line sometimes breaks
-    if @previous_line_index or new_highest_in_this != @highest_in_this
+    if @add_newline_to_end_of_buffer
+      scroll_down(1)
+      new_lines = whole_lines(index: @previous_line_index, line: @line)
+      prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, prompt)
+      @buffer_of_lines[@previous_line_index] = @line
+      @line = @buffer_of_lines[@line_index]
+      render_partial(prompt, prompt_width, @line, false)
+      @cursor = @cursor_max = calculate_width(@line)
+      @byte_pointer = @line.bytesize
+      @highest_in_all += @highest_in_this
+      @highest_in_this = calculate_height_by_width(prompt_width + @cursor_max)
+      @first_line_started_from += @started_from + 1
+      @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
+      @previous_line_index = nil
+      @add_newline_to_end_of_buffer = false
+    elsif @previous_line_index or new_highest_in_this != @highest_in_this
       if @previous_line_index
         new_lines = whole_lines(index: @previous_line_index, line: @line)
       else
@@ -698,6 +715,7 @@ class Reline::LineEditor
     if @waiting_operator_proc
       if VI_MOTIONS.include?(method_symbol)
         old_cursor, old_byte_pointer = @cursor, @byte_pointer
+        @vi_arg = @waiting_operator_vi_arg if @waiting_operator_vi_arg > 1
         block.(true)
         unless @waiting_proc
           cursor_diff, byte_pointer_diff = @cursor - old_cursor, @byte_pointer - old_byte_pointer
@@ -721,6 +739,8 @@ class Reline::LineEditor
         block.(false)
       end
       @waiting_operator_proc = nil
+      @waiting_operator_vi_arg = nil
+      @vi_arg = nil
     else
       block.(false)
     end
@@ -1112,6 +1132,9 @@ class Reline::LineEditor
 
   private def key_newline(key)
     if @is_multiline
+      if (@buffer_of_lines.size - 1) == @line_index and @line.bytesize == @byte_pointer
+        @add_newline_to_end_of_buffer = true
+      end
       next_line = @line.byteslice(@byte_pointer, @line.bytesize - @byte_pointer)
       cursor_line = @line.byteslice(0, @byte_pointer)
       insert_new_line(cursor_line, next_line)
@@ -2088,7 +2111,7 @@ class Reline::LineEditor
     @cursor = 0
   end
 
-  private def vi_change_meta(key)
+  private def vi_change_meta(key, arg: 1)
     @waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
       if byte_pointer_diff > 0
         @line, cut = byteslice!(@line, @byte_pointer, byte_pointer_diff)
@@ -2101,9 +2124,10 @@ class Reline::LineEditor
       @byte_pointer += byte_pointer_diff if byte_pointer_diff < 0
       @config.editing_mode = :vi_insert
     }
+    @waiting_operator_vi_arg = arg
   end
 
-  private def vi_delete_meta(key)
+  private def vi_delete_meta(key, arg: 1)
     @waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
       if byte_pointer_diff > 0
         @line, cut = byteslice!(@line, @byte_pointer, byte_pointer_diff)
@@ -2115,9 +2139,10 @@ class Reline::LineEditor
       @cursor_max -= cursor_diff.abs
       @byte_pointer += byte_pointer_diff if byte_pointer_diff < 0
     }
+    @waiting_operator_vi_arg = arg
   end
 
-  private def vi_yank(key)
+  private def vi_yank(key, arg: 1)
     @waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
       if byte_pointer_diff > 0
         cut = @line.byteslice(@byte_pointer, byte_pointer_diff)
@@ -2126,6 +2151,7 @@ class Reline::LineEditor
       end
       copy_for_vi(cut)
     }
+    @waiting_operator_vi_arg = arg
   end
 
   private def vi_list_or_eof(key)

data/lib/reline/unicode.rb

@@ -35,11 +35,16 @@ class Reline::Unicode
   }
   EscapedChars = EscapedPairs.keys.map(&:chr)
 
-  CSI_REGEXP = /\e\[[\d;]*[ABCDEFGHJKSTfminsuhl]/
-  OSC_REGEXP = /\e\]\d+(?:;[^;]+)*\a/
   NON_PRINTING_START = "\1"
   NON_PRINTING_END = "\2"
-  WIDTH_SCANNER = /\G(?:#{NON_PRINTING_START}|#{NON_PRINTING_END}|#{CSI_REGEXP}|#{OSC_REGEXP}|\X)/
+  CSI_REGEXP = /\e\[[\d;]*[ABCDEFGHJKSTfminsuhl]/
+  OSC_REGEXP = /\e\]\d+(?:;[^;]+)*\a/
+  WIDTH_SCANNER = /\G(?:(#{NON_PRINTING_START})|(#{NON_PRINTING_END})|(#{CSI_REGEXP})|(#{OSC_REGEXP})|(\X))/o
+  NON_PRINTING_START_INDEX = 0
+  NON_PRINTING_END_INDEX = 1
+  CSI_REGEXP_INDEX = 2
+  OSC_REGEXP_INDEX = 3
+  GRAPHEME_CLUSTER_INDEX = 4
 
   def self.get_mbchar_byte_size_by_first_char(c)
     # Checks UTF-8 character byte size
@@ -89,15 +94,25 @@ class Reline::Unicode
     | #{ EastAsianWidth::TYPE_NA }
     | #{ EastAsianWidth::TYPE_N }
     )
+  | (?<ambiguous_width>
+      #{EastAsianWidth::TYPE_A}
+    )
   /x
 
   def self.get_mbchar_width(mbchar)
+    ord = mbchar.ord
+    if (0x00 <= ord and ord <= 0x1F)
+      return 2
+    elsif (0x20 <= ord and ord <= 0x7E)
+      return 1
+    end
     m = mbchar.encode(Encoding::UTF_8).match(MBCharWidthRE)
     case
     when m[:width_2_1], m[:width_2_2] then 2
     when m[:width_3] then 3
     when m[:width_0] then 0
     when m[:width_1] then 1
+    when m[:ambiguous_width] then Reline.ambiguous_width
     else
       nil
     end
@@ -109,13 +124,14 @@ class Reline::Unicode
       rest = str.encode(Encoding::UTF_8)
       in_zero_width = false
       rest.scan(WIDTH_SCANNER) do |gc|
-        case gc
-        when NON_PRINTING_START
+        case
+        when gc[NON_PRINTING_START_INDEX]
           in_zero_width = true
-        when NON_PRINTING_END
+        when gc[NON_PRINTING_END_INDEX]
           in_zero_width = false
-        when CSI_REGEXP, OSC_REGEXP
-        else
+        when gc[CSI_REGEXP_INDEX], gc[OSC_REGEXP_INDEX]
+        when gc[GRAPHEME_CLUSTER_INDEX]
+          gc = gc[GRAPHEME_CLUSTER_INDEX]
           unless in_zero_width
             width += get_mbchar_width(gc)
           end
@@ -136,14 +152,17 @@ class Reline::Unicode
     rest = str.encode(Encoding::UTF_8)
     in_zero_width = false
     rest.scan(WIDTH_SCANNER) do |gc|
-      case gc
-      when NON_PRINTING_START
+      case
+      when gc[NON_PRINTING_START_INDEX]
         in_zero_width = true
-      when NON_PRINTING_END
+      when gc[NON_PRINTING_END_INDEX]
         in_zero_width = false
-      when CSI_REGEXP, OSC_REGEXP
-        lines.last << gc
-      else
+      when gc[CSI_REGEXP_INDEX]
+        lines.last << gc[CSI_REGEXP_INDEX]
+      when gc[OSC_REGEXP_INDEX]
+        lines.last << gc[OSC_REGEXP_INDEX]
+      when gc[GRAPHEME_CLUSTER_INDEX]
+        gc = gc[GRAPHEME_CLUSTER_INDEX]
         unless in_zero_width
           mbchar_width = get_mbchar_width(gc)
           if (width += mbchar_width) > max_width

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.