reline 0.1.6 → 0.1.7

data/lib/reline/line_editor.rb.rej

@@ -0,0 +1,81 @@
+--- lib/reline/line_editor.rb
++++ lib/reline/line_editor.rb
+@@ -1092,60 +1053,38 @@ class Reline::LineEditor
+ 
+   private def ed_unassigned(key) end # do nothing
+ 
+-  private def process_insert(force: false)
+-    return if @continuous_insertion_buffer.empty? or (Reline::IOGate.in_pasting? and not force)
+-    #$stderr.puts 'process!!!!!!!'
+-    width = Reline::Unicode.calculate_width(@continuous_insertion_buffer)
+-    bytesize = @continuous_insertion_buffer.bytesize
+-    if @cursor == @cursor_max
+-      @line += @continuous_insertion_buffer
+-    else
+-      @line = byteinsert(@line, @byte_pointer, @continuous_insertion_buffer)
+-    end
+-    #$stderr.puts "#### #{@continuous_insertion_buffer.inspect}     =>    #{@line.inspect}"
+-    #$stderr.puts "width #{width.inspect} bytesize #{bytesize.inspect}"
+-    @byte_pointer += bytesize
+-    @cursor += width
+-    @cursor_max += width
+-    @continuous_insertion_buffer.clear
+-    @rerender_all = true
+-  end
+-
+   private def ed_insert(key)
+-    str = nil
+-    width = nil
+-    bytesize = nil
+     if key.instance_of?(String)
+       begin
+         key.encode(Encoding::UTF_8)
+       rescue Encoding::UndefinedConversionError
+         return
+       end
+-      str = key
+-      bytesize = key.bytesize
++      width = Reline::Unicode.get_mbchar_width(key)
++      if @cursor == @cursor_max
++        @line += key
++      else
++        @line = byteinsert(@line, @byte_pointer, key)
++      end
++      @byte_pointer += key.bytesize
++      @cursor += width
++      @cursor_max += width
+     else
+       begin
+         key.chr.encode(Encoding::UTF_8)
+       rescue Encoding::UndefinedConversionError
+         return
+       end
+-      str = key.chr
+-      bytesize = 1
++      if @cursor == @cursor_max
++        @line += key.chr
++      else
++        @line = byteinsert(@line, @byte_pointer, key.chr)
++      end
++      width = Reline::Unicode.get_mbchar_width(key.chr)
++      @byte_pointer += 1
++      @cursor += width
++      @cursor_max += width
+     end
+-    if Reline::IOGate.in_pasting?
+-      #$stderr.puts 'pasting!!!!!!'
+-      @continuous_insertion_buffer << str
+-      return
+-    end
+-    width = Reline::Unicode.get_mbchar_width(str)
+-    if @cursor == @cursor_max
+-      @line += str
+-    else
+-      @line = byteinsert(@line, @byte_pointer, str)
+-    end
+-    @byte_pointer += bytesize
+-    @cursor += width
+-    @cursor_max += width
+   end
+   alias_method :ed_digit, :ed_insert
+   alias_method :self_insert, :ed_insert

data/lib/reline/sibori.rb

@@ -1,5 +1,19 @@
 require 'reline/unicode'
 
+=begin
+
+  \       |
+   \      | <--- whipped cream
+    \     |
+     \    |
+      \-~~|
+       \  | <--- shibori kutigane (piping nozzle in Japanese)
+        \Ml
+         (\    __ __
+         ( \--(  )  )
+          (__(__)__)  <--- compressed whipped cream
+=end
+
 class Sibori
   attr_writer :output
 

data/lib/reline/unicode.rb

@@ -72,20 +72,32 @@ class Reline::Unicode
     }.join
   end
 
