reline 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8198104fe3ad27c73acaaffc9c8b1c8b9a5c50069a26a71cd940dd2b5dc13afc
-  data.tar.gz: 171ff8cdf2ae4aebaf4cfb6cea131e2d90e5eb56a2c09dbe19acfa8765522ffc
+  metadata.gz: b0fe224245c6f66bdfa42b7fd6b0dc4c30f9645f0c1498fd7780ff17db642eec
+  data.tar.gz: af1b5a53e09f4b2c60ae20e153a4b3043ea3a19a38c58be697067c58f63feec7
 SHA512:
-  metadata.gz: e3411f0086a0445d2d805fc46528a86b947c58b8e61a664dc08b437596702ef1f360cd7e85a1dab64bf159f6f39691b9d5110f951bd5376f4fce0439e9557532
-  data.tar.gz: 968ac4a376ba350590fd37d05525a5a2e5e26c44e159b5fd9b0c7400e260850e91088357c007651373d44b7b7d37c699852014d07258428be86081581baf0229
+  metadata.gz: cb456e06f2cef817fe3ae8fa27e9666587f2b3175cdbc97714ab3638d5b11bf606595d772c4e100fc21d9f50ed6e55fb6b833c28bad6b4ae3c8838d2418e75f5
+  data.tar.gz: 6f3eb2f3feee78d7b4754c069a7d6c0d5d29af100bcb493bab2696c9b610c86de4fb3b201d624b6d00f218f1257a526d0c29bf95c79a1ed3daf117f0c95a2768

data/lib/reline/ansi.rb

@@ -7,6 +7,9 @@ class Reline::ANSI
   CAPNAME_KEY_BINDINGS = {
     'khome' => :ed_move_to_beg,
     'kend'  => :ed_move_to_end,
+    'kdch1' => :key_delete,
+    'kpp' => :ed_search_prev_history,
+    'knp' => :ed_search_next_history,
     'kcuu1' => :ed_prev_history,
     'kcud1' => :ed_next_history,
     'kcuf1' => :ed_next_char,
@@ -29,8 +32,8 @@ class Reline::ANSI
     false
   end
 
-  def self.set_default_key_bindings(config)
-    if Reline::Terminfo.enabled?
+  def self.set_default_key_bindings(config, allow_terminfo: true)
+    if allow_terminfo && Reline::Terminfo.enabled?
       set_default_key_bindings_terminfo(config)
     else
       set_default_key_bindings_comprehensive_list(config)
@@ -142,6 +145,10 @@ class Reline::ANSI
     @@output = val
   end
 
+  def self.with_raw_input
+    @@input.raw { yield }
+  end
+
   @@buf = []
   def self.inner_getc
     unless @@buf.empty?

data/lib/reline/config.rb

@@ -93,7 +93,7 @@ class Reline::Config
   end
 
   def editing_mode_is?(*val)
-    (val.respond_to?(:any?) ? val : [val]).any?(@editing_mode_label)
+    val.any?(@editing_mode_label)
   end
 
   def keymap

data/lib/reline/general_io.rb

@@ -31,6 +31,10 @@ class Reline::GeneralIO
     @@input = val
   end
 
+  def self.with_raw_input
+    yield
+  end
+
   def self.getc
     unless @@buf.empty?
       return @@buf.shift

data/lib/reline/line_editor.rb

@@ -52,6 +52,7 @@ class Reline::LineEditor
   MenuInfo = Struct.new('MenuInfo', :target, :list)
 
   PROMPT_LIST_CACHE_TIMEOUT = 0.5
+  MINIMUM_SCROLLBAR_HEIGHT = 1
 
   def initialize(config, encoding)
     @config = config
@@ -449,14 +450,10 @@ class Reline::LineEditor
       Reline::IOGate.move_cursor_up(@first_line_started_from + @started_from - @scroll_partial_screen)
       Reline::IOGate.move_cursor_column(0)
       @scroll_partial_screen = nil
-      prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines)
-      if @previous_line_index
-        new_lines = whole_lines(index: @previous_line_index, line: @line)
-      else
-        new_lines = whole_lines
-      end
+      new_lines = whole_lines
+      prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
       modify_lines(new_lines).each_with_index do |line, index|
-        @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\n"
+        @output.write "#{prompt_list ? prompt_list[index] : prompt}#{line}\r\n"
         Reline::IOGate.erase_after_cursor
       end
       @output.flush
@@ -467,7 +464,7 @@ class Reline::LineEditor
     rendered = false
     if @add_newline_to_end_of_buffer
       clear_dialog_with_content
