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

[ruby/reline] Change rendered_screen.lines to non-nil

Browse Source 
(https://github.com/ruby/reline/pull/650)

https://github.com/ruby/reline/commit/9685db55f1
This commit is contained in:
tomoya ishida 2024-03-20 10:39:08 +09:00 committed by git
parent 0a10702747
commit aa2cdaa263
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/reline/line_editor.rb
View File

@ -153,7 +153,7 @@ class Reline::LineEditor
scroll_into_view scroll_into_view
Reline::IOGate.move_cursor_up @rendered_screen.cursor_y Reline::IOGate.move_cursor_up @rendered_screen.cursor_y
@rendered_screen.base_y = Reline::IOGate.cursor_pos.y @rendered_screen.base_y = Reline::IOGate.cursor_pos.y
@rendered_screen.lines = nil @rendered_screen.lines = []
@rendered_screen.cursor_y = 0 @rendered_screen.cursor_y = 0
render_differential render_differential
end end
@ -164,7 +164,7 @@ class Reline::LineEditor
scrolldown = render_differential scrolldown = render_differential
Reline::IOGate.scroll_down scrolldown Reline::IOGate.scroll_down scrolldown
Reline::IOGate.move_cursor_column 0 Reline::IOGate.move_cursor_column 0
@rendered_screen.lines = nil @rendered_screen.lines = []
@rendered_screen.cursor_y = 0 @rendered_screen.cursor_y = 0
case @old_trap case @old_trap
when 'DEFAULT', 'SYSTEM_DEFAULT' when 'DEFAULT', 'SYSTEM_DEFAULT'
@ -217,7 +217,7 @@ class Reline::LineEditor
@dialogs = [] @dialogs = []
@resized = false @resized = false
@cache = {} @cache = {}
@rendered_screen = RenderedScreen.new(base_y: 0, lines: nil, cursor_y: 0) @rendered_screen = RenderedScreen.new(base_y: 0, lines: [], cursor_y: 0)
reset_line reset_line
end end
@ -421,7 +421,7 @@ class Reline::LineEditor
Reline::IOGate.move_cursor_up @rendered_screen.cursor_y Reline::IOGate.move_cursor_up @rendered_screen.cursor_y
Reline::IOGate.move_cursor_column 0 Reline::IOGate.move_cursor_column 0
num_lines = @rendered_screen.lines&.size num_lines = @rendered_screen.lines.size
return unless num_lines && num_lines >= 1 return unless num_lines && num_lines >= 1
Reline::IOGate.move_cursor_down num_lines - 1 Reline::IOGate.move_cursor_down num_lines - 1
@ -430,7 +430,7 @@ class Reline::LineEditor
Reline::IOGate.move_cursor_up 1 Reline::IOGate.move_cursor_up 1
end end
Reline::IOGate.erase_after_cursor Reline::IOGate.erase_after_cursor
@rendered_screen.lines = nil @rendered_screen.lines = []
@rendered_screen.cursor_y = 0 @rendered_screen.cursor_y = 0
end end
@ -455,7 +455,7 @@ class Reline::LineEditor
def render_differential def render_differential
wrapped_cursor_x, wrapped_cursor_y = wrapped_cursor_position wrapped_cursor_x, wrapped_cursor_y = wrapped_cursor_position
rendered_lines = @rendered_screen.lines || [] rendered_lines = @rendered_screen.lines
new_lines = wrapped_lines.flatten[screen_scroll_top, screen_height].map do |l| new_lines = wrapped_lines.flatten[screen_scroll_top, screen_height].map do |l|
[[0, Reline::Unicode.calculate_width(l, true), l]] [[0, Reline::Unicode.calculate_width(l, true), l]]
end end
@ -528,7 +528,7 @@ class Reline::LineEditor
@cleared = false @cleared = false
Reline::IOGate.clear_screen Reline::IOGate.clear_screen
@screen_size = Reline::IOGate.get_screen_size @screen_size = Reline::IOGate.get_screen_size
@rendered_screen.lines = nil @rendered_screen.lines = []
@rendered_screen.base_y = 0 @rendered_screen.base_y = 0
@rendered_screen.cursor_y = 0 @rendered_screen.cursor_y = 0
end end