reline 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fb74f487afccdfb3b0530a043cfb7090f2a4860f2fdd168bc94112818b5f57d
-  data.tar.gz: 96b74e0f611f24022f204e9551d8692ef017c52a197ae169fbfdc1074a130857
+  metadata.gz: ec7aa526103ceb5eff3fa7dbbfff8c33f296f9cfb28ec4cc925b28e649dc18c8
+  data.tar.gz: 5c86a58b7769f390a81e9f6ca19a1e64eefad4ad05091544e5a01ef752b21983
 SHA512:
-  metadata.gz: ffdcec13818f2445bd9f639e75b36405c76a439378335fa7c05fad90a26f06965e54cd9dce1b8e1411e16df9ffc80c3c0ac356320654af2ebd40a33fd28cb247
-  data.tar.gz: 24be10266aebce2d07f1519010f6ce0e6b92b816b17e526ede204943880b54388aa5ebf5da086bde0212b5e1f837936e4972c09a57a2d6c94f7c9a41412966d9
+  metadata.gz: f4e586ed0f631e402d0b4b58fb05f0eec016f1290624021e957de1ced06c15e8638dac34e91c72d4b53a83e2c6b5eb5aadec2b749271d47201773dd220c63827
+  data.tar.gz: 6dcd53d5a30722bb4884f79eb9c70f49ab267b5e285b231237d339a52efdaa597377d308a264ed2cef23802b27aabb38d5ccbfd0c2dce40d631e15a6da5ede68

data/lib/reline/config.rb

@@ -177,6 +177,11 @@ class Reline::Config
     if_stack = []
 
     lines.each_with_index do |line, no|