-      rerender_added_newline(prompt, prompt_width)
+      rerender_added_newline(prompt, prompt_width, prompt_list)
       @add_newline_to_end_of_buffer = false
     else
       if @just_cursor_moving and not @rerender_all
@@ -490,11 +487,7 @@ class Reline::LineEditor
     if @is_multiline
       if finished?
         # Always rerender on finish because output_modifier_proc may return a different output.
-        if @previous_line_index
-          new_lines = whole_lines(index: @previous_line_index, line: @line)
-        else
-          new_lines = whole_lines
-        end
+        new_lines = whole_lines
         line = modify_lines(new_lines)[@line_index]
         clear_dialog
         prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
@@ -671,8 +664,10 @@ class Reline::LineEditor
     dialog.set_cursor_pos(cursor_column, @first_line_started_from + @started_from)
     dialog_render_info = dialog.call(@last_key)
     if dialog_render_info.nil? or dialog_render_info.contents.nil? or dialog_render_info.contents.empty?
+      lines = whole_lines
       dialog.lines_backup = {
-        lines: modify_lines(whole_lines),
+        unmodified_lines: lines,
+        lines: modify_lines(lines),
         line_index: @line_index,
         first_line_started_from: @first_line_started_from,
         started_from: @started_from,
@@ -703,17 +698,17 @@ class Reline::LineEditor
           dialog.scroll_top = dialog.pointer
         end
         pointer = dialog.pointer - dialog.scroll_top
+      else
+        dialog.scroll_top = 0
       end
       dialog.contents = dialog.contents[dialog.scroll_top, height]
     end
-    if dialog.contents and dialog.scroll_top >= dialog.contents.size
-      dialog.scroll_top = dialog.contents.size - height
-    end
     if dialog_render_info.scrollbar and dialog_render_info.contents.size > height
       bar_max_height = height * 2
       moving_distance = (dialog_render_info.contents.size - height) * 2
       position_ratio = dialog.scroll_top.zero? ? 0.0 : ((dialog.scroll_top * 2).to_f / moving_distance)
       bar_height = (bar_max_height * ((dialog.contents.size * 2).to_f / (dialog_render_info.contents.size * 2))).floor.to_i
+      bar_height = MINIMUM_SCROLLBAR_HEIGHT if bar_height < MINIMUM_SCROLLBAR_HEIGHT
       dialog.scrollbar_pos = ((bar_max_height - bar_height) * position_ratio).floor.to_i
     else
       dialog.scrollbar_pos = nil
@@ -755,7 +750,7 @@ class Reline::LineEditor
       str_width = dialog.width - (dialog.scrollbar_pos.nil? ? 0 : @block_elem_width)
       str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, str_width), str_width)
       @output.write "\e[#{bg_color}m\e[#{fg_color}m#{str}"
-      if dialog.scrollbar_pos and (dialog.scrollbar_pos != old_dialog.scrollbar_pos or dialog.column != old_dialog.column)
+      if dialog.scrollbar_pos
         @output.write "\e[37m"
         if dialog.scrollbar_pos <= (i * 2) and (i * 2 + 1) < (dialog.scrollbar_pos + bar_height)
           @output.write @full_block
@@ -774,8 +769,10 @@ class Reline::LineEditor
     Reline::IOGate.move_cursor_column(cursor_column)
     move_cursor_up(dialog.vertical_offset + dialog.contents.size - 1)
     Reline::IOGate.show_cursor
+    lines = whole_lines
     dialog.lines_backup = {
-      lines: modify_lines(whole_lines),
+      unmodified_lines: lines,
+      lines: modify_lines(lines),
       line_index: @line_index,
       first_line_started_from: @first_line_started_from,
       started_from: @started_from,
@@ -785,7 +782,7 @@ class Reline::LineEditor
 
   private def reset_dialog(dialog, old_dialog)
     return if dialog.lines_backup.nil? or old_dialog.contents.nil?
-    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines])
+    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:unmodified_lines])
     visual_lines = []
     visual_start = nil
     dialog.lines_backup[:lines].each_with_index { |l, i|
@@ -896,7 +893,7 @@ class Reline::LineEditor
   private def clear_each_dialog(dialog)
     dialog.trap_key = nil
     return unless dialog.contents
-    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines])
+    prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:unmodified_lines])
     visual_lines = []
     visual_lines_under_dialog = []
     visual_start = nil
@@ -964,11 +961,20 @@ class Reline::LineEditor
     end
   end
 
-  private def rerender_added_newline(prompt, prompt_width)
-    scroll_down(1)
+  private def rerender_added_newline(prompt, prompt_width, prompt_list)
     @buffer_of_lines[@previous_line_index] = @line
     @line = @buffer_of_lines[@line_index]
