cli: Add extra paths in detect() on Windows (#25765)

I'm already integrating CLI into MSYS2 package, and this patche helped
me to make it work like in Arch:
https://github.com/msys2/MINGW-packages/pull/23537. used the same way as
in [Linux
implementation](https://github.com/zed-industries/zed/blob/2a129925fc8696e7ea71d8fae2f170fcdeeb8f9a/crates/cli/src/main.rs#L314)

Closes #ISSUE

Release Notes:

- N/A
This commit is contained in:
Maksim Bondarenkov authored and GitHub committed 2025-03-02 00:17:55 +08:00
1 parent d8155dc28e
commit 9c7bf90a2c
1 file changed
+13 -6
+13 -6
View File
@@ -614,12 +614,19 @@ mod windows {
let path = if let Some(path) = path {
path.to_path_buf().canonicalize()?
} else {
std::env::current_exe()?
.parent()
.context("no parent path for cli")?
.parent()
.context("no parent path for cli folder")?
.join("Zed.exe")
let cli = std::env::current_exe()?;
let dir = cli.parent().context("no parent path for cli")?;
// ../Zed.exe is the standard, lib/zed is for MSYS2, ./zed.exe is for the target
// directory in development builds.
let possible_locations = ["../Zed.exe", "../lib/zed/zed-editor.exe", "./zed.exe"];
possible_locations
.iter()
.find_map(|p| dir.join(p).canonicalize().ok().filter(|path| path != &cli))
.context(format!(
"could not find any of: {}",
possible_locations.join(", ")
))?
};
Ok(App(path))