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

Added a bit of documentation for the working directory calculation

Browse source
This commit is contained in:
Mikayla Maki 2022-07-12 17:49:14 -07:00
parent 41e83b6be2
commit 598954d39f
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/terminal/src/terminal.rs
View file

@ -426,6 +426,11 @@ impl Item for Terminal {
} }
} }
///Gets the intuitively correct working directory from the given workspace
///If there is an active entry for this project, returns that entry's worktree root.
///If there's no active entry but there is a worktree, returns that worktrees root.
///If either of these roots are files, or if there are any other query failures,
/// returns the user's home directory
fn get_wd_for_workspace(workspace: &Workspace, cx: &AppContext) -> Option<PathBuf> { fn get_wd_for_workspace(workspace: &Workspace, cx: &AppContext) -> Option<PathBuf> {
let project = workspace.project().read(cx); let project = workspace.project().read(cx);
@ -435,19 +440,11 @@ fn get_wd_for_workspace(workspace: &Workspace, cx: &AppContext) -> Option<PathBu
.or_else(|| workspace.worktrees(cx).next()) .or_else(|| workspace.worktrees(cx).next())
.and_then(|worktree_handle| worktree_handle.read(cx).as_local()) .and_then(|worktree_handle| worktree_handle.read(cx).as_local())
.and_then(|wt| { .and_then(|wt| {
println!("{:?}", wt.root_entry()); wt.root_entry()
let rs = wt
.root_entry()
.filter(|re| re.is_dir()) .filter(|re| re.is_dir())
.map(|_| wt.abs_path().to_path_buf()); .map(|_| wt.abs_path().to_path_buf())
println!("{:?}", rs);
rs
})
.or_else(|| {
println!("HERE");
home_dir()
}) })
.or_else(|| home_dir())
} }
#[cfg(test)] #[cfg(test)]