reline 0.1.1 → 0.1.6

data/lib/reline/general_io.rb

@@ -1,6 +1,14 @@
 require 'timeout'
 
 class Reline::GeneralIO
+  def self.encoding
+    RUBY_PLATFORM =~ /mswin|mingw/ ? Encoding::UTF_8 : Encoding::default_external
+  end
+
+  def self.win?
+    false
+  end
+
   RAW_KEYSTROKE_CONFIG = {}
 
   @@buf = []
@@ -59,6 +67,10 @@ class Reline::GeneralIO
   def self.set_winch_handler(&handler)
   end
 
+  def self.in_pasting?
+    false
+  end
+
   def self.prep
   end
 

data/lib/reline/history.rb

@@ -19,7 +19,7 @@ class Reline::History < Array
 
   def []=(index, val)
     index = check_index(index)
-    super(index, String.new(val, encoding: Encoding::default_external))
+    super(index, String.new(val, encoding: Reline.encoding_system_needs))
   end
 
   def concat(*val)
@@ -29,27 +29,47 @@ class Reline::History < Array
   end
 
   def push(*val)
-    diff = size + val.size - @config.history_size
-    if diff > 0
-      if diff <= size
-        shift(diff)
-      else
-        diff -= size
-        clear
-        val.shift(diff)
+    # If history_size is zero, all histories are dropped.
+    return self if @config.history_size.zero?
+    # If history_size is negative, history size is unlimited.
+    if @config.history_size.positive?
+      diff = size + val.size - @config.history_size
+      if diff > 0
+        if diff <= size
+          shift(diff)
+        else
+          diff -= size
+          clear
+          val.shift(diff)
+        end
       end
     end
-    super(*(val.map{ |v| String.new(v, encoding: Encoding::default_external) }))
+    super(*(val.map{ |v|
+      String.new(v, encoding: Reline.encoding_system_needs)
+    }))
   end
 
   def <<(val)
-    shift if size + 1 > @config.history_size
-    super(String.new(val, encoding: Encoding::default_external))
+    # If history_size is zero, all histories are dropped.
+    return self if @config.history_size.zero?
+    # If history_size is negative, history size is unlimited.
+    if @config.history_size.positive?
+      shift if size + 1 > @config.history_size
+    end
+    super(String.new(val, encoding: Reline.encoding_system_needs))
   end
 
   private def check_index(index)
     index += size if index < 0
-    raise RangeError.new("index=<#{index}>") if index < -@config.history_size or @config.history_size < index
+    if index < -2147483648 or 2147483647 < index
+      raise RangeError.new("integer #{index} too big to convert to `int'")
+    end
+    # If history_size is negative, history size is unlimited.
+    if @config.history_size.positive?
+      if index < -@config.history_size or @config.history_size < index
+        raise RangeError.new("index=<#{index}>")
+      end
+    end
     raise IndexError.new("index=<#{index}>") if index < 0 or size <= index
     index
   end

data/lib/reline/key_actor/emacs.rb

@@ -37,9 +37,9 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
     #  17 ^Q
     :ed_quoted_insert,
     #  18 ^R
-    :ed_search_prev_history,
+    :vi_search_prev,
     #  19 ^S
-    :ed_search_next_history,
+    :vi_search_next,
     #  20 ^T
     :ed_transpose_chars,
     #  21 ^U
@@ -413,11 +413,11 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
     # 205 M-M
     :ed_unassigned,
     # 206 M-N
-    :ed_search_next_history,
+    :vi_search_next,
     # 207 M-O
     :ed_sequence_lead_in,
     # 208 M-P
-    :ed_search_prev_history,
+    :vi_search_prev,
     # 209 M-Q
     :ed_unassigned,
     # 210 M-R
@@ -477,11 +477,11 @@ class Reline::KeyActor::Emacs < Reline::KeyActor::Base
     # 237 M-m
     :ed_unassigned,
     # 238 M-n
-    :ed_search_next_history,
+    :vi_search_next,
     # 239 M-o
     :ed_unassigned,
     # 240 M-p
