zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

clojure: Don't cache user-installed clojure-lsp (#10636)

Browse Source 
This PR updates the Clojure extension to not cache the binary when it is
using the one on the $PATH.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-04-16 13:12:08 -04:00 committed by GitHub
parent 53105ddd16
commit 1ba0bf925b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/clojure/src/clojure.rs
View File

@ -11,17 +11,16 @@ impl ClojureExtension {
config: zed::LanguageServerConfig, config: zed::LanguageServerConfig,
worktree: &zed::Worktree, worktree: &zed::Worktree,
) -> Result<String> { ) -> Result<String> {
if let Some(path) = worktree.which("clojure-lsp") {
return Ok(path);
}
if let Some(path) = &self.cached_binary_path { if let Some(path) = &self.cached_binary_path {
if fs::metadata(path).map_or(false, |stat| stat.is_file()) { if fs::metadata(path).map_or(false, |stat| stat.is_file()) {
return Ok(path.clone()); return Ok(path.clone());
} }
} }
if let Some(path) = worktree.which("clojure-lsp") {
self.cached_binary_path = Some(path.clone());
return Ok(path);
}
zed::set_language_server_installation_status( zed::set_language_server_installation_status(
&config.name, &config.name,
&zed::LanguageServerInstallationStatus::CheckingForUpdate, &zed::LanguageServerInstallationStatus::CheckingForUpdate,