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

[ruby/reline] Cut out a method that calcs width including the escape sequence and padding with spaces

Browse Source 
https://github.com/ruby/reline/commit/46c9d944e5
This commit is contained in:
aycabta 2021-09-01 18:00:44 +09:00 committed by git
parent a669b9661e
commit acf11b94d2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/reline/line_editor.rb
View File

@ -582,6 +582,10 @@ class Reline::LineEditor
end end
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) private def render_each_dialog(dialog, cursor_column)
if @in_pasting if @in_pasting
dialog.contents = nil dialog.contents = nil
@ -651,8 +655,7 @@ class Reline::LineEditor
bg_color = '46' bg_color = '46'
end end
end end
str = Reline::Unicode.take_range(item, 0, dialog.width) str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, dialog.width), dialog.width)
str += ' ' * (dialog.width - calculate_width(str, true))
@output.write "\e[#{bg_color}m#{str}\e[49m" @output.write "\e[#{bg_color}m#{str}\e[49m"
Reline::IOGate.move_cursor_column(dialog.column) Reline::IOGate.move_cursor_column(dialog.column)
move_cursor_down(1) if i < (dialog.contents.size - 1) move_cursor_down(1) if i < (dialog.contents.size - 1)
@ -789,8 +792,7 @@ class Reline::LineEditor
dialog_vertical_size.times do |i| dialog_vertical_size.times do |i|
if i < visual_lines_under_dialog.size if i < visual_lines_under_dialog.size
Reline::IOGate.move_cursor_column(0) Reline::IOGate.move_cursor_column(0)
width = calculate_width(visual_lines_under_dialog[i], true) str = padding_space_with_escape_sequences(visual_lines_under_dialog[i], dialog.width)
str = visual_lines_under_dialog[i] + (' ' * (dialog.width - width))
@output.write "\e[39m\e[49m#{str}\e[39m\e[49m" @output.write "\e[39m\e[49m#{str}\e[39m\e[49m"
else else
Reline::IOGate.move_cursor_column(dialog.column) Reline::IOGate.move_cursor_column(dialog.column)