Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If completions menu is already displayed, don't select inline completion (#22977)

Browse source 
Before this change, inline completion would displace the user's
selection. Unfortunately this brings less visibility to the inline
completion, I think a good solution to this will be to display a chunk
of the completion inline in the menu, and have a WIP change for that.
Since the current behavior is frustrating, not blocking this improvement
on that

Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2025-01-10 11:45:55 -07:00 • committed by GitHub
parent c74ad61c0f
commit fe3d409b17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/editor/src/code_context_menus.rs
View file

@ -333,9 +333,7 @@ impl CompletionsMenu {
entries[0] = hint;
}
_ => {
if self.selected_item != 0 {
self.selected_item += 1;
}
self.selected_item += 1;
entries.insert(0, hint);
}
}
@ -674,6 +672,11 @@ impl CompletionsMenu {
}
pub async fn filter(&mut self, query: Option<&str>, executor: BackgroundExecutor) {
let inline_completion_was_selected = self.selected_item == 0
&& self.entries.borrow().first().map_or(false, |entry| {
matches!(entry, CompletionEntry::InlineCompletionHint(_))
});
let mut matches = if let Some(query) = query {
fuzzy::match_strings(
&self.match_candidates,
@ -770,12 +773,16 @@ impl CompletionsMenu {
let mut entries = self.entries.borrow_mut();
if let Some(CompletionEntry::InlineCompletionHint(_)) = entries.first() {
entries.truncate(1);
if inline_completion_was_selected {
self.selected_item = 0;
} else {
self.selected_item = 1;
}
} else {
entries.truncate(0);
self.selected_item = 0;
}
entries.extend(matches.into_iter().map(CompletionEntry::Match));
self.selected_item = 0;
}
}