katakata_irb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d3d6ff924cd8fa8f05b097253525517a988c377d59e63ed1e5c6e5867cfde88
-  data.tar.gz: af6afd4a833e2b9bfd08a05877db80e45faadcac845be5148b53e3266d5539d8
+  metadata.gz: fb7e44af7218463a13dd4e072748d5880924a3b5678f8c30200f3e5bfde391cd
+  data.tar.gz: c0a6c33286b4a8197ad594f16baa87892448ea487e2faa153cac4d8f48d4208f
 SHA512:
-  metadata.gz: 35b76a766b99913226c5888b00efcc1c88c35ecb1bbb38338cf69a47772153caecb204bf5cad0a4f7affb475a179b0bd084ecd673c793260165731eef88a258b
-  data.tar.gz: e2dc520f4d5fe10a95795d5cbcdb784289e674c415a8eddea2c06883262f02847a5fd5b4fb7dc83d219e8a2add95e5fb5ed7c3d7000b4c83ea539825d50c5f20
+  metadata.gz: c79ea66192ad0c3f671a8cbaa9cf2d497b6b662482615a6f497e9a86ad6f797cc4d7b8d228bd44afd4c0968736a1ea83630311d2056b3bd4ae4befc1d2c94609
+  data.tar.gz: d3cde5bdd7a966ecf6a06e82bdd9f276664e513999902e37e3abd1a0870452e4eb8265c43949ce8c7f110e6786980a79e4b07abaf0dd7880c37dee39a27865c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    katakata_irb (0.1.2)
+    katakata_irb (0.1.3)
       rbs
 
 GEM

data/lib/katakata_irb/reline_patch.rb

@@ -3,7 +3,7 @@ module KatakataIrb::RelinePatch
   module RelinePatchIseqLoader; end
   def self.require_patched_reline
     # Apply patches of unmerged pull-request to reline
-    patches = %w[wholelines escapeseq indent fullwidth raw scrollbar]
+    patches = %w[wholelines escapeseq indent raw scrollbar]
     patched = {}
     require 'reline/version.rb' # result of $LOAD_PATH.resolve_feature_path will change after this require
     patches.each do |patch_name|

data/lib/katakata_irb/reline_patches/scrollbar.patch

@@ -1,18 +1,8 @@
 diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
-index e3985a3..8d785db 100644
+index 8153aab..50a063a 100644
 --- a/lib/reline/line_editor.rb
 +++ b/lib/reline/line_editor.rb
-@@ -680,6 +680,9 @@ class Reline::LineEditor
-     end
-     height = dialog_render_info.height || DIALOG_DEFAULT_HEIGHT
-     height = dialog.contents.size if dialog.contents.size < height
-+    if dialog.scroll_top >= dialog.contents.size - height
-+      dialog.scroll_top = dialog.contents.size - height
-+    end
-     if dialog.contents.size > height
-       if dialog.pointer
-         if dialog.pointer < 0
-@@ -690,17 +693,20 @@ class Reline::LineEditor
+@@ -703,17 +703,17 @@ class Reline::LineEditor
            dialog.scroll_top = dialog.pointer
          end
          pointer = dialog.pointer - dialog.scroll_top
@@ -23,9 +13,7 @@ index e3985a3..8d785db 100644
      end
 -    if dialog.contents and dialog.scroll_top >= dialog.contents.size
 -      dialog.scroll_top = dialog.contents.size - height
-+    if dialog_render_info.contents and dialog.scroll_top > dialog_render_info.contents.size - height
-+      dialog.scroll_top = dialog_render_info.contents.size - height
-     end
+-    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
@@ -35,7 +23,10 @@ index e3985a3..8d785db 100644
        dialog.scrollbar_pos = ((bar_max_height - bar_height) * position_ratio).floor.to_i
      else
        dialog.scrollbar_pos = nil
-@@ -745,4 +751,4 @@ class Reline::LineEditor
+@@ -755,7 +755,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"

data/lib/katakata_irb/ruby_lex_patch.rb

@@ -84,16 +84,17 @@ module KatakataIrb::RubyLexPatch
 
     if first_token && first_token.state != Ripper::EXPR_DOT
       tokens_without_last_line = tokens[0..index]
-      if check_termination(tokens_without_last_line)
+      if check_termination(tokens_without_last_line.map(&:tok).join, context: context)
         return last_line_tokens.map(&:tok).join
       end
     end
     false
   end
 
