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

LibGUI: Allow autocomplete to stay open after applying

Browse source 
Previously the autocomplete box would always close after applying a
suggestion. This is the desired behavior in almost all cases, but there
are some situations (like autocompleting paths) where it would be nicer
to keep the autocomplete box open after applying the suggestion.
This commit is contained in:
thislooksfun 2021-10-28 20:31:54 -05:00 • committed by Andreas Kling
parent 352f593958
commit d5baf1c1fa
4 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibGUI/AutocompleteProvider.cpp
View file

@ -34,6 +34,7 @@ public:
__ModelRoleCustom = (int)GUI::ModelRole::Custom,
PartialInputLength,
Completion,
HideAutocompleteAfterApplying,
};
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return m_suggestions.size(); }
@ -71,6 +72,9 @@ public:
if ((int)role == InternalRole::Completion)
return suggestion.completion;
if ((int)role == InternalRole::HideAutocompleteAfterApplying)
return suggestion.hide_autocomplete_after_applying == AutocompleteProvider::Entry::HideAutocompleteAfterApplying::Yes;
return {};
}
@ -173,21 +177,27 @@ void AutocompleteBox::previous_suggestion()
}
}
void AutocompleteBox::apply_suggestion()
AutocompleteProvider::Entry::HideAutocompleteAfterApplying AutocompleteBox::apply_suggestion()
{
auto hide_when_done = AutocompleteProvider::Entry::HideAutocompleteAfterApplying::Yes;
if (m_editor.is_null())
return;
return hide_when_done;
if (!m_editor->is_editable())
return;
return hide_when_done;
auto selected_index = m_suggestion_view->selection().first();
if (!selected_index.is_valid() || !m_suggestion_view->model()->is_within_range(selected_index))
return;
return hide_when_done;
auto suggestion_index = m_suggestion_view->model()->index(selected_index.row());
auto completion = suggestion_index.data((GUI::ModelRole)AutocompleteSuggestionModel::InternalRole::Completion).to_string();
size_t partial_length = suggestion_index.data((GUI::ModelRole)AutocompleteSuggestionModel::InternalRole::PartialInputLength).to_i64();
auto hide_after_applying = suggestion_index.data((GUI::ModelRole)AutocompleteSuggestionModel::InternalRole::HideAutocompleteAfterApplying).to_bool();
if (!hide_after_applying)
hide_when_done = AutocompleteProvider::Entry::HideAutocompleteAfterApplying::No;
VERIFY(completion.length() >= partial_length);
if (!m_editor->has_selection()) {
@ -200,6 +210,8 @@ void AutocompleteBox::apply_suggestion()
}
m_editor->insert_at_cursor_or_replace_selection(completion);
return hide_when_done;
}
bool AutocompleteProvider::Declaration::operator==(const AutocompleteProvider::Declaration& other) const