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/gpui2/src/view.rs
+++ b/crates/gpui2/src/view.rs
@ -191,6 +191,10 @@ impl AnyView {
        self.model.entity_type
    }

+    pub fn entity_id(&self) -> EntityId {
+        self.model.entity_id()
+    }
+
    pub(crate) fn draw(
        &self,
        origin: Point<Pixels>,