ruby-changes:67657
From: aycabta <ko1@a...>
Date: Wed, 8 Sep 2021 03:34:54 +0900 (JST)
Subject: [ruby-changes:67657] 8b6d757ba0 (master): [ruby/reline] Remove variables that have no meaning in calculations
https://git.ruby-lang.org/ruby.git/commit/?id=8b6d757ba0 From 8b6d757ba0782799e17431be4ea4d776c7c2f80b Mon Sep 17 00:00:00 2001 From: aycabta <aycabta@g...> Date: Wed, 8 Sep 2021 03:25:54 +0900 Subject: [ruby/reline] Remove variables that have no meaning in calculations https://github.com/ruby/reline/commit/3b7a1900fd --- lib/reline/line_editor.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 7afc3ed..7f5c441 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -811,12 +811,10 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L811 end move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff) end - old_dialog_scrollbar = old_dialog.scrollbar_pos.nil? ? 0 : @block_elem_width - dialog_scrollbar = dialog.scrollbar_pos.nil? ? 0 : @block_elem_width - if (old_dialog.column + old_dialog.width - old_dialog_scrollbar) > (dialog.column + dialog.width - dialog_scrollbar) + if (old_dialog.column + old_dialog.width) > (dialog.column + dialog.width) # rerender right move_cursor_down(old_dialog.vertical_offset + y_diff) - width = (old_dialog.column + old_dialog.width - old_dialog_scrollbar) - (dialog.column + dialog.width - dialog_scrollbar) + width = (old_dialog.column + old_dialog.width) - (dialog.column + dialog.width) start = visual_start + old_dialog.vertical_offset line_num = old_dialog.contents.size line_num.times do |i| @@ -827,7 +825,7 @@ class Reline::LineEditor https://github.com/ruby/ruby/blob/trunk/lib/reline/line_editor.rb#L825 s = Reline::Unicode.take_range(visual_lines[start + i], old_dialog.column + dialog.width, width) s = padding_space_with_escape_sequences(s, dialog.width) end - Reline::IOGate.move_cursor_column(dialog.column + dialog.width - dialog_scrollbar) + Reline::IOGate.move_cursor_column(dialog.column + dialog.width) @output.write "\e[39m\e[49m#{s}\e[39m\e[49m" move_cursor_down(1) if i < (line_num - 1) end -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/