-    unless @in_pasting
+    @previous_line_index = nil
+    if @in_pasting
+      scroll_down(1)
+    else
+      lines = whole_lines
+      prev_line_prompt = @prompt_proc ? prompt_list[@line_index - 1] : prompt
+      prev_line_prompt_width = @prompt_proc ? calculate_width(prev_line_prompt, true) : prompt_width
+      prev_line = modify_lines(lines)[@line_index - 1]
+      move_cursor_up(@started_from)
+      render_partial(prev_line_prompt, prev_line_prompt_width, prev_line, @first_line_started_from + @started_from, with_control: false)
+      scroll_down(1)
       render_partial(prompt, prompt_width, @line, @first_line_started_from + @started_from + 1, with_control: false)
     end
     @cursor = @cursor_max = calculate_width(@line)
@@ -977,7 +983,6 @@ class Reline::LineEditor
     @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
   end
 
   def just_move_cursor
@@ -990,22 +995,18 @@ class Reline::LineEditor
         calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
       end
     first_line_diff = new_first_line_started_from - @first_line_started_from
-    new_cursor, new_cursor_max, new_started_from, new_byte_pointer = calculate_nearest_cursor(@buffer_of_lines[@line_index], @cursor, @started_from, @byte_pointer, false)
-    new_started_from = calculate_height_by_width(prompt_width + new_cursor) - 1
+    @cursor, @cursor_max, _, @byte_pointer = calculate_nearest_cursor(@buffer_of_lines[@line_index], @cursor, @started_from, @byte_pointer, false)
+    new_started_from = calculate_height_by_width(prompt_width + @cursor) - 1
     calculate_scroll_partial_screen(@highest_in_all, new_first_line_started_from + new_started_from)
     @previous_line_index = nil
+    @line = @buffer_of_lines[@line_index]
     if @rerender_all
-      @line = @buffer_of_lines[@line_index]
       rerender_all_lines
       @rerender_all = false
       true
     else
-      @line = @buffer_of_lines[@line_index]
       @first_line_started_from = new_first_line_started_from
       @started_from = new_started_from
-      @cursor = new_cursor
-      @cursor_max = new_cursor_max
-      @byte_pointer = new_byte_pointer
       move_cursor_down(first_line_diff + @started_from)
       Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
       false
@@ -1013,11 +1014,7 @@ class Reline::LineEditor
   end
 
   private def rerender_changed_current_line
-    if @previous_line_index
-      new_lines = whole_lines(index: @previous_line_index, line: @line)
-    else
-      new_lines = whole_lines
-    end
+    new_lines = whole_lines
     prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
     all_height = calculate_height_by_lines(new_lines, prompt_list || prompt)
     diff = all_height - @highest_in_all
@@ -1371,8 +1368,8 @@ class Reline::LineEditor
         @completion_state = CompletionState::MENU
       end
       if not just_show_list and target < completed
-        @line = preposing + completed + completion_append_character.to_s + postposing
-        line_to_pointer = preposing + completed + completion_append_character.to_s
+        @line = (preposing + completed + completion_append_character.to_s + postposing).split("\n")[@line_index] || String.new(encoding: @encoding)
+        line_to_pointer = (preposing + completed + completion_append_character.to_s).split("\n").last || String.new(encoding: @encoding)
         @cursor_max = calculate_width(@line)
         @cursor = calculate_width(line_to_pointer)
         @byte_pointer = line_to_pointer.bytesize
@@ -1698,7 +1695,7 @@ class Reline::LineEditor
     return if not @check_new_auto_indent and @previous_line_index # move cursor up or down
     if @check_new_auto_indent and @previous_line_index and @previous_line_index > 0 and @line_index > @previous_line_index
       # Fix indent of a line when a newline is inserted to the next
-      new_lines = whole_lines(index: @previous_line_index, line: @line)
+      new_lines = whole_lines
       new_indent = @auto_indent_proc.(new_lines[0..-3].push(''), @line_index - 1, 0, true)
       md = @line.match(/\A */)
       prev_indent = md[0].count(' ')
@@ -1713,23 +1710,20 @@ class Reline::LineEditor
         @line = ' ' * new_indent + @line.lstrip
       end
     end
-    if @previous_line_index
-      new_lines = whole_lines(index: @previous_line_index, line: @line)
-    else
-      new_lines = whole_lines
-    end
+    new_lines = whole_lines
     new_indent = @auto_indent_proc.(new_lines, @line_index, @byte_pointer, @check_new_auto_indent)
-    new_indent = @cursor_max if new_indent&.> @cursor_max
     if new_indent&.>= 0
       md = new_lines[@line_index].match(/\A */)
       prev_indent = md[0].count(' ')
       if @check_new_auto_indent
