Merge branch 'main' into share-project

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-12-20 11:42:59 -08:00 · 2021-12-20 11:42:59 -08:00 · 466a377e1d
commit 466a377e1d
parent 614ee4eac7 29bc2db6e8
16 changed files with 423 additions and 306 deletions
--- a/crates/server/src/rpc.rs
+++ b/crates/server/src/rpc.rs
@ -1174,7 +1174,8 @@ mod tests {
                )
            })
            .unwrap()
-            .await;
+            .await
+            .unwrap();
        workspace_b.read_with(&cx_b, |workspace, cx| {
            let active_pane = workspace.active_pane().read(cx);
            assert!(active_pane.active_item().is_some());