-    :ed_search_prev_history,
+    :vi_search_prev,
     # 241 M-q
     :ed_unassigned,
     # 242 M-r

data/lib/reline/key_actor/vi_command.rb

@@ -37,7 +37,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
     #  17 ^Q
     :ed_ignore,
     #  18 ^R
-    :ed_search_prev_history,
+    :vi_search_prev,
     #  19 ^S
     :ed_ignore,
     #  20 ^T
@@ -151,7 +151,7 @@ class Reline::KeyActor::ViCommand < Reline::KeyActor::Base
     #  74 J
     :vi_join_lines,
     #  75 K
-    :ed_search_prev_history,
+    :vi_search_prev,
     #  76 L
     :ed_unassigned,
     #  77 M

data/lib/reline/key_actor/vi_insert.rb

@@ -37,9 +37,9 @@ class Reline::KeyActor::ViInsert < Reline::KeyActor::Base
     #  17 ^Q
     :ed_ignore,
     #  18 ^R
-    :ed_search_prev_history,
+    :vi_search_prev,
     #  19 ^S
-    :ed_search_next_history,
+    :vi_search_next,
     #  20 ^T
     :ed_insert,
     #  21 ^U

data/lib/reline/key_stroke.rb

@@ -42,6 +42,8 @@ class Reline::KeyStroke
       expand(expand(rhs_bytes) + expand(input.drop(lhs.size)))
     when Symbol
       [rhs] + expand(input.drop(lhs.size))
+    when Array
+      rhs
     end
   end
 

data/lib/reline/line_editor.rb

@@ -2,7 +2,6 @@ require 'reline/kill_ring'
 require 'reline/unicode'
 
 require 'tempfile'
-require 'pathname'
 
 class Reline::LineEditor
   # TODO: undo
@@ -51,16 +50,18 @@ class Reline::LineEditor
   CompletionJourneyData = Struct.new('CompletionJourneyData', :preposing, :postposing, :list, :pointer)
   MenuInfo = Struct.new('MenuInfo', :target, :list)
 
-  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)/
-
-  def initialize(config)
+  def initialize(config, encoding)
     @config = config
     @completion_append_character = ''
-    reset_variables
+    reset_variables(encoding: encoding)
+  end
+
+  def simplified_rendering?
+    if finished?
+      false
+    else
+      not @rerender_all and not finished? and Reline::IOGate.in_pasting?
+    end
   end
 
   private def check_multiline_prompt(buffer, prompt)
@@ -73,22 +74,47 @@ class Reline::LineEditor
     else
       prompt = @prompt
     end
+    return [prompt, calculate_width(prompt, true), [prompt] * buffer.size] if simplified_rendering?
     if @prompt_proc
       prompt_list = @prompt_proc.(buffer)
       prompt_list.map!{ prompt } if @vi_arg or @searching_prompt
+      if @config.show_mode_in_prompt
+        if @config.editing_mode_is?(:vi_command)
+          mode_icon = @config.vi_cmd_mode_icon
+        elsif @config.editing_mode_is?(:vi_insert)
+          mode_icon = @config.vi_ins_mode_icon
+        elsif @config.editing_mode_is?(:emacs)
+          mode_icon = @config.emacs_mode_string
+        else
+          mode_icon = '?'
+        end
+        prompt_list.map!{ |pr| mode_icon + pr }
+      end
       prompt = prompt_list[@line_index]
       prompt_width = calculate_width(prompt, true)
       [prompt, prompt_width, prompt_list]
     else
       prompt_width = calculate_width(prompt, true)
+      if @config.show_mode_in_prompt
+        if @config.editing_mode_is?(:vi_command)
+          mode_icon = @config.vi_cmd_mode_icon
+        elsif @config.editing_mode_is?(:vi_insert)
+          mode_icon = @config.vi_ins_mode_icon
+        elsif @config.editing_mode_is?(:emacs)
+          mode_icon = @config.emacs_mode_string
+        else
+          mode_icon = '?'
+        end
+        prompt = mode_icon + prompt
+      end
       [prompt, prompt_width, nil]
     end
   end
 