-        @buffer_of_lines[@line_index] = ' ' * new_indent + @buffer_of_lines[@line_index].lstrip
+        line = @buffer_of_lines[@line_index] = ' ' * new_indent + @buffer_of_lines[@line_index].lstrip
         @cursor = new_indent
+        @cursor_max = calculate_width(line)
         @byte_pointer = new_indent
       else
         @line = ' ' * new_indent + @line.lstrip
         @cursor += new_indent - prev_indent
+        @cursor_max = calculate_width(@line)
         @byte_pointer += new_indent - prev_indent
       end
     end
@@ -1803,11 +1797,7 @@ class Reline::LineEditor
       target = before
     end
     if @is_multiline
-      if @previous_line_index
-        lines = whole_lines(index: @previous_line_index, line: @line)
-      else
-        lines = whole_lines
-      end
+      lines = whole_lines
       if @line_index > 0
         preposing = lines[0..(@line_index - 1)].join("\n") + "\n" + preposing
       end
@@ -1907,9 +1897,10 @@ class Reline::LineEditor
     @cursor_max = calculate_width(@line)
   end
 
-  def whole_lines(index: @line_index, line: @line)
+  def whole_lines
+    index = @previous_line_index || @line_index
     temp_lines = @buffer_of_lines.dup
-    temp_lines[index] = line
+    temp_lines[index] = @line
     temp_lines
   end
 
@@ -1917,11 +1908,7 @@ class Reline::LineEditor
     if @buffer_of_lines.size == 1 and @line.nil?
       nil
     else
-      if @previous_line_index
-        whole_lines(index: @previous_line_index, line: @line).join("\n")
-      else
-        whole_lines.join("\n")
-      end
+      whole_lines.join("\n")
     end
   end
 
@@ -1953,8 +1940,10 @@ class Reline::LineEditor
   end
 
   private def key_delete(key)
-    if @config.editing_mode_is?(:vi_insert, :emacs)
+    if @config.editing_mode_is?(:vi_insert)
       ed_delete_next_char(key)
+    elsif @config.editing_mode_is?(:emacs)
+      em_delete(key)
     end
   end
 
@@ -2660,7 +2649,7 @@ class Reline::LineEditor
   alias_method :kill_whole_line, :em_kill_line
 
   private def em_delete(key)
-    if (not @is_multiline and @line.empty?) or (@is_multiline and @line.empty? and @buffer_of_lines.size == 1)
+    if @line.empty? and (not @is_multiline or @buffer_of_lines.size == 1) and key == "\C-d".ord
       @line = nil
       if @buffer_of_lines.size > 1
         scroll_down(@highest_in_all - @first_line_started_from)

data/lib/reline/unicode/east_asian_width.rb

@@ -84,8 +84,13 @@ class Reline::Unicode::EastAsianWidth
     \u{17000}-\u{187F7}
     \u{18800}-\u{18CD5}
     \u{18D00}-\u{18D08}
-    \u{1B000}-\u{1B11E}
+    \u{1AFF0}-\u{1AFF3}
+    \u{1AFF5}-\u{1AFFB}
+    \u{1AFFD}-\u{1AFFE}
+    \u{1B000}-\u{1B122}
+    \u{1B132}
     \u{1B150}-\u{1B152}
+    \u{1B155}
     \u{1B164}-\u{1B167}
     \u{1B170}-\u{1B2FB}
     \u{1F004}
@@ -119,21 +124,21 @@ class Reline::Unicode::EastAsianWidth
     \u{1F6CC}
     \u{1F6D0}-\u{1F6D2}
     \u{1F6D5}-\u{1F6D7}
+    \u{1F6DC}-\u{1F6DF}
     \u{1F6EB}-\u{1F6EC}
     \u{1F6F4}-\u{1F6FC}
     \u{1F7E0}-\u{1F7EB}
+    \u{1F7F0}
     \u{1F90C}-\u{1F93A}
     \u{1F93C}-\u{1F945}
-    \u{1F947}-\u{1F978}
-    \u{1F97A}-\u{1F9CB}
-    \u{1F9CD}-\u{1F9FF}
-    \u{1FA70}-\u{1FA74}
-    \u{1FA78}-\u{1FA7A}
-    \u{1FA80}-\u{1FA86}
-    \u{1FA90}-\u{1FAA8}
-    \u{1FAB0}-\u{1FAB6}
-    \u{1FAC0}-\u{1FAC2}
-    \u{1FAD0}-\u{1FAD6}
+    \u{1F947}-\u{1F9FF}
+    \u{1FA70}-\u{1FA7C}
+    \u{1FA80}-\u{1FA88}
+    \u{1FA90}-\u{1FABD}
+    \u{1FABF}-\u{1FAC5}
+    \u{1FACE}-\u{1FADB}
+    \u{1FAE0}-\u{1FAE8}
+    \u{1FAF0}-\u{1FAF8}
     \u{20000}-\u{2FFFD}
     \u{30000}-\u{3FFFD}
   ).join }]/
