RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:27:43 +00:00
Code Issues Activity Actions

VimEditingEngine: Operate on real lines rather than wrapped ones

Browse source 
In the normal editing engine keys like Home, End etc work on visual
lines, but vim operates on real ones. Eg if you have a really long line
and wrapping is on then in normal editing Home would take you to the
beginning of the wrapped line, but 'I' would put you insert mode at the
beginning of the real line in vim.
This commit is contained in:
Matthew Hall 2021-07-10 21:48:49 +01:00 • committed by Gunnar Beutner
parent 5d1676b05a
commit a7e7f62d08
3 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Userland/Libraries/LibGUI/EditingEngine.cpp
View file

@ -241,34 +241,42 @@ void EditingEngine::move_to_next_span(const KeyEvent& event)
}
}
void EditingEngine::move_to_line_beginning()
void EditingEngine::move_to_logical_line_beginning()
{
TextPosition new_cursor;
if (m_editor->is_wrapping_enabled()) {
// FIXME: Replicate the first_nonspace_column behavior in wrapping mode.
auto home_position = m_editor->cursor_content_rect().location().translated(-m_editor->width(), 0);
new_cursor = m_editor->text_position_at_content_position(home_position);
size_t first_nonspace_column = m_editor->current_line().first_non_whitespace_column();
if (m_editor->cursor().column() == first_nonspace_column) {
new_cursor = { m_editor->cursor().line(), 0 };
} else {
size_t first_nonspace_column = m_editor->current_line().first_non_whitespace_column();
if (m_editor->cursor().column() == first_nonspace_column) {
new_cursor = { m_editor->cursor().line(), 0 };
} else {
new_cursor = { m_editor->cursor().line(), first_nonspace_column };
}
new_cursor = { m_editor->cursor().line(), first_nonspace_column };
}
m_editor->set_cursor(new_cursor);
}
void EditingEngine::move_to_line_beginning()
{
if (m_editor->is_wrapping_enabled()) {
// FIXME: Replicate the first_nonspace_column behavior in wrapping mode.
auto home_position = m_editor->cursor_content_rect().location().translated(-m_editor->width(), 0);
m_editor->set_cursor(m_editor->text_position_at_content_position(home_position));
} else {
move_to_logical_line_beginning();
}
}
void EditingEngine::move_to_line_end()
{
TextPosition new_cursor;
if (m_editor->is_wrapping_enabled()) {
auto end_position = m_editor->cursor_content_rect().location().translated(m_editor->width(), 0);
new_cursor = m_editor->text_position_at_content_position(end_position);
m_editor->set_cursor(m_editor->text_position_at_content_position(end_position));
} else {
new_cursor = { m_editor->cursor().line(), m_editor->current_line().length() };
move_to_logical_line_end();
}
m_editor->set_cursor(new_cursor);
}
void EditingEngine::move_to_logical_line_end()
{
m_editor->set_cursor({ m_editor->cursor().line(), m_editor->current_line().length() });
}
void EditingEngine::move_one_up(const KeyEvent& event)