-  def reset(prompt = '', encoding = Encoding.default_external)
+  def reset(prompt = '', encoding:)
     @rest_height = (Reline::IOGate.get_screen_size.first - 1) - Reline::IOGate.cursor_pos.y
     @screen_size = Reline::IOGate.get_screen_size
-    reset_variables(prompt, encoding)
+    reset_variables(prompt, encoding: encoding)
     @old_trap = Signal.trap('SIGINT') {
       @old_trap.call if @old_trap.respond_to?(:call) # can also be string, ex: "DEFAULT"
       raise Interrupt
@@ -116,7 +142,7 @@ class Reline::LineEditor
           if @line_index.zero?
             0
           else
-            calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list)
+            calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
           end
         if @prompt_proc
           prompt = prompt_list[@line_index]
@@ -139,7 +165,7 @@ class Reline::LineEditor
     @eof
   end
 
-  def reset_variables(prompt = '', encoding = Encoding.default_external)
+  def reset_variables(prompt = '', encoding:)
     @prompt = prompt
     @mark_pointer = nil
     @encoding = encoding
@@ -190,10 +216,10 @@ class Reline::LineEditor
     @is_multiline = false
   end
 
-  private def calculate_height_by_lines(lines, prompt_list)
+  private def calculate_height_by_lines(lines, prompt)
     result = 0
+    prompt_list = prompt.is_a?(Array) ? prompt : nil
     lines.each_with_index { |line, i|
-      prompt = ''
       prompt = prompt_list[i] if prompt_list and prompt_list[i]
       result += calculate_height_by_width(calculate_width(prompt, true) + calculate_width(line))
     }
@@ -211,40 +237,8 @@ class Reline::LineEditor
     width.div(@screen_size.last) + 1
   end
 
-  private def split_by_width(prompt, str, max_width)
-    lines = [String.new(encoding: @encoding)]
-    height = 1
-    width = 0
-    rest = "#{prompt}#{str}".encode(Encoding::UTF_8)
-    in_zero_width = false
-    rest.scan(WIDTH_SCANNER) do |gc|
-      case gc
-      when NON_PRINTING_START
-        in_zero_width = true
-      when NON_PRINTING_END
-        in_zero_width = false
-      when CSI_REGEXP, OSC_REGEXP
-        lines.last << gc
-      else
-        unless in_zero_width
-          mbchar_width = Reline::Unicode.get_mbchar_width(gc)
-          if (width += mbchar_width) > max_width
-            width = mbchar_width
-            lines << nil
-            lines << String.new(encoding: @encoding)
-            height += 1
-          end
-        end
-        lines.last << gc
-      end
-    end
-    # The cursor moves to next line in first
-    if width == max_width
-      lines << nil
-      lines << String.new(encoding: @encoding)
-      height += 1
-    end
-    [lines, height]
+  private def split_by_width(str, max_width)
+    Reline::Unicode.split_by_width(str, max_width, @encoding)
   end
 
   private def scroll_down(val)
@@ -312,14 +306,19 @@ class Reline::LineEditor
     @byte_pointer = new_byte_pointer
   end
 
+  def rerender_all
+    @rerender_all = true
+    rerender
+  end
+
   def rerender
     return if @line.nil?
     if @menu_info
       scroll_down(@highest_in_all - @first_line_started_from)
       @rerender_all = true
-      @menu_info.list.each do |item|
+      @menu_info.list.sort!.each do |item|
         Reline::IOGate.move_cursor_column(0)
-        @output.print item
+        @output.write item
         @output.flush
         scroll_down(1)
       end
@@ -358,7 +357,7 @@ class Reline::LineEditor
         new_lines = whole_lines
       end
       prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, prompt)
-      all_height = calculate_height_by_lines(new_lines, prompt_list)
+      all_height = calculate_height_by_lines(new_lines, prompt_list || prompt)
       diff = all_height - @highest_in_all
       move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1)
       if diff > 0
