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

EditingEngine: Fix move_to_previous_word not working on last char of doc

Browse source 
Code meant for the move_to_next_word functions which set the cursor to
the last character in the file if it was reached was copied into the
move_to_previous_word functions which lead them not moving when
the function was called from the end of the file.
This commit is contained in:
Zac 2021-01-26 13:30:55 +10:00 • committed by Andreas Kling
parent 76a69be217
commit aec9658b4f
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -566,7 +566,7 @@ void EditingEngine::move_to_end_of_previous_word()
return;
}
if (line_index == lines.size() - 1 && column_index == line.length() - 1) {
if (line_index == 0 && column_index == 0) {
m_editor->set_cursor({ line_index, column_index });
return;
}
@ -614,9 +614,11 @@ void EditingEngine::move_to_beginning_of_previous_word()
const u32* line_chars = line.view().code_points();
const u32 current_char = line_chars[column_index];
if (column_index == 0 && !is_first_iteration && (vim_isalnum(current_char) || vim_ispunct(current_char)))
if (column_index == 0 && !is_first_iteration && (vim_isalnum(current_char) || vim_ispunct(current_char))) {
return m_editor->set_cursor({ line_index, column_index });
else if (column_index == 0) {
} else if (line_index == 0 && column_index == 0) {
return m_editor->set_cursor({ line_index, column_index });
} else if (column_index == 0 && is_first_iteration) {
is_first_iteration = false;
continue;
}
@ -629,10 +631,6 @@ void EditingEngine::move_to_beginning_of_previous_word()
if (!is_first_iteration && vim_ispunct(current_char) && (isspace(next_char) || vim_isalnum(next_char)))
return m_editor->set_cursor({ line_index, column_index });
if (line_index == lines.size() - 1 && column_index == line.length() - 1) {
return m_editor->set_cursor({ line_index, column_index });
}
is_first_iteration = false;
}
}