1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Calculate prompt width correctly

Browse Source
This commit is contained in:
aycabta 2019-10-17 02:19:01 +09:00
parent e26c6d4ab8
commit db84123600
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/reline/line_editor.rb
View File

@ -64,11 +64,13 @@ class Reline::LineEditor
if @prompt_proc if @prompt_proc
prompt_list = @prompt_proc.(buffer) prompt_list = @prompt_proc.(buffer)
prompt_list[@line_index] = special_prompt if special_prompt prompt_list[@line_index] = special_prompt if special_prompt
prompt_list.map!{ special_prompt } if @searching_prompt
prompt = prompt_list[@line_index] prompt = prompt_list[@line_index]
prompt_width = calculate_width(prompt, true) prompt_width = calculate_width(prompt, true)
[prompt, prompt_list] [prompt, prompt_width, prompt_list]
else else
[prompt, nil] prompt_width = calculate_width(prompt, true)
[prompt, prompt_width, nil]
end end
end end
@ -103,7 +105,7 @@ class Reline::LineEditor
end end
back = 0 back = 0
new_buffer = whole_lines new_buffer = whole_lines
prompt, prompt_list = check_multiline_prompt(new_buffer, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, prompt, special_prompt)
new_buffer.each_with_index do |line, index| new_buffer.each_with_index do |line, index|
prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc
width = prompt_width + calculate_width(line) width = prompt_width + calculate_width(line)
@ -335,7 +337,7 @@ class Reline::LineEditor
Reline::IOGate.clear_screen Reline::IOGate.clear_screen
@cleared = false @cleared = false
back = 0 back = 0
prompt, prompt_list = check_multiline_prompt(whole_lines, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt, special_prompt)
modify_lines(whole_lines).each_with_index do |line, index| modify_lines(whole_lines).each_with_index do |line, index|
if @prompt_proc if @prompt_proc
pr = prompt_list[index] pr = prompt_list[index]
@ -361,7 +363,7 @@ class Reline::LineEditor
else else
new_lines = whole_lines new_lines = whole_lines
end end
prompt, prompt_list = check_multiline_prompt(new_lines, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, prompt, special_prompt)
all_height = new_lines.inject(0) { |result, line| all_height = new_lines.inject(0) { |result, line|
result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list result + calculate_height_by_width(prompt_width + calculate_width(line)) # TODO prompt_list
} }
@ -425,7 +427,7 @@ class Reline::LineEditor
Reline::IOGate.move_cursor_column(0) Reline::IOGate.move_cursor_column(0)
back = 0 back = 0
new_buffer = whole_lines new_buffer = whole_lines
prompt, prompt_list = check_multiline_prompt(new_buffer, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, prompt, special_prompt)
new_buffer.each_with_index do |line, index| new_buffer.each_with_index do |line, index|
prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc
width = prompt_width + calculate_width(line) width = prompt_width + calculate_width(line)
@ -477,7 +479,7 @@ class Reline::LineEditor
end end
line = modify_lines(whole_lines)[@line_index] line = modify_lines(whole_lines)[@line_index]
if @is_multiline if @is_multiline
prompt, prompt_list = check_multiline_prompt(whole_lines, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt, special_prompt)
if finished? if finished?
# Always rerender on finish because output_modifier_proc may return a different output. # Always rerender on finish because output_modifier_proc may return a different output.
render_partial(prompt, prompt_width, line) render_partial(prompt, prompt_width, line)