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

Refactor prompt generation logic

Browse Source
This commit is contained in:
aycabta 2019-10-17 16:35:11 +09:00
parent 37457117c9
commit 60a0c20cb6
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/reline/line_editor.rb
View File

@ -60,11 +60,20 @@ class Reline::LineEditor
reset_variables reset_variables
end end
private def check_multiline_prompt(buffer, prompt, special_prompt) private def check_multiline_prompt(buffer, prompt)
special_prompt = nil
if @vi_arg
prompt = "(arg: #{@vi_arg}) "
@rerender_all = true
elsif @searching_prompt
prompt = @searching_prompt
@rerender_all = true
else
prompt = @prompt
end
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.map!{ prompt } if @vi_arg or @searching_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_width, prompt_list] [prompt, prompt_width, prompt_list]
@ -90,22 +99,9 @@ class Reline::LineEditor
@rerender_all = true @rerender_all = true
rerender rerender
else else
special_prompt = nil
if @vi_arg
prompt = "(arg: #{@vi_arg}) "
prompt_width = calculate_width(prompt)
special_prompt = prompt
elsif @searching_prompt
prompt = @searching_prompt
prompt_width = calculate_width(prompt)
special_prompt = prompt
else
prompt = @prompt
prompt_width = calculate_width(prompt, true)
end
back = 0 back = 0
new_buffer = whole_lines new_buffer = whole_lines
prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, 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)
@ -320,24 +316,11 @@ class Reline::LineEditor
move_cursor_up(@highest_in_all - 1 - @first_line_started_from) move_cursor_up(@highest_in_all - 1 - @first_line_started_from)
@menu_info = nil @menu_info = nil
end end
special_prompt = nil prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt)
if @vi_arg
prompt = "(arg: #{@vi_arg}) "
prompt_width = calculate_width(prompt)
special_prompt = prompt
elsif @searching_prompt
prompt = @searching_prompt
prompt_width = calculate_width(prompt)
special_prompt = prompt
else
prompt = @prompt
prompt_width = calculate_width(prompt, true)
end
if @cleared if @cleared
Reline::IOGate.clear_screen Reline::IOGate.clear_screen
@cleared = false @cleared = false
back = 0 back = 0
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]
@ -363,7 +346,7 @@ class Reline::LineEditor
else else
new_lines = whole_lines new_lines = whole_lines
end end
prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, 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
} }
@ -427,7 +410,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_width, prompt_list = check_multiline_prompt(new_buffer, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, 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)
@ -479,7 +462,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_width, prompt_list = check_multiline_prompt(whole_lines, prompt, special_prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, 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)