@@ -403,8 +408,7 @@ class Reline::Unicode::EastAsianWidth
     \u{0591}-\u{05C7}
     \u{05D0}-\u{05EA}
     \u{05EF}-\u{05F4}
-    \u{0600}-\u{061C}
-    \u{061E}-\u{070D}
+    \u{0600}-\u{070D}
     \u{070F}-\u{074A}
     \u{074D}-\u{07B1}
     \u{07C0}-\u{07FA}
@@ -413,9 +417,9 @@ class Reline::Unicode::EastAsianWidth
     \u{0840}-\u{085B}
     \u{085E}
     \u{0860}-\u{086A}
-    \u{08A0}-\u{08B4}
-    \u{08B6}-\u{08C7}
-    \u{08D3}-\u{0983}
+    \u{0870}-\u{088E}
+    \u{0890}-\u{0891}
+    \u{0898}-\u{0983}
     \u{0985}-\u{098C}
     \u{098F}-\u{0990}
     \u{0993}-\u{09A8}
@@ -493,11 +497,12 @@ class Reline::Unicode::EastAsianWidth
     \u{0C0E}-\u{0C10}
     \u{0C12}-\u{0C28}
     \u{0C2A}-\u{0C39}
-    \u{0C3D}-\u{0C44}
+    \u{0C3C}-\u{0C44}
     \u{0C46}-\u{0C48}
     \u{0C4A}-\u{0C4D}
     \u{0C55}-\u{0C56}
     \u{0C58}-\u{0C5A}
+    \u{0C5D}
     \u{0C60}-\u{0C63}
     \u{0C66}-\u{0C6F}
     \u{0C77}-\u{0C8C}
@@ -509,10 +514,10 @@ class Reline::Unicode::EastAsianWidth
     \u{0CC6}-\u{0CC8}
     \u{0CCA}-\u{0CCD}
     \u{0CD5}-\u{0CD6}
-    \u{0CDE}
+    \u{0CDD}-\u{0CDE}
     \u{0CE0}-\u{0CE3}
     \u{0CE6}-\u{0CEF}
-    \u{0CF1}-\u{0CF2}
+    \u{0CF1}-\u{0CF3}
     \u{0D00}-\u{0D0C}
     \u{0D0E}-\u{0D10}
     \u{0D12}-\u{0D44}
@@ -542,7 +547,7 @@ class Reline::Unicode::EastAsianWidth
     \u{0EA7}-\u{0EBD}
     \u{0EC0}-\u{0EC4}
     \u{0EC6}
-    \u{0EC8}-\u{0ECD}
+    \u{0EC8}-\u{0ECE}
     \u{0ED0}-\u{0ED9}
     \u{0EDC}-\u{0EDF}
     \u{0F00}-\u{0F47}
@@ -577,9 +582,8 @@ class Reline::Unicode::EastAsianWidth
     \u{13F8}-\u{13FD}
     \u{1400}-\u{169C}
     \u{16A0}-\u{16F8}
-    \u{1700}-\u{170C}
-    \u{170E}-\u{1714}
-    \u{1720}-\u{1736}
+    \u{1700}-\u{1715}
+    \u{171F}-\u{1736}
     \u{1740}-\u{1753}
     \u{1760}-\u{176C}
     \u{176E}-\u{1770}
@@ -587,8 +591,7 @@ class Reline::Unicode::EastAsianWidth
     \u{1780}-\u{17DD}
     \u{17E0}-\u{17E9}
     \u{17F0}-\u{17F9}
-    \u{1800}-\u{180E}
-    \u{1810}-\u{1819}
+    \u{1800}-\u{1819}
     \u{1820}-\u{1878}
     \u{1880}-\u{18AA}
     \u{18B0}-\u{18F5}
@@ -607,9 +610,9 @@ class Reline::Unicode::EastAsianWidth
     \u{1A7F}-\u{1A89}
     \u{1A90}-\u{1A99}
     \u{1AA0}-\u{1AAD}
-    \u{1AB0}-\u{1AC0}
-    \u{1B00}-\u{1B4B}
-    \u{1B50}-\u{1B7C}
+    \u{1AB0}-\u{1ACE}
+    \u{1B00}-\u{1B4C}
+    \u{1B50}-\u{1B7E}
     \u{1B80}-\u{1BF3}
     \u{1BFC}-\u{1C37}
     \u{1C3B}-\u{1C49}
