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

Merge branch 'main' into polish-project-diagnostics

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2022-01-04 18:35:28 +01:00
commit b2f0c78924
12 changed files with 166 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -619,10 +619,10 @@ impl Workspace {
cx: &mut ViewContext<Self>,
) -> Task<Result<ProjectPath>> {
let entry = self.worktree_for_abs_path(abs_path, cx);
cx.spawn(|_, _| async move {
cx.spawn(|_, cx| async move {
let (worktree, path) = entry.await?;
Ok(ProjectPath {
worktree_id: worktree.id(),
worktree_id: worktree.read_with(&cx, |t, _| t.id()),
path: path.into(),
})
})
@ -1252,7 +1252,7 @@ impl WorkspaceHandle for ViewHandle<Workspace> {
.worktrees(cx)
.iter()
.flat_map(|worktree| {
let worktree_id = worktree.id();
let worktree_id = worktree.read(cx).id();
worktree.read(cx).files(true, 0).map(move |f| ProjectPath {
worktree_id,
path: f.path.clone(),