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

Better display labels for external files

Browse source
This commit is contained in:
Kirill Bulatov 2023-05-26 18:13:09 +03:00
parent 508533ebb7
commit cf2bbfc85a
3 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/workspace/src/workspace.rs
View file

@ -1306,14 +1306,19 @@ impl Workspace {
}
pub fn absolute_path(&self, project_path: &ProjectPath, cx: &AppContext) -> Option<PathBuf> {
Some(
self.project()
.read(cx)
.worktree_for_id(project_path.worktree_id, cx)?
.read(cx)
.abs_path()
.to_path_buf(),
)
let workspace_root = self
.project()
.read(cx)
.worktree_for_id(project_path.worktree_id, cx)?
.read(cx)
.abs_path();
let project_path = project_path.path.as_ref();
Some(if project_path == Path::new("") {
workspace_root.to_path_buf()
} else {
workspace_root.join(project_path)
})
}
fn add_folder_to_project(&mut self, _: &AddFolderToProject, cx: &mut ViewContext<Self>) {
@ -1661,23 +1666,14 @@ impl Workspace {
})
});
let project_path = path.into();
let task = self.load_path(project_path.clone(), cx);
let task = self.load_path(path.into(), cx);
cx.spawn(|this, mut cx| async move {
let (project_entry_id, build_item) = task.await?;
let pane = pane
.upgrade(&cx)
.ok_or_else(|| anyhow!("pane was closed"))?;
this.update(&mut cx, |this, cx| {
Pane::open_item(
this,
pane,
project_entry_id,
&project_path,
focus_item,
cx,
build_item,
)
Pane::open_item(this, pane, project_entry_id, focus_item, cx, build_item)
})
})
}