-  def check_termination(tokens)
+  def check_termination(code, context: nil)
+    tokens = KatakataIrb::RubyLexPatch.complete_tokens(code, context: context)
     opens = KatakataIrb::TRex.parse(tokens)
-    opens.empty? && !process_continue(tokens)
+    opens.empty? && !process_continue(tokens) && !check_code_block(code, tokens)
   end
 
   def set_input(io, p = nil, context: nil, &block)
@@ -101,8 +102,7 @@ module KatakataIrb::RubyLexPatch
     if @io.respond_to?(:check_termination)
       @io.check_termination do |code|
         if Reline::IOGate.in_pasting?
-          lex = RubyLex.new
-          rest = lex.check_termination_in_prev_line(code, context: context)
+          rest = check_termination_in_prev_line(code, context: context)
           if rest
             Reline.delete_text
             rest.bytes.reverse_each do |c|
@@ -113,8 +113,14 @@ module KatakataIrb::RubyLexPatch
             false
           end
         else
-          tokens = KatakataIrb::RubyLexPatch.complete_tokens(code, context: context)
-          check_termination(tokens)
+          # Accept any single-line input for symbol aliases or commands that transform args
+          command = code.split(/\s/, 2).first
+          if context.symbol_alias?(command) || context.transform_args?(command)
+            next true
+          end
+
+          code.gsub!(/\s*\z/, '').concat("\n")
+          check_termination(code, context: context)
         end
       end
     end
@@ -130,9 +136,7 @@ module KatakataIrb::RubyLexPatch
           line_tokens.each do |token, _s|
             tokens_until_line << token if token != tokens_until_line.last
           end
-          unless (c = process_continue(tokens_until_line)).nil?
-            continue = c
-          end
+          continue = process_continue(tokens_until_line)
           prompt next_opens, continue, line_num_offset
         end
       end
@@ -152,7 +156,7 @@ module KatakataIrb::RubyLexPatch
       @io.auto_indent do |lines, line_index, byte_pointer, is_newline|
         if is_newline
           tokens = KatakataIrb::RubyLexPatch.complete_tokens(lines[0..line_index].join("\n"), context: context)
-          process_indent_level tokens
+          process_indent_level(tokens)
         else
           code = line_index.zero? ? '' : lines[0..(line_index - 1)].map{ |l| l + "\n" }.join
           last_line = lines[line_index]&.byteslice(0, byte_pointer)
@@ -170,19 +174,20 @@ module KatakataIrb::RubyLexPatch
     @prompt.call(ltype, nesting_level, opens.any? || continue, @line_no + line_num_offset)
   end
 
-  def store_prompt_to_irb(...)
-    prompt(...) # TODO: do not use this. change the api. example: @input.call(prompt)
+  # TODO: do not use this. change the api. example: @input.call(prompt)
+  def store_prompt_to_irb(opens, continue, line_num_offset)
+    prompt(opens, continue, line_num_offset)
   end
 
   def readmultiline(context)
     if @io.respond_to? :check_termination
-      store_prompt_to_irb [], false, 0
+      store_prompt_to_irb([], false, 0)
       @input.call
     else
       # nomultiline
       line = ''
       line_offset = 0
-      store_prompt_to_irb [], false, 0
+      store_prompt_to_irb([], false, 0)
       loop do
         l = @input.call
         unless l
@@ -194,7 +199,7 @@ module KatakataIrb::RubyLexPatch
         _line_tokens, _prev_opens, next_opens = KatakataIrb::TRex.parse_line(tokens).last
         return line if next_opens.empty?
         line_offset += 1
-        store_prompt_to_irb next_opens, true, line_offset
+        store_prompt_to_irb(next_opens, true, line_offset)
       end
     end
   end

data/lib/katakata_irb/trex.rb

@@ -37,75 +37,92 @@ module KatakataIrb::TRex
       case state
       when :in_unquoted_symbol
         opens.pop
-        skip = true if %i[on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int on_backtick].include? t.event
+        skip = true if %i[on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int on_backtick].include?(t.event)
       when :in_method_head
-        unless %i[on_sp on_ignored_nl].include?(t.event)
+        unless %i[on_sp on_ignored_nl on_comment on_embdoc_beg on_embdoc on_embdoc_end].include?(t.event)
           next_args = []
           body = nil