@@ -617,8 +620,7 @@ class Reline::Unicode::EastAsianWidth
     \u{1C90}-\u{1CBA}
     \u{1CBD}-\u{1CC7}
     \u{1CD0}-\u{1CFA}
-    \u{1D00}-\u{1DF9}
-    \u{1DFB}-\u{1F15}
+    \u{1D00}-\u{1F15}
     \u{1F18}-\u{1F1D}
     \u{1F20}-\u{1F45}
     \u{1F48}-\u{1F4D}
@@ -653,7 +655,7 @@ class Reline::Unicode::EastAsianWidth
     \u{2090}-\u{209C}
     \u{20A0}-\u{20A8}
     \u{20AA}-\u{20AB}
-    \u{20AD}-\u{20BF}
+    \u{20AD}-\u{20C0}
     \u{20D0}-\u{20F0}
     \u{2100}-\u{2102}
     \u{2104}
@@ -767,9 +769,7 @@ class Reline::Unicode::EastAsianWidth
     \u{2B51}-\u{2B54}
     \u{2B5A}-\u{2B73}
     \u{2B76}-\u{2B95}
-    \u{2B97}-\u{2C2E}
-    \u{2C30}-\u{2C5E}
-    \u{2C60}-\u{2CF3}
+    \u{2B97}-\u{2CF3}
     \u{2CF9}-\u{2D25}
     \u{2D27}
     \u{2D2D}
@@ -784,14 +784,16 @@ class Reline::Unicode::EastAsianWidth
     \u{2DC8}-\u{2DCE}
     \u{2DD0}-\u{2DD6}
     \u{2DD8}-\u{2DDE}
-    \u{2DE0}-\u{2E52}
+    \u{2DE0}-\u{2E5D}
     \u{303F}
     \u{4DC0}-\u{4DFF}
     \u{A4D0}-\u{A62B}
     \u{A640}-\u{A6F7}
-    \u{A700}-\u{A7BF}
-    \u{A7C2}-\u{A7CA}
-    \u{A7F5}-\u{A82C}
+    \u{A700}-\u{A7CA}
+    \u{A7D0}-\u{A7D1}
+    \u{A7D3}
+    \u{A7D5}-\u{A7D9}
+    \u{A7F2}-\u{A82C}
     \u{A830}-\u{A839}
     \u{A840}-\u{A877}
     \u{A880}-\u{A8C5}
@@ -823,11 +825,11 @@ class Reline::Unicode::EastAsianWidth
     \u{FB3E}
     \u{FB40}-\u{FB41}
     \u{FB43}-\u{FB44}
-    \u{FB46}-\u{FBC1}
-    \u{FBD3}-\u{FD3F}
-    \u{FD50}-\u{FD8F}
+    \u{FB46}-\u{FBC2}
+    \u{FBD3}-\u{FD8F}
     \u{FD92}-\u{FDC7}
-    \u{FDF0}-\u{FDFD}
+    \u{FDCF}
+    \u{FDF0}-\u{FDFF}
     \u{FE20}-\u{FE2F}
     \u{FE70}-\u{FE74}
     \u{FE76}-\u{FEFC}
@@ -861,10 +863,20 @@ class Reline::Unicode::EastAsianWidth
     \u{104D8}-\u{104FB}
     \u{10500}-\u{10527}
     \u{10530}-\u{10563}
-    \u{1056F}
+    \u{1056F}-\u{1057A}
+    \u{1057C}-\u{1058A}
+    \u{1058C}-\u{10592}
+    \u{10594}-\u{10595}
+    \u{10597}-\u{105A1}
+    \u{105A3}-\u{105B1}
+    \u{105B3}-\u{105B9}
+    \u{105BB}-\u{105BC}
     \u{10600}-\u{10736}
     \u{10740}-\u{10755}
     \u{10760}-\u{10767}
+    \u{10780}-\u{10785}
+    \u{10787}-\u{107B0}
+    \u{107B2}-\u{107BA}
     \u{10800}-\u{10805}
     \u{10808}
     \u{1080A}-\u{10835}
@@ -906,13 +918,14 @@ class Reline::Unicode::EastAsianWidth
     \u{10E80}-\u{10EA9}
     \u{10EAB}-\u{10EAD}
     \u{10EB0}-\u{10EB1}
-    \u{10F00}-\u{10F27}
+    \u{10EFD}-\u{10F27}
     \u{10F30}-\u{10F59}
