kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/reline] Remove unnecessary parameter

Browse source 
https://github.com/ruby/reline/commit/20fcd22564
This commit is contained in:
aycabta 2021-12-24 19:57:41 +09:00 • committed by git
parent 20dae14ba9
commit 22cc2243f9
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/reline/line_editor.rb
View file

@ -93,7 +93,7 @@ class Reline::LineEditor
mode_string mode_string
end end
private def check_multiline_prompt(buffer, prompt) private def check_multiline_prompt(buffer)
if @vi_arg if @vi_arg
prompt = "(arg: #{@vi_arg}) " prompt = "(arg: #{@vi_arg}) "
@rerender_all = true @rerender_all = true
@ -190,7 +190,7 @@ class Reline::LineEditor
else else
back = 0 back = 0
new_buffer = whole_lines new_buffer = whole_lines
prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer, prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer)
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)
@ -438,7 +438,7 @@ class Reline::LineEditor
show_menu show_menu
@menu_info = nil @menu_info = nil
end end
prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines)
if @cleared if @cleared
clear_screen_buffer(prompt, prompt_list, prompt_width) clear_screen_buffer(prompt, prompt_list, prompt_width)
@cleared = false @cleared = false
@ -449,7 +449,7 @@ class Reline::LineEditor
Reline::IOGate.move_cursor_up(@first_line_started_from + @started_from - @scroll_partial_screen) Reline::IOGate.move_cursor_up(@first_line_started_from + @started_from - @scroll_partial_screen)
Reline::IOGate.move_cursor_column(0) Reline::IOGate.move_cursor_column(0)
@scroll_partial_screen = nil @scroll_partial_screen = nil
prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines)
if @previous_line_index if @previous_line_index
new_lines = whole_lines(index: @previous_line_index, line: @line) new_lines = whole_lines(index: @previous_line_index, line: @line)
else else
@ -495,7 +495,7 @@ class Reline::LineEditor
end end
line = modify_lines(new_lines)[@line_index] line = modify_lines(new_lines)[@line_index]
clear_dialog clear_dialog
prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines, prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
render_partial(prompt, prompt_width, line, @first_line_started_from) render_partial(prompt, prompt_width, line, @first_line_started_from)
move_cursor_down(@highest_in_all - (@first_line_started_from + @highest_in_this - 1) - 1) move_cursor_down(@highest_in_all - (@first_line_started_from + @highest_in_this - 1) - 1)
scroll_down(1) scroll_down(1)
@ -504,7 +504,7 @@ class Reline::LineEditor
else else
if not rendered and not @in_pasting if not rendered and not @in_pasting
line = modify_lines(whole_lines)[@line_index] line = modify_lines(whole_lines)[@line_index]
prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines)
render_partial(prompt, prompt_width, line, @first_line_started_from) render_partial(prompt, prompt_width, line, @first_line_started_from)
end end
render_dialog((prompt_width + @cursor) % @screen_size.last) render_dialog((prompt_width + @cursor) % @screen_size.last)
@ -783,7 +783,7 @@ class Reline::LineEditor
private def reset_dialog(dialog, old_dialog) private def reset_dialog(dialog, old_dialog)
return if dialog.lines_backup.nil? or old_dialog.contents.nil? return if dialog.lines_backup.nil? or old_dialog.contents.nil?
prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines], prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines])
visual_lines = [] visual_lines = []
visual_start = nil visual_start = nil
dialog.lines_backup[:lines].each_with_index { |l, i| dialog.lines_backup[:lines].each_with_index { |l, i|
@ -886,7 +886,7 @@ class Reline::LineEditor
private def clear_each_dialog(dialog) private def clear_each_dialog(dialog)
dialog.trap_key = nil dialog.trap_key = nil
return unless dialog.contents return unless dialog.contents
prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines], prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(dialog.lines_backup[:lines])
visual_lines = [] visual_lines = []
visual_lines_under_dialog = [] visual_lines_under_dialog = []
visual_start = nil visual_start = nil
@ -971,7 +971,7 @@ class Reline::LineEditor
end end
def just_move_cursor def just_move_cursor
prompt, prompt_width, prompt_list = check_multiline_prompt(@buffer_of_lines, prompt) prompt, prompt_width, prompt_list = check_multiline_prompt(@buffer_of_lines)
move_cursor_up(@started_from) move_cursor_up(@started_from)
new_first_line_started_from = new_first_line_started_from =
if @line_index.zero? if @line_index.zero?
@ -1008,7 +1008,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) prompt, prompt_width, prompt_list = check_multiline_prompt(new_lines)
all_height = calculate_height_by_lines(new_lines, prompt_list || prompt) all_height = calculate_height_by_lines(new_lines, prompt_list || prompt)
diff = all_height - @highest_in_all diff = all_height - @highest_in_all
move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1) move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1)
@ -1055,7 +1055,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) prompt, prompt_width, prompt_list = check_multiline_prompt(new_buffer)
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)