nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for both path separators on windows

Browse Source
This commit is contained in:
Lukas Wirth 2023-10-06 13:26:36 +02:00
parent a8ec77dc7e
commit b3ebc9ab6a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/rust-analyzer/src/handlers/request.rs
View File

@ -2000,8 +2000,18 @@ fn run_rustfmt(
let workspace = CargoTargetSpec::for_file(&snap, file_id)?; let workspace = CargoTargetSpec::for_file(&snap, file_id)?;
let mut cmd = match workspace { let mut cmd = match workspace {
Some(spec) => { Some(spec) => {
let cmd = spec.workspace_root.join(cmd); // approach: if the command name contains a path seperator, join it with the workspace root.
process::Command::new(cmd.as_os_str()) // however, if the path is absolute, joining will result in the absolute path being preserved.
// as a fallback, rely on $PATH-based discovery.
let cmd_path =
if cfg!(windows) && command.contains(&[std::path::MAIN_SEPARATOR, '/']) {
spec.workspace_root.join(cmd).into()
} else if command.contains(std::path::MAIN_SEPARATOR) {
spec.workspace_root.join(cmd).into()
} else {
cmd
};
process::Command::new(cmd_path)
} }
None => process::Command::new(cmd), None => process::Command::new(cmd),
}; };