+      # Even after encoding conversion, we need to verify the encoding is valid
+      # as some invalid byte sequences might pass through the conversion.
+      unless line.valid_encoding?
+        raise InvalidInputrc, "#{file}:#{no + 1}: can't be converted to the locale #{Reline.encoding_system_needs.name}"
+      end
       next if line.match(/\A\s*#/)
 
       no += 1

data/lib/reline/io/ansi.rb

@@ -124,6 +124,10 @@ class Reline::ANSI < Reline::IO
       Reline.core.line_editor.handle_signal
     end
     c = @input.getbyte
+
+    # When "Escape non-ASCII Input with Control-V" is enabled in macOS Terminal.app,
+    # all non-ascii bytes are automatically escaped with `C-v`.
+    # "\xE3\x81\x82" (U+3042) becomes "\x16\xE3\x16\x81\x16\x82".
     (c == 0x16 && @input.tty? && @input.raw(min: 0, time: 0, &:getbyte)) || c
   rescue Errno::EIO
     # Maybe the I/O has been closed.
@@ -180,14 +184,14 @@ class Reline::ANSI < Reline::IO
     s = [ENV["LINES"].to_i, ENV["COLUMNS"].to_i]
     return s if s[0] > 0 && s[1] > 0
     [24, 80]
-  rescue Errno::ENOTTY, Errno::ENODEV
+  rescue SystemCallError
     [24, 80]
   end
 
   def set_screen_size(rows, columns)
     @input.winsize = [rows, columns]
     self
-  rescue Errno::ENOTTY, Errno::ENODEV
+  rescue SystemCallError
     self
   end
 
@@ -295,7 +299,7 @@ class Reline::ANSI < Reline::IO
     # Signal.trap may raise an ArgumentError if the platform doesn't support the signal.
   end
 
-  def read_single_char(keyseq_timeout)
+  def read_single_char(timeout_second)
     # Disable intr to read `C-c` `C-z` `C-\` for quoted insert
     @input.raw(intr: false) do
       super

data/lib/reline/io.rb

@@ -37,10 +37,10 @@ module Reline
     end
 
     # Read a single encoding valid character from the input.
-    def read_single_char(keyseq_timeout)
+    def read_single_char(timeout_second)
       buffer = String.new(encoding: Encoding::ASCII_8BIT)
       loop do
-        timeout = buffer.empty? ? Float::INFINITY : keyseq_timeout
+        timeout = buffer.empty? ? Float::INFINITY : timeout_second
         c = getc(timeout)
         return unless c
 

data/lib/reline/key_actor/emacs.rb

@@ -377,11 +377,11 @@ module Reline::KeyActor
     # 187 M-;
     nil,
     # 188 M-<
-    nil,
+    :beginning_of_history,
     # 189 M-=
     nil,
     # 190 M->
-    nil,
+    :end_of_history,
     # 191 M-?
     nil,
     # 192 M-@

data/lib/reline/line_editor.rb

@@ -470,14 +470,6 @@ class Reline::LineEditor
     end
   end
 
-  def print_nomultiline_prompt
-    Reline::IOGate.disable_auto_linewrap(true) if Reline::IOGate.win?
-    # Readline's test `TestRelineAsReadline#test_readline` requires first output to be prompt, not cursor reset escape sequence.
-    Reline::IOGate.write Reline::Unicode.strip_non_printing_start_end(@prompt) if @prompt && !@is_multiline
-  ensure
-    Reline::IOGate.disable_auto_linewrap(false) if Reline::IOGate.win?
-  end
-
   def render
     wrapped_cursor_x, wrapped_cursor_y = wrapped_cursor_position
     new_lines = wrapped_prompt_and_input_lines.flatten(1)[screen_scroll_top, screen_height].map do |prompt, line|
@@ -1654,6 +1646,16 @@ class Reline::LineEditor
   end
   alias_method :next_history, :ed_next_history
 
+  private def ed_beginning_of_history(key)
+    move_history(0, line: :end, cursor: :end)
+  end
+  alias_method :beginning_of_history, :ed_beginning_of_history
+
+  private def ed_end_of_history(key)
+    move_history(Reline::HISTORY.size, line: :end, cursor: :end)
+  end
+  alias_method :end_of_history, :ed_end_of_history
+
   private def ed_newline(key)
     process_insert(force: true)
     if @is_multiline

data/lib/reline/unicode/east_asian_width.rb

@@ -129,7 +129,7 @@ class Reline::Unicode::EastAsianWidth
     [0x450, 1],
     [0x451, -1],
     [0x482, 1],
-    [0x487, 0],
+    [0x489, 0],
     [0x590, 1],
     [0x5bd, 0],
     [0x5be, 1],
@@ -356,6 +356,7 @@ class Reline::Unicode::EastAsianWidth
     [0x109d, 0],
     [0x10ff, 1],
     [0x115f, 2],
+    [0x11ff, 0],
     [0x135c, 1],
     [0x135f, 0],
     [0x1711, 1],
@@ -411,8 +412,6 @@ class Reline::Unicode::EastAsianWidth
     [0x1a7e, 1],
     [0x1a7f, 0],
     [0x1aaf, 1],
-    [0x1abd, 0],
-    [0x1abe, 1],
     [0x1ace, 0],
     [0x1aff, 1],
     [0x1b03, 0],
@@ -491,10 +490,6 @@ class Reline::Unicode::EastAsianWidth
     [0x20ab, 1],
     [0x20ac, -1],
     [0x20cf, 1],
-    [0x20dc, 0],
-    [0x20e0, 1],
-    [0x20e1, 0],
-    [0x20e4, 1],
     [0x20f0, 0],
     [0x2102, 1],
     [0x2103, -1],
@@ -767,7 +762,7 @@ class Reline::Unicode::EastAsianWidth
     [0xa48f, 1],
     [0xa4c6, 2],
     [0xa66e, 1],
-    [0xa66f, 0],
+    [0xa672, 0],
     [0xa673, 1],
     [0xa67d, 0],
     [0xa69d, 1],
@@ -840,6 +835,10 @@ class Reline::Unicode::EastAsianWidth
     [0xabed, 0],
     [0xabff, 1],
     [0xd7a3, 2],
+    [0xd7af, 1],
+    [0xd7c6, 0],
+    [0xd7ca, 1],
+    [0xd7fb, 0],
     [0xdfff, 1],
     [0xf8ff, -1],
     [0xfaff, 2],

data/lib/reline/unicode.rb

@@ -72,26 +72,32 @@ class Reline::Unicode
 
   require 'reline/unicode/east_asian_width'
 
+  def self.east_asian_width(ord)
+    chunk_index = EastAsianWidth::CHUNK_LAST.bsearch_index { |o| ord <= o }
+    size = EastAsianWidth::CHUNK_WIDTH[chunk_index]
+    size == -1 ? Reline.ambiguous_width : size
+  end
+
   def self.get_mbchar_width(mbchar)
     ord = mbchar.ord
     if ord <= 0x1F # in EscapedPairs
       return 2
-    elsif ord <= 0x7E # printable ASCII chars
+    elsif mbchar.length == 1 && ord <= 0x7E # printable ASCII chars
       return 1
     end
+
     utf8_mbchar = mbchar.encode(Encoding::UTF_8)
-    ord = utf8_mbchar.ord
-    chunk_index = EastAsianWidth::CHUNK_LAST.bsearch_index { |o| ord <= o }
-    size = EastAsianWidth::CHUNK_WIDTH[chunk_index]
-    if size == -1
-      Reline.ambiguous_width
-    elsif size == 1 && utf8_mbchar.size >= 2
-      second_char_ord = utf8_mbchar[1].ord
-      # Halfwidth Dakuten Handakuten
-      # Only these two character has Letter Modifier category and can be combined in a single grapheme cluster
-      (second_char_ord == 0xFF9E || second_char_ord == 0xFF9F) ? 2 : 1
-    else
-      size
+    zwj = false
+    utf8_mbchar.chars.sum do |c|
+      if zwj
+        zwj = false
+        0
+      elsif c.ord == 0x200D # Zero Width Joiner
+        zwj = true
+        0
+      else
+        east_asian_width(c.ord)
+      end
     end
   end
 
@@ -214,7 +220,7 @@ class Reline::Unicode
           next
         elsif padding && !cover_begin && prev_width < start_col && start_col < total_width
           # Add preceding padding. This padding might have background color.
-          chunk << ' '
+          chunk << ' ' * (total_width - start_col)
           chunk_start_col ||= start_col
           chunk_end_col = total_width
           next
@@ -228,7 +234,7 @@ class Reline::Unicode
           # Current character exceeds end_col
           if padding && end_col < total_width
             # Add succeeding padding. This padding might have background color.
-            chunk << ' '
+            chunk << ' ' * (end_col - prev_width)
             chunk_start_col ||= prev_width
             chunk_end_col = end_col
           end

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/reline.rb

@@ -324,8 +324,6 @@ module Reline
       line_editor.auto_indent_proc = auto_indent_proc
       line_editor.dig_perfect_match_proc = dig_perfect_match_proc
 
-      # Readline calls pre_input_hook just after printing the first prompt.
-      line_editor.print_nomultiline_prompt
       pre_input_hook&.call
 
       unless Reline::IOGate.dumb?
@@ -347,7 +345,8 @@ module Reline
                 # io_gate is Reline::ANSI because the key :bracketed_paste_start is only assigned in Reline::ANSI
                 key = Reline::Key.new(io_gate.read_bracketed_paste, :insert_multiline_text)
               when :quoted_insert, :ed_quoted_insert
-                key = Reline::Key.new(io_gate.read_single_char(config.keyseq_timeout), :insert_raw_char)
+                char = io_gate.read_single_char(config.keyseq_timeout.fdiv(1000))
+                key = Reline::Key.new(char || '', :insert_raw_char)
               end
               line_editor.set_pasting_state(io_gate.in_pasting?)
               line_editor.update(key)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - aycabta
 bindir: bin
 cert_chain: []
-date: 2025-04-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.
 test_files: []