starred/openidea
1
0
Fork 0
mirror of https://github.com/l0ng-ai/openidea.git synced 2026-11-06 08:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tools): reinstall a managed rust-analyzer with the installer that made it

Browse Source 
Once rustup appeared, Reinstall ran rustup while the Open VSX copy stayed in use.
This commit is contained in:
l0ng-ai
2026-10-31 10:00:27 +08:00
parent 2bbae3c998
commit c74ee05436
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ide-tools/src/lib.rs
+8 -6
View File
@@ -520,8 +520,14 @@ impl Tools {
parse_version(&out)
}
/// The installer that owns this tool: a managed copy is refreshed and removed by the
/// fallback that made it, even if the primary installer has appeared since.
fn install_method(&self, spec: &ToolSpec) -> Method {
if self.method_missing(spec.method).is_some() { spec.fallback.unwrap_or(spec.method) } else { spec.method }
let Some(fallback) = spec.fallback else { return spec.method };
let managed = managed_bin_dir(&self.root, spec, self.platform)
.and_then(|dir| self.exe_in(&dir, spec.commands[0]))
.is_some();
if managed || self.method_missing(spec.method).is_some() { fallback } else { spec.method }
}
/// Requirement check for installing `spec` right now.
@@ -1179,11 +1185,7 @@ impl Tools {
let _guard = InstallGuard::acquire(&format!("uninstall-{name}"))?;
let cancel = CancellationToken::new();
let quiet = |_: InstallEvent| {};
let managed = managed_bin_dir(&self.root, spec, self.platform)
.and_then(|dir| self.exe_in(&dir, spec.commands[0]))
.is_some();
let method = if managed { spec.fallback.unwrap_or(spec.method) } else { self.install_method(spec) };
match method {
match self.install_method(spec) {
Method::Rustup { component } => {
let rustup = self.which("rustup").ok_or_else(|| IdeError::unavailable("rustup not found"))?;
let mut c = self.command(rustup);
crates/ide-tools/src/tests.rs
+1 -1
View File
@@ -617,7 +617,7 @@ fn rust_analyzer_managed_copy_survives_rustup_becoming_available() {
let info = env.tools().info("rust-analyzer", &langs()).unwrap();
assert_eq!(info.status, ToolStatus::Installed);
assert_eq!(info.path.as_deref(), Some(bin.join("rust-analyzer").as_path()));
assert_eq!(info.install_method.as_deref(), Some(if with_rustup { "rustup" } else { "Open VSX" }));
assert_eq!(info.install_method.as_deref(), Some("Open VSX"), "Reinstall refreshes the copy in use");
assert!(info.can_uninstall);
}
env.tools().uninstall("rust-analyzer", &langs()).unwrap();