From b7edf3117089769566c9a7ecbf55b8897c9f017d Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:10:34 +0100 Subject: [PATCH] lsp: Disable usage of follow-up completion invokes (#21755) Some of our users ran into a peculiar bug: autoimports with vtsls were leaving behind an extra curly brace. I think we were slightly incorrect in always requesting a follow-up completion without regard for last result of completion request (whether it was incomplete or not). Specifically, we're falling into this branch in current form: https://github.com/yioneko/vtsls/blob/037c2b615bf4cfe9dd65d9affc7a155fbb2ca255/packages/service/src/service/completion.ts#L121 which then leads to incorrect edits being returned from vtsls. Release Notes: - Fixed an edge case with appliance of autocompletions in VTSLS that could result in incorrect edits being applied. --- crates/editor/src/editor.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index ed0bd3f798..51f4cf7c0e 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -4461,16 +4461,15 @@ impl Editor { }; let query = Self::completion_query(&self.buffer.read(cx).read(cx), position); - let (is_followup_invoke, aside_was_displayed) = match self.context_menu.read().deref() { - Some(ContextMenu::Completions(menu)) => (true, menu.aside_was_displayed.get()), - _ => (false, false), + + let aside_was_displayed = match self.context_menu.read().deref() { + Some(ContextMenu::Completions(menu)) => menu.aside_was_displayed.get(), + _ => false, }; - let trigger_kind = match (&options.trigger, is_followup_invoke) { - (_, true) => CompletionTriggerKind::TRIGGER_FOR_INCOMPLETE_COMPLETIONS, - (Some(trigger), _) if buffer.read(cx).completion_triggers().contains(trigger) => { + let trigger_kind = match &options.trigger { + Some(trigger) if buffer.read(cx).completion_triggers().contains(trigger) => { CompletionTriggerKind::TRIGGER_CHARACTER } - _ => CompletionTriggerKind::INVOKED, }; let completion_context = CompletionContext {