Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

language_extension: Hold LspStore weakly in LspAccess::ViaLspStore (#60558)

Ben Kunkle5d7d1d3f09f1
diff --git a/crates/extension_host/src/extension_store_test.rs b/crates/extension_host/src/extension_store_test.rs
index 59b00f936f9..aae9dbb942d 100644
--- a/crates/extension_host/src/extension_store_test.rs
+++ b/crates/extension_host/src/extension_store_test.rs
@@ -769,7 +769,11 @@ async fn test_extension_store_with_test_extension(cx: &mut TestAppContext) {
theme_extension::init(proxy.clone(), theme_registry.clone(), cx.executor());
let language_registry = project.read_with(cx, |project, _cx| project.languages().clone());
language_extension::init(
- LspAccess::ViaLspStore(project.update(cx, |project, _| project.lsp_store())),
+ LspAccess::ViaLspStore(
+ project
+ .update(cx, |project, _| project.lsp_store())
+ .downgrade(),
+ ),
proxy.clone(),
language_registry.clone(),
);
diff --git a/crates/language_extension/src/extension_lsp_adapter.rs b/crates/language_extension/src/extension_lsp_adapter.rs
index 3c28e07e6b3..44092bf2639 100644
--- a/crates/language_extension/src/extension_lsp_adapter.rs
+++ b/crates/language_extension/src/extension_lsp_adapter.rs
@@ -79,16 +79,19 @@ impl ExtensionLanguageServerProxy for LanguageServerRegistryProxy {
let mut tasks = Vec::new();
match &self.lsp_access {
- LspAccess::ViaLspStore(lsp_store) => lsp_store.update(cx, |lsp_store, cx| {
- let stop_task = lsp_store.stop_language_servers_for_buffers(
- Vec::new(),
- HashSet::from_iter([LanguageServerSelector::Name(
- language_server_name.clone(),
- )]),
- cx,
- );
- tasks.push(stop_task);
- }),
+ LspAccess::ViaLspStore(lsp_store) => {
+ if let Ok(stop_task) = lsp_store.update(cx, |lsp_store, cx| {
+ lsp_store.stop_language_servers_for_buffers(
+ Vec::new(),
+ HashSet::from_iter([LanguageServerSelector::Name(
+ language_server_name.clone(),
+ )]),
+ cx,
+ )
+ }) {
+ tasks.push(stop_task);
+ }
+ }
LspAccess::ViaWorkspaces(lsp_store_provider) => {
if let Ok(lsp_stores) = lsp_store_provider(cx) {
for lsp_store in lsp_stores {
diff --git a/crates/language_extension/src/language_extension.rs b/crates/language_extension/src/language_extension.rs
index 96536b6c021..ffddd3d90f8 100644
--- a/crates/language_extension/src/language_extension.rs
+++ b/crates/language_extension/src/language_extension.rs
@@ -5,13 +5,13 @@ use std::sync::Arc;
use anyhow::Result;
use extension::{ExtensionGrammarProxy, ExtensionHostProxy, ExtensionLanguageProxy};
-use gpui::{App, Entity};
+use gpui::{App, Entity, WeakEntity};
use language::{LanguageMatcher, LanguageName, LanguageRegistry, LoadedLanguage};
use project::LspStore;
#[derive(Clone)]
pub enum LspAccess {
- ViaLspStore(Entity<LspStore>),
+ ViaLspStore(WeakEntity<LspStore>),
ViaWorkspaces(Arc<dyn Fn(&mut App) -> Result<Vec<Entity<LspStore>>> + Send + Sync + 'static>),
Noop,
}
diff --git a/crates/remote_server/src/headless_project.rs b/crates/remote_server/src/headless_project.rs
index 57f910b5ea1..db9ff6524c2 100644
--- a/crates/remote_server/src/headless_project.rs
+++ b/crates/remote_server/src/headless_project.rs
@@ -254,7 +254,7 @@ impl HeadlessProject {
cx.subscribe(&lsp_store, Self::on_lsp_store_event).detach();
language_extension::init(
- language_extension::LspAccess::ViaLspStore(lsp_store.clone()),
+ language_extension::LspAccess::ViaLspStore(lsp_store.downgrade()),
proxy.clone(),
languages.clone(),
);