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

terminal: Support ~ in cwd field of task definitions (#35097)

Browse source 
Closes #35022

Release Notes:

- Fixed `~` not being expanded correctly in `cwd` field of task
definitions.
This commit is contained in:
Piotr Osiewicz 2025-07-25 17:39:50 +02:00 • committed by GitHub
parent 0e9d955e9b
commit 985350f9e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/project/src/terminals.rs
View file

@ -213,17 +213,24 @@ impl Project {
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Result<Entity<Terminal>> { ) -> Result<Entity<Terminal>> {
let this = &mut *self; let this = &mut *self;
let ssh_details = this.ssh_details(cx);
let path: Option<Arc<Path>> = match &kind { let path: Option<Arc<Path>> = match &kind {
TerminalKind::Shell(path) => path.as_ref().map(|path| Arc::from(path.as_ref())), TerminalKind::Shell(path) => path.as_ref().map(|path| Arc::from(path.as_ref())),
TerminalKind::Task(spawn_task) => { TerminalKind::Task(spawn_task) => {
if let Some(cwd) = &spawn_task.cwd { if let Some(cwd) = &spawn_task.cwd {
Some(Arc::from(cwd.as_ref())) if ssh_details.is_some() {
Some(Arc::from(cwd.as_ref()))
} else {
let cwd = cwd.to_string_lossy();
let tilde_substituted = shellexpand::tilde(&cwd);
Some(Arc::from(Path::new(tilde_substituted.as_ref())))
}
} else { } else {
this.active_project_directory(cx) this.active_project_directory(cx)
} }
} }
}; };
let ssh_details = this.ssh_details(cx);
let is_ssh_terminal = ssh_details.is_some(); let is_ssh_terminal = ssh_details.is_some();
let mut settings_location = None; let mut settings_location = None;