Merge branch 'main' into unborked-git-zed2-diagnostics-view

2023-11-17 16:35:08 -05:00 · 2023-11-17 16:35:08 -05:00 · 189ddf9380
commit 189ddf9380
parent 62297a56c8 12b59daa1e
50 changed files with 3822 additions and 2611 deletions
--- a/crates/workspace2/src/workspace2.rs
+++ b/crates/workspace2/src/workspace2.rs
@ -813,7 +813,9 @@ impl Workspace {
            DockPosition::Right => &self.right_dock,
        };

-        dock.update(cx, |dock, cx| dock.add_panel(panel, cx));
+        dock.update(cx, |dock, cx| {
+            dock.add_panel(panel, self.weak_self.clone(), cx)
+        });
    }

    pub fn status_bar(&self) -> &View<StatusBar> {