+  require 'reline/unicode/east_asian_width'
+
+  MBCharWidthRE = /
+    (?<width_2_1>
+      [#{ EscapedChars.map {|c| "\\x%02x" % c.ord }.join }] (?# ^ + char, such as ^M, ^H, ^[, ...)
+    )
+  | (?<width_3>^\u{2E3B}) (?# THREE-EM DASH)
+  | (?<width_0>^\p{M})
+  | (?<width_2_2>
+      #{ EastAsianWidth::TYPE_F }
+    | #{ EastAsianWidth::TYPE_W }
+    )
+  | (?<width_1>
+      #{ EastAsianWidth::TYPE_H }
+    | #{ EastAsianWidth::TYPE_NA }
+    | #{ EastAsianWidth::TYPE_N }
+    )
+  /x
+
   def self.get_mbchar_width(mbchar)
-    case mbchar.encode(Encoding::UTF_8)
-    when *EscapedChars # ^ + char, such as ^M, ^H, ^[, ...
-      2
-    when /^\u{2E3B}/ # THREE-EM DASH
-      3
-    when /^\p{M}/
-      0
-    when EastAsianWidth::TYPE_A
-      Reline.ambiguous_width
-    when EastAsianWidth::TYPE_F, EastAsianWidth::TYPE_W
-      2
-    when EastAsianWidth::TYPE_H, EastAsianWidth::TYPE_NA, EastAsianWidth::TYPE_N
-      1
+    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
     else
       nil
     end
@@ -591,5 +603,3 @@ class Reline::Unicode
     [byte_size, width]
   end
 end
-
-require 'reline/unicode/east_asian_width'

data/lib/reline/unicode/east_asian_width.rb

@@ -1,16 +1,16 @@
 class Reline::Unicode::EastAsianWidth
   # This is based on EastAsianWidth.txt
-  # http://www.unicode.org/Public/13.0.0/ucd/EastAsianWidth.txt
+  # EastAsianWidth.txt
 
   # Fullwidth
-  TYPE_F = /^([#{ %W(
+  TYPE_F = /^[#{ %W(
     \u{3000}
     \u{FF01}-\u{FF60}
     \u{FFE0}-\u{FFE6}
-  ).join }])/
+  ).join }]/
 
   # Halfwidth
-  TYPE_H = /^([#{ %W(
+  TYPE_H = /^[#{ %W(
     \u{20A9}
     \u{FF61}-\u{FFBE}
     \u{FFC2}-\u{FFC7}
@@ -18,10 +18,10 @@ class Reline::Unicode::EastAsianWidth
     \u{FFD2}-\u{FFD7}
     \u{FFDA}-\u{FFDC}
     \u{FFE8}-\u{FFEE}
-  ).join }])/
+  ).join }]/
 
   # Wide
-  TYPE_W = /^([#{ %W(
+  TYPE_W = /^[#{ %W(
     \u{1100}-\u{115F}
     \u{231A}-\u{231B}
     \u{2329}-\u{232A}
@@ -136,10 +136,10 @@ class Reline::Unicode::EastAsianWidth
     \u{1FAD0}-\u{1FAD6}
     \u{20000}-\u{2FFFD}
     \u{30000}-\u{3FFFD}
-  ).join }])/
+  ).join }]/
 
   # Narrow
-  TYPE_NA = /^([#{ %W(
+  TYPE_NA = /^[#{ %W(
     \u{0020}-\u{007E}
     \u{00A2}-\u{00A3}
     \u{00A5}-\u{00A6}
@@ -147,10 +147,10 @@ class Reline::Unicode::EastAsianWidth
     \u{00AF}
     \u{27E6}-\u{27ED}
     \u{2985}-\u{2986}
-  ).join }])/
+  ).join }]/
 
   # Ambiguous
-  TYPE_A = /^([#{ %W(
+  TYPE_A = /^[#{ %W(
     \u{00A1}
     \u{00A4}
     \u{00A7}-\u{00A8}
@@ -330,10 +330,10 @@ class Reline::Unicode::EastAsianWidth
     \u{E0100}-\u{E01EF}
     \u{F0000}-\u{FFFFD}
     \u{100000}-\u{10FFFD}
-  ).join }])/
+  ).join }]/
 
   # Neutral
-  TYPE_N = /^([#{ %W(
+  TYPE_N = /^[#{ %W(
     \u{0000}-\u{001F}
     \u{007F}-\u{00A0}
     \u{00A9}
@@ -1160,5 +1160,5 @@ class Reline::Unicode::EastAsianWidth
     \u{1FBF0}-\u{1FBF9}
     \u{E0001}
     \u{E0020}-\u{E007F}
-  ).join }])/
+  ).join }]/
 end

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -103,6 +103,8 @@ files:
 - lib/reline/key_stroke.rb
 - lib/reline/kill_ring.rb
 - lib/reline/line_editor.rb
+- lib/reline/line_editor.rb.orig
+- lib/reline/line_editor.rb.rej
 - lib/reline/sibori.rb
 - lib/reline/unicode.rb
 - lib/reline/unicode/east_asian_width.rb