Merge branch 'main' into polish-project-diagnostics

Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-01-04 18:35:28 +01:00 · 2022-01-04 18:35:28 +01:00 · b2f0c78924
commit b2f0c78924
parent ad1db117e6 5d45c5711d
12 changed files with 166 additions and 107 deletions
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@ -556,7 +556,7 @@ mod tests {
                workspace
                    .open_entry(
                        ProjectPath {
-                            worktree_id: worktree.id(),
+                            worktree_id: worktree.read(cx).id(),
                            path: Path::new("the-new-name.rs").into(),
                        },
                        cx,