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.

Fix offline lookup of clangd on Windows (#54781)

Kirill Bulatov7cfdc0662539
diff --git a/crates/dap_adapters/src/codelldb.rs b/crates/dap_adapters/src/codelldb.rs
index 6c9dc0d49f9..e4c7f3dce7b 100644
--- a/crates/dap_adapters/src/codelldb.rs
+++ b/crates/dap_adapters/src/codelldb.rs
@@ -1,4 +1,4 @@
-use std::{path::PathBuf, sync::OnceLock};
+use std::{env::consts, path::PathBuf, sync::OnceLock};
use anyhow::{Context as _, Result};
use async_trait::async_trait;
@@ -374,7 +374,10 @@ impl DebugAdapter for CodeLldbDebugAdapter {
}
};
let adapter_dir = version_path.join("extension").join("adapter");
- let path = adapter_dir.join("codelldb").to_string_lossy().into_owned();
+ let path = adapter_dir
+ .join(format!("codelldb{}", consts::EXE_SUFFIX))
+ .to_string_lossy()
+ .into_owned();
self.path_to_codelldb.set(path.clone()).ok();
command = Some(path);
};
diff --git a/crates/dap_adapters/src/go.rs b/crates/dap_adapters/src/go.rs
index 93d0e8a9585..7d9af1d7341 100644
--- a/crates/dap_adapters/src/go.rs
+++ b/crates/dap_adapters/src/go.rs
@@ -446,7 +446,8 @@ impl DebugAdapter for GoDebugAdapter {
_cx: &mut AsyncApp,
) -> Result<DebugAdapterBinary> {
let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
- let dlv_path = adapter_path.join("dlv");
+ let dlv_binary = format!("dlv{}", consts::EXE_SUFFIX);
+ let dlv_path = adapter_path.join(&dlv_binary);
let delve_path = if let Some(path) = user_installed_path {
path.to_string_lossy().into_owned()
@@ -477,7 +478,10 @@ impl DebugAdapter for GoDebugAdapter {
);
}
- adapter_path.join("dlv").to_string_lossy().into_owned()
+ adapter_path
+ .join(&dlv_binary)
+ .to_string_lossy()
+ .into_owned()
};
let cwd = Some(
diff --git a/crates/languages/src/c.rs b/crates/languages/src/c.rs
index bc75a9dbabb..6585863f993 100644
--- a/crates/languages/src/c.rs
+++ b/crates/languages/src/c.rs
@@ -80,7 +80,9 @@ impl LspInstaller for CLspAdapter {
digest: expected_digest,
} = version;
let version_dir = container_dir.join(format!("clangd_{name}"));
- let binary_path = version_dir.join("bin/clangd");
+ let binary_path = version_dir
+ .join("bin")
+ .join(format!("clangd{}", consts::EXE_SUFFIX));
let binary = LanguageServerBinary {
path: binary_path.clone(),
@@ -388,7 +390,9 @@ async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServ
}
}
let clangd_dir = last_clangd_dir.context("no cached binary")?;
- let clangd_bin = clangd_dir.join("bin/clangd");
+ let clangd_bin = clangd_dir
+ .join("bin")
+ .join(format!("clangd{}", consts::EXE_SUFFIX));
anyhow::ensure!(
clangd_bin.exists(),
"missing clangd binary in directory {clangd_dir:?}"