kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Clear remaining lines when line number decreased

Browse source
This commit is contained in:
aycabta 2019-05-30 14:04:14 +09:00
parent 4a31c1e45d
commit 1cf9f79342
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/reline/line_editor.rb
View file

@ -330,17 +330,33 @@ class Reline::LineEditor
Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last) Reline::IOGate.move_cursor_column((prompt_width + @cursor) % @screen_size.last)
return return
end end
new_highest_in_this = calculate_height_by_width(@prompt_width + calculate_width(@line.nil? ? '' : @line))
# FIXME: end of logical line sometimes breaks # FIXME: end of logical line sometimes breaks
if @previous_line_index if @previous_line_index or new_highest_in_this < @highest_in_this
new_lines = whole_lines(index: @previous_line_index, line: @line) if @previous_line_index
new_lines = whole_lines(index: @previous_line_index, line: @line)
else
new_lines = whole_lines
end
all_height = new_lines.inject(0) { |result, line| all_height = new_lines.inject(0) { |result, line|
result + calculate_height_by_width(@prompt_width + calculate_width(line)) result + calculate_height_by_width(@prompt_width + calculate_width(line))
} }
diff = all_height - @highest_in_all diff = all_height - @highest_in_all
move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1) move_cursor_down(@highest_in_all - @first_line_started_from - @started_from - 1)
if diff > 0
scroll_down(diff)
move_cursor_up(all_height - 1)
elsif diff < 0
(-diff).times do
Reline::IOGate.move_cursor_column(0)
Reline::IOGate.erase_after_cursor
move_cursor_up(1)
end
move_cursor_up(all_height - 1)
else
move_cursor_up(all_height - 1)
end
@highest_in_all = all_height @highest_in_all = all_height
scroll_down(diff)
move_cursor_up(all_height - 1)
back = 0 back = 0
modify_lines(new_lines).each_with_index do |line, index| modify_lines(new_lines).each_with_index do |line, index|
height = render_partial(prompt, prompt_width, line, false) height = render_partial(prompt, prompt_width, line, false)
@ -350,8 +366,10 @@ class Reline::LineEditor
end end
end end
move_cursor_up(back) move_cursor_up(back)
@buffer_of_lines[@previous_line_index] = @line if @previous_line_index
@line = @buffer_of_lines[@line_index] @buffer_of_lines[@previous_line_index] = @line
@line = @buffer_of_lines[@line_index]
end
@first_line_started_from = @first_line_started_from =
if @line_index.zero? if @line_index.zero?
0 0