Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle ~ in debugger launch modal (#31087)

Browse source 
@Anthony-Eid I'm pretty sure this maintains the behavior of #30680, and
I added some tests to be sure.

Release Notes:

- `~` now expands to the home directory in the debugger launch modal.

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
This commit is contained in:
Julia Ryan 2025-05-22 13:20:00 +02:00 • committed by GitHub
parent 28ec7fbb81
commit baf6d82cd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

65
crates/debugger_ui/src/new_session_modal.rs
View file

@ -779,7 +779,7 @@ impl CustomMode {
}
pub(super) fn debug_request(&self, cx: &App) -> task::LaunchRequest {
let path = self.cwd.read(cx).text(cx);
let path = resolve_path(&self.cwd.read(cx).text(cx));
if cfg!(windows) {
return task::LaunchRequest {
program: self.program.read(cx).text(cx),
@ -797,17 +797,15 @@ impl CustomMode {
env.insert(lhs.to_string(), rhs.to_string());
}
let program = if let Some(program) = args.next() {
let program = resolve_path(&if let Some(program) = args.next() {
program
} else {
env = FxHashMap::default();
command
};
});
let args = args.collect::<Vec<_>>();
let (program, path) = resolve_paths(program, path);
task::LaunchRequest {
program,
cwd: path.is_empty().not().then(|| PathBuf::from(path)),
@ -1147,34 +1145,33 @@ impl PickerDelegate for DebugScenarioDelegate {
}
}
fn resolve_paths(program: String, path: String) -> (String, String) {
let program = if let Some(program) = program.strip_prefix('~') {
format!(
"$ZED_WORKTREE_ROOT{}{}",
std::path::MAIN_SEPARATOR,
&program
)
} else if !program.starts_with(std::path::MAIN_SEPARATOR) {
format!(
"$ZED_WORKTREE_ROOT{}{}",
std::path::MAIN_SEPARATOR,
&program
)
fn resolve_path(path: &str) -> String {
if path.starts_with('~') {
let home = paths::home_dir().to_string_lossy().to_string();
let path = path.trim().to_owned();
path.replace('~', &home)
} else {
program
};
let path = if path.starts_with('~') && !path.is_empty() {
format!(
"$ZED_WORKTREE_ROOT{}{}",
std::path::MAIN_SEPARATOR,
&path[1..]
)
} else if !path.starts_with(std::path::MAIN_SEPARATOR) && !path.is_empty() {
format!("$ZED_WORKTREE_ROOT{}{}", std::path::MAIN_SEPARATOR, &path)
} else {
path
};
(program, path)
path.to_owned()
}
}
#[cfg(test)]
mod tests {
use paths::home_dir;
use super::*;
#[test]
fn test_normalize_paths() {
let sep = std::path::MAIN_SEPARATOR;
let home = home_dir().to_string_lossy().to_string();
assert_eq!(resolve_path("bin"), format!("bin"));
assert_eq!(resolve_path(&format!("{sep}foo")), format!("{sep}foo"));
assert_eq!(resolve_path(""), format!(""));
assert_eq!(
resolve_path(&format!("~{sep}blah")),
format!("{home}{sep}blah")
);
assert_eq!(resolve_path("~"), home);
}
}