mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-23 23:09:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

zig: Do not cache user-installed zls (#10634)

Browse source 
This was a bug introduced when moving to extensions: when we find a
binary in the user's project environment, we shouldn't cache that
globally since it might not work for other projects.

See also: https://github.com/zed-industries/zed/pull/10559

Release Notes:


- N/A
This commit is contained in:
Thorsten Ball 2024-04-16 19:05:11 +02:00 committed by GitHub
parent c015b5c4cd
commit 210f8ebfed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
extensions/zig/src/zig.rs
View file

@ -3,7 +3,7 @@ use zed::LanguageServerId;
use zed_extension_api::{self as zed, Result};
struct ZigExtension {
cached_binary: Option<ZlsBinary>,
cached_binary: Option<String>,
}
#[derive(Clone)]
@ -18,20 +18,21 @@ impl ZigExtension {
language_server_id: &LanguageServerId,
worktree: &zed::Worktree,
) -> Result<ZlsBinary> {
if let Some(zls_binary) = &self.cached_binary {
if fs::metadata(&zls_binary.path).map_or(false, |stat| stat.is_file()) {
return Ok(zls_binary.clone());
}
}
if let Some(path) = worktree.which("zls") {
let environment = worktree.shell_env();
let zls_binary = ZlsBinary {
return Ok(ZlsBinary {
path,
environment: Some(environment),
};
self.cached_binary = Some(zls_binary.clone());
return Ok(zls_binary);
});
}
if let Some(path) = &self.cached_binary {
if fs::metadata(&path).map_or(false, |stat| stat.is_file()) {
return Ok(ZlsBinary {
path: path.clone(),
environment: None,
});
}
}
zed::set_language_server_installation_status(
@ -102,12 +103,11 @@ impl ZigExtension {
}
}
let zls_binary = ZlsBinary {
self.cached_binary = Some(binary_path.clone());
Ok(ZlsBinary {
path: binary_path,
environment: None,
};
self.cached_binary = Some(zls_binary.clone());
Ok(zls_binary)
})
}
}