+    \u{10F70}-\u{10F89}
     \u{10FB0}-\u{10FCB}
     \u{10FE0}-\u{10FF6}
     \u{11000}-\u{1104D}
-    \u{11052}-\u{1106F}
-    \u{1107F}-\u{110C1}
+    \u{11052}-\u{11075}
+    \u{1107F}-\u{110C2}
     \u{110CD}
     \u{110D0}-\u{110E8}
     \u{110F0}-\u{110F9}
@@ -922,7 +935,7 @@ class Reline::Unicode::EastAsianWidth
     \u{11180}-\u{111DF}
     \u{111E1}-\u{111F4}
     \u{11200}-\u{11211}
-    \u{11213}-\u{1123E}
+    \u{11213}-\u{11241}
     \u{11280}-\u{11286}
     \u{11288}
     \u{1128A}-\u{1128D}
@@ -954,11 +967,11 @@ class Reline::Unicode::EastAsianWidth
     \u{11600}-\u{11644}
     \u{11650}-\u{11659}
     \u{11660}-\u{1166C}
-    \u{11680}-\u{116B8}
+    \u{11680}-\u{116B9}
     \u{116C0}-\u{116C9}
     \u{11700}-\u{1171A}
     \u{1171D}-\u{1172B}
-    \u{11730}-\u{1173F}
+    \u{11730}-\u{11746}
     \u{11800}-\u{1183B}
     \u{118A0}-\u{118F2}
     \u{118FF}-\u{11906}
@@ -974,7 +987,8 @@ class Reline::Unicode::EastAsianWidth
     \u{119DA}-\u{119E4}
     \u{11A00}-\u{11A47}
     \u{11A50}-\u{11AA2}
-    \u{11AC0}-\u{11AF8}
+    \u{11AB0}-\u{11AF8}
+    \u{11B00}-\u{11B09}
     \u{11C00}-\u{11C08}
     \u{11C0A}-\u{11C36}
     \u{11C38}-\u{11C45}
@@ -996,19 +1010,23 @@ class Reline::Unicode::EastAsianWidth
     \u{11D93}-\u{11D98}
     \u{11DA0}-\u{11DA9}
     \u{11EE0}-\u{11EF8}
+    \u{11F00}-\u{11F10}
+    \u{11F12}-\u{11F3A}
+    \u{11F3E}-\u{11F59}
     \u{11FB0}
     \u{11FC0}-\u{11FF1}
     \u{11FFF}-\u{12399}
     \u{12400}-\u{1246E}
     \u{12470}-\u{12474}
     \u{12480}-\u{12543}
-    \u{13000}-\u{1342E}
-    \u{13430}-\u{13438}
+    \u{12F90}-\u{12FF2}
+    \u{13000}-\u{13455}
     \u{14400}-\u{14646}
     \u{16800}-\u{16A38}
     \u{16A40}-\u{16A5E}
     \u{16A60}-\u{16A69}
-    \u{16A6E}-\u{16A6F}
+    \u{16A6E}-\u{16ABE}
+    \u{16AC0}-\u{16AC9}
     \u{16AD0}-\u{16AED}
     \u{16AF0}-\u{16AF5}
     \u{16B00}-\u{16B45}
@@ -1025,10 +1043,14 @@ class Reline::Unicode::EastAsianWidth
     \u{1BC80}-\u{1BC88}
     \u{1BC90}-\u{1BC99}
     \u{1BC9C}-\u{1BCA3}
+    \u{1CF00}-\u{1CF2D}
+    \u{1CF30}-\u{1CF46}
+    \u{1CF50}-\u{1CFC3}
     \u{1D000}-\u{1D0F5}
     \u{1D100}-\u{1D126}
-    \u{1D129}-\u{1D1E8}
+    \u{1D129}-\u{1D1EA}
     \u{1D200}-\u{1D245}
+    \u{1D2C0}-\u{1D2D3}
     \u{1D2E0}-\u{1D2F3}
     \u{1D300}-\u{1D356}
     \u{1D360}-\u{1D378}
@@ -1055,17 +1077,27 @@ class Reline::Unicode::EastAsianWidth
     \u{1D7CE}-\u{1DA8B}
     \u{1DA9B}-\u{1DA9F}
     \u{1DAA1}-\u{1DAAF}
+    \u{1DF00}-\u{1DF1E}
+    \u{1DF25}-\u{1DF2A}
     \u{1E000}-\u{1E006}
     \u{1E008}-\u{1E018}
     \u{1E01B}-\u{1E021}
     \u{1E023}-\u{1E024}
     \u{1E026}-\u{1E02A}
+    \u{1E030}-\u{1E06D}
+    \u{1E08F}
     \u{1E100}-\u{1E12C}
     \u{1E130}-\u{1E13D}
     \u{1E140}-\u{1E149}
     \u{1E14E}-\u{1E14F}
