toolchains: Run listing tasks on background thread

Potentially fixes #21404
zed-industries · Dec 2, 2024 · 84b190c · 84b190c
1 parent 995b40f
commit 84b190c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/crates/language/src/toolchain.rs b/crates/language/src/toolchain.rs
@@ -24,7 +24,7 @@ pub struct Toolchain {
     pub as_json: serde_json::Value,
 }
 
-#[async_trait(?Send)]
+#[async_trait]
 pub trait ToolchainLister: Send + Sync {
     async fn list(
         &self,

diff --git a/crates/languages/src/python.rs b/crates/languages/src/python.rs
@@ -536,7 +536,7 @@ fn env_priority(kind: Option<PythonEnvironmentKind>) -> usize {
     }
 }
 
-#[async_trait(?Send)]
+#[async_trait]
 impl ToolchainLister for PythonToolchainProvider {
     async fn list(
         &self,

diff --git a/crates/project/src/toolchain_store.rs b/crates/project/src/toolchain_store.rs
@@ -312,11 +312,12 @@ impl LocalToolchainStore {
                 .ok()?
                 .await;
             let language = registry.language_for_name(&language_name.0).await.ok()?;
-            let toolchains = language
-                .toolchain_lister()?
-                .list(root.to_path_buf(), project_env)
-                .await;
-            Some(toolchains)
+            let toolchains = language.toolchain_lister()?;
+            Some(
+                cx.background_executor()
+                    .spawn(async move { toolchains.list(root.to_path_buf(), project_env).await })
+                    .await,
+            )
         })
     }
     pub(crate) fn active_toolchain(