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

LibLine: Respect the provided completion static offset

Browse source 
Now that we can resolve these correctly and they're per-suggestion, we
can finally use them for their intended purpose of letting suggestions
overwrite stuff in the buffer.
This commit is contained in:
Ali Mohammad Pur 2022-04-15 01:48:56 +04:30 • committed by Ali Mohammad Pur
parent 4ea9ca06b4
commit d5b3998d23
5 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibLine/Editor.cpp
View file

@ -1103,12 +1103,23 @@ void Editor::handle_read_event()
break;
}
insert(Utf32View { m_remembered_suggestion_static_data.data(), m_remembered_suggestion_static_data.size() });
m_remembered_suggestion_static_data.clear_with_capacity();
auto completion_result = m_suggestion_manager.attempt_completion(completion_mode, token_start);
auto new_cursor = m_cursor + completion_result.new_cursor_offset;
auto new_cursor = m_cursor;
new_cursor += completion_result.new_cursor_offset;
for (size_t i = completion_result.offset_region_to_remove.start; i < completion_result.offset_region_to_remove.end; ++i)
remove_at_index(new_cursor);
new_cursor -= completion_result.static_offset_from_cursor;
for (size_t i = 0; i < completion_result.static_offset_from_cursor; ++i) {
m_remembered_suggestion_static_data.append(m_buffer[new_cursor]);
remove_at_index(new_cursor);
}
m_cursor = new_cursor;
m_inline_search_cursor = new_cursor;
m_refresh_needed = true;
@ -1129,6 +1140,7 @@ void Editor::handle_read_event()
switch (completion_result.new_completion_mode) {
case SuggestionManager::DontComplete:
m_times_tab_pressed = 0;
m_remembered_suggestion_static_data.clear_with_capacity();
break;
case SuggestionManager::CompletePrefix:
break;
@ -1159,14 +1171,15 @@ void Editor::handle_read_event()
// We have none, or just one suggestion,
// we should just commit that and continue
// after it, as if it were auto-completed.
m_times_tab_pressed = 0;
m_suggestion_manager.reset();
m_suggestion_display->finish();
reposition_cursor(stderr_stream, true);
cleanup_suggestions();
m_remembered_suggestion_static_data.clear_with_capacity();
}
continue;
}
// If we got here, manually cleanup the suggestions and then insert the new code point.
m_remembered_suggestion_static_data.clear_with_capacity();
suggestion_cleanup.disarm();
cleanup_suggestions();
insert(code_point);
@ -1185,7 +1198,7 @@ void Editor::handle_read_event()
void Editor::cleanup_suggestions()
{
if (m_times_tab_pressed) {
if (m_times_tab_pressed != 0) {
// Apply the style of the last suggestion.
readjust_anchored_styles(m_suggestion_manager.current_suggestion().start_index, ModificationKind::ForcedOverlapRemoval);
stylize({ m_suggestion_manager.current_suggestion().start_index, m_cursor, Span::Mode::CodepointOriented }, m_suggestion_manager.current_suggestion().style);