@@ -398,7 +397,7 @@ class Reline::LineEditor
         if @line_index.zero?
           0
         else
-          calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list)
+          calculate_height_by_lines(@buffer_of_lines[0..(@line_index - 1)], prompt_list || prompt)
         end
       if @prompt_proc
         prompt = prompt_list[@line_index]
@@ -457,7 +456,7 @@ class Reline::LineEditor
         if @line_index.zero?
           0
         else
-          calculate_height_by_lines(new_buffer[0..(@line_index - 1)], prompt_list)
+          calculate_height_by_lines(new_buffer[0..(@line_index - 1)], prompt_list || prompt)
         end
       @started_from = calculate_height_by_width(prompt_width + @cursor) - 1
       move_cursor_down(@first_line_started_from + @started_from)
@@ -488,7 +487,7 @@ class Reline::LineEditor
   end
 
   private def render_partial(prompt, prompt_width, line_to_render, with_control = true)
-    visual_lines, height = split_by_width(prompt, line_to_render.nil? ? '' : line_to_render, @screen_size.last)
+    visual_lines, height = split_by_width(line_to_render.nil? ? prompt : prompt + line_to_render, @screen_size.last)
     if with_control
       if height > @highest_in_this
         diff = height - @highest_in_this
@@ -507,12 +506,30 @@ class Reline::LineEditor
     Reline::IOGate.move_cursor_column(0)
     visual_lines.each_with_index do |line, index|
       if line.nil?
-        Reline::IOGate.erase_after_cursor
-        move_cursor_down(1)
-        Reline::IOGate.move_cursor_column(0)
+        if calculate_width(visual_lines[index - 1], true) == Reline::IOGate.get_screen_size.last
+          # reaches the end of line
+          if Reline::IOGate.win?
+            # A newline is automatically inserted if a character is rendered at
+            # eol on command prompt.
+          else
+            # When the cursor is at the end of the line and erases characters
+            # after the cursor, some terminals delete the character at the
+            # cursor position.
+            move_cursor_down(1)
+            Reline::IOGate.move_cursor_column(0)
+          end
+        else
+          Reline::IOGate.erase_after_cursor
+          move_cursor_down(1)
+          Reline::IOGate.move_cursor_column(0)
+        end
         next
       end
-      @output.print line
+      @output.write line
+      if Reline::IOGate.win? and calculate_width(line, true) == Reline::IOGate.get_screen_size.last
+        # A newline is automatically inserted if a character is rendered at eol on command prompt.
+        @rest_height -= 1 if @rest_height > 0
+      end
       @output.flush
       if @first_prompt
         @first_prompt = false
@@ -520,22 +537,25 @@ class Reline::LineEditor
       end
     end
     Reline::IOGate.erase_after_cursor
+    Reline::IOGate.move_cursor_column(0)
     if with_control
-      move_cursor_up(height - 1)
+      # Just after rendring, so the cursor is on the last line.
       if finished?
-        move_cursor_down(@started_from)
+        Reline::IOGate.move_cursor_column(0)
+      else
+        # Moves up from bottom of lines to the cursor position.
+        move_cursor_up(height - 1 - @started_from)
+        Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
       end
-      move_cursor_down(@started_from)
-      Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
     end
     height
   end
 
   private def modify_lines(before)
-    return before if before.nil? || before.empty?
+    return before if before.nil? || before.empty? || simplified_rendering?
 
     if after = @output_modifier_proc&.call("#{before.join("\n")}\n", complete: finished?)
-      after.lines(chomp: true)
+      after.lines("\n").map { |l| l.chomp('') }
     else
       before
     end
@@ -560,7 +580,7 @@ class Reline::LineEditor
       else
         i&.start_with?(target)
       end
-    }
+    }.uniq
     if is_menu
       menu(target, list)
       return nil
@@ -831,7 +851,7 @@ class Reline::LineEditor
     unless completion_occurs
       @completion_state = CompletionState::NORMAL
     end
-    if @is_multiline and @auto_indent_proc
+    if @is_multiline and @auto_indent_proc and not simplified_rendering?
       process_auto_indent
     end
   end
