From d088ace4047e6a97a35b7372fc18dc0ac1823668 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 11 Jan 2024 12:48:05 +0100
Subject: [PATCH] Explicitly push a node in the dispatch tree when painting a
 new view

---
 crates/editor/src/element.rs    | 10 +++++-----
 crates/gpui/src/key_dispatch.rs |  9 ---------
 crates/gpui/src/view.rs         |  6 +++---
 crates/gpui/src/window.rs       | 15 +++++++++++++--
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 53578392e8cf2c95c3415f5e5e3de950c5db4abc..7efb43bd4852fc7ef1d8e5a5a43a79ad72a0303e 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -26,11 +26,11 @@ use git::diff::DiffHunkStatus;
 use gpui::{
     div, fill, outline, overlay, point, px, quad, relative, size, transparent_black, Action,
     AnchorCorner, AnyElement, AvailableSpace, BorrowWindow, Bounds, ContentMask, Corners,
-    CursorStyle, DispatchPhase, Edges, Element, ElementInputHandler, Entity, Hsla,
-    InteractiveBounds, InteractiveElement, IntoElement, ModifiersChangedEvent, MouseButton,
-    MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, ScrollDelta,
-    ScrollWheelEvent, ShapedLine, SharedString, Size, StackingOrder, StatefulInteractiveElement,
-    Style, Styled, TextRun, TextStyle, View, ViewContext, WindowContext,
+    CursorStyle, DispatchPhase, Edges, Element, ElementInputHandler, Hsla, InteractiveBounds,
+    InteractiveElement, IntoElement, ModifiersChangedEvent, MouseButton, MouseDownEvent,
+    MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, ScrollDelta, ScrollWheelEvent, ShapedLine,
+    SharedString, Size, StackingOrder, StatefulInteractiveElement, Style, Styled, TextRun,
+    TextStyle, View, ViewContext, WindowContext,
 };
 use itertools::Itertools;
 use language::language_settings::ShowWhitespaceSetting;
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index b3fdddf00f0c20fcfeda0befab58bb0b485501bc..06d502d7780c9c59dc180d3508d7e4074009dbb6 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -73,15 +73,6 @@ impl DispatchTree {
         focus_id: Option<FocusId>,
         view_id: Option<EntityId>,
     ) {
-        // Associate a view id to this only if it is the root node for the view.
-        let view_id = view_id.and_then(|view_id| {
-            if self.view_node_ids.contains_key(&view_id) {
-                None
-            } else {
-                Some(view_id)
-            }
-        });
-
         let parent = self.node_stack.last().copied();
         let node_id = DispatchNodeId(self.nodes.len());
         self.nodes.push(DispatchNode {
diff --git a/crates/gpui/src/view.rs b/crates/gpui/src/view.rs
index 961c6aef64cde75b6ea1554a0dd6c16f1c8326af..968fbbd94cd142bdfc6629539da997652f71d91c 100644
--- a/crates/gpui/src/view.rs
+++ b/crates/gpui/src/view.rs
@@ -97,7 +97,7 @@ impl<V: Render> Element for View<V> {
     }
 
     fn paint(&mut self, _: Bounds<Pixels>, element: &mut Self::State, cx: &mut WindowContext) {
-        cx.with_view_id(self.entity_id(), |cx| element.take().unwrap().paint(cx));
+        cx.paint_view(self.entity_id(), |cx| element.take().unwrap().paint(cx));
     }
 }
 
@@ -230,7 +230,7 @@ impl AnyView {
         available_space: Size<AvailableSpace>,
         cx: &mut WindowContext,
     ) {
-        cx.with_view_id(self.entity_id(), |cx| {
+        cx.paint_view(self.entity_id(), |cx| {
             cx.with_absolute_element_offset(origin, |cx| {
                 let (layout_id, mut rendered_element) = (self.request_layout)(self, cx);
                 cx.compute_layout(layout_id, available_space);
@@ -278,7 +278,7 @@ impl Element for AnyView {
     }
 
     fn paint(&mut self, bounds: Bounds<Pixels>, state: &mut Self::State, cx: &mut WindowContext) {
-        cx.with_view_id(self.entity_id(), |cx| {
+        cx.paint_view(self.entity_id(), |cx| {
             if !self.cache {
                 state.element.take().unwrap().paint(cx);
                 return;
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 34df4b24236be52108e68771ded67140e4a43b0c..3bdd8607c031008e161b64d607a6b41ff870f702 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1942,13 +1942,12 @@ impl<'a> WindowContext<'a> {
         focus_handle: Option<FocusHandle>,
         f: impl FnOnce(Option<FocusHandle>, &mut Self) -> R,
     ) -> R {
-        let parent_view_id = self.parent_view_id();
         let window = &mut self.window;
         let focus_id = focus_handle.as_ref().map(|handle| handle.id);
         window
             .next_frame
             .dispatch_tree
-            .push_node(context.clone(), focus_id, parent_view_id);
+            .push_node(context.clone(), focus_id, None);
 
         let result = f(focus_handle, self);
 
@@ -1968,6 +1967,18 @@ impl<'a> WindowContext<'a> {
         result
     }
 
+    pub(crate) fn paint_view<R>(&mut self, view_id: EntityId, f: impl FnOnce(&mut Self) -> R) -> R {
+        self.with_view_id(view_id, |cx| {
+            cx.window
+                .next_frame
+                .dispatch_tree
+                .push_node(None, None, Some(view_id));
+            let result = f(cx);
+            cx.window.next_frame.dispatch_tree.pop_node();
+            result
+        })
+    }
+
     /// Update or initialize state for an element with the given id that lives across multiple
     /// frames. If an element with this id existed in the rendered frame, its state will be passed
     /// to the given closure. The state returned by the closure will be stored so it can be referenced