Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix management of rust-analyzer binaries on windows (#36056)

Browse source 
Closes https://github.com/zed-industries/zed/issues/34472


* Avoid removing the just-downloaded exe
* Invoke exe within nested version directory

Release Notes:

- Fix issue where Rust-analyzer was not installed correctly on windows

Co-authored-by: Lukas Wirth <lukas@zed.dev>
This commit is contained in:
Max Brunsfeld 2025-08-12 10:26:56 -07:00 • committed by GitHub
parent 978b75bba9
commit bfbb18476f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/languages/src/rust.rs
View file

@ -238,7 +238,7 @@ impl LspAdapter for RustLspAdapter {
) )
.await?; .await?;
make_file_executable(&server_path).await?; make_file_executable(&server_path).await?;
remove_matching(&container_dir, |path| server_path != path).await; remove_matching(&container_dir, |path| path != destination_path).await;
GithubBinaryMetadata::write_to_file( GithubBinaryMetadata::write_to_file(
&GithubBinaryMetadata { &GithubBinaryMetadata {
metadata_version: 1, metadata_version: 1,
@ -1023,8 +1023,14 @@ async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServ
last = Some(path); last = Some(path);
} }
let path = last.context("no cached binary")?;
let path = match RustLspAdapter::GITHUB_ASSET_KIND {
AssetKind::TarGz | AssetKind::Gz => path.clone(), // Tar and gzip extract in place.
AssetKind::Zip => path.clone().join("rust-analyzer.exe"), // zip contains a .exe
};
anyhow::Ok(LanguageServerBinary { anyhow::Ok(LanguageServerBinary {
path: last.context("no cached binary")?, path,
env: None, env: None,
arguments: Default::default(), arguments: Default::default(),
}) })