reline 0.1.6 → 0.2.0

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

@@ -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
@@ -72,20 +77,42 @@ 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 }
+    )
+  | (?<ambiguous_width>
+      #{EastAsianWidth::TYPE_A}
+    )
+  /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
+    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
@@ -97,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
@@ -124,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
@@ -427,8 +458,8 @@ class Reline::Unicode
     [byte_size, width]
   end
 
-  def self.vi_forward_word(line, byte_pointer)
-    if (line.bytesize - 1) > byte_pointer
+  def self.vi_forward_word(line, byte_pointer, drop_terminate_spaces = false)
+    if line.bytesize > byte_pointer
       size = get_next_mbchar_size(line, byte_pointer)
       mbchar = line.byteslice(byte_pointer, size)
       if mbchar =~ /\w/
@@ -443,7 +474,7 @@ class Reline::Unicode
     else
       return [0, 0]
     end
-    while (line.bytesize - 1) > (byte_pointer + byte_size)
+    while line.bytesize > (byte_pointer + byte_size)
       size = get_next_mbchar_size(line, byte_pointer + byte_size)
       mbchar = line.byteslice(byte_pointer + byte_size, size)
       case started_by
@@ -457,7 +488,8 @@ class Reline::Unicode
       width += get_mbchar_width(mbchar)
       byte_size += size
     end
-    while (line.bytesize - 1) > (byte_pointer + byte_size)
+    return [byte_size, width] if drop_terminate_spaces
+    while line.bytesize > (byte_pointer + byte_size)
       size = get_next_mbchar_size(line, byte_pointer + byte_size)
       mbchar = line.byteslice(byte_pointer + byte_size, size)
       break if mbchar =~ /\S/
@@ -591,5 +623,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.2.0'
 end

data/lib/reline/windows.rb

@@ -233,7 +233,9 @@ class Reline::Windows
 
   def self.move_cursor_up(val)
     if val > 0
-      @@SetConsoleCursorPosition.call(@@hConsoleHandle, (cursor_pos.y - val) * 65536 + cursor_pos.x)
+      y = cursor_pos.y - val
+      y = 0 if y < 0
+      @@SetConsoleCursorPosition.call(@@hConsoleHandle, y * 65536 + cursor_pos.x)
     elsif val < 0
       move_cursor_down(-val)
     end
@@ -241,6 +243,9 @@ class Reline::Windows
 
   def self.move_cursor_down(val)
     if val > 0
+      screen_height = get_screen_size.first
+      y = cursor_pos.y + val
+      y = screen_height - 1 if y > (screen_height - 1)
       @@SetConsoleCursorPosition.call(@@hConsoleHandle, (cursor_pos.y + val) * 65536 + cursor_pos.x)
     elsif val < 0
       move_cursor_up(-val)
@@ -257,6 +262,8 @@ class Reline::Windows
 
   def self.scroll_down(val)
     return if val.zero?
+    screen_height = get_screen_size.first
+    val = screen_height - 1 if val > (screen_height - 1)
     scroll_rectangle = [0, val, get_screen_size.last, get_screen_size.first].pack('s4')
     destination_origin = 0 # y * 65536 + x
     fill = [' '.ord, 0].pack('SS')

metadata

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