Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dialog corrupts rendering by pushing up input line too much #524

Merged
merged 3 commits into from
May 7, 2023
Merged

Fix dialog corrupts rendering by pushing up input line too much #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
523fb6d
Do not render dialog where it overflows screen
tompng Mar 18, 2023
3206d10
Dialog rendering should Scroll down only when needed
tompng Mar 18, 2023
e281afa
Refactor screen_y_range calculation
tompng May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/reline/line_editor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,10 +708,16 @@ def add_dialog_proc(name, p, context = nil)
# Clear and rerender all dialogs line by line
Reline::IOGate.hide_cursor
ymin, ymax = (ranges_to_restore.keys + new_dialog_ranges.keys).minmax
st0012 marked this conversation as resolved.
Show resolved Hide resolved
scroll_partial_screen = @scroll_partial_screen || 0
screen_y_range = scroll_partial_screen..(scroll_partial_screen + @screen_height - 1)
ymin = ymin.clamp(screen_y_range.begin, screen_y_range.end)
ymax = ymax.clamp(screen_y_range.begin, screen_y_range.end)
dialog_y = @first_line_started_from + @started_from
cursor_y = dialog_y
scroll_down(ymax - cursor_y)
move_cursor_up(ymax - cursor_y)
if @highest_in_all < ymax
scroll_down(ymax - cursor_y)
move_cursor_up(ymax - cursor_y)
end
(ymin..ymax).each do |y|
move_cursor_down(y - cursor_y)
cursor_y = y
Expand Down
20 changes: 17 additions & 3 deletions test/reline/yamatanooroti/test_rendering.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,20 @@ def test_simple_dialog_at_right_edge
EOC
end

def test_simple_dialog_with_scroll_screen
start_terminal(5, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog simple}, startup_message: 'Multiline REPL.')
write("if 1\n 2\n 3\n 4\n 5\n 6")
write("\C-p\C-n\C-p\C-p\C-p#")
close
assert_screen(<<~'EOC')
prompt> 2
prompt> 3#
prompt> 4
prompt> 5
prompt> 6 Ruby is...
EOC
end

def test_autocomplete_at_bottom
start_terminal(15, 50, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete}, startup_message: 'Multiline REPL.')
write('def hoge' + "\C-m" * 10 + "end\C-p ")
Expand Down Expand Up @@ -1360,12 +1374,12 @@ def test_scroll_at_bottom_for_dialog
prompt>
prompt>
prompt>
prompt> S
prompt> String
prompt> Struct
prompt> Symbol
prompt> enScriptError
prompt> enSymbol
ScriptError
SyntaxError
Signal
EOC
end

Expand Down