+    \u{1E290}-\u{1E2AE}
     \u{1E2C0}-\u{1E2F9}
     \u{1E2FF}
+    \u{1E4D0}-\u{1E4F9}
+    \u{1E7E0}-\u{1E7E6}
+    \u{1E7E8}-\u{1E7EB}
+    \u{1E7ED}-\u{1E7EE}
+    \u{1E7F0}-\u{1E7FE}
     \u{1E800}-\u{1E8C4}
     \u{1E8C7}-\u{1E8D6}
     \u{1E900}-\u{1E94B}
@@ -1142,8 +1174,8 @@ class Reline::Unicode::EastAsianWidth
     \u{1F6D3}-\u{1F6D4}
     \u{1F6E0}-\u{1F6EA}
     \u{1F6F0}-\u{1F6F3}
-    \u{1F700}-\u{1F773}
-    \u{1F780}-\u{1F7D8}
+    \u{1F700}-\u{1F776}
+    \u{1F77B}-\u{1F7D9}
     \u{1F800}-\u{1F80B}
     \u{1F810}-\u{1F847}
     \u{1F850}-\u{1F859}

data/lib/reline/unicode.rb

@@ -160,16 +160,21 @@ class Reline::Unicode
     width = 0
     rest = str.encode(Encoding::UTF_8)
     in_zero_width = false
+    seq = String.new(encoding: encoding)
     rest.scan(WIDTH_SCANNER) do |gc|
       case
       when gc[NON_PRINTING_START_INDEX]
         in_zero_width = true
+        lines.last << NON_PRINTING_START
       when gc[NON_PRINTING_END_INDEX]
         in_zero_width = false
+        lines.last << NON_PRINTING_END
       when gc[CSI_REGEXP_INDEX]
         lines.last << gc[CSI_REGEXP_INDEX]
+        seq << gc[CSI_REGEXP_INDEX]
       when gc[OSC_REGEXP_INDEX]
         lines.last << gc[OSC_REGEXP_INDEX]
+        seq << gc[OSC_REGEXP_INDEX]
       when gc[GRAPHEME_CLUSTER_INDEX]
         gc = gc[GRAPHEME_CLUSTER_INDEX]
         unless in_zero_width
@@ -177,7 +182,7 @@ class Reline::Unicode
           if (width += mbchar_width) > max_width
             width = mbchar_width
             lines << nil
-            lines << String.new(encoding: encoding)
+            lines << seq.dup
             height += 1
           end
         end

data/lib/reline/version.rb

@@ -1,3 +1,3 @@
 module Reline
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/reline/windows.rb

@@ -291,6 +291,10 @@ class Reline::Windows
     end
   end
 
+  def self.with_raw_input
+    yield
+  end
+
   def self.getc
     check_input_event
     @@output_buf.shift

data/lib/reline.rb

@@ -11,6 +11,7 @@ require 'reline/terminfo'
 require 'rbconfig'
 
 module Reline
+  # NOTE: For making compatible with the rb-readline gem
   FILENAME_COMPLETION_PROC = nil
   USERNAME_COMPLETION_PROC = nil
 
@@ -265,19 +266,21 @@ module Reline
     Reline::DEFAULT_DIALOG_CONTEXT = Array.new
 
     def readmultiline(prompt = '', add_hist = false, &confirm_multiline_termination)
-      unless confirm_multiline_termination
-        raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
-      end
-      inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
+      Reline::IOGate.with_raw_input do
+        unless confirm_multiline_termination
+          raise ArgumentError.new('#readmultiline needs block to confirm multiline termination')
+        end
+        inner_readline(prompt, add_hist, true, &confirm_multiline_termination)
 
-      whole_buffer = line_editor.whole_buffer.dup
-      whole_buffer.taint if RUBY_VERSION < '2.7'
-      if add_hist and whole_buffer and whole_buffer.chomp("\n").size > 0
-        Reline::HISTORY << whole_buffer
-      end
+        whole_buffer = line_editor.whole_buffer.dup
+        whole_buffer.taint if RUBY_VERSION < '2.7'
+        if add_hist and whole_buffer and whole_buffer.chomp("\n").size > 0
+          Reline::HISTORY << whole_buffer
+        end
 
-      line_editor.reset_line if line_editor.whole_buffer.nil?
-      whole_buffer
+        line_editor.reset_line if line_editor.whole_buffer.nil?
+        whole_buffer
+      end
     end
 
     def readline(prompt = '', add_hist = false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reline
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Alternative GNU Readline or Editline implementation by pure Ruby.