Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add mode_string to prompt calculation dependencies #658

Merged
merged 2 commits into from
Mar 24, 2024
Merged

Add mode_string to prompt calculation dependencies #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ff16f7
Add mode_string to prompt calculation dependencies
tompng Mar 22, 2024
d04901a
Update vi show-mode-in-prompt test
tompng Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/reline/line_editor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def set_pasting_state(in_pasting)
end
end

private def check_multiline_prompt(buffer)
private def check_multiline_prompt(buffer, mode_string)
if @vi_arg
prompt = "(arg: #{@vi_arg}) "
elsif @searching_prompt
Expand All @@ -97,7 +97,6 @@ def set_pasting_state(in_pasting)
prompt_list = @prompt_proc.(buffer).map { |pr| pr.gsub("\n", "\\n") }
prompt_list.map!{ prompt } if @vi_arg or @searching_prompt
prompt_list = [prompt] if prompt_list.empty?
mode_string = check_mode_string
prompt_list = prompt_list.map{ |pr| mode_string + pr } if mode_string
prompt = prompt_list[@line_index]
prompt = prompt_list[0] if prompt.nil?
Expand All @@ -109,7 +108,6 @@ def set_pasting_state(in_pasting)
end
prompt_list
else
mode_string = check_mode_string
prompt = mode_string + prompt if mode_string
[prompt] * buffer.size
end
Expand Down Expand Up @@ -319,8 +317,8 @@ def modified_lines
end

def prompt_list
with_cache(__method__, whole_lines, @vi_arg, @searching_prompt) do |lines|
check_multiline_prompt(lines)
with_cache(__method__, whole_lines, check_mode_string, @vi_arg, @searching_prompt) do |lines, mode_string|
check_multiline_prompt(lines, mode_string)
end
end

Expand Down
5 changes: 4 additions & 1 deletion test/reline/yamatanooroti/test_rendering.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,12 @@ def test_mode_string_vi
LINES
start_terminal(5, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl}, startup_message: 'Multiline REPL.')
write(":a\n\C-[k")
write("i\n:a")
write("\C-[h")
close
assert_screen(<<~EOC)
Multiline REPL.
(ins)prompt> :a
=> :a
(ins)prompt> :a
=> :a
(cmd)prompt> :a
Expand Down
Loading