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

[ruby/reline] Re-calc the scroll pos when the content in dialog is shortened

Browse Source 
https://github.com/ruby/reline/commit/12ea63e6e0
This commit is contained in:
aycabta 2021-10-03 18:25:26 +09:00 committed by git
parent 208b7b8199
commit 64e96d6b41
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/reline/line_editor.rb
View File

@ -673,6 +673,9 @@ class Reline::LineEditor
end end
dialog.contents = dialog.contents[dialog.scroll_top, height] dialog.contents = dialog.contents[dialog.scroll_top, height]
end end
if dialog.contents and dialog.scroll_top >= dialog.contents.size
dialog.scroll_top = dialog.contents.size - height
end
if dialog_render_info.scrollbar and dialog_render_info.contents.size > height if dialog_render_info.scrollbar and dialog_render_info.contents.size > height
bar_max_height = height * 2 bar_max_height = height * 2
moving_distance = (dialog_render_info.contents.size - height) * 2 moving_distance = (dialog_render_info.contents.size - height) * 2

7
test/reline/yamatanooroti/multiline_repl
View File

@ -115,6 +115,13 @@ opt.on('--autocomplete-long') {
}.select{ |c| c.start_with?(target) } }.select{ |c| c.start_with?(target) }
} }
} }
opt.on('--autocomplete-super-long') {
Reline.autocompletion = true
Reline.completion_proc = lambda { |target, preposing = nil, postposing = nil|
c = 'A'
2000.times.map{ s = "Str_#{c}"; c.succ!; s }.select{ |c| c.start_with?(target) }
}
}
opt.parse!(ARGV) opt.parse!(ARGV)
begin begin

27
test/reline/yamatanooroti/test_rendering.rb
View File

@ -1057,6 +1057,33 @@ begin
EOC EOC
end end
def test_autocomplete_super_long_and_backspace
start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --autocomplete-super-long}, startup_message: 'Multiline REPL.')
shift_tab = [27, 91, 90]
write('S' + shift_tab.map(&:chr).join)
write("\C-h")
close
assert_screen(<<~'EOC')
Multiline REPL.
prompt> Str_BX
Str_BX
Str_BXA
Str_BXB
Str_BXC
Str_BXD
Str_BXE
Str_BXF
Str_BXG
Str_BXH
Str_BXI
Str_BXJ
Str_BXK
Str_BXL
Str_BXM
Str_BXN
EOC
end
def test_dialog_callback_returns_nil def test_dialog_callback_returns_nil
start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog nil}, startup_message: 'Multiline REPL.') start_terminal(20, 30, %W{ruby -I#{@pwd}/lib #{@pwd}/test/reline/yamatanooroti/multiline_repl --dialog nil}, startup_message: 'Multiline REPL.')
write('a') write('a')