diff --git a/Cargo.toml b/Cargo.toml index 2071fdcb6f..c72fec020f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -174,9 +174,6 @@ members = [ default-members = ["crates/zed"] [workspace.dependencies] - - - # # Workspace member crates # @@ -216,7 +213,6 @@ file_icons = { path = "crates/file_icons" } fs = { path = "crates/fs" } fsevent = { path = "crates/fsevent" } fuzzy = { path = "crates/fuzzy" } -isahc_http_client = { path = "crates/isahc_http_client" } git = { path = "crates/git" } git_hosting_providers = { path = "crates/git_hosting_providers" } go_to_line = { path = "crates/go_to_line" } @@ -231,6 +227,7 @@ image_viewer = { path = "crates/image_viewer" } indexed_docs = { path = "crates/indexed_docs" } inline_completion_button = { path = "crates/inline_completion_button" } install_cli = { path = "crates/install_cli" } +isahc_http_client = { path = "crates/isahc_http_client" } journal = { path = "crates/journal" } language = { path = "crates/language" } language_model = { path = "crates/language_model" } diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index 296809158d..ad43d2d1f0 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -36,8 +36,8 @@ envy = "0.4.2" futures.workspace = true google_ai.workspace = true hex.workspace = true -isahc_http_client.workspace = true http_client.workspace = true +isahc_http_client.workspace = true jsonwebtoken.workspace = true live_kit_server.workspace = true log.workspace = true diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs index b2a694027a..bc0f827e78 100644 --- a/crates/collab/src/rpc.rs +++ b/crates/collab/src/rpc.rs @@ -956,7 +956,6 @@ impl Server { tracing::info!("connection opened"); - let user_agent = format!("Zed Server/{}", env!("CARGO_PKG_VERSION")); let http_client = match IsahcHttpClient::builder().default_header("User-Agent", user_agent).build() { Ok(http_client) => Arc::new(IsahcHttpClient::from(http_client)), diff --git a/crates/extension/src/extension_store.rs b/crates/extension/src/extension_store.rs index bd416f4029..8dbd618a25 100644 --- a/crates/extension/src/extension_store.rs +++ b/crates/extension/src/extension_store.rs @@ -827,6 +827,7 @@ impl ExtensionStore { let mut extension_manifest = ExtensionManifest::load(fs.clone(), &extension_source_path).await?; let extension_id = extension_manifest.id.clone(); + if !this.update(&mut cx, |this, cx| { match this.outstanding_operations.entry(extension_id.clone()) { btree_map::Entry::Occupied(_) => return false, @@ -850,6 +851,7 @@ impl ExtensionStore { .ok(); } }); + cx.background_executor() .spawn({ let extension_source_path = extension_source_path.clone(); @@ -880,8 +882,10 @@ impl ExtensionStore { bail!("extension {extension_id} is already installed"); } } + fs.create_symlink(output_path, extension_source_path) .await?; + this.update(&mut cx, |this, cx| this.reload(None, cx))? .await; Ok(()) diff --git a/crates/isahc_http_client/Cargo.toml b/crates/isahc_http_client/Cargo.toml index b90163ef74..82f7621bf8 100644 --- a/crates/isahc_http_client/Cargo.toml +++ b/crates/isahc_http_client/Cargo.toml @@ -15,8 +15,8 @@ test-support = [] path = "src/isahc_http_client.rs" [dependencies] +anyhow.workspace = true +futures.workspace = true http_client.workspace = true isahc.workspace = true -futures.workspace = true -anyhow.workspace = true util.workspace = true diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 7fa9602a14..645d12fc76 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -47,7 +47,6 @@ file_finder.workspace = true file_icons.workspace = true fs.workspace = true futures.workspace = true -isahc_http_client.workspace = true git.workspace = true git_hosting_providers.workspace = true go_to_line.workspace = true @@ -58,6 +57,7 @@ image_viewer.workspace = true inline_completion_button.workspace = true install_cli.workspace = true isahc.workspace = true +isahc_http_client.workspace = true journal.workspace = true language.workspace = true language_model.workspace = true