@@ -905,7 +925,6 @@ class Reline::LineEditor
         quote = nil
         i += 1
         rest = nil
-        break_pointer = nil
       elsif quote and slice.start_with?(escaped_quote)
         # skip
         i += 2
@@ -915,10 +934,11 @@ class Reline::LineEditor
         closing_quote = /(?!\\)#{Regexp.escape(quote)}/
         escaped_quote = /\\#{Regexp.escape(quote)}/
         i += 1
-        break_pointer = i
+        break_pointer = i - 1
       elsif not quote and slice =~ word_break_regexp
         rest = $'
         i += 1
+        before = @line.byteslice(i, @byte_pointer - i)
         break_pointer = i
       else
         i += 1
@@ -936,6 +956,11 @@ class Reline::LineEditor
       end
     else
       preposing = ''
+      if break_pointer
+        preposing = @line.byteslice(0, break_pointer)
+      else
+        preposing = ''
+      end
       target = before
     end
     [preposing.encode(@encoding), target.encode(@encoding), postposing.encode(@encoding)]
@@ -1028,6 +1053,7 @@ class Reline::LineEditor
 
   def finish
     @finished = true
+    @rerender_all = true
     @config.reset
   end
 
@@ -1045,29 +1071,7 @@ class Reline::LineEditor
   end
 
   private def calculate_width(str, allow_escape_code = false)
-    if allow_escape_code
-      width = 0
-      rest = str.encode(Encoding::UTF_8)
-      in_zero_width = false
-      rest.scan(WIDTH_SCANNER) do |gc|
-        case gc
-        when NON_PRINTING_START
-          in_zero_width = true
-        when NON_PRINTING_END
-          in_zero_width = false
-        when CSI_REGEXP, OSC_REGEXP
-        else
-          unless in_zero_width
-            width += Reline::Unicode.get_mbchar_width(gc)
-          end
-        end
-      end
-      width
-    else
-      str.encode(Encoding::UTF_8).grapheme_clusters.inject(0) { |w, gc|
-        w + Reline::Unicode.get_mbchar_width(gc)
-      }
-    end
+    Reline::Unicode.calculate_width(str, allow_escape_code)
   end
 
   private def key_delete(key)
@@ -1090,6 +1094,11 @@ class Reline::LineEditor
 
   private def ed_insert(key)
     if key.instance_of?(String)
+      begin
+        key.encode(Encoding::UTF_8)
+      rescue Encoding::UndefinedConversionError
+        return
+      end
       width = Reline::Unicode.get_mbchar_width(key)
       if @cursor == @cursor_max
         @line += key
@@ -1100,6 +1109,11 @@ class Reline::LineEditor
       @cursor += width
       @cursor_max += width
     else
+      begin
+        key.chr.encode(Encoding::UTF_8)
+      rescue Encoding::UndefinedConversionError
+        return
+      end
       if @cursor == @cursor_max
         @line += key.chr
       else
@@ -1235,7 +1249,7 @@ class Reline::LineEditor
             if search_word.empty? and Reline.last_incremental_search
               search_word = Reline.last_incremental_search
             end
-            if @history_pointer # TODO
+            if @history_pointer
               case prev_search_key
               when "\C-r".ord
                 history_pointer_base = 0
@@ -1307,7 +1321,7 @@ class Reline::LineEditor
     end
   end
 
-  private def search_history(key)
+  private def incremental_search_history(key)
     unless @history_pointer
       if @is_multiline
         @line_backup_in_history = whole_buffer
@@ -1388,15 +1402,114 @@ class Reline::LineEditor
     }
   end
 
-  private def ed_search_prev_history(key)
-    search_history(key)
+  private def vi_search_prev(key)
+    incremental_search_history(key)
+  end
+  alias_method :reverse_search_history, :vi_search_prev
+
+  private def vi_search_next(key)
+    incremental_search_history(key)
   end
-  alias_method :reverse_search_history, :ed_search_prev_history
+  alias_method :forward_search_history, :vi_search_next
 
