From b1b8fc02b866b277db0621ee056c37a7511bdf26 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 23:38:38 -0700 Subject: [PATCH] Fix panic in request_multiple_lsp_locally (cherry-pick #22806) (#22807) Cherry-picked Fix panic in request_multiple_lsp_locally (#22806) Release Notes: - Fix a panic after disconnecting from a remote project Co-authored-by: Conrad Irwin --- crates/project/src/lsp_store.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/project/src/lsp_store.rs b/crates/project/src/lsp_store.rs index e06858eeda798602686b824fc141ba071eb4728a..f3ac7b1265f494702cdd267b9bb41fdfaa8cb1a7 100644 --- a/crates/project/src/lsp_store.rs +++ b/crates/project/src/lsp_store.rs @@ -5586,13 +5586,13 @@ impl LspStore { ::Result: Send, ::Params: Send, { - debug_assert!(self.upstream_client().is_none()); + let Some(local) = self.as_local() else { + return Task::ready(Vec::new()); + }; let snapshot = buffer.read(cx).snapshot(); let scope = position.and_then(|position| snapshot.language_scope_at(position)); - let server_ids = self - .as_local() - .unwrap() + let server_ids = local .language_servers_for_buffer(buffer.read(cx), cx) .filter(|(adapter, _)| { scope