-          if args.include? :receiver
+          if args.include?(:receiver)
             case t.event
             when :on_lparen, :on_ivar, :on_gvar, :on_cvar
+              # def (receiver). | def @ivar. | def $gvar. | def @@cvar.
               next_args << :dot
             when :on_kw
-              if t.tok in 'self' | 'true' | 'false' | 'nil'
-                next_args.push :arg, :dot
+              case t.tok
+              when 'self', 'true', 'false', 'nil'
+                # def self(arg) | def self.
+                next_args.push(:arg, :dot)
               else
+                # def if(arg)
                 skip = true
                 next_args << :arg
               end
-            when :on_op
+            when :on_op, :on_backtick
+              # def +(arg)
               skip = true
               next_args << :arg
             when :on_ident, :on_const
-              next_args.push :arg, :dot
+              # def a(arg) | def a.
+              next_args.push(:arg, :dot)
             end
           end
-          if args.include? :dot
+          if args.include?(:dot)
+            # def receiver.name
             next_args << :name if t.event == :on_period || (t.event == :on_op && t.tok == '::')
           end
-          if args.include? :name
-            if %i[on_ident on_const on_op on_kw].include? t.event
+          if args.include?(:name)
+            if %i[on_ident on_const on_op on_kw on_backtick].include?(t.event)
+              # def name(arg) | def receiver.name(arg)
               next_args << :arg
               skip = true
             end
           end
-          if args.include? :arg
+          if args.include?(:arg)
             case t.event
-            when :on_op
-              body = :oneliner if t.tok == '='
             when :on_nl, :on_semicolon
+              # def recever.f;
               body = :normal
             when :on_lparen
+              # def recever.f()
               next_args << :eq
             else
-              next_args << :arg_without_paren
+              if t.event == :on_op && t.tok == '='
+                # def receiver.f =
+                body = :oneliner
+              else
+                # def recever.f arg
+                next_args << :arg_without_paren
+              end
             end
           end
-          if args.include? :eq
+          if args.include?(:eq)
             if t.event == :on_op && t.tok == '='
               body = :oneliner
-            elsif t.event != :on_embdoc_beg
+            else
               body = :normal
             end
           end
-          if args.include? :args_without_paren
-            body = :normal if %i[on_semicolon on_nl].include? t.event
+          if args.include?(:arg_without_paren)
+            if %i[on_semicolon on_nl].include?(t.event)
+              # def f a;
+              body = :normal
+            else
+              # def f a, b
+              next_args << :arg_without_paren
+            end
           end
           if body == :oneliner
             opens.pop
           elsif body
-            opens.pop
-            opens << [last_tok, nil]
+            opens[-1] = [last_tok, nil]
           else
-            opens.pop
-            opens << [last_tok, :in_method_head, next_args]
+            opens[-1] = [last_tok, :in_method_head, next_args]
           end
         end
       when :in_for_while_until_condition
         if t.event == :on_semicolon || t.event == :on_nl || (t.event == :on_kw && t.tok == 'do')
           skip = true if t.event == :on_kw && t.tok == 'do'
-          opens.pop
-          opens << [last_tok, nil]
+          opens[-1] = [last_tok, nil]
         end
       end
 
@@ -184,10 +201,10 @@ module KatakataIrb::TRex
     prev_opens = []
     min_depth = 0
     output = []
-    last_opens = KatakataIrb::TRex.parse(tokens) do |t, _index, opens|
+    last_opens = parse(tokens) do |t, _index, opens|
       depth = t == opens.last&.first ? opens.size - 1 : opens.size
       min_depth = depth if depth < min_depth
-      if t.tok.include? "\n"
+      if t.tok.include?("\n")
         t.tok.each_line do |line|
           line_tokens << [t, line]
           next if line[-1] != "\n"

data/lib/katakata_irb/type_simulator.rb

@@ -293,7 +293,7 @@ class KatakataIrb::TypeSimulator
       sexp in [:def, _method_name_exp, params, body_stmt]
       sexp in [:defs, receiver_exp, _dot_exp, _method_name_exp, params, body_stmt]
       if receiver_exp
-        receiver_exp in  [:paren, receiver_exp]
+        receiver_exp in [:paren, receiver_exp]
         self_type = simulate_evaluate receiver_exp, scope
       else
         current_self_types = scope.self_type.types