-  private def ed_search_next_history(key)
-    search_history(key)
+  private def ed_search_prev_history(key, arg: 1)
+    history = nil
+    h_pointer = nil
+    line_no = nil
+    substr = @line.slice(0, @byte_pointer)
+    if @history_pointer.nil?
+      return if not @line.empty? and substr.empty?
+      history = Reline::HISTORY
+    elsif @history_pointer.zero?
+      history = nil
+      h_pointer = nil
+    else
+      history = Reline::HISTORY.slice(0, @history_pointer)
+    end
+    return if history.nil?
+    if @is_multiline
+      h_pointer = history.rindex { |h|
+        h.split("\n").each_with_index { |l, i|
+          if l.start_with?(substr)
+            line_no = i
+            break
+          end
+        }
+        not line_no.nil?
+      }
+    else
+      h_pointer = history.rindex { |l|
+        l.start_with?(substr)
+      }
+    end
+    return if h_pointer.nil?
+    @history_pointer = h_pointer
+    if @is_multiline
+      @buffer_of_lines = Reline::HISTORY[@history_pointer].split("\n")
+      @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
+      @line_index = line_no
+      @line = @buffer_of_lines.last
+      @rerender_all = true
+    else
+      @line = Reline::HISTORY[@history_pointer]
+    end
+    @cursor_max = calculate_width(@line)
+    arg -= 1
+    ed_search_prev_history(key, arg: arg) if arg > 0
+  end
+  alias_method :history_search_backward, :ed_search_prev_history
+
+  private def ed_search_next_history(key, arg: 1)
+    substr = @line.slice(0, @byte_pointer)
+    if @history_pointer.nil?
+      return
+    elsif @history_pointer == (Reline::HISTORY.size - 1) and not substr.empty?
+      return
+    end
+    history = Reline::HISTORY.slice((@history_pointer + 1)..-1)
+    h_pointer = nil
+    line_no = nil
+    if @is_multiline
+      h_pointer = history.index { |h|
+        h.split("\n").each_with_index { |l, i|
+          if l.start_with?(substr)
+            line_no = i
+            break
+          end
+        }
+        not line_no.nil?
+      }
+    else
+      h_pointer = history.index { |l|
+        l.start_with?(substr)
+      }
+    end
+    h_pointer += @history_pointer + 1 if h_pointer and @history_pointer
+    return if h_pointer.nil? and not substr.empty?
+    @history_pointer = h_pointer
+    if @is_multiline
+      if @history_pointer.nil? and substr.empty?
+        @buffer_of_lines = []
+        @line_index = 0
+      else
+        @buffer_of_lines = Reline::HISTORY[@history_pointer].split("\n")
+        @line_index = line_no
+      end
+      @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty?
+      @line = @buffer_of_lines.last
+      @rerender_all = true
+    else
+      if @history_pointer.nil? and substr.empty?
+        @line = ''
+      else
+        @line = Reline::HISTORY[@history_pointer]
+      end
+    end
+    @cursor_max = calculate_width(@line)
+    arg -= 1
+    ed_search_next_history(key, arg: arg) if arg > 0
   end
-  alias_method :forward_search_history, :ed_search_next_history
+  alias_method :history_search_forward, :ed_search_next_history
 
   private def ed_prev_history(key, arg: 1)
     if @is_multiline and @line_index > 0
@@ -1875,6 +1988,16 @@ class Reline::LineEditor
     end
   end
 
+  private def vi_insert_at_bol(key)
+    ed_move_to_beg(key)
+    @config.editing_mode = :vi_insert
+  end
+
+  private def vi_add_at_eol(key)
+    ed_move_to_end(key)
+    @config.editing_mode = :vi_insert
+  end
+
   private def ed_delete_prev_char(key, arg: 1)
     deleted = ''
     arg.times do
@@ -1897,6 +2020,18 @@ class Reline::LineEditor
   end
 
   private def vi_change_meta(key)
