diff options
| author | tomoya ishida <[email protected]> | 2024-10-03 02:46:59 +0900 |
|---|---|---|
| committer | git <[email protected]> | 2024-10-02 17:47:02 +0000 |
| commit | 09761e4789d04eff1f407dcb9afcc2f5f93b541f (patch) | |
| tree | af1c645713399e3030c03cfd8844974b876fe4ce /lib/reline | |
| parent | 8f4277f40594333a7dcad21fe0ef9138a909e777 (diff) | |
[ruby/reline] Fix incremental search cancel bug
(https://github.com/ruby/reline/pull/748)
https://github.com/ruby/reline/commit/bf0f8fa333
Diffstat (limited to 'lib/reline')
| -rw-r--r-- | lib/reline/line_editor.rb | 64 |
1 files changed, 18 insertions, 46 deletions
diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 56dc235c03..b815659713 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -1665,57 +1665,29 @@ class Reline::LineEditor end private def incremental_search_history(key) - unless @history_pointer - @line_backup_in_history = whole_buffer - end + backup = @buffer_of_lines.dup, @line_index, @byte_pointer, @history_pointer, @line_backup_in_history searcher = generate_searcher(key) @searching_prompt = "(reverse-i-search)`': " termination_keys = ["\C-j".ord] - termination_keys.concat(@config.isearch_terminators&.chars&.map(&:ord)) if @config.isearch_terminators + termination_keys.concat(@config.isearch_terminators.chars.map(&:ord)) if @config.isearch_terminators @waiting_proc = ->(k) { - case k - when *termination_keys - if @history_pointer - buffer = Reline::HISTORY[@history_pointer] - else - buffer = @line_backup_in_history - end - @buffer_of_lines = buffer.split("\n") - @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty? - @line_index = @buffer_of_lines.size - 1 + chr = k.is_a?(String) ? k : k.chr(Encoding::ASCII_8BIT) + if k == "\C-g".ord + # cancel search and restore buffer + @buffer_of_lines, @line_index, @byte_pointer, @history_pointer, @line_backup_in_history = backup @searching_prompt = nil @waiting_proc = nil - @byte_pointer = 0 - when "\C-g".ord - @buffer_of_lines = @line_backup_in_history.split("\n") - @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty? - @line_index = @buffer_of_lines.size - 1 - move_history(nil, line: :end, cursor: :end, save_buffer: false) + elsif !termination_keys.include?(k) && (chr.match?(/[[:print:]]/) || k == "\C-h".ord || k == "\C-?".ord || k == "\C-r".ord || k == "\C-s".ord) + search_word, prompt_name, hit_pointer = searcher.call(k) + Reline.last_incremental_search = search_word + @searching_prompt = "(%s)`%s'" % [prompt_name, search_word] + @searching_prompt += ': ' unless @is_multiline + move_history(hit_pointer, line: :end, cursor: :end) if hit_pointer + else + # terminaton_keys and other keys will terminalte + move_history(@history_pointer, line: :end, cursor: :start) @searching_prompt = nil @waiting_proc = nil - @byte_pointer = 0 - else - chr = k.is_a?(String) ? k : k.chr(Encoding::ASCII_8BIT) - if chr.match?(/[[:print:]]/) or k == "\C-h".ord or k == "\C-?".ord or k == "\C-r".ord or k == "\C-s".ord - search_word, prompt_name, hit_pointer = searcher.call(k) - Reline.last_incremental_search = search_word - @searching_prompt = "(%s)`%s'" % [prompt_name, search_word] - @searching_prompt += ': ' unless @is_multiline - move_history(hit_pointer, line: :end, cursor: :end, save_buffer: false) if hit_pointer - else - if @history_pointer - line = Reline::HISTORY[@history_pointer] - else - line = @line_backup_in_history - end - @line_backup_in_history = whole_buffer - @buffer_of_lines = line.split("\n") - @buffer_of_lines = [String.new(encoding: @encoding)] if @buffer_of_lines.empty? - @line_index = @buffer_of_lines.size - 1 - @searching_prompt = nil - @waiting_proc = nil - @byte_pointer = 0 - end end } end @@ -1770,14 +1742,14 @@ class Reline::LineEditor end alias_method :history_search_forward, :ed_search_next_history - private def move_history(history_pointer, line:, cursor:, save_buffer: true) + private def move_history(history_pointer, line:, cursor:) history_pointer ||= Reline::HISTORY.size return if history_pointer < 0 || history_pointer > Reline::HISTORY.size old_history_pointer = @history_pointer || Reline::HISTORY.size if old_history_pointer == Reline::HISTORY.size - @line_backup_in_history = save_buffer ? whole_buffer : '' + @line_backup_in_history = whole_buffer else - Reline::HISTORY[old_history_pointer] = whole_buffer if save_buffer + Reline::HISTORY[old_history_pointer] = whole_buffer end if history_pointer == Reline::HISTORY.size buf = @line_backup_in_history |