@@ -407,6 +407,9 @@ class KatakataIrb::TypeSimulator
       KatakataIrb::Types::InstanceType.new Hash, K: KatakataIrb::Types::UnionType[*keys], V: KatakataIrb::Types::UnionType[*values]
     in [:hash, nil]
       KatakataIrb::Types::InstanceType.new Hash
+    in [:paren, [Symbol,] | false => statement]
+      # workaround for `p ()` and `p (foo)`
+      simulate_evaluate statement, scope if statement
     in [:paren | :ensure | :else, statements]
       statements.map { simulate_evaluate _1, scope }.last
     in [:const_path_ref, receiver, [:@const, name,]]
@@ -574,6 +577,7 @@ class KatakataIrb::TypeSimulator
       simulate_evaluate target, scope
       simulate_evaluate value, scope
     in [:massign, targets, value]
+      targets in [:mlhs, *targets] # (a,b) = value
       rhs = simulate_evaluate value, scope
       evaluate_massign targets, rhs, scope
       rhs

data/lib/katakata_irb/types.rb

@@ -85,23 +85,26 @@ module KatakataIrb::Types
 
   def self.type_from_object(object, max_level: 4)
     max_level -= 1
+    sample_size = 1000
     case object
     when Array
+      values = object.size > sample_size ? object.sample(sample_size) : object
       if max_level > 0
-        values = object.map { type_from_object(_1, max_level:) }
-        InstanceType.new Array, { Elem: UnionType[*values] }
+        InstanceType.new Array, { Elem: UnionType[*values.map { type_from_object(_1, max_level:) }] }
       else
-        InstanceType.new Array, { Elem: UnionType[*object.map(&:class).uniq.map { InstanceType.new _1 }] }
+        InstanceType.new Array, { Elem: UnionType[*values.map(&:class).uniq.map { InstanceType.new _1 }] }
       end
     when Hash
+      keys = object.size > sample_size ? object.keys.sample(sample_size) : object.keys
+      values = object.size > sample_size ? object.values.sample(sample_size) : object.values
       if max_level > 0
-        keys = object.keys.map { type_from_object(_1, max_level:) }
-        values = object.values.map { type_from_object(_1, max_level:) }
-        InstanceType.new Hash, { K: UnionType[*keys], V: UnionType[*values] }
+        key_types = keys.map { type_from_object(_1, max_level:) }
+        value_types = values.map { type_from_object(_1, max_level:) }
+        InstanceType.new Hash, { K: UnionType[*key_types], V: UnionType[*value_types] }
       else
-        keys = object.keys.map(&:class).uniq.map { InstanceType.new _1 }
-        values = object.values.map(&:class).uniq.map { InstanceType.new _1 }
-        InstanceType.new Hash, { K: UnionType[*keys], V: UnionType[*values] }
+        key_types = keys.map(&:class).uniq.map { InstanceType.new _1 }
+        value_types = values.map(&:class).uniq.map { InstanceType.new _1 }
+        InstanceType.new Hash, { K: UnionType[*key_types], V: UnionType[*value_types] }
       end
     when Module
       SingletonType.new object

data/lib/katakata_irb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KatakataIrb
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katakata_irb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -45,7 +45,6 @@ files:
 - lib/katakata_irb/completor.rb
 - lib/katakata_irb/reline_patch.rb
 - lib/katakata_irb/reline_patches/escapeseq.patch
-- lib/katakata_irb/reline_patches/fullwidth.patch
 - lib/katakata_irb/reline_patches/indent.patch
 - lib/katakata_irb/reline_patches/raw.patch
 - lib/katakata_irb/reline_patches/scrollbar.patch
@@ -77,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: IRB with Typed Completion

data/lib/katakata_irb/reline_patches/fullwidth.patch

