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 line wrapped cursor position #791

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Fix line wrapped cursor position #791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/reline/line_editor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def render_line_differential(old_items, new_items)
# Calculate cursor position in word wrapped content.
def wrapped_cursor_position
prompt_width = calculate_width(prompt_list[@line_index], true)
line_before_cursor = whole_lines[@line_index].byteslice(0, @byte_pointer)
line_before_cursor = Reline::Unicode.escape_for_print(whole_lines[@line_index].byteslice(0, @byte_pointer))
wrapped_line_before_cursor = split_line_by_width(' ' * prompt_width + line_before_cursor, screen_width)
wrapped_cursor_y = wrapped_prompt_and_input_lines[0...@line_index].sum(&:size) + wrapped_line_before_cursor.size - 1
wrapped_cursor_x = calculate_width(wrapped_line_before_cursor.last)
Expand Down
29 changes: 29 additions & 0 deletions test/reline/test_line_editor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,35 @@ def test_retrieve_completion_quote
end
end

class CursorPositionTest < Reline::TestCase
def setup
@line_editor = Reline::LineEditor.new(nil)
@line_editor.instance_variable_set(:@config, Reline::Config.new)
end

def test_cursor_position_with_escaped_input
@line_editor.instance_variable_set(:@screen_size, [4, 16])
@line_editor.instance_variable_set(:@prompt, "\e[1mprompt\e[0m> ")
@line_editor.instance_variable_set(:@buffer_of_lines, ["\e[1m\0\1\2\3\4\5\6\7abcd"])
@line_editor.instance_variable_set(:@line_index, 0)
# prompt> ^[[1m^@^
# A^B^C^D^E^F^Gabc
# d
@line_editor.instance_variable_set(:@byte_pointer, 0)
assert_equal [8, 0], @line_editor.wrapped_cursor_position
@line_editor.instance_variable_set(:@byte_pointer, 5)
assert_equal [15, 0], @line_editor.wrapped_cursor_position
@line_editor.instance_variable_set(:@byte_pointer, 6)
assert_equal [1, 1], @line_editor.wrapped_cursor_position
@line_editor.instance_variable_set(:@byte_pointer, 14)
assert_equal [15, 1], @line_editor.wrapped_cursor_position
@line_editor.instance_variable_set(:@byte_pointer, 15)
assert_equal [0, 2], @line_editor.wrapped_cursor_position
@line_editor.instance_variable_set(:@byte_pointer, 16)
assert_equal [1, 2], @line_editor.wrapped_cursor_position
end
end

class RenderLineDifferentialTest < Reline::TestCase
class TestIO < Reline::IO
def write(string)
Expand Down
Loading