ruby-changes:70558
From: aycabta <ko1@a...>
Date: Sat, 25 Dec 2021 00:33:09 +0900 (JST)
Subject: [ruby-changes:70558] 22cc2243f9 (master): [ruby/reline] Remove unnecessary parameter
https://git.ruby-lang.org/ruby.git/commit/?id=22cc2243f9 From 22cc2243f92ef09c10534412511a02ca8ccd45cb Mon Sep 17 00:00:00 2001 From: aycabta <aycabta@g...> Date: Fri, 24 Dec 2021 19:57:41 +0900 Subject: [ruby/reline] Remove unnecessary parameter https://github.com/ruby/reline/commit/20fcd22564 --- lib/reline/line_editor.rb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 74198491daa..ff5d160e645 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -93,7 +93,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L93 mode_string end - private def check_multiline_prompt(buffer, prompt) + private def check_multiline_prompt(buffer) if @vi_arg prompt = "(arg: #{@vi_arg}) " @rerender_all = true @@ -190,7 +190,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L190 else back = 0 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| prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc width = prompt_width + calculate_width(line) @@ -438,7 +438,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L438 show_menu @menu_info = nil end - prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines, prompt) + prompt, prompt_width, prompt_list = check_multiline_prompt(whole_lines) if @cleared clear_screen_buffer(prompt, prompt_list, prompt_width) @cleared = false @@ -449,7 +449,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L449 Reline::IOGate.move_cursor_up(@first_line_started_from + @started_from - @scroll_partial_screen) Reline::IOGate.move_cursor_column(0) @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 new_lines = whole_lines(index: @previous_line_index, line: @line) else @@ -495,7 +495,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L495 end line = modify_lines(new_lines)[@line_index] 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) move_cursor_down(@highest_in_all - (@first_line_started_from + @highest_in_this - 1) - 1) scroll_down(1) @@ -504,7 +504,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L504 else if not rendered and not @in_pasting 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) end render_dialog((prompt_width + @cursor) % @screen_size.last) @@ -783,7 +783,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L783 private def reset_dialog(dialog, old_dialog) 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_start = nil dialog.lines_backup[:lines].each_with_index { |l, i| @@ -886,7 +886,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L886 private def clear_each_dialog(dialog) dialog.trap_key = nil 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_under_dialog = [] visual_start = nil @@ -971,7 +971,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L971 end 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) new_first_line_started_from = if @line_index.zero? @@ -1008,7 +1008,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L1008 else new_lines = whole_lines 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) diff = all_height - @highest_in_all move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1) @@ -1055,7 +1055,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L1055 Reline::IOGate.move_cursor_column(0) back = 0 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| prompt_width = calculate_width(prompt_list[index], true) if @prompt_proc width = prompt_width + calculate_width(line) -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/