@@ -1,200 +0,0 @@
-diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
-index c9e613e..6acf969 100644
---- a/lib/reline/line_editor.rb
-+++ b/lib/reline/line_editor.rb
-@@ -748,3 +741,3 @@ class Reline::LineEditor
-       end
-       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)
-+      str, = Reline::Unicode.take_range(item, 0, str_width, padding: true)
-@@ -793,85 +786,42 @@ class Reline::LineEditor
-       end
-       visual_lines.concat(vl)
-     }
--    old_y = dialog.lines_backup[:first_line_started_from] + dialog.lines_backup[:started_from]
--    y = @first_line_started_from + @started_from
--    y_diff = y - old_y
--    if (old_y + old_dialog.vertical_offset) < (y + dialog.vertical_offset)
--      # rerender top
--      move_cursor_down(old_dialog.vertical_offset - y_diff)
--      start = visual_start + old_dialog.vertical_offset
--      line_num = dialog.vertical_offset - old_dialog.vertical_offset
--      line_num.times do |i|
--        Reline::IOGate.move_cursor_column(old_dialog.column)
--        if visual_lines[start + i].nil?
--          s = ' ' * old_dialog.width
--        else
--          s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, old_dialog.width)
--          s = padding_space_with_escape_sequences(s, old_dialog.width)
--        end
--        @output.write "\e[0m#{s}\e[0m"
--        move_cursor_down(1) if i < (line_num - 1)
--      end
--      move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff)
--    end
--    if (old_y + old_dialog.vertical_offset + old_dialog.contents.size) > (y + dialog.vertical_offset + dialog.contents.size)
--      # rerender bottom
--      move_cursor_down(dialog.vertical_offset + dialog.contents.size - y_diff)
--      start = visual_start + dialog.vertical_offset + dialog.contents.size
--      line_num = (old_dialog.vertical_offset + old_dialog.contents.size) - (dialog.vertical_offset + dialog.contents.size)
--      line_num.times do |i|
--        Reline::IOGate.move_cursor_column(old_dialog.column)
--        if visual_lines[start + i].nil?
--          s = ' ' * old_dialog.width
--        else
--          s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, old_dialog.width)
--          s = padding_space_with_escape_sequences(s, old_dialog.width)
-+    old_dialog_y = dialog.lines_backup[:first_line_started_from] + dialog.lines_backup[:started_from]
-+    dialog_y = @first_line_started_from + @started_from
-+
-+    x_range = dialog.column...dialog.column + dialog.width
-+    old_x_range = old_dialog.column...old_dialog.column + old_dialog.width
-+    y_range = dialog_y + dialog.vertical_offset...dialog_y + dialog.vertical_offset + dialog.contents.size
-+    old_y_range = old_dialog_y + old_dialog.vertical_offset...old_dialog_y + old_dialog.vertical_offset + old_dialog.contents.size
-+
-+    cursor_y = dialog_y
-+    old_y_range.each do |y|
-+      rerender_ranges = []
-+      if y_range.cover?(y) && x_range.any?(old_x_range)
-+        if old_x_range.begin < x_range.begin
-+          # rerender left
-+          rerender_ranges << [old_x_range.begin...[old_x_range.end, x_range.begin].min, true, false]
-         end
--        @output.write "\e[0m#{s}\e[0m"
--        move_cursor_down(1) if i < (line_num - 1)
--      end
--      move_cursor_up(dialog.vertical_offset + dialog.contents.size + line_num - 1 - y_diff)
--    end
--    if old_dialog.column < dialog.column
--      # rerender left
--      move_cursor_down(old_dialog.vertical_offset - y_diff)
--      width = dialog.column - old_dialog.column
--      start = visual_start + old_dialog.vertical_offset
--      line_num = old_dialog.contents.size
--      line_num.times do |i|
--        Reline::IOGate.move_cursor_column(old_dialog.column)
--        if visual_lines[start + i].nil?
--          s = ' ' * width
--        else
--          s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column, width)
--          s = padding_space_with_escape_sequences(s, dialog.width)
-+        if x_range.end < old_x_range.end
-+          # rerender right
-+          rerender_ranges << [[x_range.end, old_x_range.begin].max...old_x_range.end, false, true]
-         end
-+      else
-+        rerender_ranges << [old_x_range, true, true]
-+      end
-+
-+      rerender_ranges.each do |range, cover_begin, cover_end|
-+        move_cursor_down(y - cursor_y)
-+        cursor_y = y
-+        col = range.begin
-+        width = range.end - range.begin
-+        line = visual_lines[y + visual_start - old_dialog_y] || ''
-+        s, col = Reline::Unicode.take_range(line, col, width, cover_begin: cover_begin, cover_end: cover_end, padding: true)
-+        Reline::IOGate.move_cursor_column(col)
-         @output.write "\e[0m#{s}\e[0m"
--        move_cursor_down(1) if i < (line_num - 1)
--      end
--      move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff)
--    end
--    if (old_dialog.column + old_dialog.width) > (dialog.column + dialog.width)
--      # rerender right
--      move_cursor_down(old_dialog.vertical_offset + y_diff)
--      width = (old_dialog.column + old_dialog.width) - (dialog.column + dialog.width)
--      start = visual_start + old_dialog.vertical_offset
--      line_num = old_dialog.contents.size
--      line_num.times do |i|
--        Reline::IOGate.move_cursor_column(old_dialog.column + dialog.width)
--        if visual_lines[start + i].nil?
--          s = ' ' * width
--        else
--          s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column + dialog.width, width)
--          rerender_width = old_dialog.width - dialog.width
--          s = padding_space_with_escape_sequences(s, rerender_width)
--        end
--        Reline::IOGate.move_cursor_column(dialog.column + dialog.width)
--        @output.write "\e[0m#{s}\e[0m"
--        move_cursor_down(1) if i < (line_num - 1)
-       end
--      move_cursor_up(old_dialog.vertical_offset + line_num - 1 + y_diff)
-     end
-+    move_cursor_up(cursor_y - dialog_y)
-     Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
-   end
- 
-@@ -912,9 +862,8 @@ class Reline::LineEditor
-     dialog_vertical_size = dialog.contents.size
-     dialog_vertical_size.times do |i|
-       if i < visual_lines_under_dialog.size
--        Reline::IOGate.move_cursor_column(dialog.column)
--        str = Reline::Unicode.take_range(visual_lines_under_dialog[i], dialog.column, dialog.width)
--        str = padding_space_with_escape_sequences(str, dialog.width)
-+        str, start_pos = Reline::Unicode.take_range(visual_lines_under_dialog[i], dialog.column, dialog.width, cover_begin: true, cover_end: true, padding: true)
-+        Reline::IOGate.move_cursor_column(start_pos)
-         @output.write "\e[0m#{str}\e[0m"
-       else
-         Reline::IOGate.move_cursor_column(dialog.column)
-diff --git a/lib/reline/unicode.rb b/lib/reline/unicode.rb
-index 6000c9f..03074dd 100644
---- a/lib/reline/unicode.rb
-+++ b/lib/reline/unicode.rb
-@@ -194,17 +194,21 @@ class Reline::Unicode
-   end
- 
-   # Take a chunk of a String cut by width with escape sequences.
--  def self.take_range(str, start_col, max_width, encoding = str.encoding)
-+  def self.take_range(str, start_col, width, encoding: str.encoding, cover_begin: false, cover_end: false, padding: false)
-     chunk = String.new(encoding: encoding)
-     total_width = 0
-     rest = str.encode(Encoding::UTF_8)
-     in_zero_width = false
-+    chunk_start_col = nil
-+    chunk_end_col = nil
-     rest.scan(WIDTH_SCANNER) do |gc|
-       case
-       when gc[NON_PRINTING_START_INDEX]
-         in_zero_width = true
-+        chunk << NON_PRINTING_START
-       when gc[NON_PRINTING_END_INDEX]
-         in_zero_width = false
-+        chunk << NON_PRINTING_END
-       when gc[CSI_REGEXP_INDEX]
-         chunk << gc[CSI_REGEXP_INDEX]
-       when gc[OSC_REGEXP_INDEX]
-@@ -215,13 +219,31 @@ class Reline::Unicode
-           chunk << gc
-         else
-           mbchar_width = get_mbchar_width(gc)
-+          prev_width = total_width
-           total_width += mbchar_width
--          break if (start_col + max_width) < total_width
--          chunk << gc if start_col < total_width
-+          break if !cover_end && total_width > start_col + width
-+          if cover_begin ? start_col < total_width : start_col <= prev_width
-+            chunk << gc
-+            chunk_start_col ||= prev_width
-+            chunk_end_col = total_width
-+          end
-+          break if total_width >= start_col + width
-         end
-       end
-     end
--    chunk
-+    chunk_start_col ||= start_col
-+    chunk_end_col ||= start_col
-+    if padding
-+      if start_col < chunk_start_col
-+        chunk = ' ' * (chunk_start_col - start_col) + chunk
-+        chunk_start_col = start_col
-+      end
-+      if chunk_end_col < start_col + width
-+        chunk << ' ' * (start_col + width - chunk_end_col)
-+        chunk_end_col = start_col + width
-+      end
-+    end
-+    [chunk, chunk_start_col, chunk_end_col - chunk_start_col]
-   end
- 
-   def self.get_next_mbchar_size(line, byte_pointer)