From 46c9d944e5225dfd37e852a2c24c1cf43fcde4d9 Mon Sep 17 00:00:00 2001 From: aycabta Date: Wed, 1 Sep 2021 18:00:44 +0900 Subject: [PATCH] Cut out a method that calcs width including the escape sequence and padding with spaces --- lib/reline/line_editor.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb index 9df04f14f4..0c23e67ebd 100644 --- a/lib/reline/line_editor.rb +++ b/lib/reline/line_editor.rb @@ -582,6 +582,10 @@ def add_dialog_proc(name, p, context = nil) end end + private def padding_space_with_escape_sequences(str, width) + str + (' ' * (width - calculate_width(str, true))) + end + private def render_each_dialog(dialog, cursor_column) if @in_pasting dialog.contents = nil @@ -651,8 +655,7 @@ def add_dialog_proc(name, p, context = nil) bg_color = '46' end end - str = Reline::Unicode.take_range(item, 0, dialog.width) - str += ' ' * (dialog.width - calculate_width(str, true)) + str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, dialog.width), dialog.width) @output.write "\e[#{bg_color}m#{str}\e[49m" Reline::IOGate.move_cursor_column(dialog.column) move_cursor_down(1) if i < (dialog.contents.size - 1) @@ -789,8 +792,7 @@ def add_dialog_proc(name, p, context = nil) dialog_vertical_size.times do |i| if i < visual_lines_under_dialog.size Reline::IOGate.move_cursor_column(0) - width = calculate_width(visual_lines_under_dialog[i], true) - str = visual_lines_under_dialog[i] + (' ' * (dialog.width - width)) + str = padding_space_with_escape_sequences(visual_lines_under_dialog[i], dialog.width) @output.write "\e[39m\e[49m#{str}\e[39m\e[49m" else Reline::IOGate.move_cursor_column(dialog.column)