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

VimEditingEngine: allow selection of the endline character

Browse source 
This patch fixes the visual selection of endline characters in the
VimEditingEngine. When the visual mode is disabled and the cursor
is located on the endline character, it is shifted back to the last
character of the line.
This commit is contained in:
Paul Berg 2021-04-26 23:37:56 +02:00 • committed by Linus Groh
parent 0b47ea408c
commit 03d8ee1082
2 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Userland/Libraries/LibGUI/VimEditingEngine.cpp
View file

@ -665,7 +665,7 @@ void VimMotion::calculate_find_range(VimCursor& cursor, int amount)
m_find_mode = FindMode::None;
}
Optional<TextPosition> VimMotion::get_position(VimEditingEngine& engine)
Optional<TextPosition> VimMotion::get_position(VimEditingEngine& engine, bool in_visual_mode)
{
auto range_optional = get_range(engine, true);
if (!range_optional.has_value())
@ -716,11 +716,13 @@ Optional<TextPosition> VimMotion::get_position(VimEditingEngine& engine)
// above in get_range normalizes some values which shouldn't be
// end-exclusive during normal operations.
bool is_at_start = range.end().column() == 0;
size_t column = is_at_start ? 0 : range.end().column() - 1;
// Need to not go beyond the last character, as standard in vim.
auto& line = editor.line(range.end().line());
return { TextPosition { range.end().line(), min(column, line.length() - 1) } };
size_t column = is_at_start ? 0 : range.end().column() - 1;
column = min(column, line.length() - (in_visual_mode ? 0 : 1));
// Need to not go beyond the last character, as standard in vim.
return { TextPosition { range.end().line(), column } };
}
}
}
@ -1012,7 +1014,7 @@ bool VimEditingEngine::on_key_in_visual_mode(const KeyEvent& event)
m_motion.add_key_code(event.key(), event.ctrl(), event.shift(), event.alt());
if (m_motion.is_complete()) {
if (!m_motion.is_cancelled()) {
auto maybe_new_position = m_motion.get_position(*this);
auto maybe_new_position = m_motion.get_position(*this, true);
if (maybe_new_position.has_value()) {
auto new_position = maybe_new_position.value();
m_editor->set_cursor(new_position);
@ -1114,7 +1116,7 @@ bool VimEditingEngine::on_key_in_visual_mode(const KeyEvent& event)
m_motion.add_key_code(event.key(), event.ctrl(), event.shift(), event.alt());
if (m_motion.is_complete()) {
if (!m_motion.is_cancelled()) {
auto maybe_new_position = m_motion.get_position(*this);
auto maybe_new_position = m_motion.get_position(*this, true);
if (maybe_new_position.has_value()) {
auto new_position = maybe_new_position.value();
m_editor->set_cursor(new_position);
@ -1151,6 +1153,7 @@ void VimEditingEngine::switch_to_visual_mode()
m_vim_mode = VimMode::Visual;
m_editor->reset_cursor_blink();
m_previous_key = {};
m_selection_start_position = m_editor->cursor();
m_editor->selection()->set(m_editor->cursor(), { m_editor->cursor().line(), m_editor->cursor().column() + 1 });
m_editor->did_update_selection();
m_motion.reset();
@ -1159,18 +1162,37 @@ void VimEditingEngine::switch_to_visual_mode()
void VimEditingEngine::update_selection_on_cursor_move()
{
auto cursor = m_editor->cursor();
auto& line = m_editor->current_line();
cursor.set_column(min(cursor.column() + 1, line.length()));
m_editor->selection()->set_end(cursor);
auto start = m_selection_start_position < cursor ? m_selection_start_position : cursor;
auto end = m_selection_start_position < cursor ? cursor : m_selection_start_position;
if (end.column() >= m_editor->current_line().length()) {
if (end.line() != m_editor->line_count() - 1)
end = { end.line() + 1, 0 };
} else {
end.set_column(end.column() + 1);
}
m_editor->selection()->set(start, end);
m_editor->did_update_selection();
}
void VimEditingEngine::clamp_cursor_position()
{
auto cursor = m_editor->cursor();
if (cursor.column() >= m_editor->current_line().length()) {
cursor.set_column(m_editor->current_line().length() - 1);
m_editor->set_cursor(cursor);
}
}
void VimEditingEngine::clear_visual_mode_data()
{
if (m_editor->has_selection()) {
m_editor->selection()->clear();
m_editor->did_update_selection();
clamp_cursor_position();
}
m_selection_start_position = {};
}
void VimEditingEngine::move_half_page_up()