+    @waiting_operator_proc = proc { |cursor_diff, byte_pointer_diff|
+      if byte_pointer_diff > 0
+        @line, cut = byteslice!(@line, @byte_pointer, byte_pointer_diff)
+      elsif byte_pointer_diff < 0
+        @line, cut = byteslice!(@line, @byte_pointer + byte_pointer_diff, -byte_pointer_diff)
+      end
+      copy_for_vi(cut)
+      @cursor += cursor_diff if cursor_diff < 0
+      @cursor_max -= cursor_diff.abs
+      @byte_pointer += byte_pointer_diff if byte_pointer_diff < 0
+      @config.editing_mode = :vi_insert
+    }
   end
 
   private def vi_delete_meta(key)
@@ -1977,7 +2112,7 @@ class Reline::LineEditor
       fp.path
     }
     system("#{ENV['EDITOR']} #{path}")
-    @line = Pathname.new(path).read
+    @line = File.read(path)
     finish
   end
 
@@ -2062,12 +2197,17 @@ class Reline::LineEditor
     @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg) }
   end
 
-  private def search_next_char(key, arg)
+  private def vi_to_next_char(key, arg: 1)
+    @waiting_proc = ->(key_for_proc) { search_next_char(key_for_proc, arg, true) }
+  end
+
+  private def search_next_char(key, arg, need_prev_char = false)
     if key.instance_of?(String)
       inputed_char = key
     else
       inputed_char = key.chr
     end
+    prev_total = nil
     total = nil
     found = false
     @line.byteslice(@byte_pointer..-1).grapheme_clusters.each do |mbchar|
@@ -2085,13 +2225,66 @@ class Reline::LineEditor
           end
         end
         width = Reline::Unicode.get_mbchar_width(mbchar)
+        prev_total = total
         total = [total.first + mbchar.bytesize, total.last + width]
       end
     end
-    if found and total
+    if not need_prev_char and found and total
       byte_size, width = total
       @byte_pointer += byte_size
       @cursor += width
+    elsif need_prev_char and found and prev_total
+      byte_size, width = prev_total
+      @byte_pointer += byte_size
+      @cursor += width
+    end
+    @waiting_proc = nil
+  end
+
+  private def vi_prev_char(key, arg: 1)
+    @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg) }
+  end
+
+  private def vi_to_prev_char(key, arg: 1)
+    @waiting_proc = ->(key_for_proc) { search_prev_char(key_for_proc, arg, true) }
+  end
+
+  private def search_prev_char(key, arg, need_next_char = false)
+    if key.instance_of?(String)
+      inputed_char = key
+    else
+      inputed_char = key.chr
+    end
+    prev_total = nil
+    total = nil
+    found = false
+    @line.byteslice(0..@byte_pointer).grapheme_clusters.reverse_each do |mbchar|
+      # total has [byte_size, cursor]
+      unless total
+        # skip cursor point
+        width = Reline::Unicode.get_mbchar_width(mbchar)
+        total = [mbchar.bytesize, width]
+      else
+        if inputed_char == mbchar
+          arg -= 1
+          if arg.zero?
+            found = true
+            break
+          end
+        end
+        width = Reline::Unicode.get_mbchar_width(mbchar)
+        prev_total = total
+        total = [total.first + mbchar.bytesize, total.last + width]
+      end
+    end
+    if not need_next_char and found and total
+      byte_size, width = total
+      @byte_pointer -= byte_size
+      @cursor -= width
+    elsif need_next_char and found and prev_total
+      byte_size, width = prev_total
+      @byte_pointer -= byte_size
+      @cursor -= width
     end
     @waiting_proc = nil
   end
@@ -2119,7 +2312,6 @@ class Reline::LineEditor
     new_pointer = [@byte_pointer, @line_index]
     @previous_line_index = @line_index
     @byte_pointer, @line_index = @mark_pointer
-    @byte_pointer, @line_index = @mark_pointer
     @cursor = calculate_width(@line.byteslice(0, @byte_pointer))
     @cursor_max = calculate_width(@line)
     @mark_pointer = new_pointer