From 569d99a5a1cbdb89c0a87c90940237b33fc91274 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 23 Aug 2023 09:08:05 -0600
Subject: [PATCH 001/109] Add hover styling support

---
 crates/gpui/playground/src/hoverable.rs  | 33 ++++++++++++------------
 crates/gpui/playground/src/playground.rs |  9 ++++---
 crates/gpui/playground/src/style.rs      |  8 ++++++
 crates/gpui/src/app.rs                   |  9 ++++++-
 crates/gpui/src/app/window.rs            |  3 ++-
 crates/gpui/src/platform.rs              |  1 +
 crates/gpui/src/platform/mac/platform.rs |  8 +++++-
 crates/gpui/src/platform/test.rs         |  4 +++
 8 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/crates/gpui/playground/src/hoverable.rs b/crates/gpui/playground/src/hoverable.rs
index 5545155a60c4e55e15bc534843c76a0e6f543d36..d2c87506c4931f37fbeec8e70103596f2e96b0df 100644
--- a/crates/gpui/playground/src/hoverable.rs
+++ b/crates/gpui/playground/src/hoverable.rs
@@ -2,40 +2,38 @@ use crate::{
     element::{Element, Layout},
     layout_context::LayoutContext,
     paint_context::PaintContext,
-    style::{StyleRefinement, Styleable},
+    style::{Style, StyleHelpers, StyleRefinement, Styleable},
 };
 use anyhow::Result;
 use gpui::platform::MouseMovedEvent;
 use refineable::Refineable;
-use std::{cell::Cell, marker::PhantomData};
+use std::cell::Cell;
 
-pub struct Hoverable<V: 'static, E: Element<V> + Styleable> {
+pub struct Hoverable<E: Styleable> {
     hovered: Cell<bool>,
     child_style: StyleRefinement,
     hovered_style: StyleRefinement,
     child: E,
-    view_type: PhantomData<V>,
 }
 
-pub fn hoverable<V, E: Element<V> + Styleable>(mut child: E) -> Hoverable<V, E> {
+pub fn hoverable<E: Styleable>(mut child: E) -> Hoverable<E> {
     Hoverable {
         hovered: Cell::new(false),
         child_style: child.declared_style().clone(),
         hovered_style: Default::default(),
         child,
-        view_type: PhantomData,
     }
 }
 
-impl<V, E: Element<V> + Styleable> Styleable for Hoverable<V, E> {
+impl<E: Styleable> Styleable for Hoverable<E> {
     type Style = E::Style;
 
     fn declared_style(&mut self) -> &mut crate::style::StyleRefinement {
-        self.child.declared_style()
+        &mut self.hovered_style
     }
 }
 
-impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<V, E> {
+impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
     type Layout = E::Layout;
 
     fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<Layout<V, Self::Layout>>
@@ -53,6 +51,10 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<V, E> {
     ) where
         Self: Sized,
     {
+        let bounds = layout.bounds(cx);
+        let order = layout.order(cx);
+
+        self.hovered.set(bounds.contains_point(cx.mouse_position()));
         if self.hovered.get() {
             // If hovered, refine the child's style with this element's style.
             self.child.declared_style().refine(&self.hovered_style);
@@ -61,16 +63,15 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<V, E> {
             *self.child.declared_style() = self.child_style.clone();
         }
 
-        let bounds = layout.bounds(cx);
-        let order = layout.order(cx);
-        self.hovered.set(bounds.contains_point(cx.mouse_position()));
-        let was_hovered = self.hovered.clone();
+        let hovered = self.hovered.clone();
         cx.on_event(order, move |view, event: &MouseMovedEvent, cx| {
-            let is_hovered = bounds.contains_point(event.position);
-            if is_hovered != was_hovered.get() {
-                was_hovered.set(is_hovered);
+            if bounds.contains_point(event.position) != hovered.get() {
                 cx.repaint();
             }
         });
+
+        self.child.paint(view, layout, cx);
     }
 }
+
+impl<E: Styleable<Style = Style>> StyleHelpers for Hoverable<E> {}
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 2462ac99f59e412cdbd16d3b616503dcb7810660..00f0ebdc8007aaf2017a3a45b4b3dbc547634713 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -1,5 +1,8 @@
 #![allow(dead_code, unused_variables)]
-use crate::{color::black, style::StyleHelpers};
+use crate::{
+    color::black,
+    style::{StyleHelpers, Styleable},
+};
 use element::Element;
 use gpui::{
     geometry::{rect::RectF, vector::vec2f},
@@ -51,8 +54,8 @@ fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
         .h_full()
         .w_1_2()
         .fill(theme.success(0.5))
-    // .hover()
-    // .fill(theme.error(0.5))
+        .hoverable()
+        .fill(theme.error(0.5))
     // .child(button().label("Hello").click(|_, _, _| println!("click!")))
 }
 
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
index 9216702f7fab3a50cc4a27502ebd3a383db5134f..9d58c583f5a9d6f0e289fe8691d0fe3f3d007268 100644
--- a/crates/gpui/playground/src/style.rs
+++ b/crates/gpui/playground/src/style.rs
@@ -1,6 +1,7 @@
 use crate::{
     color::Hsla,
     element::{Element, Layout},
+    hoverable::{hoverable, Hoverable},
     paint_context::PaintContext,
 };
 use gpui::{
@@ -255,6 +256,13 @@ pub trait Styleable {
         style.refine(self.declared_style());
         style
     }
+
+    fn hoverable(self) -> Hoverable<Self>
+    where
+        Self: Sized,
+    {
+        hoverable(self)
+    }
 }
 
 // Helpers methods that take and return mut self. This includes tailwind style methods for standard sizes etc.
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 076a3fdde32ac008a05869004a859a9a002a8f80..55ed812f994f663f66e6aea11664895ec0627b41 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1363,7 +1363,14 @@ impl AppContext {
             window: handle,
         }));
 
-        let mut window = Window::new(handle, platform_window, self, build_root_view);
+        let mouse_position = self.platform.mouse_position();
+        let mut window = Window::new(
+            handle,
+            platform_window,
+            mouse_position,
+            self,
+            build_root_view,
+        );
         let mut cx = WindowContext::mutable(self, &mut window, handle);
         cx.layout(false).expect("initial layout should not error");
         let scene = cx.paint().expect("initial paint should not error");
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 5638699565fbbb8c725bf3e119b3ffa0f1e07ce4..e0d53401a8b37915fcd48b602d005a5351dc81c0 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -70,6 +70,7 @@ impl Window {
     pub fn new<V, F>(
         handle: AnyWindowHandle,
         platform_window: Box<dyn platform::Window>,
+        mouse_position: Vector2F,
         cx: &mut AppContext,
         build_view: F,
     ) -> Self
@@ -97,7 +98,7 @@ impl Window {
             hovered_region_ids: Default::default(),
             clicked_region_ids: Default::default(),
             clicked_region: None,
-            mouse_position: vec2f(0., 0.),
+            mouse_position,
             titlebar_height,
             appearance,
         };
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 824e6b61e5342923f8cb6c21a6e4590bb5b240a2..2ac7ec54c704c17779d81e3237c3375a7c5789e7 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -75,6 +75,7 @@ pub trait Platform: Send + Sync {
     fn read_credentials(&self, url: &str) -> Result<Option<(String, Vec<u8>)>>;
     fn delete_credentials(&self, url: &str) -> Result<()>;
 
+    fn mouse_position(&self) -> Vector2F;
     fn set_cursor_style(&self, style: CursorStyle);
     fn should_auto_hide_scrollbars(&self) -> bool;
 
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 9a799c3a3a17767bb1be4fcdd9d7a7a217f52e11..af4eaa2a4092b1a4a29adcc447356f5b5e379f3d 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -18,7 +18,7 @@ use cocoa::{
     },
     base::{id, nil, selector, BOOL, YES},
     foundation::{
-        NSArray, NSAutoreleasePool, NSBundle, NSData, NSInteger, NSProcessInfo, NSString,
+        NSArray, NSAutoreleasePool, NSBundle, NSData, NSInteger, NSPoint, NSProcessInfo, NSString,
         NSUInteger, NSURL,
     },
 };
@@ -37,6 +37,7 @@ use objc::{
     runtime::{Class, Object, Sel},
     sel, sel_impl,
 };
+use pathfinder_geometry::vector::{vec2f, Vector2F};
 use postage::oneshot;
 use ptr::null_mut;
 use std::{
@@ -784,6 +785,11 @@ impl platform::Platform for MacPlatform {
         Ok(())
     }
 
+    fn mouse_position(&self) -> Vector2F {
+        let position: NSPoint = unsafe { msg_send![class!(NSEvent), mouseLocation] };
+        vec2f(position.x as f32, position.y as f32)
+    }
+
     fn set_cursor_style(&self, style: CursorStyle) {
         unsafe {
             let new_cursor: id = match style {
diff --git a/crates/gpui/src/platform/test.rs b/crates/gpui/src/platform/test.rs
index ee3a26c6fd887dc9d3215476d29045376bc2c087..5b6f299f9c0b1b4167ae44b42d07c30bf3f6ad50 100644
--- a/crates/gpui/src/platform/test.rs
+++ b/crates/gpui/src/platform/test.rs
@@ -195,6 +195,10 @@ impl super::Platform for Platform {
         Ok(())
     }
 
+    fn mouse_position(&self) -> Vector2F {
+        Vector2F::zero()
+    }
+
     fn set_cursor_style(&self, style: CursorStyle) {
         *self.cursor.lock() = style;
     }

From 5996b6b46bd3bd69703a8ebf3c68f13c2faf9f30 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 23 Aug 2023 12:18:12 -0600
Subject: [PATCH 002/109] Use RefinementCascade to compose pressability and
 hoverability

Co-Authored-By: Conrad Irwin <conrad@zed.dev>
---
 crates/gpui/playground/src/div.rs             | 23 +++---
 crates/gpui/playground/src/element.rs         | 32 ++++----
 crates/gpui/playground/src/hoverable.rs       | 33 ++++----
 crates/gpui/playground/src/playground.rs      |  5 +-
 crates/gpui/playground/src/pressable.rs       | 81 +++++++++++++++++++
 crates/gpui/playground/src/style.rs           | 38 ++++-----
 .../playground_macros/src/derive_element.rs   | 10 +--
 .../src/styleable_helpers.rs                  |  1 +
 crates/gpui/src/app.rs                        |  1 -
 crates/refineable/src/refineable.rs           | 46 ++++++++++-
 10 files changed, 202 insertions(+), 68 deletions(-)
 create mode 100644 crates/gpui/playground/src/pressable.rs

diff --git a/crates/gpui/playground/src/div.rs b/crates/gpui/playground/src/div.rs
index 8efe3590258a4249abd9bb69a359f95692b6a6a0..73f196b4f07088cd3d007b071759a18eb373b164 100644
--- a/crates/gpui/playground/src/div.rs
+++ b/crates/gpui/playground/src/div.rs
@@ -3,21 +3,22 @@ use crate::{
     interactive::{InteractionHandlers, Interactive},
     layout_context::LayoutContext,
     paint_context::PaintContext,
-    style::{Style, StyleHelpers, StyleRefinement, Styleable},
+    style::{Style, StyleHelpers, Styleable},
 };
 use anyhow::Result;
 use gpui::LayoutId;
+use refineable::{Refineable, RefinementCascade};
 use smallvec::SmallVec;
 
 pub struct Div<V: 'static> {
-    style: StyleRefinement,
+    styles: RefinementCascade<Style>,
     handlers: InteractionHandlers<V>,
     children: SmallVec<[AnyElement<V>; 2]>,
 }
 
 pub fn div<V>() -> Div<V> {
     Div {
-        style: Default::default(),
+        styles: Default::default(),
         handlers: Default::default(),
         children: Default::default(),
     }
@@ -36,16 +37,16 @@ impl<V: 'static> Element<V> for Div<V> {
             .map(|child| child.layout(view, cx))
             .collect::<Result<Vec<LayoutId>>>()?;
 
-        cx.add_layout_node(self.style(), (), children)
+        let style = Style::from_refinement(&self.style_cascade().merged());
+        cx.add_layout_node(style.clone(), (), children)
     }
 
     fn paint(&mut self, view: &mut V, layout: &mut Layout<V, ()>, cx: &mut PaintContext<V>)
     where
         Self: Sized,
     {
-        let style = self.style();
-
-        style.paint_background::<V, Self>(layout, cx);
+        self.computed_style()
+            .paint_background(layout.bounds(cx), cx);
         for child in &mut self.children {
             child.paint(view, cx);
         }
@@ -55,8 +56,12 @@ impl<V: 'static> Element<V> for Div<V> {
 impl<V> Styleable for Div<V> {
     type Style = Style;
 
-    fn declared_style(&mut self) -> &mut StyleRefinement {
-        &mut self.style
+    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style> {
+        &mut self.styles
+    }
+
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
+        self.styles.base()
     }
 }
 
diff --git a/crates/gpui/playground/src/element.rs b/crates/gpui/playground/src/element.rs
index 082f3b02b06522f3c12b435e6d02febd4a319390..f0b6df75b3af16536a4637437bccb5fb31fd1dc7 100644
--- a/crates/gpui/playground/src/element.rs
+++ b/crates/gpui/playground/src/element.rs
@@ -1,5 +1,4 @@
-use anyhow::Result;
-use derive_more::{Deref, DerefMut};
+use anyhow::{anyhow, Result};
 use gpui::{geometry::rect::RectF, EngineLayout};
 use smallvec::SmallVec;
 use std::marker::PhantomData;
@@ -83,13 +82,10 @@ impl<V> AnyElement<V> {
     }
 }
 
-#[derive(Deref, DerefMut)]
 pub struct Layout<V, D> {
     id: LayoutId,
     engine_layout: Option<EngineLayout>,
-    #[deref]
-    #[deref_mut]
-    element_data: D,
+    element_data: Option<D>,
     view_type: PhantomData<V>,
 }
 
@@ -98,7 +94,7 @@ impl<V: 'static, D> Layout<V, D> {
         Self {
             id,
             engine_layout: None,
-            element_data: element_data,
+            element_data: Some(element_data),
             view_type: PhantomData,
         }
     }
@@ -111,20 +107,26 @@ impl<V: 'static, D> Layout<V, D> {
         self.engine_layout(cx).order
     }
 
+    pub fn update<F, T>(&mut self, update: F) -> Result<T>
+    where
+        F: FnOnce(&mut Self, &mut D) -> T,
+    {
+        self.element_data
+            .take()
+            .map(|mut element_data| {
+                let result = update(self, &mut element_data);
+                self.element_data = Some(element_data);
+                result
+            })
+            .ok_or_else(|| anyhow!("reentrant calls to Layout::update are not allowed"))
+    }
+
     fn engine_layout(&mut self, cx: &mut PaintContext<'_, '_, '_, '_, V>) -> &mut EngineLayout {
         self.engine_layout
             .get_or_insert_with(|| cx.computed_layout(self.id).log_err().unwrap_or_default())
     }
 }
 
-impl<V: 'static> Layout<V, Option<AnyElement<V>>> {
-    pub fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>) {
-        let mut element = self.element_data.take().unwrap();
-        element.paint(view, cx);
-        self.element_data = Some(element);
-    }
-}
-
 pub trait ParentElement<V: 'static> {
     fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]>;
 
diff --git a/crates/gpui/playground/src/hoverable.rs b/crates/gpui/playground/src/hoverable.rs
index d2c87506c4931f37fbeec8e70103596f2e96b0df..6cfd0c75b09071f8d2d1c79e701b80c5a7062a89 100644
--- a/crates/gpui/playground/src/hoverable.rs
+++ b/crates/gpui/playground/src/hoverable.rs
@@ -2,24 +2,24 @@ use crate::{
     element::{Element, Layout},
     layout_context::LayoutContext,
     paint_context::PaintContext,
-    style::{Style, StyleHelpers, StyleRefinement, Styleable},
+    style::{Style, StyleHelpers, Styleable},
 };
 use anyhow::Result;
 use gpui::platform::MouseMovedEvent;
-use refineable::Refineable;
-use std::cell::Cell;
+use refineable::{CascadeSlot, Refineable, RefinementCascade};
+use std::{cell::Cell, rc::Rc};
 
 pub struct Hoverable<E: Styleable> {
-    hovered: Cell<bool>,
-    child_style: StyleRefinement,
-    hovered_style: StyleRefinement,
+    hovered: Rc<Cell<bool>>,
+    cascade_slot: CascadeSlot,
+    hovered_style: <E::Style as Refineable>::Refinement,
     child: E,
 }
 
 pub fn hoverable<E: Styleable>(mut child: E) -> Hoverable<E> {
     Hoverable {
-        hovered: Cell::new(false),
-        child_style: child.declared_style().clone(),
+        hovered: Rc::new(Cell::new(false)),
+        cascade_slot: child.style_cascade().reserve(),
         hovered_style: Default::default(),
         child,
     }
@@ -28,7 +28,11 @@ pub fn hoverable<E: Styleable>(mut child: E) -> Hoverable<E> {
 impl<E: Styleable> Styleable for Hoverable<E> {
     type Style = E::Style;
 
-    fn declared_style(&mut self) -> &mut crate::style::StyleRefinement {
+    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style> {
+        self.child.style_cascade()
+    }
+
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
         &mut self.hovered_style
     }
 }
@@ -55,13 +59,10 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
         let order = layout.order(cx);
 
         self.hovered.set(bounds.contains_point(cx.mouse_position()));
-        if self.hovered.get() {
-            // If hovered, refine the child's style with this element's style.
-            self.child.declared_style().refine(&self.hovered_style);
-        } else {
-            // Otherwise, set the child's style back to its original style.
-            *self.child.declared_style() = self.child_style.clone();
-        }
+
+        let slot = self.cascade_slot;
+        let style = self.hovered.get().then_some(self.hovered_style.clone());
+        self.style_cascade().set(slot, style);
 
         let hovered = self.hovered.clone();
         cx.on_event(order, move |view, event: &MouseMovedEvent, cx| {
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 00f0ebdc8007aaf2017a3a45b4b3dbc547634713..e387aeb7d21ec3041477c53d8dde188d1d09752d 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -22,6 +22,7 @@ mod hoverable;
 mod interactive;
 mod layout_context;
 mod paint_context;
+mod pressable;
 mod style;
 mod text;
 mod themes;
@@ -54,8 +55,10 @@ fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
         .h_full()
         .w_1_2()
         .fill(theme.success(0.5))
-        .hoverable()
+        .hovered()
         .fill(theme.error(0.5))
+        .pressed()
+        .fill(theme.warning(0.5))
     // .child(button().label("Hello").click(|_, _, _| println!("click!")))
 }
 
diff --git a/crates/gpui/playground/src/pressable.rs b/crates/gpui/playground/src/pressable.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1428bf402116a88a65921fb83bcbc91b6b45a27c
--- /dev/null
+++ b/crates/gpui/playground/src/pressable.rs
@@ -0,0 +1,81 @@
+use crate::{
+    element::{Element, Layout},
+    layout_context::LayoutContext,
+    paint_context::PaintContext,
+    style::{Style, StyleHelpers, Styleable},
+};
+use anyhow::Result;
+use gpui::platform::MouseButtonEvent;
+use refineable::{CascadeSlot, Refineable, RefinementCascade};
+use std::{cell::Cell, rc::Rc};
+
+pub struct Pressable<E: Styleable> {
+    pressed: Rc<Cell<bool>>,
+    pressed_style: <E::Style as Refineable>::Refinement,
+    cascade_slot: CascadeSlot,
+    child: E,
+}
+
+pub fn pressable<E: Styleable>(mut child: E) -> Pressable<E> {
+    Pressable {
+        pressed: Rc::new(Cell::new(false)),
+        pressed_style: Default::default(),
+        cascade_slot: child.style_cascade().reserve(),
+        child,
+    }
+}
+
+impl<E: Styleable> Styleable for Pressable<E> {
+    type Style = E::Style;
+
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
+        &mut self.pressed_style
+    }
+
+    fn style_cascade(&mut self) -> &mut RefinementCascade<E::Style> {
+        self.child.style_cascade()
+    }
+}
+
+impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
+    type Layout = E::Layout;
+
+    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<Layout<V, Self::Layout>>
+    where
+        Self: Sized,
+    {
+        self.child.layout(view, cx)
+    }
+
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &mut Layout<V, Self::Layout>,
+        cx: &mut PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        let slot = self.cascade_slot;
+        let style = self.pressed.get().then_some(self.pressed_style.clone());
+        self.style_cascade().set(slot, style);
+
+        let bounds = layout.bounds(cx);
+        let order = layout.order(cx);
+        let pressed = self.pressed.clone();
+        cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+            if event.is_down {
+                if bounds.contains_point(event.position) {
+                    pressed.set(true);
+                    cx.repaint();
+                }
+            } else if pressed.get() {
+                pressed.set(false);
+                cx.repaint();
+            }
+        });
+
+        self.child.paint(view, layout, cx);
+    }
+}
+
+impl<E: Styleable<Style = Style>> StyleHelpers for Pressable<E> {}
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
index 9d58c583f5a9d6f0e289fe8691d0fe3f3d007268..f2a64348d2cf089444f68f457985fc8a5934d630 100644
--- a/crates/gpui/playground/src/style.rs
+++ b/crates/gpui/playground/src/style.rs
@@ -1,18 +1,18 @@
 use crate::{
     color::Hsla,
-    element::{Element, Layout},
     hoverable::{hoverable, Hoverable},
     paint_context::PaintContext,
+    pressable::{pressable, Pressable},
 };
 use gpui::{
     fonts::TextStyleRefinement,
     geometry::{
-        AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length, Point, PointRefinement,
-        Size, SizeRefinement,
+        rect::RectF, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length, Point,
+        PointRefinement, Size, SizeRefinement,
     },
 };
 use playground_macros::styleable_helpers;
-use refineable::Refineable;
+use refineable::{Refineable, RefinementCascade};
 pub use taffy::style::{
     AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
     Overflow, Position,
@@ -126,12 +126,7 @@ impl Style {
 
     /// Paints the background of an element styled with this style.
     /// Return the bounds in which to paint the content.
-    pub fn paint_background<V: 'static, E: Element<V>>(
-        &self,
-        layout: &mut Layout<V, E::Layout>,
-        cx: &mut PaintContext<V>,
-    ) {
-        let bounds = layout.bounds(cx);
+    pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
         let rem_size = cx.rem_pixels();
         if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
             cx.scene.push_quad(gpui::Quad {
@@ -202,7 +197,7 @@ impl OptionalTextStyle {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum Fill {
     Color(Hsla),
 }
@@ -247,22 +242,28 @@ impl CornerRadii {
 }
 
 pub trait Styleable {
-    type Style: refineable::Refineable;
+    type Style: Refineable + Default;
 
-    fn declared_style(&mut self) -> &mut playground::style::StyleRefinement;
+    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style>;
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement;
 
-    fn style(&mut self) -> playground::style::Style {
-        let mut style = playground::style::Style::default();
-        style.refine(self.declared_style());
-        style
+    fn computed_style(&mut self) -> Self::Style {
+        Self::Style::from_refinement(&self.style_cascade().merged())
     }
 
-    fn hoverable(self) -> Hoverable<Self>
+    fn hovered(self) -> Hoverable<Self>
     where
         Self: Sized,
     {
         hoverable(self)
     }
+
+    fn pressed(self) -> Pressable<Self>
+    where
+        Self: Sized,
+    {
+        pressable(self)
+    }
 }
 
 // Helpers methods that take and return mut self. This includes tailwind style methods for standard sizes etc.
@@ -270,7 +271,6 @@ pub trait Styleable {
 // Example:
 // // Sets the padding to 0.5rem, just like class="p-2" in Tailwind.
 // fn p_2(mut self) -> Self where Self: Sized;
-use crate as playground; // Macro invocation references this crate as playground.
 pub trait StyleHelpers: Styleable<Style = Style> {
     styleable_helpers!();
 
diff --git a/crates/gpui/playground_macros/src/derive_element.rs b/crates/gpui/playground_macros/src/derive_element.rs
index bb83727791cc9b980dc87080ae2aeb400eb3bdfe..ca2636e2e1675210ed683c4b20642d34290655d4 100644
--- a/crates/gpui/playground_macros/src/derive_element.rs
+++ b/crates/gpui/playground_macros/src/derive_element.rs
@@ -62,16 +62,16 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
         impl #impl_generics playground::element::Element<#view_type_name> for #type_name #type_generics
         #where_clause
         {
-            type Layout = Option<playground::element::AnyElement<#view_type_name #lifetimes>>;
+            type Layout = playground::element::AnyElement<#view_type_name #lifetimes>;
 
             fn layout(
                 &mut self,
                 view: &mut V,
                 cx: &mut playground::element::LayoutContext<V>,
             ) -> anyhow::Result<playground::element::Layout<V, Self::Layout>> {
-                let mut element = self.render(view, cx).into_any();
-                let layout_id = element.layout(view, cx)?;
-                Ok(playground::element::Layout::new(layout_id, Some(element)))
+                let mut rendered_element = self.render(view, cx).into_any();
+                let layout_id = rendered_element.layout(view, cx)?;
+                Ok(playground::element::Layout::new(layout_id, rendered_element))
             }
 
             fn paint(
@@ -80,7 +80,7 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
                 layout: &mut playground::element::Layout<V, Self::Layout>,
                 cx: &mut playground::element::PaintContext<V>,
             ) {
-                layout.paint(view, cx);
+                layout.update(|_, rendered_element| rendered_element.paint(view, cx)).ok();
             }
         }
 
diff --git a/crates/gpui/playground_macros/src/styleable_helpers.rs b/crates/gpui/playground_macros/src/styleable_helpers.rs
index 8021154e08a8d029432f54f44476589ebf6f9e48..9b1a4b714a44be50ba07dae3b0c21e56faf892ef 100644
--- a/crates/gpui/playground_macros/src/styleable_helpers.rs
+++ b/crates/gpui/playground_macros/src/styleable_helpers.rs
@@ -20,6 +20,7 @@ pub fn styleable_helpers(input: TokenStream) -> TokenStream {
     let output = quote! {
         #(#methods)*
     };
+
     output.into()
 }
 
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 55ed812f994f663f66e6aea11664895ec0627b41..d630d792d605a9a990f340f1f9ce65b72486d3a0 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1905,7 +1905,6 @@ impl AppContext {
 
     fn handle_repaint_window_effect(&mut self, window: AnyWindowHandle) {
         self.update_window(window, |cx| {
-            cx.layout(false).log_err();
             if let Some(scene) = cx.paint().log_err() {
                 cx.window.platform_window.present_scene(scene);
             }
diff --git a/crates/refineable/src/refineable.rs b/crates/refineable/src/refineable.rs
index 81cb2ad11f6f2dc1dc51bb6ad97b328ccf61ef8a..1223622f3c1b28bc3fe59facdd0087c961f25001 100644
--- a/crates/refineable/src/refineable.rs
+++ b/crates/refineable/src/refineable.rs
@@ -1,7 +1,7 @@
 pub use derive_refineable::Refineable;
 
-pub trait Refineable {
-    type Refinement: Default;
+pub trait Refineable: Clone {
+    type Refinement: Refineable<Refinement = Self::Refinement> + Default;
 
     fn refine(&mut self, refinement: &Self::Refinement);
     fn refined(mut self, refinement: &Self::Refinement) -> Self
@@ -11,4 +11,46 @@ pub trait Refineable {
         self.refine(refinement);
         self
     }
+    fn from_refinement(refinement: &Self::Refinement) -> Self
+    where
+        Self: Default + Sized,
+    {
+        Self::default().refined(refinement)
+    }
+}
+
+pub struct RefinementCascade<S: Refineable>(Vec<Option<S::Refinement>>);
+
+impl<S: Refineable + Default> Default for RefinementCascade<S> {
+    fn default() -> Self {
+        Self(vec![Some(Default::default())])
+    }
+}
+
+#[derive(Copy, Clone)]
+pub struct CascadeSlot(usize);
+
+impl<S: Refineable + Default> RefinementCascade<S> {
+    pub fn reserve(&mut self) -> CascadeSlot {
+        self.0.push(None);
+        return CascadeSlot(self.0.len() - 1);
+    }
+
+    pub fn base(&mut self) -> &mut S::Refinement {
+        self.0[0].as_mut().unwrap()
+    }
+
+    pub fn set(&mut self, slot: CascadeSlot, refinement: Option<S::Refinement>) {
+        self.0[slot.0] = refinement
+    }
+
+    pub fn merged(&self) -> S::Refinement {
+        let mut merged = self.0[0].clone().unwrap();
+        for refinement in self.0.iter().skip(1) {
+            if let Some(refinement) = refinement {
+                merged.refine(refinement);
+            }
+        }
+        merged
+    }
 }

From 684db11afd2ae5e557cfd74109e4f089268a6d68 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 23 Aug 2023 12:57:33 -0600
Subject: [PATCH 003/109] Use platform API to request mouse position

Co-Authored-By: Conrad Irwin <conrad@zed.dev>
---
 crates/gpui/playground/src/hoverable.rs     |  2 +-
 crates/gpui/src/app.rs                      |  9 +--------
 crates/gpui/src/app/window.rs               |  7 ++++---
 crates/gpui/src/platform.rs                 |  2 +-
 crates/gpui/src/platform/mac/platform.rs    |  9 ++-------
 crates/gpui/src/platform/mac/status_item.rs |  4 ++++
 crates/gpui/src/platform/mac/window.rs      | 18 ++++++++++++++++++
 crates/gpui/src/platform/test.rs            |  8 ++++----
 8 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/crates/gpui/playground/src/hoverable.rs b/crates/gpui/playground/src/hoverable.rs
index 6cfd0c75b09071f8d2d1c79e701b80c5a7062a89..5aec6dd85e37c201de74f6ab2336e6b26aa6e7d3 100644
--- a/crates/gpui/playground/src/hoverable.rs
+++ b/crates/gpui/playground/src/hoverable.rs
@@ -66,7 +66,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
 
         let hovered = self.hovered.clone();
         cx.on_event(order, move |view, event: &MouseMovedEvent, cx| {
-            if bounds.contains_point(event.position) != hovered.get() {
+            if bounds.contains_point(cx.mouse_position()) != hovered.get() {
                 cx.repaint();
             }
         });
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index d630d792d605a9a990f340f1f9ce65b72486d3a0..5b3dc438c60b97f542c5c50e8732860781e2b319 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1363,14 +1363,7 @@ impl AppContext {
             window: handle,
         }));
 
-        let mouse_position = self.platform.mouse_position();
-        let mut window = Window::new(
-            handle,
-            platform_window,
-            mouse_position,
-            self,
-            build_root_view,
-        );
+        let mut window = Window::new(handle, platform_window, self, build_root_view);
         let mut cx = WindowContext::mutable(self, &mut window, handle);
         cx.layout(false).expect("initial layout should not error");
         let scene = cx.paint().expect("initial paint should not error");
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index e0d53401a8b37915fcd48b602d005a5351dc81c0..b1a758b049e5c93d00e27f6ad39ebb2aed9cafdc 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -70,7 +70,6 @@ impl Window {
     pub fn new<V, F>(
         handle: AnyWindowHandle,
         platform_window: Box<dyn platform::Window>,
-        mouse_position: Vector2F,
         cx: &mut AppContext,
         build_view: F,
     ) -> Self
@@ -98,7 +97,7 @@ impl Window {
             hovered_region_ids: Default::default(),
             clicked_region_ids: Default::default(),
             clicked_region: None,
-            mouse_position,
+            mouse_position: Default::default(),
             titlebar_height,
             appearance,
         };
@@ -508,7 +507,9 @@ impl<'a> WindowContext<'a> {
     }
 
     pub(crate) fn dispatch_event(&mut self, event: Event, event_reused: bool) -> bool {
-        self.dispatch_to_new_event_handlers(&event);
+        if !event_reused {
+            self.dispatch_to_new_event_handlers(&event);
+        }
 
         let mut mouse_events = SmallVec::<[_; 2]>::new();
         let mut notified_views: HashSet<usize> = Default::default();
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 2ac7ec54c704c17779d81e3237c3375a7c5789e7..f6711b4374a40b48c35bb406a54cc7e3c99aec79 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -75,7 +75,6 @@ pub trait Platform: Send + Sync {
     fn read_credentials(&self, url: &str) -> Result<Option<(String, Vec<u8>)>>;
     fn delete_credentials(&self, url: &str) -> Result<()>;
 
-    fn mouse_position(&self) -> Vector2F;
     fn set_cursor_style(&self, style: CursorStyle);
     fn should_auto_hide_scrollbars(&self) -> bool;
 
@@ -147,6 +146,7 @@ pub trait Window {
     fn titlebar_height(&self) -> f32;
     fn appearance(&self) -> Appearance;
     fn screen(&self) -> Rc<dyn Screen>;
+    fn mouse_position(&self) -> Vector2F;
 
     fn as_any_mut(&mut self) -> &mut dyn Any;
     fn set_input_handler(&mut self, input_handler: Box<dyn InputHandler>);
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index af4eaa2a4092b1a4a29adcc447356f5b5e379f3d..656f2e44750641d752fce2ff4f639cce59601c25 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -18,7 +18,7 @@ use cocoa::{
     },
     base::{id, nil, selector, BOOL, YES},
     foundation::{
-        NSArray, NSAutoreleasePool, NSBundle, NSData, NSInteger, NSPoint, NSProcessInfo, NSString,
+        NSArray, NSAutoreleasePool, NSBundle, NSData, NSInteger, NSProcessInfo, NSString,
         NSUInteger, NSURL,
     },
 };
@@ -37,7 +37,7 @@ use objc::{
     runtime::{Class, Object, Sel},
     sel, sel_impl,
 };
-use pathfinder_geometry::vector::{vec2f, Vector2F};
+
 use postage::oneshot;
 use ptr::null_mut;
 use std::{
@@ -785,11 +785,6 @@ impl platform::Platform for MacPlatform {
         Ok(())
     }
 
-    fn mouse_position(&self) -> Vector2F {
-        let position: NSPoint = unsafe { msg_send![class!(NSEvent), mouseLocation] };
-        vec2f(position.x as f32, position.y as f32)
-    }
-
     fn set_cursor_style(&self, style: CursorStyle) {
         unsafe {
             let new_cursor: id = match style {
diff --git a/crates/gpui/src/platform/mac/status_item.rs b/crates/gpui/src/platform/mac/status_item.rs
index 955b2b659a8d8d9e6ef1444d4f0de8ee97525dd6..9c7903a0fc11f7247a05f4562b73a97a7d525022 100644
--- a/crates/gpui/src/platform/mac/status_item.rs
+++ b/crates/gpui/src/platform/mac/status_item.rs
@@ -202,6 +202,10 @@ impl platform::Window for StatusItem {
         }
     }
 
+    fn mouse_position(&self) -> Vector2F {
+        unimplemented!()
+    }
+
     fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
         self
     }
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 3be425d3122a97b161c13444d41b082b22c98f74..a6d57e514084a305fcda6d6983767bb3ff01cbaf 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -221,6 +221,14 @@ unsafe fn build_classes() {
     };
 }
 
+pub fn convert_mouse_position(position: NSPoint, window_height: f32) -> Vector2F {
+    vec2f(
+        position.x as f32,
+        // MacOS screen coordinates are relative to bottom left
+        window_height - position.y as f32,
+    )
+}
+
 unsafe fn build_window_class(name: &'static str, superclass: &Class) -> *const Class {
     let mut decl = ClassDecl::new(name, superclass).unwrap();
     decl.add_ivar::<*mut c_void>(WINDOW_STATE_IVAR);
@@ -661,6 +669,16 @@ impl platform::Window for MacWindow {
         }
     }
 
+    fn mouse_position(&self) -> Vector2F {
+        let position = unsafe {
+            self.0
+                .borrow()
+                .native_window
+                .mouseLocationOutsideOfEventStream()
+        };
+        convert_mouse_position(position, self.content_size().y())
+    }
+
     fn as_any_mut(&mut self) -> &mut dyn Any {
         self
     }
diff --git a/crates/gpui/src/platform/test.rs b/crates/gpui/src/platform/test.rs
index 5b6f299f9c0b1b4167ae44b42d07c30bf3f6ad50..e8579a0006014585024d03a1b875183a66233169 100644
--- a/crates/gpui/src/platform/test.rs
+++ b/crates/gpui/src/platform/test.rs
@@ -195,10 +195,6 @@ impl super::Platform for Platform {
         Ok(())
     }
 
-    fn mouse_position(&self) -> Vector2F {
-        Vector2F::zero()
-    }
-
     fn set_cursor_style(&self, style: CursorStyle) {
         *self.cursor.lock() = style;
     }
@@ -336,6 +332,10 @@ impl super::Window for Window {
         Rc::new(Screen)
     }
 
+    fn mouse_position(&self) -> Vector2F {
+        Vector2F::zero()
+    }
+
     fn as_any_mut(&mut self) -> &mut dyn Any {
         self
     }

From 8e3b23e510bd4e658ba2de67ed451d2789a64a80 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 23 Aug 2023 13:28:22 -0600
Subject: [PATCH 004/109] Rename Window::mouse_position to last_mouse_position

We want to encourage people to use WindowContext::mouse_position, which
requests the position from the platform.

Co-Authored-By: Conrad Irwin <conrad@zed.dev>
---
 crates/gpui/src/app/window.rs | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index b1a758b049e5c93d00e27f6ad39ebb2aed9cafdc..2edb2af8a1ea3104028601f0af2064c4ec2f48a4 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -59,10 +59,10 @@ pub struct Window {
     mouse_regions: Vec<(MouseRegion, usize)>,
     event_handlers: Vec<EventHandler>,
     last_mouse_moved_event: Option<Event>,
+    last_mouse_position: Vector2F,
     pub(crate) hovered_region_ids: Vec<MouseRegionId>,
     pub(crate) clicked_region_ids: Vec<MouseRegionId>,
     pub(crate) clicked_region: Option<(MouseRegionId, MouseButton)>,
-    mouse_position: Vector2F,
     text_layout_cache: TextLayoutCache,
 }
 
@@ -94,10 +94,10 @@ impl Window {
             event_handlers: Default::default(),
             text_layout_cache: TextLayoutCache::new(cx.font_system.clone()),
             last_mouse_moved_event: None,
+            last_mouse_position: Vector2F::zero(),
             hovered_region_ids: Default::default(),
             clicked_region_ids: Default::default(),
             clicked_region: None,
-            mouse_position: Default::default(),
             titlebar_height,
             appearance,
         };
@@ -259,7 +259,7 @@ impl<'a> WindowContext<'a> {
     }
 
     pub fn mouse_position(&self) -> Vector2F {
-        self.window.mouse_position
+        self.window.platform_window.mouse_position()
     }
 
     pub fn text_layout_cache(&self) -> &TextLayoutCache {
@@ -578,7 +578,7 @@ impl<'a> WindowContext<'a> {
                 // Synthesize one last drag event to end the drag
                 mouse_events.push(MouseEvent::Drag(MouseDrag {
                     region: Default::default(),
-                    prev_mouse_position: self.window.mouse_position,
+                    prev_mouse_position: self.window.last_mouse_position,
                     platform_event: MouseMovedEvent {
                         position: e.position,
                         pressed_button: Some(e.button),
@@ -631,14 +631,14 @@ impl<'a> WindowContext<'a> {
                     if pressed_button.is_some() {
                         mouse_events.push(MouseEvent::Drag(MouseDrag {
                             region: Default::default(),
-                            prev_mouse_position: self.window.mouse_position,
+                            prev_mouse_position: self.window.last_mouse_position,
                             platform_event: e.clone(),
                             end: false,
                         }));
                     } else if let Some((_, clicked_button)) = self.window.clicked_region {
                         mouse_events.push(MouseEvent::Drag(MouseDrag {
                             region: Default::default(),
-                            prev_mouse_position: self.window.mouse_position,
+                            prev_mouse_position: self.window.last_mouse_position,
                             platform_event: e.clone(),
                             end: true,
                         }));
@@ -698,7 +698,7 @@ impl<'a> WindowContext<'a> {
         }
 
         if let Some(position) = event.position() {
-            self.window.mouse_position = position;
+            self.window.last_mouse_position = position;
         }
 
         // 2. Dispatch mouse events on regions
@@ -712,7 +712,7 @@ impl<'a> WindowContext<'a> {
             match &mouse_event {
                 MouseEvent::Hover(_) => {
                     let mut highest_z_index = None;
-                    let mouse_position = self.window.mouse_position.clone();
+                    let mouse_position = self.mouse_position();
                     let window = &mut *self.window;
                     let prev_hovered_regions = mem::take(&mut window.hovered_region_ids);
                     for (region, z_index) in window.mouse_regions.iter().rev() {
@@ -757,7 +757,7 @@ impl<'a> WindowContext<'a> {
 
                 MouseEvent::Down(_) | MouseEvent::Up(_) => {
                     for (region, _) in self.window.mouse_regions.iter().rev() {
-                        if region.bounds.contains_point(self.window.mouse_position) {
+                        if region.bounds.contains_point(self.mouse_position()) {
                             valid_regions.push(region.clone());
                             if region.notify_on_click {
                                 notified_views.insert(region.id().view_id());
@@ -784,10 +784,7 @@ impl<'a> WindowContext<'a> {
                         // Find regions which still overlap with the mouse since the last MouseDown happened
                         for (mouse_region, _) in self.window.mouse_regions.iter().rev() {
                             if clicked_region_ids.contains(&mouse_region.id()) {
-                                if mouse_region
-                                    .bounds
-                                    .contains_point(self.window.mouse_position)
-                                {
+                                if mouse_region.bounds.contains_point(self.mouse_position()) {
                                     valid_regions.push(mouse_region.clone());
                                 }
                             }
@@ -809,10 +806,7 @@ impl<'a> WindowContext<'a> {
                 | MouseEvent::ClickOut(_) => {
                     for (mouse_region, _) in self.window.mouse_regions.iter().rev() {
                         // NOT contains
-                        if !mouse_region
-                            .bounds
-                            .contains_point(self.window.mouse_position)
-                        {
+                        if !mouse_region.bounds.contains_point(self.mouse_position()) {
                             valid_regions.push(mouse_region.clone());
                         }
                     }
@@ -821,10 +815,7 @@ impl<'a> WindowContext<'a> {
                 _ => {
                     for (mouse_region, _) in self.window.mouse_regions.iter().rev() {
                         // Contains
-                        if mouse_region
-                            .bounds
-                            .contains_point(self.window.mouse_position)
-                        {
+                        if mouse_region.bounds.contains_point(self.mouse_position()) {
                             valid_regions.push(mouse_region.clone());
                         }
                     }

From 4c000379d2028ca0c5bed580c1ff1276558dde83 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 23 Aug 2023 16:02:56 -0600
Subject: [PATCH 005/109] Click events, children

---
 crates/gpui/playground/src/div.rs           |  41 ++----
 crates/gpui/playground/src/hoverable.rs     |  24 +++-
 crates/gpui/playground/src/interactive.rs   | 137 ++++++++++++++++++--
 crates/gpui/playground/src/paint_context.rs |   2 +-
 crates/gpui/playground/src/playground.rs    |  10 +-
 crates/gpui/playground/src/pressable.rs     |  24 +++-
 crates/gpui/playground/src/style.rs         |  16 +++
 7 files changed, 206 insertions(+), 48 deletions(-)

diff --git a/crates/gpui/playground/src/div.rs b/crates/gpui/playground/src/div.rs
index 73f196b4f07088cd3d007b071759a18eb373b164..98cebfe4ea84bcb3c061fe504d4b8444e9c60340 100644
--- a/crates/gpui/playground/src/div.rs
+++ b/crates/gpui/playground/src/div.rs
@@ -1,5 +1,5 @@
 use crate::{
-    element::{AnyElement, Element, Layout, ParentElement},
+    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     interactive::{InteractionHandlers, Interactive},
     layout_context::LayoutContext,
     paint_context::PaintContext,
@@ -47,6 +47,8 @@ impl<V: 'static> Element<V> for Div<V> {
     {
         self.computed_style()
             .paint_background(layout.bounds(cx), cx);
+        self.interaction_handlers()
+            .paint(layout.order(cx), layout.bounds(cx), cx);
         for child in &mut self.children {
             child.paint(view, cx);
         }
@@ -79,35 +81,10 @@ impl<V: 'static> ParentElement<V> for Div<V> {
     }
 }
 
-#[test]
-fn test() {
-    // let elt = div().w_auto();
-}
-
-// trait Element<V: 'static> {
-//     type Style;
-
-//     fn layout()
-// }
-
-// trait Stylable<V: 'static>: Element<V> {
-//     type Style;
-
-//     fn with_style(self, style: Self::Style) -> Self;
-// }
+impl<V: 'static> IntoElement<V> for Div<V> {
+    type Element = Self;
 
-// pub struct HoverStyle<S> {
-//     default: S,
-//     hovered: S,
-// }
-
-// struct Hover<V: 'static, C: Stylable<V>> {
-//     child: C,
-//     style: HoverStyle<C::Style>,
-// }
-
-// impl<V: 'static, C: Stylable<V>> Hover<V, C> {
-//     fn new(child: C, style: HoverStyle<C::Style>) -> Self {
-//         Self { child, style }
-//     }
-// }
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
diff --git a/crates/gpui/playground/src/hoverable.rs b/crates/gpui/playground/src/hoverable.rs
index 5aec6dd85e37c201de74f6ab2336e6b26aa6e7d3..7da8334225fe3743f999692aacba63931517bbbf 100644
--- a/crates/gpui/playground/src/hoverable.rs
+++ b/crates/gpui/playground/src/hoverable.rs
@@ -1,5 +1,6 @@
 use crate::{
-    element::{Element, Layout},
+    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
+    interactive::{InteractionHandlers, Interactive},
     layout_context::LayoutContext,
     paint_context::PaintContext,
     style::{Style, StyleHelpers, Styleable},
@@ -7,6 +8,7 @@ use crate::{
 use anyhow::Result;
 use gpui::platform::MouseMovedEvent;
 use refineable::{CascadeSlot, Refineable, RefinementCascade};
+use smallvec::SmallVec;
 use std::{cell::Cell, rc::Rc};
 
 pub struct Hoverable<E: Styleable> {
@@ -76,3 +78,23 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
 }
 
 impl<E: Styleable<Style = Style>> StyleHelpers for Hoverable<E> {}
+
+impl<V: 'static, E: Interactive<V> + Styleable> Interactive<V> for Hoverable<E> {
+    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
+        self.child.interaction_handlers()
+    }
+}
+
+impl<V: 'static, E: ParentElement<V> + Styleable> ParentElement<V> for Hoverable<E> {
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
+        self.child.children_mut()
+    }
+}
+
+impl<V: 'static, E: Element<V> + Styleable> IntoElement<V> for Hoverable<E> {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
diff --git a/crates/gpui/playground/src/interactive.rs b/crates/gpui/playground/src/interactive.rs
index 8debcb1692cc5bcd42a8e65e82aa27ad6a02d4a0..3afe928b3e6dad9f09abac49c768df106903b2dd 100644
--- a/crates/gpui/playground/src/interactive.rs
+++ b/crates/gpui/playground/src/interactive.rs
@@ -1,34 +1,147 @@
-use gpui::{platform::MouseMovedEvent, EventContext};
+use gpui::{
+    geometry::rect::RectF,
+    platform::{MouseButton, MouseButtonEvent},
+    EventContext,
+};
 use smallvec::SmallVec;
-use std::rc::Rc;
+use std::{cell::Cell, rc::Rc};
+
+use crate::element::PaintContext;
 
 pub trait Interactive<V: 'static> {
     fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V>;
 
-    fn on_mouse_move<H>(mut self, handler: H) -> Self
+    fn on_mouse_down(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
     where
-        H: 'static + Fn(&mut V, &MouseMovedEvent, bool, &mut EventContext<V>),
         Self: Sized,
     {
         self.interaction_handlers()
-            .mouse_moved
-            .push(Rc::new(move |view, event, hit_test, cx| {
-                handler(view, event, hit_test, cx);
-                cx.bubble
-            }));
+            .mouse_down
+            .push(Rc::new(handler));
         self
     }
+
+    fn on_mouse_up(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        self.interaction_handlers().mouse_up.push(Rc::new(handler));
+        self
+    }
+
+    fn on_mouse_down_out(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        self.interaction_handlers()
+            .mouse_down_out
+            .push(Rc::new(handler));
+        self
+    }
+
+    fn on_mouse_up_out(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        self.interaction_handlers()
+            .mouse_up_out
+            .push(Rc::new(handler));
+        self
+    }
+
+    fn on_click(
+        self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        let pressed = Rc::new(Cell::new(false));
+        self.on_mouse_down(button, {
+            let pressed = pressed.clone();
+            move |_, _, _| {
+                pressed.set(true);
+            }
+        })
+        .on_mouse_up_out(button, {
+            let pressed = pressed.clone();
+            move |_, _, _| {
+                pressed.set(false);
+            }
+        })
+        .on_mouse_up(button, move |view, event, cx| {
+            if pressed.get() {
+                pressed.set(false);
+                handler(view, event, cx);
+            }
+        })
+    }
 }
 
 pub struct InteractionHandlers<V: 'static> {
-    mouse_moved:
-        SmallVec<[Rc<dyn Fn(&mut V, &MouseMovedEvent, bool, &mut EventContext<V>) -> bool>; 2]>,
+    mouse_down: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+    mouse_down_out: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+    mouse_up: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+    mouse_up_out: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+}
+
+impl<V: 'static> InteractionHandlers<V> {
+    pub fn paint(&self, order: u32, bounds: RectF, cx: &mut PaintContext<V>) {
+        for handler in self.mouse_down.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if event.is_down && bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+        for handler in self.mouse_up.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if !event.is_down && bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+        for handler in self.mouse_down_out.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if event.is_down && !bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+        for handler in self.mouse_up_out.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if !event.is_down && !bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+    }
 }
 
 impl<V> Default for InteractionHandlers<V> {
     fn default() -> Self {
         Self {
-            mouse_moved: Default::default(),
+            mouse_down: Default::default(),
+            mouse_up: Default::default(),
+            mouse_down_out: Default::default(),
+            mouse_up_out: Default::default(),
         }
     }
 }
diff --git a/crates/gpui/playground/src/paint_context.rs b/crates/gpui/playground/src/paint_context.rs
index d853aff7f85ff4b8b434dffb6e99caca9f91d0d2..e3e8c2b1515b8806bed0f45a26b0958ce595b7b9 100644
--- a/crates/gpui/playground/src/paint_context.rs
+++ b/crates/gpui/playground/src/paint_context.rs
@@ -42,7 +42,7 @@ impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
     pub fn on_event<E: 'static>(
         &mut self,
         order: u32,
-        handler: impl Fn(&mut V, &E, &mut ViewContext<V>) + 'static,
+        handler: impl Fn(&mut V, &E, &mut EventContext<V>) + 'static,
     ) {
         let view = self.weak_handle();
 
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index e387aeb7d21ec3041477c53d8dde188d1d09752d..486f1b20b79183c9c5b784e6b4b6bb989888f200 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -1,6 +1,7 @@
 #![allow(dead_code, unused_variables)]
 use crate::{
     color::black,
+    element::ParentElement,
     style::{StyleHelpers, Styleable},
 };
 use element::Element;
@@ -59,7 +60,14 @@ fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
         .fill(theme.error(0.5))
         .pressed()
         .fill(theme.warning(0.5))
-    // .child(button().label("Hello").click(|_, _, _| println!("click!")))
+        .child(
+            div()
+                .h_6()
+                .w_6()
+                .absolute()
+                .bottom_0()
+                .fill(theme.success(0.)),
+        )
 }
 
 //     todo!()
diff --git a/crates/gpui/playground/src/pressable.rs b/crates/gpui/playground/src/pressable.rs
index 1428bf402116a88a65921fb83bcbc91b6b45a27c..a6d35d65c8e6b59ea501360c4953a6fda5e4acba 100644
--- a/crates/gpui/playground/src/pressable.rs
+++ b/crates/gpui/playground/src/pressable.rs
@@ -1,5 +1,6 @@
 use crate::{
-    element::{Element, Layout},
+    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
+    interactive::{InteractionHandlers, Interactive},
     layout_context::LayoutContext,
     paint_context::PaintContext,
     style::{Style, StyleHelpers, Styleable},
@@ -7,6 +8,7 @@ use crate::{
 use anyhow::Result;
 use gpui::platform::MouseButtonEvent;
 use refineable::{CascadeSlot, Refineable, RefinementCascade};
+use smallvec::SmallVec;
 use std::{cell::Cell, rc::Rc};
 
 pub struct Pressable<E: Styleable> {
@@ -79,3 +81,23 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
 }
 
 impl<E: Styleable<Style = Style>> StyleHelpers for Pressable<E> {}
+
+impl<V: 'static, E: Interactive<V> + Styleable> Interactive<V> for Pressable<E> {
+    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
+        self.child.interaction_handlers()
+    }
+}
+
+impl<V: 'static, E: ParentElement<V> + Styleable> ParentElement<V> for Pressable<E> {
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
+        self.child.children_mut()
+    }
+}
+
+impl<V: 'static, E: Element<V> + Styleable> IntoElement<V> for Pressable<E> {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
index f2a64348d2cf089444f68f457985fc8a5934d630..0decdb232f117bfbdfc6ce9ea11260bb7bca46c5 100644
--- a/crates/gpui/playground/src/style.rs
+++ b/crates/gpui/playground/src/style.rs
@@ -274,6 +274,22 @@ pub trait Styleable {
 pub trait StyleHelpers: Styleable<Style = Style> {
     styleable_helpers!();
 
+    fn relative(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().position = Some(Position::Relative);
+        self
+    }
+
+    fn absolute(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().position = Some(Position::Absolute);
+        self
+    }
+
     fn fill<F>(mut self, fill: F) -> Self
     where
         F: Into<Fill>,

From cf007a3d3b310a17c48bf5bf3f824ae971ed5ac8 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 23 Aug 2023 16:17:45 -0600
Subject: [PATCH 006/109] Start working on restoring button

---
 crates/gpui/playground/src/components.rs | 40 ++++++++++++------------
 crates/gpui/playground/src/playground.rs | 17 ++++++++++
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/crates/gpui/playground/src/components.rs b/crates/gpui/playground/src/components.rs
index 3901968bfcc0c1cd1f75f80419942a27b4180494..304e8bc9e98d1de60669ee586ccaa26a1273f3b5 100644
--- a/crates/gpui/playground/src/components.rs
+++ b/crates/gpui/playground/src/components.rs
@@ -1,11 +1,12 @@
 use crate::{
     div::div,
     element::{Element, ParentElement},
+    interactive::Interactive,
     style::StyleHelpers,
     text::ArcCow,
     themes::rose_pine,
 };
-use gpui::ViewContext;
+use gpui::{platform::MouseButton, ViewContext};
 use playground_macros::Element;
 use std::{marker::PhantomData, rc::Rc};
 
@@ -53,7 +54,7 @@ impl<V: 'static> Button<V, ()> {
     }
 }
 
-// Impl block for *any* button.
+// Impl block for button regardless of its data type.
 impl<V: 'static, D: 'static> Button<V, D> {
     pub fn label(mut self, label: impl Into<ArcCow<'static, str>>) -> Self {
         self.label = Some(label.into());
@@ -65,12 +66,10 @@ impl<V: 'static, D: 'static> Button<V, D> {
         self
     }
 
-    // pub fn click(self, handler: impl Fn(&mut V, &D, &mut ViewContext<V>) + 'static) -> Self {
-    //     let data = self.data.clone();
-    //     Self::click(self, MouseButton::Left, move |view, _, cx| {
-    //         handler(view, data.as_ref(), cx);
-    //     })
-    // }
+    pub fn on_click(mut self, handler: impl Fn(&mut V, &D, &mut ViewContext<V>) + 'static) -> Self {
+        self.handlers.click = Some(Rc::new(handler));
+        self
+    }
 }
 
 pub fn button<V>() -> Button<V, ()> {
@@ -78,23 +77,24 @@ pub fn button<V>() -> Button<V, ()> {
 }
 
 impl<V: 'static, D: 'static> Button<V, D> {
-    fn render(&mut self, view: &mut V, cx: &mut ViewContext<V>) -> impl Element<V> {
+    fn render(
+        &mut self,
+        view: &mut V,
+        cx: &mut ViewContext<V>,
+    ) -> impl Element<V> + Interactive<V> {
         // TODO: Drive theme from the context
         let button = div()
             .fill(rose_pine::dawn().error(0.5))
             .h_4()
             .children(self.label.clone());
 
-        button
-
-        // TODO: Event handling
-        // if let Some(handler) = self.handlers.click.clone() {
-        //     let data = self.data.clone();
-        //     // button.mouse_down(MouseButton::Left, move |view, event, cx| {
-        //     //     handler(view, data.as_ref(), cx)
-        //     // })
-        // } else {
-        //     button
-        // }
+        if let Some(handler) = self.handlers.click.clone() {
+            let data = self.data.clone();
+            button.on_mouse_down(MouseButton::Left, move |view, event, cx| {
+                handler(view, data.as_ref(), cx)
+            })
+        } else {
+            button
+        }
     }
 }
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 486f1b20b79183c9c5b784e6b4b6bb989888f200..beca547e18e191de7062c13a322281c52919ea01 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -1,6 +1,7 @@
 #![allow(dead_code, unused_variables)]
 use crate::{
     color::black,
+    components::button,
     element::ParentElement,
     style::{StyleHelpers, Styleable},
 };
@@ -68,6 +69,22 @@ fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
                 .bottom_0()
                 .fill(theme.success(0.)),
         )
+        .child(
+            button()
+                .label("Click me")
+                .data(1_usize)
+                .on_click(|_, data, _| {
+                    dbg!(*data);
+                }),
+        )
+        .child(
+            button()
+                .label("And me")
+                .data(2_usize)
+                .on_click(|_, data, _| {
+                    dbg!(*data);
+                }),
+        )
 }
 
 //     todo!()

From 147aa0f695f9df0b2e01a57007a654f98084ae6d Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 25 Aug 2023 21:41:21 -0600
Subject: [PATCH 007/109] WIP

---
 Cargo.lock                                    |   3 +-
 crates/editor/src/editor.rs                   |   1 -
 crates/gpui/Cargo.toml                        |   2 +-
 crates/gpui/playground/Cargo.toml             |   1 -
 crates/gpui/playground/src/div.rs             |  29 ++++-
 crates/gpui/playground/src/element.rs         |  22 ++--
 crates/gpui/playground/src/interactive.rs     |   1 +
 crates/gpui/playground/src/layout_context.rs  |  23 +++-
 crates/gpui/playground/src/paint_context.rs   |   8 +-
 crates/gpui/playground/src/playground.rs      |  67 ++----------
 crates/gpui/playground/src/style.rs           |  30 ++++-
 crates/gpui/playground/src/text.rs            | 103 ++++++++----------
 .../playground_macros/src/derive_element.rs   |   2 +-
 crates/gpui/src/app.rs                        |   1 +
 crates/gpui/src/app/window.rs                 |   2 +-
 crates/gpui/src/geometry.rs                   |   2 +-
 crates/gpui/src/gpui.rs                       |   1 +
 17 files changed, 155 insertions(+), 143 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d6490337daecb788d3190a0aca7573b57f9391a1..4c31069461b3d8519477bd1745ff6ba66a27afa9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5119,7 +5119,6 @@ dependencies = [
  "serde",
  "simplelog",
  "smallvec",
- "taffy",
  "util",
 ]
 
@@ -7435,7 +7434,7 @@ dependencies = [
 [[package]]
 name = "taffy"
 version = "0.3.11"
-source = "git+https://github.com/DioxusLabs/taffy?rev=dab541d6104d58e2e10ce90c4a1dad0b703160cd#dab541d6104d58e2e10ce90c4a1dad0b703160cd"
+source = "git+https://github.com/DioxusLabs/taffy?rev=4fb530bdd71609bb1d3f76c6a8bde1ba82805d5e#4fb530bdd71609bb1d3f76c6a8bde1ba82805d5e"
 dependencies = [
  "arrayvec 0.7.4",
  "grid",
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 67279b1ba62551d0b41b7dc97a3d1e56eb841691..b51f7ae25541aad9df19c117552c48af50c5e396 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4866,7 +4866,6 @@ impl Editor {
                             if let Some(clipboard_selection) = clipboard_selections.get(ix) {
                                 let end_offset = start_offset + clipboard_selection.len;
                                 to_insert = &clipboard_text[start_offset..end_offset];
-                                dbg!(start_offset, end_offset, &clipboard_text, &to_insert);
                                 entire_line = clipboard_selection.is_entire_line;
                                 start_offset = end_offset + 1;
                                 original_indent_column =
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 24397f619357a5454f333c21ef96e4ac369c6397..a77c9e2237bdc372f24c27fdec3dd991d51daef2 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -48,7 +48,7 @@ serde_derive.workspace = true
 serde_json.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "dab541d6104d58e2e10ce90c4a1dad0b703160cd", features = ["flexbox"] }
+taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "4fb530bdd71609bb1d3f76c6a8bde1ba82805d5e" }
 time.workspace = true
 tiny-skia = "0.5"
 usvg = { version = "0.14", features = [] }
diff --git a/crates/gpui/playground/Cargo.toml b/crates/gpui/playground/Cargo.toml
index 3e5a5e5606a5e3351104a9587f881ab3caf2fccc..d907d3d6b6f8ba6b37c404f33abeb23fd05d577f 100644
--- a/crates/gpui/playground/Cargo.toml
+++ b/crates/gpui/playground/Cargo.toml
@@ -19,7 +19,6 @@ refineable.workspace = true
 serde.workspace = true
 simplelog = "0.9"
 smallvec.workspace = true
-taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "dab541d6104d58e2e10ce90c4a1dad0b703160cd", features = ["flexbox"] }
 util = { path = "../../util" }
 
 [dev-dependencies]
diff --git a/crates/gpui/playground/src/div.rs b/crates/gpui/playground/src/div.rs
index 98cebfe4ea84bcb3c061fe504d4b8444e9c60340..a9bf89dc2aed9ff37573ab63ab737b5613410f44 100644
--- a/crates/gpui/playground/src/div.rs
+++ b/crates/gpui/playground/src/div.rs
@@ -6,7 +6,7 @@ use crate::{
     style::{Style, StyleHelpers, Styleable},
 };
 use anyhow::Result;
-use gpui::LayoutId;
+use gpui::{LayoutId, RenderContext};
 use refineable::{Refineable, RefinementCascade};
 use smallvec::SmallVec;
 
@@ -31,27 +31,46 @@ impl<V: 'static> Element<V> for Div<V> {
     where
         Self: Sized,
     {
+        let style = self.computed_style();
+        let pop_text_style = style.text_style().map_or(false, |style| {
+            cx.push_text_style(cx.text_style().clone().refined(&style));
+            true
+        });
+
         let children = self
             .children
             .iter_mut()
             .map(|child| child.layout(view, cx))
             .collect::<Result<Vec<LayoutId>>>()?;
 
-        let style = Style::from_refinement(&self.style_cascade().merged());
-        cx.add_layout_node(style.clone(), (), children)
+        if pop_text_style {
+            cx.pop_text_style();
+        }
+
+        let layout = cx.add_layout_node(style, (), children.clone())?;
+
+        dbg!(layout.id(), children);
+        Ok(layout)
     }
 
     fn paint(&mut self, view: &mut V, layout: &mut Layout<V, ()>, cx: &mut PaintContext<V>)
     where
         Self: Sized,
     {
-        self.computed_style()
-            .paint_background(layout.bounds(cx), cx);
+        let style = &self.computed_style();
+        let pop_text_style = style.text_style().map_or(false, |style| {
+            cx.push_text_style(cx.text_style().clone().refined(&style));
+            true
+        });
+        style.paint_background(layout.bounds(cx), cx);
         self.interaction_handlers()
             .paint(layout.order(cx), layout.bounds(cx), cx);
         for child in &mut self.children {
             child.paint(view, cx);
         }
+        if pop_text_style {
+            cx.pop_text_style();
+        }
     }
 }
 
diff --git a/crates/gpui/playground/src/element.rs b/crates/gpui/playground/src/element.rs
index f0b6df75b3af16536a4637437bccb5fb31fd1dc7..3de6ea2903de7d7626843afbb2b62eeaf1af3f1c 100644
--- a/crates/gpui/playground/src/element.rs
+++ b/crates/gpui/playground/src/element.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use gpui::{geometry::rect::RectF, EngineLayout};
 use smallvec::SmallVec;
 use std::marker::PhantomData;
@@ -32,7 +32,7 @@ pub trait Element<V: 'static>: 'static {
     where
         Self: 'static + Sized,
     {
-        AnyElement(Box::new(ElementState {
+        AnyElement(Box::new(StatefulElement {
             element: self,
             layout: None,
         }))
@@ -40,19 +40,19 @@ pub trait Element<V: 'static>: 'static {
 }
 
 /// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
-trait ElementStateObject<V> {
+trait AnyStatefulElement<V> {
     fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId>;
     fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>);
 }
 
 /// A wrapper around an element that stores its layout state.
-struct ElementState<V: 'static, E: Element<V>> {
+struct StatefulElement<V: 'static, E: Element<V>> {
     element: E,
     layout: Option<Layout<V, E::Layout>>,
 }
 
 /// We blanket-implement the object-safe ElementStateObject interface to make ElementStates into trait objects
-impl<V, E: Element<V>> ElementStateObject<V> for ElementState<V, E> {
+impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
     fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
         let layout = self.element.layout(view, cx)?;
         let layout_id = layout.id;
@@ -63,14 +63,14 @@ impl<V, E: Element<V>> ElementStateObject<V> for ElementState<V, E> {
     fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>) {
         let layout = self.layout.as_mut().expect("paint called before layout");
         if layout.engine_layout.is_none() {
-            layout.engine_layout = cx.computed_layout(layout.id).log_err()
+            layout.engine_layout = dbg!(cx.computed_layout(dbg!(layout.id)).log_err())
         }
         self.element.paint(view, layout, cx)
     }
 }
 
 /// A dynamic element.
-pub struct AnyElement<V>(Box<dyn ElementStateObject<V>>);
+pub struct AnyElement<V>(Box<dyn AnyStatefulElement<V>>);
 
 impl<V> AnyElement<V> {
     pub fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
@@ -99,6 +99,10 @@ impl<V: 'static, D> Layout<V, D> {
         }
     }
 
+    pub fn id(&self) -> LayoutId {
+        self.id
+    }
+
     pub fn bounds(&mut self, cx: &mut PaintContext<V>) -> RectF {
         self.engine_layout(cx).bounds
     }
@@ -107,7 +111,7 @@ impl<V: 'static, D> Layout<V, D> {
         self.engine_layout(cx).order
     }
 
-    pub fn update<F, T>(&mut self, update: F) -> Result<T>
+    pub fn update<F, T>(&mut self, update: F) -> T
     where
         F: FnOnce(&mut Self, &mut D) -> T,
     {
@@ -118,7 +122,7 @@ impl<V: 'static, D> Layout<V, D> {
                 self.element_data = Some(element_data);
                 result
             })
-            .ok_or_else(|| anyhow!("reentrant calls to Layout::update are not allowed"))
+            .expect("reentrant calls to Layout::update are not supported")
     }
 
     fn engine_layout(&mut self, cx: &mut PaintContext<'_, '_, '_, '_, V>) -> &mut EngineLayout {
diff --git a/crates/gpui/playground/src/interactive.rs b/crates/gpui/playground/src/interactive.rs
index 3afe928b3e6dad9f09abac49c768df106903b2dd..e91436499ca06ba1dce11d2ca1e8e82287a97b47 100644
--- a/crates/gpui/playground/src/interactive.rs
+++ b/crates/gpui/playground/src/interactive.rs
@@ -11,6 +11,7 @@ use crate::element::PaintContext;
 pub trait Interactive<V: 'static> {
     fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V>;
 
+    // One line change.
     fn on_mouse_down(
         mut self,
         button: MouseButton,
diff --git a/crates/gpui/playground/src/layout_context.rs b/crates/gpui/playground/src/layout_context.rs
index 7c9f13e7f08519c13a7ac78c2f90bd628e8fd3a8..71bd3ac5a35163bdabef9dbfba8e9584e579e7b0 100644
--- a/crates/gpui/playground/src/layout_context.rs
+++ b/crates/gpui/playground/src/layout_context.rs
@@ -1,8 +1,7 @@
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
-pub use gpui::LayoutContext as LegacyLayoutContext;
-use gpui::{RenderContext, ViewContext};
-pub use taffy::tree::NodeId;
+use gpui::{geometry::Size, MeasureParams, RenderContext, ViewContext};
+pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
 
 use crate::{element::Layout, style::Style};
 
@@ -51,4 +50,22 @@ impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
 
         Ok(Layout::new(id, element_data))
     }
+
+    pub fn add_measured_layout_node<D, F>(
+        &mut self,
+        style: Style,
+        element_data: D,
+        measure: F,
+    ) -> Result<Layout<V, D>>
+    where
+        F: Fn(MeasureParams) -> Size<f32> + Sync + Send + 'static,
+    {
+        let rem_size = self.rem_pixels();
+        let layout_id = self
+            .layout_engine()
+            .ok_or_else(|| anyhow!("no layout engine"))?
+            .add_measured_node(style.to_taffy(rem_size), measure)?;
+
+        Ok(Layout::new(layout_id, element_data))
+    }
 }
diff --git a/crates/gpui/playground/src/paint_context.rs b/crates/gpui/playground/src/paint_context.rs
index e3e8c2b1515b8806bed0f45a26b0958ce595b7b9..d49cbaf6beb7ca3517f82739fd71733e4d26691b 100644
--- a/crates/gpui/playground/src/paint_context.rs
+++ b/crates/gpui/playground/src/paint_context.rs
@@ -1,9 +1,11 @@
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
-use gpui::{scene::EventHandler, EngineLayout, EventContext, LayoutId, RenderContext, ViewContext};
-pub use gpui::{LayoutContext, PaintContext as LegacyPaintContext};
+pub use gpui::taffy::tree::NodeId;
+use gpui::{
+    scene::EventHandler, EngineLayout, EventContext, LayoutId, PaintContext as LegacyPaintContext,
+    RenderContext, ViewContext,
+};
 use std::{any::TypeId, rc::Rc};
-pub use taffy::tree::NodeId;
 
 #[derive(Deref, DerefMut)]
 pub struct PaintContext<'a, 'b, 'c, 'd, V> {
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index beca547e18e191de7062c13a322281c52919ea01..bd184ac621d2a8dfdc0c6e530c782365348b95ba 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -1,9 +1,6 @@
 #![allow(dead_code, unused_variables)]
 use crate::{
-    color::black,
-    components::button,
-    element::ParentElement,
-    style::{StyleHelpers, Styleable},
+    color::black, element::ParentElement, style::StyleHelpers, themes::rose_pine::RosePinePalette,
 };
 use element::Element;
 use gpui::{
@@ -51,64 +48,24 @@ fn main() {
 
 fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
     use div::div;
+    let p = RosePinePalette::dawn();
 
     div()
         .text_color(black())
         .h_full()
-        .w_1_2()
-        .fill(theme.success(0.5))
-        .hovered()
-        .fill(theme.error(0.5))
-        .pressed()
-        .fill(theme.warning(0.5))
+        .w_full()
+        .fill(p.rose)
+        .block()
         .child(
             div()
-                .h_6()
-                .w_6()
-                .absolute()
-                .bottom_0()
-                .fill(theme.success(0.)),
+                .block()
+                .fill(p.pine)
+                .child(div().block().fill(p.love).w_6().h_3()),
         )
         .child(
-            button()
-                .label("Click me")
-                .data(1_usize)
-                .on_click(|_, data, _| {
-                    dbg!(*data);
-                }),
-        )
-        .child(
-            button()
-                .label("And me")
-                .data(2_usize)
-                .on_click(|_, data, _| {
-                    dbg!(*data);
-                }),
+            div()
+                .block()
+                .fill(p.gold)
+                .child(div().block().fill(p.iris).w_3().h_3()),
         )
 }
-
-//     todo!()
-//     // column()
-//     // .size(auto())
-//     // .fill(theme.base(0.5))
-//     // .text_color(theme.text(0.5))
-//     // .child(title_bar(theme))
-//     // .child(stage(theme))
-//     // .child(status_bar(theme))
-// }
-
-// fn title_bar<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
-//     row()
-//         .fill(theme.base(0.2))
-//         .justify(0.)
-//         .width(auto())
-//         .child(text("Zed Playground"))
-// }
-
-// fn stage<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
-//     row().fill(theme.surface(0.9))
-// }
-
-// fn status_bar<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
-//     row().fill(theme.surface(0.1))
-// }
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
index 0decdb232f117bfbdfc6ce9ea11260bb7bca46c5..0d6a53e29606845e155b8de115296a4bc9373c9b 100644
--- a/crates/gpui/playground/src/style.rs
+++ b/crates/gpui/playground/src/style.rs
@@ -4,19 +4,20 @@ use crate::{
     paint_context::PaintContext,
     pressable::{pressable, Pressable},
 };
+pub use gpui::taffy::style::{
+    AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
+    Overflow, Position,
+};
 use gpui::{
     fonts::TextStyleRefinement,
     geometry::{
         rect::RectF, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length, Point,
         PointRefinement, Size, SizeRefinement,
     },
+    taffy,
 };
 use playground_macros::styleable_helpers;
 use refineable::{Refineable, RefinementCascade};
-pub use taffy::style::{
-    AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
-    Overflow, Position,
-};
 
 #[derive(Clone, Refineable)]
 pub struct Style {
@@ -137,12 +138,23 @@ impl Style {
             });
         }
     }
+
+    pub fn text_style(&self) -> Option<TextStyleRefinement> {
+        if let Some(color) = self.text_color {
+            Some(TextStyleRefinement {
+                color: Some(color.into()),
+                ..Default::default()
+            })
+        } else {
+            None
+        }
+    }
 }
 
 impl Default for Style {
     fn default() -> Self {
         Style {
-            display: Display::DEFAULT,
+            display: Display::Block,
             overflow: Point {
                 x: Overflow::Visible,
                 y: Overflow::Visible,
@@ -290,6 +302,14 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
+    fn block(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().display = Some(Display::Block);
+        self
+    }
+
     fn fill<F>(mut self, fill: F) -> Self
     where
         F: Into<Fill>,
diff --git a/crates/gpui/playground/src/text.rs b/crates/gpui/playground/src/text.rs
index b15f7f123ecde35afd54f00455d8d601a6d664c0..58dcaeb1f2b845fa58707efa8ec23ce061b25f3d 100644
--- a/crates/gpui/playground/src/text.rs
+++ b/crates/gpui/playground/src/text.rs
@@ -4,7 +4,7 @@ use crate::{
     paint_context::PaintContext,
 };
 use anyhow::Result;
-use gpui::text_layout::LineLayout;
+use gpui::{geometry::Size, text_layout::LineLayout, RenderContext};
 use parking_lot::Mutex;
 use std::sync::Arc;
 
@@ -28,40 +28,32 @@ impl<V: 'static> Element<V> for Text {
         view: &mut V,
         cx: &mut LayoutContext<V>,
     ) -> Result<Layout<V, Self::Layout>> {
-        // let rem_size = cx.rem_pixels();
-        // let fonts = cx.platform().fonts();
-        // let text_style = cx.text_style();
-        // let line_height = cx.font_cache().line_height(text_style.font_size);
-        // let layout_engine = cx.layout_engine().expect("no layout engine present");
-        // let text = self.text.clone();
-        // let layout = Arc::new(Mutex::new(None));
-
-        // let style: Style = Style::default().refined(&self.metadata.style);
-        // let node_id = layout_engine.add_measured_node(style.to_taffy(rem_size), {
-        //     let layout = layout.clone();
-        //     move |params| {
-        //         let line_layout = fonts.layout_line(
-        //             text.as_ref(),
-        //             text_style.font_size,
-        //             &[(text.len(), text_style.to_run())],
-        //         );
-
-        //         let size = Size {
-        //             width: line_layout.width,
-        //             height: line_height,
-        //         };
-
-        //         layout.lock().replace(TextLayout {
-        //             line_layout: Arc::new(line_layout),
-        //             line_height,
-        //         });
-
-        //         size
-        //     }
-        // })?;
-
-        // Ok((node_id, layout))
-        todo!()
+        let rem_size = cx.rem_pixels();
+        let fonts = cx.platform().fonts();
+        let text_style = cx.text_style();
+        let line_height = cx.font_cache().line_height(text_style.font_size);
+        let text = self.text.clone();
+        let layout = Arc::new(Mutex::new(None));
+
+        cx.add_measured_layout_node(Default::default(), layout.clone(), move |params| {
+            let line_layout = fonts.layout_line(
+                text.as_ref(),
+                text_style.font_size,
+                &[(text.len(), text_style.to_run())],
+            );
+
+            let size = Size {
+                width: line_layout.width,
+                height: line_height,
+            };
+
+            layout.lock().replace(TextLayout {
+                line_layout: Arc::new(line_layout),
+                line_height,
+            });
+
+            size
+        })
     }
 
     fn paint<'a>(
@@ -70,26 +62,27 @@ impl<V: 'static> Element<V> for Text {
         layout: &mut Layout<V, Self::Layout>,
         cx: &mut PaintContext<V>,
     ) {
-        // ) {
-        //     let element_layout_lock = layout.from_element.lock();
-        //     let element_layout = element_layout_lock
-        //         .as_ref()
-        //         .expect("layout has not been performed");
-        //     let line_layout = element_layout.line_layout.clone();
-        //     let line_height = element_layout.line_height;
-        //     drop(element_layout_lock);
-
-        //     let text_style = cx.text_style();
-        //     let line =
-        //         gpui::text_layout::Line::new(line_layout, &[(self.text.len(), text_style.to_run())]);
-        //     line.paint(
-        //         cx.scene,
-        //         layout.from_engine.bounds.origin(),
-        //         layout.from_engine.bounds,
-        //         line_height,
-        //         cx.legacy_cx,
-        //     );
-        todo!()
+        let element_layout = layout.update(|layout, element_data| element_data.clone());
+
+        let line_layout;
+        let line_height;
+        {
+            let element_layout = element_layout.lock();
+            let element_layout = element_layout
+                .as_ref()
+                .expect("measurement has not been performed");
+            line_layout = element_layout.line_layout.clone();
+            line_height = element_layout.line_height;
+        }
+
+        let text_style = cx.text_style();
+        let line =
+            gpui::text_layout::Line::new(line_layout, &[(self.text.len(), text_style.to_run())]);
+
+        let origin = layout.bounds(cx).origin();
+        // TODO: We haven't added visible bounds to the new element system yet, so this is a placeholder.
+        let visible_bounds = layout.bounds(cx);
+        line.paint(cx.scene, origin, visible_bounds, line_height, cx.legacy_cx);
     }
 }
 
diff --git a/crates/gpui/playground_macros/src/derive_element.rs b/crates/gpui/playground_macros/src/derive_element.rs
index ca2636e2e1675210ed683c4b20642d34290655d4..66d39d68e6eac0875ec6fcc34da156b189ef67f2 100644
--- a/crates/gpui/playground_macros/src/derive_element.rs
+++ b/crates/gpui/playground_macros/src/derive_element.rs
@@ -80,7 +80,7 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
                 layout: &mut playground::element::Layout<V, Self::Layout>,
                 cx: &mut playground::element::PaintContext<V>,
             ) {
-                layout.update(|_, rendered_element| rendered_element.paint(view, cx)).ok();
+                layout.update(|_, rendered_element| rendered_element.paint(view, cx));
             }
         }
 
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 5b3dc438c60b97f542c5c50e8732860781e2b319..a2536e0b4a558e1b8ca59b9b9dd8cc9795ae58e8 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -53,6 +53,7 @@ use std::{
 pub use test_app_context::{ContextHandle, TestAppContext};
 use util::ResultExt;
 use uuid::Uuid;
+pub use window::MeasureParams;
 use window_input_handler::WindowInputHandler;
 
 pub trait Entity: 'static {
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 2edb2af8a1ea3104028601f0af2064c4ec2f48a4..62c514b4e95d5a85a10b96abdc114dc2f79b38f0 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1302,7 +1302,7 @@ impl LayoutEngine {
     }
 
     pub fn computed_layout(&mut self, node: LayoutId) -> Result<EngineLayout> {
-        Ok(self.0.layout(node)?.into())
+        dbg!(Ok(self.0.layout(node)?.into()))
     }
 }
 
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index ff3647f5a2ca36a52e1a075380193ca041327d0e..db9af34516f5c12b798fd151f980c155b7224dee 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -157,7 +157,7 @@ impl<T: Clone + Default> Into<taffy::geometry::Point<T>> for Point<T> {
     }
 }
 
-#[derive(Clone, Refineable)]
+#[derive(Clone, Refineable, Debug)]
 pub struct Size<T: Clone + Default> {
     pub width: T,
     pub height: T,
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 4bd1481f5b5cafdb46fe47b2277f7fc35e966ad7..66e6648b0e3c37db256564bb19a888bfd4f52a0f 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -7,6 +7,7 @@ pub use assets::*;
 pub mod elements;
 pub mod font_cache;
 mod image_data;
+pub use taffy;
 pub use crate::image_data::ImageData;
 pub mod views;
 pub use font_cache::FontCache;

From 8ad736da8d39d61b44bb50a5e38e8b1cd5773993 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 25 Aug 2023 22:19:49 -0600
Subject: [PATCH 008/109] WIP

---
 crates/gpui/playground/src/playground.rs | 15 ++-------------
 crates/gpui/src/app/window.rs            | 11 +++++++----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index bd184ac621d2a8dfdc0c6e530c782365348b95ba..88e953b8bc953d232668baeed49c48708ad2e423 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -55,17 +55,6 @@ fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
         .h_full()
         .w_full()
         .fill(p.rose)
-        .block()
-        .child(
-            div()
-                .block()
-                .fill(p.pine)
-                .child(div().block().fill(p.love).w_6().h_3()),
-        )
-        .child(
-            div()
-                .block()
-                .fill(p.gold)
-                .child(div().block().fill(p.iris).w_3().h_3()),
-        )
+        .child(div().fill(p.pine).child(div().fill(p.love).w_6().h_3()))
+        .child(div().fill(p.gold).child(div().fill(p.iris).w_3().h_3()))
 }
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 62c514b4e95d5a85a10b96abdc114dc2f79b38f0..a372b865fe017a56da79896d9cf002385b24515a 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1276,9 +1276,12 @@ impl LayoutEngine {
     where
         C: IntoIterator<Item = LayoutId>,
     {
-        Ok(self
-            .0
-            .new_with_children(style, &children.into_iter().collect::<Vec<_>>())?)
+        let children = children.into_iter().collect::<Vec<_>>();
+        if children.is_empty() {
+            Ok(self.0.new_leaf(style)?)
+        } else {
+            Ok(self.0.new_with_children(style, &children)?)
+        }
     }
 
     pub fn add_measured_node<F>(&mut self, style: LayoutStyle, measure: F) -> Result<LayoutId>
@@ -1302,7 +1305,7 @@ impl LayoutEngine {
     }
 
     pub fn computed_layout(&mut self, node: LayoutId) -> Result<EngineLayout> {
-        dbg!(Ok(self.0.layout(node)?.into()))
+        Ok(EngineLayout::from(self.0.layout(node)?))
     }
 }
 

From 3bebfbcd50dd21fdabdeddea970c7f4a30d3ac81 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 25 Aug 2023 23:15:58 -0600
Subject: [PATCH 009/109] Checkpoint

---
 crates/gpui/playground/src/div.rs             |  26 ++--
 crates/gpui/playground/src/element.rs         | 136 +++++++++---------
 crates/gpui/playground/src/hoverable.rs       |  26 ++--
 crates/gpui/playground/src/layout_context.rs  |  19 +--
 crates/gpui/playground/src/paint_context.rs   |   4 +-
 crates/gpui/playground/src/pressable.rs       |  20 +--
 crates/gpui/playground/src/text.rs            |  70 ++++-----
 .../playground_macros/src/derive_element.rs   |  11 +-
 crates/gpui/src/app/window.rs                 |   8 +-
 crates/gpui/src/gpui.rs                       |   5 +-
 10 files changed, 165 insertions(+), 160 deletions(-)

diff --git a/crates/gpui/playground/src/div.rs b/crates/gpui/playground/src/div.rs
index a9bf89dc2aed9ff37573ab63ab737b5613410f44..75ac5d965b6dea24b77725327a2f947ad3d0bf61 100644
--- a/crates/gpui/playground/src/div.rs
+++ b/crates/gpui/playground/src/div.rs
@@ -25,9 +25,13 @@ pub fn div<V>() -> Div<V> {
 }
 
 impl<V: 'static> Element<V> for Div<V> {
-    type Layout = ();
+    type PaintState = ();
 
-    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<Layout<V, ()>>
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized,
     {
@@ -47,14 +51,16 @@ impl<V: 'static> Element<V> for Div<V> {
             cx.pop_text_style();
         }
 
-        let layout = cx.add_layout_node(style, (), children.clone())?;
-
-        dbg!(layout.id(), children);
-        Ok(layout)
+        Ok((cx.add_layout_node(style, children)?, ()))
     }
 
-    fn paint(&mut self, view: &mut V, layout: &mut Layout<V, ()>, cx: &mut PaintContext<V>)
-    where
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) where
         Self: Sized,
     {
         let style = &self.computed_style();
@@ -62,9 +68,9 @@ impl<V: 'static> Element<V> for Div<V> {
             cx.push_text_style(cx.text_style().clone().refined(&style));
             true
         });
-        style.paint_background(layout.bounds(cx), cx);
+        style.paint_background(layout.bounds, cx);
         self.interaction_handlers()
-            .paint(layout.order(cx), layout.bounds(cx), cx);
+            .paint(layout.order, layout.bounds, cx);
         for child in &mut self.children {
             child.paint(view, cx);
         }
diff --git a/crates/gpui/playground/src/element.rs b/crates/gpui/playground/src/element.rs
index 3de6ea2903de7d7626843afbb2b62eeaf1af3f1c..c39ee7e19671d537d9c027d837c4ca67f67f0f07 100644
--- a/crates/gpui/playground/src/element.rs
+++ b/crates/gpui/playground/src/element.rs
@@ -1,29 +1,25 @@
-use anyhow::Result;
-use gpui::{geometry::rect::RectF, EngineLayout};
-use smallvec::SmallVec;
-use std::marker::PhantomData;
-use util::ResultExt;
-
 pub use crate::layout_context::LayoutContext;
 pub use crate::paint_context::PaintContext;
-
-type LayoutId = gpui::LayoutId;
+use anyhow::Result;
+pub use gpui::{Layout, LayoutId};
+use smallvec::SmallVec;
 
 pub trait Element<V: 'static>: 'static {
-    type Layout;
+    type PaintState;
 
     fn layout(
         &mut self,
         view: &mut V,
         cx: &mut LayoutContext<V>,
-    ) -> Result<Layout<V, Self::Layout>>
+    ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized;
 
     fn paint(
         &mut self,
         view: &mut V,
-        layout: &mut Layout<V, Self::Layout>,
+        layout: &Layout,
+        state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) where
         Self: Sized;
@@ -34,7 +30,7 @@ pub trait Element<V: 'static>: 'static {
     {
         AnyElement(Box::new(StatefulElement {
             element: self,
-            layout: None,
+            phase: ElementPhase::Init,
         }))
     }
 }
@@ -48,24 +44,71 @@ trait AnyStatefulElement<V> {
 /// A wrapper around an element that stores its layout state.
 struct StatefulElement<V: 'static, E: Element<V>> {
     element: E,
-    layout: Option<Layout<V, E::Layout>>,
+    phase: ElementPhase<V, E>,
+}
+
+enum ElementPhase<V: 'static, E: Element<V>> {
+    Init,
+    PostLayout {
+        layout_id: LayoutId,
+        paint_state: E::PaintState,
+    },
+    PostPaint {
+        layout: Layout,
+        paint_state: E::PaintState,
+    },
+    Error(String),
+}
+
+impl<V: 'static, E: Element<V>> Default for ElementPhase<V, E> {
+    fn default() -> Self {
+        Self::Init
+    }
 }
 
 /// We blanket-implement the object-safe ElementStateObject interface to make ElementStates into trait objects
 impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
     fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
-        let layout = self.element.layout(view, cx)?;
-        let layout_id = layout.id;
-        self.layout = Some(layout);
-        Ok(layout_id)
+        let result;
+        self.phase = match std::mem::take(&mut self.phase) {
+            ElementPhase::Init => match self.element.layout(view, cx) {
+                Ok((layout_id, paint_state)) => {
+                    result = Ok(layout_id);
+                    ElementPhase::PostLayout {
+                        layout_id,
+                        paint_state,
+                    }
+                }
+                Err(error) => {
+                    let message = error.to_string();
+                    result = Err(error);
+                    ElementPhase::Error(message)
+                }
+            },
+            _ => panic!("invalid element phase to call layout"),
+        };
+
+        result
     }
 
     fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>) {
-        let layout = self.layout.as_mut().expect("paint called before layout");
-        if layout.engine_layout.is_none() {
-            layout.engine_layout = dbg!(cx.computed_layout(dbg!(layout.id)).log_err())
-        }
-        self.element.paint(view, layout, cx)
+        self.phase = match std::mem::take(&mut self.phase) {
+            ElementPhase::PostLayout {
+                layout_id,
+                mut paint_state,
+            } => match cx.computed_layout(layout_id) {
+                Ok(layout) => {
+                    self.element.paint(view, &layout, &mut paint_state, cx);
+                    ElementPhase::PostPaint {
+                        layout,
+                        paint_state,
+                    }
+                }
+                Err(error) => ElementPhase::Error(error.to_string()),
+            },
+            phase @ ElementPhase::Error(_) => phase,
+            _ => panic!("invalid element phase to call paint"),
+        };
     }
 }
 
@@ -82,55 +125,6 @@ impl<V> AnyElement<V> {
     }
 }
 
-pub struct Layout<V, D> {
-    id: LayoutId,
-    engine_layout: Option<EngineLayout>,
-    element_data: Option<D>,
-    view_type: PhantomData<V>,
-}
-
-impl<V: 'static, D> Layout<V, D> {
-    pub fn new(id: LayoutId, element_data: D) -> Self {
-        Self {
-            id,
-            engine_layout: None,
-            element_data: Some(element_data),
-            view_type: PhantomData,
-        }
-    }
-
-    pub fn id(&self) -> LayoutId {
-        self.id
-    }
-
-    pub fn bounds(&mut self, cx: &mut PaintContext<V>) -> RectF {
-        self.engine_layout(cx).bounds
-    }
-
-    pub fn order(&mut self, cx: &mut PaintContext<V>) -> u32 {
-        self.engine_layout(cx).order
-    }
-
-    pub fn update<F, T>(&mut self, update: F) -> T
-    where
-        F: FnOnce(&mut Self, &mut D) -> T,
-    {
-        self.element_data
-            .take()
-            .map(|mut element_data| {
-                let result = update(self, &mut element_data);
-                self.element_data = Some(element_data);
-                result
-            })
-            .expect("reentrant calls to Layout::update are not supported")
-    }
-
-    fn engine_layout(&mut self, cx: &mut PaintContext<'_, '_, '_, '_, V>) -> &mut EngineLayout {
-        self.engine_layout
-            .get_or_insert_with(|| cx.computed_layout(self.id).log_err().unwrap_or_default())
-    }
-}
-
 pub trait ParentElement<V: 'static> {
     fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]>;
 
diff --git a/crates/gpui/playground/src/hoverable.rs b/crates/gpui/playground/src/hoverable.rs
index 7da8334225fe3743f999692aacba63931517bbbf..8ed06b7cbe6019d2118577c76dc955a54a85c48c 100644
--- a/crates/gpui/playground/src/hoverable.rs
+++ b/crates/gpui/playground/src/hoverable.rs
@@ -6,7 +6,7 @@ use crate::{
     style::{Style, StyleHelpers, Styleable},
 };
 use anyhow::Result;
-use gpui::platform::MouseMovedEvent;
+use gpui::{platform::MouseMovedEvent, LayoutId};
 use refineable::{CascadeSlot, Refineable, RefinementCascade};
 use smallvec::SmallVec;
 use std::{cell::Cell, rc::Rc};
@@ -40,40 +40,44 @@ impl<E: Styleable> Styleable for Hoverable<E> {
 }
 
 impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
-    type Layout = E::Layout;
+    type PaintState = E::PaintState;
 
-    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<Layout<V, Self::Layout>>
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized,
     {
-        self.child.layout(view, cx)
+        Ok(self.child.layout(view, cx)?)
     }
 
     fn paint(
         &mut self,
         view: &mut V,
-        layout: &mut Layout<V, Self::Layout>,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) where
         Self: Sized,
     {
-        let bounds = layout.bounds(cx);
-        let order = layout.order(cx);
-
-        self.hovered.set(bounds.contains_point(cx.mouse_position()));
+        self.hovered
+            .set(layout.bounds.contains_point(cx.mouse_position()));
 
         let slot = self.cascade_slot;
         let style = self.hovered.get().then_some(self.hovered_style.clone());
         self.style_cascade().set(slot, style);
 
         let hovered = self.hovered.clone();
-        cx.on_event(order, move |view, event: &MouseMovedEvent, cx| {
+        let bounds = layout.bounds;
+        cx.on_event(layout.order, move |view, event: &MouseMovedEvent, cx| {
             if bounds.contains_point(cx.mouse_position()) != hovered.get() {
                 cx.repaint();
             }
         });
 
-        self.child.paint(view, layout, cx);
+        self.child.paint(view, layout, paint_state, cx);
     }
 }
 
diff --git a/crates/gpui/playground/src/layout_context.rs b/crates/gpui/playground/src/layout_context.rs
index 71bd3ac5a35163bdabef9dbfba8e9584e579e7b0..a08efdac3451e2a0a9566d7daa25f5a574d8464a 100644
--- a/crates/gpui/playground/src/layout_context.rs
+++ b/crates/gpui/playground/src/layout_context.rs
@@ -1,10 +1,9 @@
+use crate::{element::LayoutId, style::Style};
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
 use gpui::{geometry::Size, MeasureParams, RenderContext, ViewContext};
 pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
 
-use crate::{element::Layout, style::Style};
-
 #[derive(Deref, DerefMut)]
 pub struct LayoutContext<'a, 'b, 'c, 'd, V> {
     #[deref]
@@ -35,12 +34,11 @@ impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
         Self { legacy_cx }
     }
 
-    pub fn add_layout_node<D>(
+    pub fn add_layout_node(
         &mut self,
         style: Style,
-        element_data: D,
         children: impl IntoIterator<Item = NodeId>,
-    ) -> Result<Layout<V, D>> {
+    ) -> Result<LayoutId> {
         let rem_size = self.rem_pixels();
         let id = self
             .legacy_cx
@@ -48,15 +46,10 @@ impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
             .ok_or_else(|| anyhow!("no layout engine"))?
             .add_node(style.to_taffy(rem_size), children)?;
 
-        Ok(Layout::new(id, element_data))
+        Ok(id)
     }
 
-    pub fn add_measured_layout_node<D, F>(
-        &mut self,
-        style: Style,
-        element_data: D,
-        measure: F,
-    ) -> Result<Layout<V, D>>
+    pub fn add_measured_layout_node<F>(&mut self, style: Style, measure: F) -> Result<LayoutId>
     where
         F: Fn(MeasureParams) -> Size<f32> + Sync + Send + 'static,
     {
@@ -66,6 +59,6 @@ impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
             .ok_or_else(|| anyhow!("no layout engine"))?
             .add_measured_node(style.to_taffy(rem_size), measure)?;
 
-        Ok(Layout::new(layout_id, element_data))
+        Ok(layout_id)
     }
 }
diff --git a/crates/gpui/playground/src/paint_context.rs b/crates/gpui/playground/src/paint_context.rs
index d49cbaf6beb7ca3517f82739fd71733e4d26691b..9cd59143cfd07428773deff4abe0398f283a4f72 100644
--- a/crates/gpui/playground/src/paint_context.rs
+++ b/crates/gpui/playground/src/paint_context.rs
@@ -2,7 +2,7 @@ use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
 pub use gpui::taffy::tree::NodeId;
 use gpui::{
-    scene::EventHandler, EngineLayout, EventContext, LayoutId, PaintContext as LegacyPaintContext,
+    scene::EventHandler, EventContext, Layout, LayoutId, PaintContext as LegacyPaintContext,
     RenderContext, ViewContext,
 };
 use std::{any::TypeId, rc::Rc};
@@ -65,7 +65,7 @@ impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
         })
     }
 
-    pub(crate) fn computed_layout(&mut self, layout_id: LayoutId) -> Result<EngineLayout> {
+    pub(crate) fn computed_layout(&mut self, layout_id: LayoutId) -> Result<Layout> {
         self.layout_engine()
             .ok_or_else(|| anyhow!("no layout engine present"))?
             .computed_layout(layout_id)
diff --git a/crates/gpui/playground/src/pressable.rs b/crates/gpui/playground/src/pressable.rs
index a6d35d65c8e6b59ea501360c4953a6fda5e4acba..261ec310832363de0b334b3d6986035286125d46 100644
--- a/crates/gpui/playground/src/pressable.rs
+++ b/crates/gpui/playground/src/pressable.rs
@@ -6,7 +6,7 @@ use crate::{
     style::{Style, StyleHelpers, Styleable},
 };
 use anyhow::Result;
-use gpui::platform::MouseButtonEvent;
+use gpui::{platform::MouseButtonEvent, LayoutId};
 use refineable::{CascadeSlot, Refineable, RefinementCascade};
 use smallvec::SmallVec;
 use std::{cell::Cell, rc::Rc};
@@ -40,9 +40,13 @@ impl<E: Styleable> Styleable for Pressable<E> {
 }
 
 impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
-    type Layout = E::Layout;
+    type PaintState = E::PaintState;
 
-    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<Layout<V, Self::Layout>>
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized,
     {
@@ -52,7 +56,8 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
     fn paint(
         &mut self,
         view: &mut V,
-        layout: &mut Layout<V, Self::Layout>,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) where
         Self: Sized,
@@ -61,10 +66,9 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
         let style = self.pressed.get().then_some(self.pressed_style.clone());
         self.style_cascade().set(slot, style);
 
-        let bounds = layout.bounds(cx);
-        let order = layout.order(cx);
         let pressed = self.pressed.clone();
-        cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+        let bounds = layout.bounds;
+        cx.on_event(layout.order, move |view, event: &MouseButtonEvent, cx| {
             if event.is_down {
                 if bounds.contains_point(event.position) {
                     pressed.set(true);
@@ -76,7 +80,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
             }
         });
 
-        self.child.paint(view, layout, cx);
+        self.child.paint(view, layout, paint_state, cx);
     }
 }
 
diff --git a/crates/gpui/playground/src/text.rs b/crates/gpui/playground/src/text.rs
index 58dcaeb1f2b845fa58707efa8ec23ce061b25f3d..d43ecb0329a441356ed02b73fc49e1ba7d9cee22 100644
--- a/crates/gpui/playground/src/text.rs
+++ b/crates/gpui/playground/src/text.rs
@@ -4,7 +4,7 @@ use crate::{
     paint_context::PaintContext,
 };
 use anyhow::Result;
-use gpui::{geometry::Size, text_layout::LineLayout, RenderContext};
+use gpui::{geometry::Size, text_layout::LineLayout, LayoutId, RenderContext};
 use parking_lot::Mutex;
 use std::sync::Arc;
 
@@ -21,67 +21,71 @@ pub struct Text {
 }
 
 impl<V: 'static> Element<V> for Text {
-    type Layout = Arc<Mutex<Option<TextLayout>>>;
+    type PaintState = Arc<Mutex<Option<TextLayout>>>;
 
     fn layout(
         &mut self,
         view: &mut V,
         cx: &mut LayoutContext<V>,
-    ) -> Result<Layout<V, Self::Layout>> {
+    ) -> Result<(LayoutId, Self::PaintState)> {
         let rem_size = cx.rem_pixels();
         let fonts = cx.platform().fonts();
         let text_style = cx.text_style();
         let line_height = cx.font_cache().line_height(text_style.font_size);
         let text = self.text.clone();
-        let layout = Arc::new(Mutex::new(None));
-
-        cx.add_measured_layout_node(Default::default(), layout.clone(), move |params| {
-            let line_layout = fonts.layout_line(
-                text.as_ref(),
-                text_style.font_size,
-                &[(text.len(), text_style.to_run())],
-            );
-
-            let size = Size {
-                width: line_layout.width,
-                height: line_height,
-            };
-
-            layout.lock().replace(TextLayout {
-                line_layout: Arc::new(line_layout),
-                line_height,
-            });
-
-            size
-        })
+        let paint_state = Arc::new(Mutex::new(None));
+
+        let layout_id = cx.add_measured_layout_node(Default::default(), {
+            let paint_state = paint_state.clone();
+            move |params| {
+                let line_layout = fonts.layout_line(
+                    text.as_ref(),
+                    text_style.font_size,
+                    &[(text.len(), text_style.to_run())],
+                );
+
+                let size = Size {
+                    width: line_layout.width,
+                    height: line_height,
+                };
+
+                paint_state.lock().replace(TextLayout {
+                    line_layout: Arc::new(line_layout),
+                    line_height,
+                });
+
+                size
+            }
+        });
+
+        Ok((layout_id?, paint_state))
     }
 
     fn paint<'a>(
         &mut self,
         view: &mut V,
-        layout: &mut Layout<V, Self::Layout>,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) {
-        let element_layout = layout.update(|layout, element_data| element_data.clone());
-
         let line_layout;
         let line_height;
         {
-            let element_layout = element_layout.lock();
-            let element_layout = element_layout
+            let paint_state = paint_state.lock();
+            let paint_state = paint_state
                 .as_ref()
                 .expect("measurement has not been performed");
-            line_layout = element_layout.line_layout.clone();
-            line_height = element_layout.line_height;
+            line_layout = paint_state.line_layout.clone();
+            line_height = paint_state.line_height;
         }
 
         let text_style = cx.text_style();
         let line =
             gpui::text_layout::Line::new(line_layout, &[(self.text.len(), text_style.to_run())]);
 
-        let origin = layout.bounds(cx).origin();
+        let origin = layout.bounds.origin();
         // TODO: We haven't added visible bounds to the new element system yet, so this is a placeholder.
-        let visible_bounds = layout.bounds(cx);
+        let visible_bounds = layout.bounds;
         line.paint(cx.scene, origin, visible_bounds, line_height, cx.legacy_cx);
     }
 }
diff --git a/crates/gpui/playground_macros/src/derive_element.rs b/crates/gpui/playground_macros/src/derive_element.rs
index 66d39d68e6eac0875ec6fcc34da156b189ef67f2..482f6ccaf48b6e00dd0161c9fbdbabbc77842d7f 100644
--- a/crates/gpui/playground_macros/src/derive_element.rs
+++ b/crates/gpui/playground_macros/src/derive_element.rs
@@ -62,25 +62,26 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
         impl #impl_generics playground::element::Element<#view_type_name> for #type_name #type_generics
         #where_clause
         {
-            type Layout = playground::element::AnyElement<#view_type_name #lifetimes>;
+            type PaintState = playground::element::AnyElement<#view_type_name #lifetimes>;
 
             fn layout(
                 &mut self,
                 view: &mut V,
                 cx: &mut playground::element::LayoutContext<V>,
-            ) -> anyhow::Result<playground::element::Layout<V, Self::Layout>> {
+            ) -> anyhow::Result<(playground::element::LayoutId, Self::PaintState)> {
                 let mut rendered_element = self.render(view, cx).into_any();
                 let layout_id = rendered_element.layout(view, cx)?;
-                Ok(playground::element::Layout::new(layout_id, rendered_element))
+                Ok((layout_id, rendered_element))
             }
 
             fn paint(
                 &mut self,
                 view: &mut V,
-                layout: &mut playground::element::Layout<V, Self::Layout>,
+                layout: &playground::element::Layout,
+                rendered_element: &mut Self::PaintState,
                 cx: &mut playground::element::PaintContext<V>,
             ) {
-                layout.update(|_, rendered_element| rendered_element.paint(view, cx));
+                rendered_element.paint(view, cx);
             }
         }
 
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index a372b865fe017a56da79896d9cf002385b24515a..c243b4591a3a85e1f1c112592b9b9d234c73b99d 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1304,8 +1304,8 @@ impl LayoutEngine {
         Ok(())
     }
 
-    pub fn computed_layout(&mut self, node: LayoutId) -> Result<EngineLayout> {
-        Ok(EngineLayout::from(self.0.layout(node)?))
+    pub fn computed_layout(&mut self, node: LayoutId) -> Result<Layout> {
+        Ok(Layout::from(self.0.layout(node)?))
     }
 }
 
@@ -1329,7 +1329,7 @@ where
 }
 
 #[derive(Debug, Clone, Default)]
-pub struct EngineLayout {
+pub struct Layout {
     pub bounds: RectF,
     pub order: u32,
 }
@@ -1365,7 +1365,7 @@ impl From<taffy::prelude::AvailableSpace> for AvailableSpace {
     }
 }
 
-impl From<&taffy::tree::Layout> for EngineLayout {
+impl From<&taffy::tree::Layout> for Layout {
     fn from(value: &taffy::tree::Layout) -> Self {
         Self {
             bounds: RectF::new(
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 66e6648b0e3c37db256564bb19a888bfd4f52a0f..a0e7804a149c7482d7b2f7a353211ea8362e9128 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -7,8 +7,8 @@ pub use assets::*;
 pub mod elements;
 pub mod font_cache;
 mod image_data;
-pub use taffy;
 pub use crate::image_data::ImageData;
+pub use taffy;
 pub mod views;
 pub use font_cache::FontCache;
 mod clipboard;
@@ -29,8 +29,7 @@ pub mod keymap_matcher;
 pub mod platform;
 pub use gpui_macros::{test, Element};
 pub use window::{
-    Axis, EngineLayout, LayoutEngine, LayoutId, RectFExt, SizeConstraint, Vector2FExt,
-    WindowContext,
+    Axis, Layout, LayoutEngine, LayoutId, RectFExt, SizeConstraint, Vector2FExt, WindowContext,
 };
 
 pub use anyhow;

From 5bb780073e1f3281316886ba7f9735806ac62e79 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 25 Aug 2023 23:22:53 -0600
Subject: [PATCH 010/109] Relativize child layouts to their parent origin

---
 crates/gpui/playground/src/adapter.rs               |  2 +-
 crates/gpui/playground/src/div.rs                   |  2 +-
 crates/gpui/playground/src/element.rs               | 12 +++++++-----
 crates/gpui/playground_macros/src/derive_element.rs |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/gpui/playground/src/adapter.rs b/crates/gpui/playground/src/adapter.rs
index 7a5a0399a81224ac2a9032f791b55764d9d76f68..eff2356c94a36cffdcf08d13df9985fd7f9a025a 100644
--- a/crates/gpui/playground/src/adapter.rs
+++ b/crates/gpui/playground/src/adapter.rs
@@ -47,7 +47,7 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
         let (layout_engine, layout_id) = layout_data.take().unwrap();
         legacy_cx.push_layout_engine(layout_engine);
         let mut cx = PaintContext::new(legacy_cx, scene);
-        self.0.paint(view, &mut cx);
+        self.0.paint(view, bounds.origin(), &mut cx);
         *layout_data = legacy_cx.pop_layout_engine().zip(Some(layout_id));
         debug_assert!(layout_data.is_some());
     }
diff --git a/crates/gpui/playground/src/div.rs b/crates/gpui/playground/src/div.rs
index 75ac5d965b6dea24b77725327a2f947ad3d0bf61..ca71ede6d447c5aa36f3012316ff7630ec2db90d 100644
--- a/crates/gpui/playground/src/div.rs
+++ b/crates/gpui/playground/src/div.rs
@@ -72,7 +72,7 @@ impl<V: 'static> Element<V> for Div<V> {
         self.interaction_handlers()
             .paint(layout.order, layout.bounds, cx);
         for child in &mut self.children {
-            child.paint(view, cx);
+            child.paint(view, layout.bounds.origin(), cx);
         }
         if pop_text_style {
             cx.pop_text_style();
diff --git a/crates/gpui/playground/src/element.rs b/crates/gpui/playground/src/element.rs
index c39ee7e19671d537d9c027d837c4ca67f67f0f07..6091e17989fe54b7a95a27e1789e9eb3eef2fecd 100644
--- a/crates/gpui/playground/src/element.rs
+++ b/crates/gpui/playground/src/element.rs
@@ -1,6 +1,7 @@
 pub use crate::layout_context::LayoutContext;
 pub use crate::paint_context::PaintContext;
 use anyhow::Result;
+use gpui::geometry::vector::Vector2F;
 pub use gpui::{Layout, LayoutId};
 use smallvec::SmallVec;
 
@@ -38,7 +39,7 @@ pub trait Element<V: 'static>: 'static {
 /// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
 trait AnyStatefulElement<V> {
     fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId>;
-    fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>);
+    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>);
 }
 
 /// A wrapper around an element that stores its layout state.
@@ -91,13 +92,14 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
         result
     }
 
-    fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>) {
+    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
         self.phase = match std::mem::take(&mut self.phase) {
             ElementPhase::PostLayout {
                 layout_id,
                 mut paint_state,
             } => match cx.computed_layout(layout_id) {
-                Ok(layout) => {
+                Ok(mut layout) => {
+                    layout.bounds = layout.bounds + parent_origin;
                     self.element.paint(view, &layout, &mut paint_state, cx);
                     ElementPhase::PostPaint {
                         layout,
@@ -120,8 +122,8 @@ impl<V> AnyElement<V> {
         self.0.layout(view, cx)
     }
 
-    pub fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>) {
-        self.0.paint(view, cx)
+    pub fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
+        self.0.paint(view, parent_origin, cx)
     }
 }
 
diff --git a/crates/gpui/playground_macros/src/derive_element.rs b/crates/gpui/playground_macros/src/derive_element.rs
index 482f6ccaf48b6e00dd0161c9fbdbabbc77842d7f..180d19227d875a895676c43c8897902ba7865743 100644
--- a/crates/gpui/playground_macros/src/derive_element.rs
+++ b/crates/gpui/playground_macros/src/derive_element.rs
@@ -81,7 +81,7 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
                 rendered_element: &mut Self::PaintState,
                 cx: &mut playground::element::PaintContext<V>,
             ) {
-                rendered_element.paint(view, cx);
+                rendered_element.paint(view, layout.bounds.origin(), cx);
             }
         }
 

From b5aedc144d440de745cf94ed305a6cc55133cec8 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Mon, 28 Aug 2023 14:23:16 -0600
Subject: [PATCH 011/109] Allow layout to be called on element in any phase of
 its lifecyle.

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
---
 crates/gpui/playground/src/element.rs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/crates/gpui/playground/src/element.rs b/crates/gpui/playground/src/element.rs
index 6091e17989fe54b7a95a27e1789e9eb3eef2fecd..741ba68317ae40f7c14b3bcbd7812024b0ecd3a0 100644
--- a/crates/gpui/playground/src/element.rs
+++ b/crates/gpui/playground/src/element.rs
@@ -71,22 +71,19 @@ impl<V: 'static, E: Element<V>> Default for ElementPhase<V, E> {
 impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
     fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
         let result;
-        self.phase = match std::mem::take(&mut self.phase) {
-            ElementPhase::Init => match self.element.layout(view, cx) {
-                Ok((layout_id, paint_state)) => {
-                    result = Ok(layout_id);
-                    ElementPhase::PostLayout {
-                        layout_id,
-                        paint_state,
-                    }
+        self.phase = match self.element.layout(view, cx) {
+            Ok((layout_id, paint_state)) => {
+                result = Ok(layout_id);
+                ElementPhase::PostLayout {
+                    layout_id,
+                    paint_state,
                 }
-                Err(error) => {
-                    let message = error.to_string();
-                    result = Err(error);
-                    ElementPhase::Error(message)
-                }
-            },
-            _ => panic!("invalid element phase to call layout"),
+            }
+            Err(error) => {
+                let message = error.to_string();
+                result = Err(error);
+                ElementPhase::Error(message)
+            }
         };
 
         result

From fd1633ac4b0973fd3e3aace7866414aeee6e9521 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Mon, 28 Aug 2023 14:24:27 -0600
Subject: [PATCH 012/109] Render a titlebar you can barely see

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
---
 crates/gpui/playground/src/playground.rs | 14 ++++++++++++--
 crates/gpui/playground/src/style.rs      | 21 +++++++++++++++++++--
 crates/gpui/src/app/window.rs            |  4 ++++
 crates/gpui/src/geometry.rs              |  6 ++++++
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 88e953b8bc953d232668baeed49c48708ad2e423..58b9f9438f5c90a0577dd3d657489560c0ca36a2 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -4,8 +4,9 @@ use crate::{
 };
 use element::Element;
 use gpui::{
-    geometry::{rect::RectF, vector::vec2f},
+    geometry::{pixels, rect::RectF, vector::vec2f},
     platform::WindowOptions,
+    ViewContext,
 };
 use log::LevelFilter;
 use simplelog::SimpleLogger;
@@ -40,7 +41,7 @@ fn main() {
                 center: true,
                 ..Default::default()
             },
-            |_| view(|_| playground(&rose_pine::moon())),
+            |_| view(|cx| workspace(&rose_pine::moon(), cx)),
         );
         cx.platform().activate(true);
     });
@@ -58,3 +59,12 @@ fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
         .child(div().fill(p.pine).child(div().fill(p.love).w_6().h_3()))
         .child(div().fill(p.gold).child(div().fill(p.iris).w_3().h_3()))
 }
+
+fn workspace<V: 'static>(theme: &ThemeColors, cx: &mut ViewContext<V>) -> impl Element<V> {
+    use div::div;
+    // one line change1!
+    div()
+        .full()
+        .fill(theme.base(0.5))
+        .child(div().h(pixels(cx.titlebar_height())).fill(theme.base(0.)))
+}
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
index 0d6a53e29606845e155b8de115296a4bc9373c9b..f01f269aa623b6a2b027663209cc5c25ddd52712 100644
--- a/crates/gpui/playground/src/style.rs
+++ b/crates/gpui/playground/src/style.rs
@@ -11,8 +11,8 @@ pub use gpui::taffy::style::{
 use gpui::{
     fonts::TextStyleRefinement,
     geometry::{
-        rect::RectF, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length, Point,
-        PointRefinement, Size, SizeRefinement,
+        rect::RectF, relative, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length,
+        Point, PointRefinement, Size, SizeRefinement,
     },
     taffy,
 };
@@ -286,6 +286,23 @@ pub trait Styleable {
 pub trait StyleHelpers: Styleable<Style = Style> {
     styleable_helpers!();
 
+    fn h(mut self, height: Length) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().size.height = Some(height);
+        self
+    }
+
+    fn full(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().size.width = Some(relative(1.));
+        self.declared_style().size.height = Some(relative(1.));
+        self
+    }
+
     fn relative(mut self) -> Self
     where
         Self: Sized,
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index c243b4591a3a85e1f1c112592b9b9d234c73b99d..e1492eda997cc9df57b7bedc4b6abc1d078f2e91 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1190,6 +1190,10 @@ impl<'a> WindowContext<'a> {
         self.window.platform_window.bounds()
     }
 
+    pub fn titlebar_height(&self) -> f32 {
+        self.window.titlebar_height
+    }
+
     pub fn window_appearance(&self) -> Appearance {
         self.window.appearance
     }
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index db9af34516f5c12b798fd151f980c155b7224dee..c6312b18c440bd7caf20f1396481c01a0cccc9c9 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -387,3 +387,9 @@ impl Default for Length {
         Self::Definite(DefiniteLength::default())
     }
 }
+
+impl From<()> for Length {
+    fn from(_: ()) -> Self {
+        Self::Definite(DefiniteLength::default())
+    }
+}

From 9371754942d16ea00e08c00513e52a7a196f0f46 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Mon, 28 Aug 2023 15:13:59 -0600
Subject: [PATCH 013/109] Provide themes to subtrees via context

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
---
 crates/gpui/playground/src/div.rs           |  3 +-
 crates/gpui/playground/src/element.rs       | 15 +++-
 crates/gpui/playground/src/paint_context.rs | 19 -----
 crates/gpui/playground/src/playground.rs    | 78 +++++++++++++++------
 crates/gpui/playground/src/style.rs         | 32 +++++++++
 crates/gpui/playground/src/themes.rs        | 63 ++++++++++++++++-
 crates/gpui/src/app.rs                      | 27 +------
 crates/gpui/src/app/window.rs               | 41 ++++++++++-
 8 files changed, 205 insertions(+), 73 deletions(-)

diff --git a/crates/gpui/playground/src/div.rs b/crates/gpui/playground/src/div.rs
index ca71ede6d447c5aa36f3012316ff7630ec2db90d..79d539b221354c568195aa8e9b4c111142063b08 100644
--- a/crates/gpui/playground/src/div.rs
+++ b/crates/gpui/playground/src/div.rs
@@ -65,7 +65,8 @@ impl<V: 'static> Element<V> for Div<V> {
     {
         let style = &self.computed_style();
         let pop_text_style = style.text_style().map_or(false, |style| {
-            cx.push_text_style(cx.text_style().clone().refined(&style));
+            let style = cx.text_style().clone().refined(&style);
+            cx.push_text_style(style);
             true
         });
         style.paint_background(layout.bounds, cx);
diff --git a/crates/gpui/playground/src/element.rs b/crates/gpui/playground/src/element.rs
index 741ba68317ae40f7c14b3bcbd7812024b0ecd3a0..2ebe07f5fd75202110bc6785980ca23110baebb0 100644
--- a/crates/gpui/playground/src/element.rs
+++ b/crates/gpui/playground/src/element.rs
@@ -1,5 +1,8 @@
+use std::marker::PhantomData;
+
 pub use crate::layout_context::LayoutContext;
 pub use crate::paint_context::PaintContext;
+use crate::themes::{Theme, Themed};
 use anyhow::Result;
 use gpui::geometry::vector::Vector2F;
 pub use gpui::{Layout, LayoutId};
@@ -34,6 +37,17 @@ pub trait Element<V: 'static>: 'static {
             phase: ElementPhase::Init,
         }))
     }
+
+    fn themed(self, theme: Theme) -> Themed<V, Self>
+    where
+        Self: Sized,
+    {
+        crate::themes::Themed {
+            child: self,
+            theme,
+            view_type: PhantomData,
+        }
+    }
 }
 
 /// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
@@ -85,7 +99,6 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
                 ElementPhase::Error(message)
             }
         };
-
         result
     }
 
diff --git a/crates/gpui/playground/src/paint_context.rs b/crates/gpui/playground/src/paint_context.rs
index 9cd59143cfd07428773deff4abe0398f283a4f72..0760b13cd33396b3d8c14e907c7ea8dc46eca1ae 100644
--- a/crates/gpui/playground/src/paint_context.rs
+++ b/crates/gpui/playground/src/paint_context.rs
@@ -3,7 +3,6 @@ use derive_more::{Deref, DerefMut};
 pub use gpui::taffy::tree::NodeId;
 use gpui::{
     scene::EventHandler, EventContext, Layout, LayoutId, PaintContext as LegacyPaintContext,
-    RenderContext, ViewContext,
 };
 use std::{any::TypeId, rc::Rc};
 
@@ -15,24 +14,6 @@ pub struct PaintContext<'a, 'b, 'c, 'd, V> {
     pub(crate) scene: &'d mut gpui::SceneBuilder,
 }
 
-impl<'a, 'b, V> RenderContext<'a, 'b, V> for PaintContext<'a, 'b, '_, '_, V> {
-    fn text_style(&self) -> gpui::fonts::TextStyle {
-        self.legacy_cx.text_style()
-    }
-
-    fn push_text_style(&mut self, style: gpui::fonts::TextStyle) {
-        self.legacy_cx.push_text_style(style)
-    }
-
-    fn pop_text_style(&mut self) {
-        self.legacy_cx.pop_text_style()
-    }
-
-    fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
-        &mut self.view_context
-    }
-}
-
 impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
     pub fn new(
         legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 58b9f9438f5c90a0577dd3d657489560c0ca36a2..59c9113fd40133d0e2036acd5827bccd172c2670 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -1,16 +1,15 @@
 #![allow(dead_code, unused_variables)]
-use crate::{
-    color::black, element::ParentElement, style::StyleHelpers, themes::rose_pine::RosePinePalette,
-};
-use element::Element;
+use crate::{element::ParentElement, style::StyleHelpers};
+use element::{Element, IntoElement};
 use gpui::{
     geometry::{pixels, rect::RectF, vector::vec2f},
     platform::WindowOptions,
     ViewContext,
 };
 use log::LevelFilter;
+use playground_macros::Element;
 use simplelog::SimpleLogger;
-use themes::{rose_pine, ThemeColors};
+use themes::{current_theme, rose_pine, Theme, ThemeColors};
 use view::view;
 
 mod adapter;
@@ -41,30 +40,63 @@ fn main() {
                 center: true,
                 ..Default::default()
             },
-            |_| view(|cx| workspace(&rose_pine::moon(), cx)),
+            |_| {
+                view(|cx| {
+                    playground(Theme {
+                        colors: rose_pine::dawn(),
+                    })
+                })
+            },
         );
         cx.platform().activate(true);
     });
 }
 
-fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
-    use div::div;
-    let p = RosePinePalette::dawn();
+fn playground<V: 'static>(theme: Theme) -> impl Element<V> {
+    workspace().themed(theme)
+}
 
-    div()
-        .text_color(black())
-        .h_full()
-        .w_full()
-        .fill(p.rose)
-        .child(div().fill(p.pine).child(div().fill(p.love).w_6().h_3()))
-        .child(div().fill(p.gold).child(div().fill(p.iris).w_3().h_3()))
+fn workspace<V: 'static>() -> impl Element<V> {
+    WorkspaceElement
 }
 
-fn workspace<V: 'static>(theme: &ThemeColors, cx: &mut ViewContext<V>) -> impl Element<V> {
-    use div::div;
-    // one line change1!
-    div()
-        .full()
-        .fill(theme.base(0.5))
-        .child(div().h(pixels(cx.titlebar_height())).fill(theme.base(0.)))
+use crate as playground;
+#[derive(Element)]
+struct WorkspaceElement;
+
+impl WorkspaceElement {
+    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl Element<V> {
+        use div::div;
+        let theme = &cx.theme::<Theme>().colors;
+        // one line change1!
+        div()
+            .full()
+            .flex()
+            .flex_col()
+            .fill(theme.base(0.5))
+            .child(self.title_bar(cx))
+            .child(self.stage(cx))
+            .child(self.status_bar(cx))
+    }
+
+    fn title_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        use div::div;
+
+        let theme = &current_theme(cx).colors;
+        div().h(pixels(cx.titlebar_height())).fill(theme.base(0.))
+    }
+
+    fn status_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        use div::div;
+
+        let theme = &current_theme(cx).colors;
+        div().h(pixels(cx.titlebar_height())).fill(theme.base(0.))
+    }
+
+    fn stage<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        use div::div;
+
+        let theme = &current_theme(cx).colors;
+        div().flex_grow()
+    }
 }
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
index f01f269aa623b6a2b027663209cc5c25ddd52712..d2f639fdc2fa2e938cee5a71af5c25baf5779225 100644
--- a/crates/gpui/playground/src/style.rs
+++ b/crates/gpui/playground/src/style.rs
@@ -327,6 +327,38 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
+    fn flex(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().display = Some(Display::Flex);
+        self
+    }
+
+    fn flex_col(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_direction = Some(FlexDirection::Column);
+        self
+    }
+
+    fn flex_row(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_direction = Some(FlexDirection::Row);
+        self
+    }
+
+    fn flex_grow(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_grow = Some(1.);
+        self
+    }
+
     fn fill<F>(mut self, fill: F) -> Self
     where
         F: Into<Fill>,
diff --git a/crates/gpui/playground/src/themes.rs b/crates/gpui/playground/src/themes.rs
index 320d2c58136aced156c71ae4e8d2f4bc404308b0..ce57c8c147270876c847e1192052069f12b7b974 100644
--- a/crates/gpui/playground/src/themes.rs
+++ b/crates/gpui/playground/src/themes.rs
@@ -1,8 +1,23 @@
-use crate::color::{Hsla, Lerp};
-use std::ops::Range;
+use crate::{
+    color::{Hsla, Lerp},
+    element::{Element, PaintContext},
+    layout_context::LayoutContext,
+};
+use gpui::{AppContext, WindowContext};
+use std::{marker::PhantomData, ops::Range};
 
 pub mod rose_pine;
 
+#[derive(Clone, Debug)]
+pub struct Theme {
+    pub colors: ThemeColors,
+}
+
+pub fn current_theme<'a>(cx: &'a WindowContext) -> &'a Theme {
+    cx.theme::<Theme>()
+}
+
+#[derive(Clone, Debug)]
 pub struct ThemeColors {
     pub base: Range<Hsla>,
     pub surface: Range<Hsla>,
@@ -22,6 +37,12 @@ pub struct ThemeColors {
 }
 
 impl ThemeColors {
+    fn current(cx: &AppContext) -> &Self {
+        cx.global::<Vec<Self>>()
+            .last()
+            .expect("must call within a theme provider")
+    }
+
     pub fn base(&self, level: f32) -> Hsla {
         self.base.lerp(level)
     }
@@ -82,3 +103,41 @@ impl ThemeColors {
         self.modified.lerp(level)
     }
 }
+
+pub struct Themed<V: 'static, E> {
+    pub(crate) theme: Theme,
+    pub(crate) child: E,
+    pub(crate) view_type: PhantomData<V>,
+}
+
+impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
+    type PaintState = E::PaintState;
+
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> anyhow::Result<(gpui::LayoutId, Self::PaintState)>
+    where
+        Self: Sized,
+    {
+        cx.push_theme(self.theme.clone());
+        let result = self.child.layout(view, cx);
+        cx.pop_theme();
+        result
+    }
+
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &gpui::Layout,
+        state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        cx.push_theme(self.theme.clone());
+        self.child.paint(view, layout, state, cx);
+        cx.pop_theme();
+    }
+}
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index a2536e0b4a558e1b8ca59b9b9dd8cc9795ae58e8..4750c71ea2f58c9832cda6a8fa59a005a882aa19 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3619,36 +3619,11 @@ impl<V> BorrowWindowContext for LayoutContext<'_, '_, '_, V> {
 
 pub struct PaintContext<'a, 'b, 'c, V> {
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
-    text_style_stack: Vec<TextStyle>,
 }
 
 impl<'a, 'b, 'c, V> PaintContext<'a, 'b, 'c, V> {
     pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>) -> Self {
-        Self {
-            view_context,
-            text_style_stack: Vec::new(),
-        }
-    }
-}
-
-impl<'a, 'b, 'c, V> RenderContext<'a, 'b, V> for PaintContext<'a, 'b, 'c, V> {
-    fn text_style(&self) -> TextStyle {
-        self.text_style_stack
-            .last()
-            .cloned()
-            .unwrap_or(TextStyle::default(&self.font_cache))
-    }
-
-    fn push_text_style(&mut self, style: TextStyle) {
-        self.text_style_stack.push(style);
-    }
-
-    fn pop_text_style(&mut self) {
-        self.text_style_stack.pop();
-    }
-
-    fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
-        &mut self.view_context
+        Self { view_context }
     }
 }
 
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index e1492eda997cc9df57b7bedc4b6abc1d078f2e91..e1811b6655b8e068fe8e9c962dd6b0e573460f24 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1,5 +1,6 @@
 use crate::{
     elements::AnyRootElement,
+    fonts::TextStyle,
     geometry::{rect::RectF, Size},
     json::ToJson,
     keymap_matcher::{Binding, KeymapContext, Keystroke, MatchResult},
@@ -30,7 +31,7 @@ use sqlez::{
     statement::Statement,
 };
 use std::{
-    any::TypeId,
+    any::{type_name, Any, TypeId},
     mem,
     ops::{Deref, DerefMut, Range, Sub},
 };
@@ -53,6 +54,8 @@ pub struct Window {
     pub(crate) invalidation: Option<WindowInvalidation>,
     pub(crate) platform_window: Box<dyn platform::Window>,
     pub(crate) rendered_views: HashMap<usize, Box<dyn AnyRootElement>>,
+    pub(crate) text_style_stack: Vec<TextStyle>,
+    pub(crate) theme_stack: Vec<Box<dyn Any>>,
     titlebar_height: f32,
     appearance: Appearance,
     cursor_regions: Vec<CursorRegion>,
@@ -100,6 +103,8 @@ impl Window {
             clicked_region: None,
             titlebar_height,
             appearance,
+            text_style_stack: Vec::new(),
+            theme_stack: Vec::new(),
         };
 
         let mut window_context = WindowContext::mutable(cx, &mut window, handle);
@@ -1265,6 +1270,40 @@ impl<'a> WindowContext<'a> {
         };
         handle
     }
+
+    pub fn text_style(&self) -> TextStyle {
+        self.window
+            .text_style_stack
+            .last()
+            .cloned()
+            .unwrap_or(TextStyle::default(&self.font_cache))
+    }
+
+    pub fn push_text_style(&mut self, style: TextStyle) {
+        self.window.text_style_stack.push(style);
+    }
+
+    pub fn pop_text_style(&mut self) {
+        self.window.text_style_stack.pop();
+    }
+
+    pub fn theme<T: 'static>(&self) -> &T {
+        self.window
+            .theme_stack
+            .iter()
+            .rev()
+            .find_map(|theme| theme.downcast_ref())
+            .ok_or_else(|| anyhow!("no theme provided of type {}", type_name::<T>()))
+            .unwrap()
+    }
+
+    pub fn push_theme<T: 'static>(&mut self, theme: T) {
+        self.window.theme_stack.push(Box::new(theme));
+    }
+
+    pub fn pop_theme(&mut self) {
+        self.window.theme_stack.pop();
+    }
 }
 
 #[derive(Default)]

From a56fab8c11fee981c01dc1858fecdbe6b5240bb5 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 29 Aug 2023 18:30:57 -0600
Subject: [PATCH 014/109] Remove unused proc macro

---
 .../src/playground_macros.rs                  |  6 --
 .../playground_macros/src/tailwind_lengths.rs | 99 -------------------
 2 files changed, 105 deletions(-)
 delete mode 100644 crates/gpui/playground_macros/src/tailwind_lengths.rs

diff --git a/crates/gpui/playground_macros/src/playground_macros.rs b/crates/gpui/playground_macros/src/playground_macros.rs
index ce5cb6ba59591c031754cd67723b5eba43c9b5b4..fbb0d06ed58a5f2444355f2dcbe9bf388d96770b 100644
--- a/crates/gpui/playground_macros/src/playground_macros.rs
+++ b/crates/gpui/playground_macros/src/playground_macros.rs
@@ -3,7 +3,6 @@ use proc_macro::TokenStream;
 mod derive_element;
 mod derive_into_element;
 mod styleable_helpers;
-mod tailwind_lengths;
 
 #[proc_macro]
 pub fn styleable_helpers(args: TokenStream) -> TokenStream {
@@ -19,8 +18,3 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
 pub fn derive_into_element(input: TokenStream) -> TokenStream {
     derive_into_element::derive_into_element(input)
 }
-
-#[proc_macro_attribute]
-pub fn tailwind_lengths(attr: TokenStream, item: TokenStream) -> TokenStream {
-    tailwind_lengths::tailwind_lengths(attr, item)
-}
diff --git a/crates/gpui/playground_macros/src/tailwind_lengths.rs b/crates/gpui/playground_macros/src/tailwind_lengths.rs
deleted file mode 100644
index 96c7d29947fd65fd3facc1d8998cf88eb2768e4f..0000000000000000000000000000000000000000
--- a/crates/gpui/playground_macros/src/tailwind_lengths.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use proc_macro::TokenStream;
-use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
-use syn::{parse_macro_input, FnArg, ItemFn, PatType};
-
-pub fn tailwind_lengths(_attr: TokenStream, item: TokenStream) -> TokenStream {
-    let input_function = parse_macro_input!(item as ItemFn);
-
-    let visibility = &input_function.vis;
-    let function_signature = input_function.sig.clone();
-    let function_body = input_function.block;
-    let where_clause = &function_signature.generics.where_clause;
-
-    let argument_name = match function_signature.inputs.iter().nth(1) {
-        Some(FnArg::Typed(PatType { pat, .. })) => pat,
-        _ => panic!("Couldn't find the second argument in the function signature"),
-    };
-
-    let mut output_functions = TokenStream2::new();
-
-    for (length, value) in fixed_lengths() {
-        let function_name = format_ident!("{}{}", function_signature.ident, length);
-        output_functions.extend(quote! {
-            #visibility fn #function_name(mut self) -> Self #where_clause {
-                let #argument_name = #value.into();
-                #function_body
-            }
-        });
-    }
-
-    output_functions.into()
-}
-
-fn fixed_lengths() -> Vec<(&'static str, TokenStream2)> {
-    vec![
-        ("0", quote! { DefinedLength::Pixels(0.) }),
-        ("px", quote! { DefinedLength::Pixels(1.) }),
-        ("0_5", quote! { DefinedLength::Rems(0.125) }),
-        ("1", quote! { DefinedLength::Rems(0.25) }),
-        ("1_5", quote! { DefinedLength::Rems(0.375) }),
-        ("2", quote! { DefinedLength::Rems(0.5) }),
-        ("2_5", quote! { DefinedLength::Rems(0.625) }),
-        ("3", quote! { DefinedLength::Rems(0.75) }),
-        ("3_5", quote! { DefinedLength::Rems(0.875) }),
-        ("4", quote! { DefinedLength::Rems(1.) }),
-        ("5", quote! { DefinedLength::Rems(1.25) }),
-        ("6", quote! { DefinedLength::Rems(1.5) }),
-        ("7", quote! { DefinedLength::Rems(1.75) }),
-        ("8", quote! { DefinedLength::Rems(2.) }),
-        ("9", quote! { DefinedLength::Rems(2.25) }),
-        ("10", quote! { DefinedLength::Rems(2.5) }),
-        ("11", quote! { DefinedLength::Rems(2.75) }),
-        ("12", quote! { DefinedLength::Rems(3.) }),
-        ("14", quote! { DefinedLength::Rems(3.5) }),
-        ("16", quote! { DefinedLength::Rems(4.) }),
-        ("20", quote! { DefinedLength::Rems(5.) }),
-        ("24", quote! { DefinedLength::Rems(6.) }),
-        ("28", quote! { DefinedLength::Rems(7.) }),
-        ("32", quote! { DefinedLength::Rems(8.) }),
-        ("36", quote! { DefinedLength::Rems(9.) }),
-        ("40", quote! { DefinedLength::Rems(10.) }),
-        ("44", quote! { DefinedLength::Rems(11.) }),
-        ("48", quote! { DefinedLength::Rems(12.) }),
-        ("52", quote! { DefinedLength::Rems(13.) }),
-        ("56", quote! { DefinedLength::Rems(14.) }),
-        ("60", quote! { DefinedLength::Rems(15.) }),
-        ("64", quote! { DefinedLength::Rems(16.) }),
-        ("72", quote! { DefinedLength::Rems(18.) }),
-        ("80", quote! { DefinedLength::Rems(20.) }),
-        ("96", quote! { DefinedLength::Rems(24.) }),
-        ("half", quote! { DefinedLength::Percent(50.) }),
-        ("1_3rd", quote! { DefinedLength::Percent(33.333333) }),
-        ("2_3rd", quote! { DefinedLength::Percent(66.666667) }),
-        ("1_4th", quote! { DefinedLength::Percent(25.) }),
-        ("2_4th", quote! { DefinedLength::Percent(50.) }),
-        ("3_4th", quote! { DefinedLength::Percent(75.) }),
-        ("1_5th", quote! { DefinedLength::Percent(20.) }),
-        ("2_5th", quote! { DefinedLength::Percent(40.) }),
-        ("3_5th", quote! { DefinedLength::Percent(60.) }),
-        ("4_5th", quote! { DefinedLength::Percent(80.) }),
-        ("1_6th", quote! { DefinedLength::Percent(16.666667) }),
-        ("2_6th", quote! { DefinedLength::Percent(33.333333) }),
-        ("3_6th", quote! { DefinedLength::Percent(50.) }),
-        ("4_6th", quote! { DefinedLength::Percent(66.666667) }),
-        ("5_6th", quote! { DefinedLength::Percent(83.333333) }),
-        ("1_12th", quote! { DefinedLength::Percent(8.333333) }),
-        ("2_12th", quote! { DefinedLength::Percent(16.666667) }),
-        ("3_12th", quote! { DefinedLength::Percent(25.) }),
-        ("4_12th", quote! { DefinedLength::Percent(33.333333) }),
-        ("5_12th", quote! { DefinedLength::Percent(41.666667) }),
-        ("6_12th", quote! { DefinedLength::Percent(50.) }),
-        ("7_12th", quote! { DefinedLength::Percent(58.333333) }),
-        ("8_12th", quote! { DefinedLength::Percent(66.666667) }),
-        ("9_12th", quote! { DefinedLength::Percent(75.) }),
-        ("10_12th", quote! { DefinedLength::Percent(83.333333) }),
-        ("11_12th", quote! { DefinedLength::Percent(91.666667) }),
-        ("full", quote! { DefinedLength::Percent(100.) }),
-    ]
-}

From a0b6e500cf5bdb62b1729980e622b53ecfa253ae Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 29 Aug 2023 18:40:24 -0600
Subject: [PATCH 015/109] WIP

---
 crates/gpui/playground/src/components.rs      | 11 ++--
 crates/gpui/playground/src/interactive.rs     |  1 -
 crates/gpui/playground/src/playground.rs      | 56 ++-----------------
 crates/gpui/playground/src/themes.rs          |  2 +-
 crates/gpui/playground/src/workspace.rs       | 45 +++++++++++++++
 .../playground_macros/src/derive_element.rs   |  2 +-
 6 files changed, 58 insertions(+), 59 deletions(-)
 create mode 100644 crates/gpui/playground/src/workspace.rs

diff --git a/crates/gpui/playground/src/components.rs b/crates/gpui/playground/src/components.rs
index 304e8bc9e98d1de60669ee586ccaa26a1273f3b5..73dca57f359bc2b17bcbec45e0385cc7c103280c 100644
--- a/crates/gpui/playground/src/components.rs
+++ b/crates/gpui/playground/src/components.rs
@@ -1,10 +1,10 @@
 use crate::{
     div::div,
-    element::{Element, ParentElement},
+    element::{IntoElement, ParentElement},
     interactive::Interactive,
     style::StyleHelpers,
     text::ArcCow,
-    themes::rose_pine,
+    themes::Theme,
 };
 use gpui::{platform::MouseButton, ViewContext};
 use playground_macros::Element;
@@ -81,10 +81,11 @@ impl<V: 'static, D: 'static> Button<V, D> {
         &mut self,
         view: &mut V,
         cx: &mut ViewContext<V>,
-    ) -> impl Element<V> + Interactive<V> {
-        // TODO: Drive theme from the context
+    ) -> impl IntoElement<V> + Interactive<V> {
+        let colors = &cx.theme::<Theme>().colors;
+
         let button = div()
-            .fill(rose_pine::dawn().error(0.5))
+            .fill(colors.error(0.5))
             .h_4()
             .children(self.label.clone());
 
diff --git a/crates/gpui/playground/src/interactive.rs b/crates/gpui/playground/src/interactive.rs
index e91436499ca06ba1dce11d2ca1e8e82287a97b47..3afe928b3e6dad9f09abac49c768df106903b2dd 100644
--- a/crates/gpui/playground/src/interactive.rs
+++ b/crates/gpui/playground/src/interactive.rs
@@ -11,7 +11,6 @@ use crate::element::PaintContext;
 pub trait Interactive<V: 'static> {
     fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V>;
 
-    // One line change.
     fn on_mouse_down(
         mut self,
         button: MouseButton,
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 59c9113fd40133d0e2036acd5827bccd172c2670..6d05d19a66cc789db6dc85aa9fa0ebe8d9173458 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -1,16 +1,14 @@
 #![allow(dead_code, unused_variables)]
-use crate::{element::ParentElement, style::StyleHelpers};
-use element::{Element, IntoElement};
+use element::Element;
 use gpui::{
-    geometry::{pixels, rect::RectF, vector::vec2f},
+    geometry::{rect::RectF, vector::vec2f},
     platform::WindowOptions,
-    ViewContext,
 };
 use log::LevelFilter;
-use playground_macros::Element;
 use simplelog::SimpleLogger;
-use themes::{current_theme, rose_pine, Theme, ThemeColors};
+use themes::{rose_pine, Theme, ThemeColors};
 use view::view;
+use workspace::workspace;
 
 mod adapter;
 mod color;
@@ -26,6 +24,7 @@ mod style;
 mod text;
 mod themes;
 mod view;
+mod workspace;
 
 fn main() {
     SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
@@ -55,48 +54,3 @@ fn main() {
 fn playground<V: 'static>(theme: Theme) -> impl Element<V> {
     workspace().themed(theme)
 }
-
-fn workspace<V: 'static>() -> impl Element<V> {
-    WorkspaceElement
-}
-
-use crate as playground;
-#[derive(Element)]
-struct WorkspaceElement;
-
-impl WorkspaceElement {
-    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl Element<V> {
-        use div::div;
-        let theme = &cx.theme::<Theme>().colors;
-        // one line change1!
-        div()
-            .full()
-            .flex()
-            .flex_col()
-            .fill(theme.base(0.5))
-            .child(self.title_bar(cx))
-            .child(self.stage(cx))
-            .child(self.status_bar(cx))
-    }
-
-    fn title_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        use div::div;
-
-        let theme = &current_theme(cx).colors;
-        div().h(pixels(cx.titlebar_height())).fill(theme.base(0.))
-    }
-
-    fn status_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        use div::div;
-
-        let theme = &current_theme(cx).colors;
-        div().h(pixels(cx.titlebar_height())).fill(theme.base(0.))
-    }
-
-    fn stage<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        use div::div;
-
-        let theme = &current_theme(cx).colors;
-        div().flex_grow()
-    }
-}
diff --git a/crates/gpui/playground/src/themes.rs b/crates/gpui/playground/src/themes.rs
index ce57c8c147270876c847e1192052069f12b7b974..4057491eed33bcfd6722eba10454f84cf67cc948 100644
--- a/crates/gpui/playground/src/themes.rs
+++ b/crates/gpui/playground/src/themes.rs
@@ -13,7 +13,7 @@ pub struct Theme {
     pub colors: ThemeColors,
 }
 
-pub fn current_theme<'a>(cx: &'a WindowContext) -> &'a Theme {
+pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
     cx.theme::<Theme>()
 }
 
diff --git a/crates/gpui/playground/src/workspace.rs b/crates/gpui/playground/src/workspace.rs
new file mode 100644
index 0000000000000000000000000000000000000000..bae8f80c24ad17ba465f0a3ae6355334f3e90872
--- /dev/null
+++ b/crates/gpui/playground/src/workspace.rs
@@ -0,0 +1,45 @@
+use crate::div::div;
+use crate::element::{IntoElement, ParentElement};
+use crate::style::StyleHelpers;
+use crate::themes::theme;
+use crate::{element::Element, themes::Theme};
+use gpui::geometry::pixels;
+use gpui::ViewContext;
+use playground_macros::Element;
+
+use crate as playground;
+#[derive(Element)]
+struct WorkspaceElement;
+
+pub fn workspace<V: 'static>() -> impl Element<V> {
+    WorkspaceElement
+}
+
+impl WorkspaceElement {
+    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = &cx.theme::<Theme>().colors;
+        div()
+            .full()
+            .flex()
+            .flex_col()
+            .fill(theme.base(0.5))
+            .child(self.title_bar(cx))
+            .child(self.stage(cx))
+            .child(self.status_bar(cx))
+    }
+
+    fn title_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let colors = &theme(cx).colors;
+        div().h(pixels(cx.titlebar_height())).fill(colors.base(0.))
+    }
+
+    fn status_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let colors = &theme(cx).colors;
+        div().h(pixels(cx.titlebar_height())).fill(colors.base(0.))
+    }
+
+    fn stage<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let colors = &theme(cx).colors;
+        div().flex_grow()
+    }
+}
diff --git a/crates/gpui/playground_macros/src/derive_element.rs b/crates/gpui/playground_macros/src/derive_element.rs
index 180d19227d875a895676c43c8897902ba7865743..82fb63574a0d63d2969d3b9cb352fba737f8a860 100644
--- a/crates/gpui/playground_macros/src/derive_element.rs
+++ b/crates/gpui/playground_macros/src/derive_element.rs
@@ -69,7 +69,7 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
                 view: &mut V,
                 cx: &mut playground::element::LayoutContext<V>,
             ) -> anyhow::Result<(playground::element::LayoutId, Self::PaintState)> {
-                let mut rendered_element = self.render(view, cx).into_any();
+                let mut rendered_element = self.render(view, cx).into_element().into_any();
                 let layout_id = rendered_element.layout(view, cx)?;
                 Ok((layout_id, rendered_element))
             }

From 42cd257287016075e470e69726e797e45d1e84bb Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 29 Aug 2023 21:33:08 -0600
Subject: [PATCH 016/109] Remove text style stack from LayoutContext

---
 crates/gpui/src/app.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index db6c19405573018fb509926196d035c8f4642399..2a12470a4048447259f5acdb6562aa27c1ec6dd4 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3463,7 +3463,6 @@ pub struct LayoutContext<'a, 'b, 'c, V> {
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
     new_parents: &'c mut HashMap<usize, usize>,
     views_to_notify_if_ancestors_change: &'c mut HashMap<usize, SmallVec<[usize; 2]>>,
-    text_style_stack: Vec<TextStyle>,
     pub refreshing: bool,
 }
 
@@ -3478,7 +3477,6 @@ impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
             view_context,
             new_parents,
             views_to_notify_if_ancestors_change,
-            text_style_stack: Vec::new(),
             refreshing,
         }
     }
@@ -3544,18 +3542,19 @@ impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
 
 impl<'a, 'b, 'c, V> RenderContext<'a, 'b, V> for LayoutContext<'a, 'b, 'c, V> {
     fn text_style(&self) -> TextStyle {
-        self.text_style_stack
+        self.window
+            .text_style_stack
             .last()
             .cloned()
             .unwrap_or(TextStyle::default(&self.font_cache))
     }
 
     fn push_text_style(&mut self, style: TextStyle) {
-        self.text_style_stack.push(style);
+        self.window.text_style_stack.push(style);
     }
 
     fn pop_text_style(&mut self) {
-        self.text_style_stack.pop();
+        self.window.text_style_stack.pop();
     }
 
     fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {

From 2e7356a53e7750e746a3fe84414d72892f124c1e Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 29 Aug 2023 21:43:48 -0600
Subject: [PATCH 017/109] Store new_parents on Window instead of layout context

---
 crates/editor/src/element.rs     | 32 ++++----------------------------
 crates/gpui/src/app.rs           | 12 ++----------
 crates/gpui/src/app/window.rs    | 15 ++++++++-------
 crates/gpui/src/elements.rs      |  9 +--------
 crates/gpui/src/elements/list.rs | 31 +++++--------------------------
 crates/gpui/src/elements/text.rs |  9 ++-------
 6 files changed, 22 insertions(+), 86 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 62f4c8c8065e8eb24ef24e7b1c98e75168034f43..32b84a76c11de9b5e0e5ccf4a3e245684a644598 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -3204,14 +3204,8 @@ mod tests {
                     Point::new(5, 6)..Point::new(6, 0),
                 ]);
             });
-            let mut new_parents = Default::default();
             let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
+            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3296,14 +3290,8 @@ mod tests {
                     DisplayPoint::new(10, 0)..DisplayPoint::new(13, 0),
                 ]);
             });
-            let mut new_parents = Default::default();
             let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
+            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3363,14 +3351,8 @@ mod tests {
 
         let mut element = EditorElement::new(editor.read_with(cx, |editor, cx| editor.style(cx)));
         let (size, mut state) = editor.update(cx, |editor, cx| {
-            let mut new_parents = Default::default();
             let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
+            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3567,14 +3549,8 @@ mod tests {
             editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
             editor.set_wrap_width(Some(editor_width), cx);
 
-            let mut new_parents = Default::default();
             let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
+            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
             element.layout(
                 SizeConstraint::new(vec2f(editor_width, 500.), vec2f(editor_width, 500.)),
                 editor,
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 2a12470a4048447259f5acdb6562aa27c1ec6dd4..552f57ba915f210a0481d454ed296b1174ef7f8e 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3461,7 +3461,6 @@ pub trait RenderContext<'a, 'b, V> {
 pub struct LayoutContext<'a, 'b, 'c, V> {
     // Nathan: Making this is public while I work on playground.
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
-    new_parents: &'c mut HashMap<usize, usize>,
     views_to_notify_if_ancestors_change: &'c mut HashMap<usize, SmallVec<[usize; 2]>>,
     pub refreshing: bool,
 }
@@ -3469,13 +3468,11 @@ pub struct LayoutContext<'a, 'b, 'c, V> {
 impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
     pub fn new(
         view_context: &'c mut ViewContext<'a, 'b, V>,
-        new_parents: &'c mut HashMap<usize, usize>,
         views_to_notify_if_ancestors_change: &'c mut HashMap<usize, SmallVec<[usize; 2]>>,
         refreshing: bool,
     ) -> Self {
         Self {
             view_context,
-            new_parents,
             views_to_notify_if_ancestors_change,
             refreshing,
         }
@@ -6529,14 +6526,9 @@ mod tests {
         view_1.update(cx, |_, cx| {
             view_2.update(cx, |_, cx| {
                 // Sanity check
-                let mut new_parents = Default::default();
                 let mut notify_views_if_parents_change = Default::default();
-                let mut layout_cx = LayoutContext::new(
-                    cx,
-                    &mut new_parents,
-                    &mut notify_views_if_parents_change,
-                    false,
-                );
+                let mut layout_cx =
+                    LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
                 assert_eq!(
                     layout_cx
                         .keystrokes_for_action(view_1_id, &Action1)
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index f912ee46f56a9432d02949e6a070f176da410f62..c62722ac2dab4209c76ce7a435df8fc424597f0e 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -56,6 +56,7 @@ pub struct Window {
     pub(crate) rendered_views: HashMap<usize, Box<dyn AnyRootElement>>,
     pub(crate) text_style_stack: Vec<TextStyle>,
     pub(crate) theme_stack: Vec<Box<dyn Any>>,
+    pub(crate) new_parents: HashMap<usize, usize>,
     titlebar_height: f32,
     appearance: Appearance,
     cursor_regions: Vec<CursorRegion>,
@@ -92,6 +93,9 @@ impl Window {
             is_fullscreen: false,
             platform_window,
             rendered_views: Default::default(),
+            text_style_stack: Vec::new(),
+            theme_stack: Vec::new(),
+            new_parents: HashMap::default(),
             cursor_regions: Default::default(),
             mouse_regions: Default::default(),
             event_handlers: Default::default(),
@@ -103,8 +107,6 @@ impl Window {
             clicked_region: None,
             titlebar_height,
             appearance,
-            text_style_stack: Vec::new(),
-            theme_stack: Vec::new(),
         };
 
         let mut window_context = WindowContext::mutable(cx, &mut window, handle);
@@ -998,11 +1000,9 @@ impl<'a> WindowContext<'a> {
 
         let mut rendered_root = self.window.rendered_views.remove(&root_view_id).unwrap();
 
-        let mut new_parents = HashMap::default();
         let mut views_to_notify_if_ancestors_change = HashMap::default();
         rendered_root.layout(
             SizeConstraint::new(window_size, window_size),
-            &mut new_parents,
             &mut views_to_notify_if_ancestors_change,
             refreshing,
             self,
@@ -1012,7 +1012,7 @@ impl<'a> WindowContext<'a> {
             let mut current_view_id = view_id;
             loop {
                 let old_parent_id = self.window.parents.get(&current_view_id);
-                let new_parent_id = new_parents.get(&current_view_id);
+                let new_parent_id = self.window.new_parents.get(&current_view_id);
                 if old_parent_id.is_none() && new_parent_id.is_none() {
                     break;
                 } else if old_parent_id == new_parent_id {
@@ -1027,6 +1027,7 @@ impl<'a> WindowContext<'a> {
             }
         }
 
+        let new_parents = mem::take(&mut self.window.new_parents);
         let old_parents = mem::replace(&mut self.window.parents, new_parents);
         self.window
             .rendered_views
@@ -1634,11 +1635,11 @@ impl<V: 'static> Element<V> for ChildView {
         cx: &mut LayoutContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         if let Some(mut rendered_view) = cx.window.rendered_views.remove(&self.view_id) {
-            cx.new_parents.insert(self.view_id, cx.view_id());
+            let parent_id = cx.view_id();
+            cx.window.new_parents.insert(self.view_id, parent_id);
             let size = rendered_view
                 .layout(
                     constraint,
-                    cx.new_parents,
                     cx.views_to_notify_if_ancestors_change,
                     cx.refreshing,
                     cx.view_context,
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index ca0a0b3586e279f7fa2c8308e0f1a00bf3e68bee..9d5adab3caa0029e4849d4191198d36f521475e0 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -649,7 +649,6 @@ pub trait AnyRootElement {
     fn layout(
         &mut self,
         constraint: SizeConstraint,
-        new_parents: &mut HashMap<usize, usize>,
         views_to_notify_if_ancestors_change: &mut HashMap<usize, SmallVec<[usize; 2]>>,
         refreshing: bool,
         cx: &mut WindowContext,
@@ -674,7 +673,6 @@ impl<V: View> AnyRootElement for RootElement<V> {
     fn layout(
         &mut self,
         constraint: SizeConstraint,
-        new_parents: &mut HashMap<usize, usize>,
         views_to_notify_if_ancestors_change: &mut HashMap<usize, SmallVec<[usize; 2]>>,
         refreshing: bool,
         cx: &mut WindowContext,
@@ -684,12 +682,7 @@ impl<V: View> AnyRootElement for RootElement<V> {
             .upgrade(cx)
             .ok_or_else(|| anyhow!("layout called on a root element for a dropped view"))?;
         view.update(cx, |view, cx| {
-            let mut cx = LayoutContext::new(
-                cx,
-                new_parents,
-                views_to_notify_if_ancestors_change,
-                refreshing,
-            );
+            let mut cx = LayoutContext::new(cx, views_to_notify_if_ancestors_change, refreshing);
             Ok(self.element.layout(constraint, view, &mut cx))
         })
     }
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index fd035891a102759e1dbaefd0e2f1e9099de92436..34c70eaab77d4b5ca13cdf97855247b193c67fcd 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -666,14 +666,8 @@ mod tests {
             });
 
             let mut list = List::new(state.clone());
-            let mut new_parents = Default::default();
             let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
+            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
             let (size, _) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
@@ -698,12 +692,7 @@ mod tests {
                 cx,
             );
 
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
+            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
             let (_, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(
                 logical_scroll_top,
@@ -728,12 +717,7 @@ mod tests {
                 }
             );
 
-            let mut layout_cx = LayoutContext::new(
-                cx,
-                &mut new_parents,
-                &mut notify_views_if_parents_change,
-                false,
-            );
+            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
             let (size, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
@@ -852,14 +836,9 @@ mod tests {
 
                 let mut list = List::new(state.clone());
                 let window_size = vec2f(width, height);
-                let mut new_parents = Default::default();
                 let mut notify_views_if_parents_change = Default::default();
-                let mut layout_cx = LayoutContext::new(
-                    cx,
-                    &mut new_parents,
-                    &mut notify_views_if_parents_change,
-                    false,
-                );
+                let mut layout_cx =
+                    LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
                 let (size, logical_scroll_top) = list.layout(
                     SizeConstraint::new(vec2f(0., 0.), window_size),
                     &mut view,
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 38aa75a9ed221140ece63196e527372f648325cb..2db0888029dd6403ca41a8ab3e8efbf4cfa70480 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -411,14 +411,9 @@ mod tests {
             let mut view = TestView;
             fonts::with_font_cache(cx.font_cache().clone(), || {
                 let mut text = Text::new("Hello\r\n", Default::default()).with_soft_wrap(true);
-                let mut new_parents = Default::default();
                 let mut notify_views_if_parents_change = Default::default();
-                let mut layout_cx = LayoutContext::new(
-                    cx,
-                    &mut new_parents,
-                    &mut notify_views_if_parents_change,
-                    false,
-                );
+                let mut layout_cx =
+                    LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
                 let (_, state) = text.layout(
                     SizeConstraint::new(Default::default(), vec2f(f32::INFINITY, f32::INFINITY)),
                     &mut view,

From 48d3e2d9b9951eae115672004fc3fb10243dc42b Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 29 Aug 2023 21:58:44 -0600
Subject: [PATCH 018/109] Move views_to_notify_if_ancestors_change to Window

---
 crates/editor/src/element.rs     | 12 ++++--------
 crates/gpui/src/app.rs           | 15 ++++-----------
 crates/gpui/src/app/window.rs    | 19 ++++++-------------
 crates/gpui/src/elements.rs      |  6 +-----
 crates/gpui/src/elements/list.rs | 11 ++++-------
 crates/gpui/src/elements/text.rs |  4 +---
 6 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 32b84a76c11de9b5e0e5ccf4a3e245684a644598..eb65d70908578d7ce48dbb6264096e3fd14a04a3 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -3204,8 +3204,7 @@ mod tests {
                     Point::new(5, 6)..Point::new(6, 0),
                 ]);
             });
-            let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+            let mut layout_cx = LayoutContext::new(cx, false);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3290,8 +3289,7 @@ mod tests {
                     DisplayPoint::new(10, 0)..DisplayPoint::new(13, 0),
                 ]);
             });
-            let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+            let mut layout_cx = LayoutContext::new(cx, false);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3351,8 +3349,7 @@ mod tests {
 
         let mut element = EditorElement::new(editor.read_with(cx, |editor, cx| editor.style(cx)));
         let (size, mut state) = editor.update(cx, |editor, cx| {
-            let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+            let mut layout_cx = LayoutContext::new(cx, false);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3549,8 +3546,7 @@ mod tests {
             editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
             editor.set_wrap_width(Some(editor_width), cx);
 
-            let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+            let mut layout_cx = LayoutContext::new(cx, false);
             element.layout(
                 SizeConstraint::new(vec2f(editor_width, 500.), vec2f(editor_width, 500.)),
                 editor,
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 552f57ba915f210a0481d454ed296b1174ef7f8e..cbf2c775c5c06b89c53fe28201146a1540248ca4 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3461,19 +3461,13 @@ pub trait RenderContext<'a, 'b, V> {
 pub struct LayoutContext<'a, 'b, 'c, V> {
     // Nathan: Making this is public while I work on playground.
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
-    views_to_notify_if_ancestors_change: &'c mut HashMap<usize, SmallVec<[usize; 2]>>,
     pub refreshing: bool,
 }
 
 impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
-    pub fn new(
-        view_context: &'c mut ViewContext<'a, 'b, V>,
-        views_to_notify_if_ancestors_change: &'c mut HashMap<usize, SmallVec<[usize; 2]>>,
-        refreshing: bool,
-    ) -> Self {
+    pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>, refreshing: bool) -> Self {
         Self {
             view_context,
-            views_to_notify_if_ancestors_change,
             refreshing,
         }
     }
@@ -3520,7 +3514,8 @@ impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
 
     fn notify_if_view_ancestors_change(&mut self, view_id: usize) {
         let self_view_id = self.view_id;
-        self.views_to_notify_if_ancestors_change
+        self.window
+            .views_to_notify_if_ancestors_change
             .entry(view_id)
             .or_default()
             .push(self_view_id);
@@ -6526,9 +6521,7 @@ mod tests {
         view_1.update(cx, |_, cx| {
             view_2.update(cx, |_, cx| {
                 // Sanity check
-                let mut notify_views_if_parents_change = Default::default();
-                let mut layout_cx =
-                    LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+                let mut layout_cx = LayoutContext::new(cx, false);
                 assert_eq!(
                     layout_cx
                         .keystrokes_for_action(view_1_id, &Action1)
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index c62722ac2dab4209c76ce7a435df8fc424597f0e..61a468d11b564af4181870ed735b7a86b25dffb8 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -57,6 +57,7 @@ pub struct Window {
     pub(crate) text_style_stack: Vec<TextStyle>,
     pub(crate) theme_stack: Vec<Box<dyn Any>>,
     pub(crate) new_parents: HashMap<usize, usize>,
+    pub(crate) views_to_notify_if_ancestors_change: HashMap<usize, SmallVec<[usize; 2]>>,
     titlebar_height: f32,
     appearance: Appearance,
     cursor_regions: Vec<CursorRegion>,
@@ -96,6 +97,7 @@ impl Window {
             text_style_stack: Vec::new(),
             theme_stack: Vec::new(),
             new_parents: HashMap::default(),
+            views_to_notify_if_ancestors_change: HashMap::default(),
             cursor_regions: Default::default(),
             mouse_regions: Default::default(),
             event_handlers: Default::default(),
@@ -1000,14 +1002,10 @@ impl<'a> WindowContext<'a> {
 
         let mut rendered_root = self.window.rendered_views.remove(&root_view_id).unwrap();
 
-        let mut views_to_notify_if_ancestors_change = HashMap::default();
-        rendered_root.layout(
-            SizeConstraint::new(window_size, window_size),
-            &mut views_to_notify_if_ancestors_change,
-            refreshing,
-            self,
-        )?;
+        rendered_root.layout(SizeConstraint::strict(window_size), refreshing, self)?;
 
+        let views_to_notify_if_ancestors_change =
+            mem::take(&mut self.window.views_to_notify_if_ancestors_change);
         for (view_id, view_ids_to_notify) in views_to_notify_if_ancestors_change {
             let mut current_view_id = view_id;
             loop {
@@ -1638,12 +1636,7 @@ impl<V: 'static> Element<V> for ChildView {
             let parent_id = cx.view_id();
             cx.window.new_parents.insert(self.view_id, parent_id);
             let size = rendered_view
-                .layout(
-                    constraint,
-                    cx.views_to_notify_if_ancestors_change,
-                    cx.refreshing,
-                    cx.view_context,
-                )
+                .layout(constraint, cx.refreshing, cx.view_context)
                 .log_err()
                 .unwrap_or(Vector2F::zero());
             cx.window.rendered_views.insert(self.view_id, rendered_view);
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index 9d5adab3caa0029e4849d4191198d36f521475e0..da714907c359e6ab4b2b17e3056fb3ab378bf144 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -38,10 +38,8 @@ use crate::{
     ViewContext, WeakViewHandle, WindowContext,
 };
 use anyhow::{anyhow, Result};
-use collections::HashMap;
 use core::panic;
 use json::ToJson;
-use smallvec::SmallVec;
 use std::{
     any::{type_name, Any},
     borrow::Cow,
@@ -649,7 +647,6 @@ pub trait AnyRootElement {
     fn layout(
         &mut self,
         constraint: SizeConstraint,
-        views_to_notify_if_ancestors_change: &mut HashMap<usize, SmallVec<[usize; 2]>>,
         refreshing: bool,
         cx: &mut WindowContext,
     ) -> Result<Vector2F>;
@@ -673,7 +670,6 @@ impl<V: View> AnyRootElement for RootElement<V> {
     fn layout(
         &mut self,
         constraint: SizeConstraint,
-        views_to_notify_if_ancestors_change: &mut HashMap<usize, SmallVec<[usize; 2]>>,
         refreshing: bool,
         cx: &mut WindowContext,
     ) -> Result<Vector2F> {
@@ -682,7 +678,7 @@ impl<V: View> AnyRootElement for RootElement<V> {
             .upgrade(cx)
             .ok_or_else(|| anyhow!("layout called on a root element for a dropped view"))?;
         view.update(cx, |view, cx| {
-            let mut cx = LayoutContext::new(cx, views_to_notify_if_ancestors_change, refreshing);
+            let mut cx = LayoutContext::new(cx, refreshing);
             Ok(self.element.layout(constraint, view, &mut cx))
         })
     }
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 34c70eaab77d4b5ca13cdf97855247b193c67fcd..1f1b2b9fb4f0db55be2e58f640c88d9bd4322f36 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -666,8 +666,7 @@ mod tests {
             });
 
             let mut list = List::new(state.clone());
-            let mut notify_views_if_parents_change = Default::default();
-            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+            let mut layout_cx = LayoutContext::new(cx, false);
             let (size, _) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
@@ -692,7 +691,7 @@ mod tests {
                 cx,
             );
 
-            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+            let mut layout_cx = LayoutContext::new(cx, false);
             let (_, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(
                 logical_scroll_top,
@@ -717,7 +716,7 @@ mod tests {
                 }
             );
 
-            let mut layout_cx = LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+            let mut layout_cx = LayoutContext::new(cx, false);
             let (size, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
@@ -836,9 +835,7 @@ mod tests {
 
                 let mut list = List::new(state.clone());
                 let window_size = vec2f(width, height);
-                let mut notify_views_if_parents_change = Default::default();
-                let mut layout_cx =
-                    LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+                let mut layout_cx = LayoutContext::new(cx, false);
                 let (size, logical_scroll_top) = list.layout(
                     SizeConstraint::new(vec2f(0., 0.), window_size),
                     &mut view,
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 2db0888029dd6403ca41a8ab3e8efbf4cfa70480..3e9214f12c92b36a8947e72318147b5e8dc025da 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -411,9 +411,7 @@ mod tests {
             let mut view = TestView;
             fonts::with_font_cache(cx.font_cache().clone(), || {
                 let mut text = Text::new("Hello\r\n", Default::default()).with_soft_wrap(true);
-                let mut notify_views_if_parents_change = Default::default();
-                let mut layout_cx =
-                    LayoutContext::new(cx, &mut notify_views_if_parents_change, false);
+                let mut layout_cx = LayoutContext::new(cx, false);
                 let (_, state) = text.layout(
                     SizeConstraint::new(Default::default(), vec2f(f32::INFINITY, f32::INFINITY)),
                     &mut view,

From d763946b1815c781be82650cf3c0c7991266acfa Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 30 Aug 2023 10:11:00 -0600
Subject: [PATCH 019/109] Checkpoint: Working toward compatibility with themes

---
 crates/gpui/playground/src/color.rs      |  52 +++++-
 crates/gpui/playground/src/components.rs |   6 +-
 crates/gpui/playground/src/playground.rs |  12 +-
 crates/gpui/playground/src/themes.rs     | 201 +++++++++++++----------
 crates/gpui/playground/src/workspace.rs  |  25 ++-
 5 files changed, 181 insertions(+), 115 deletions(-)

diff --git a/crates/gpui/playground/src/color.rs b/crates/gpui/playground/src/color.rs
index 14c60248aade8fbd99f8a3105dd87c6e949ac689..11590f967cdba57edebf52a23fd1721cbf1fc899 100644
--- a/crates/gpui/playground/src/color.rs
+++ b/crates/gpui/playground/src/color.rs
@@ -1,8 +1,9 @@
 #![allow(dead_code)]
 
-use std::{num::ParseIntError, ops::Range};
-
+use serde::de::{self, Deserialize, Deserializer, Visitor};
 use smallvec::SmallVec;
+use std::fmt;
+use std::{num::ParseIntError, ops::Range};
 
 pub fn rgb<C: From<Rgba>>(hex: u32) -> C {
     let r = ((hex >> 16) & 0xFF) as f32 / 255.0;
@@ -19,6 +20,40 @@ pub struct Rgba {
     pub a: f32,
 }
 
+struct RgbaVisitor;
+
+impl<'de> Visitor<'de> for RgbaVisitor {
+    type Value = Rgba;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a string in the format #rrggbb or #rrggbbaa")
+    }
+
+    fn visit_str<E: de::Error>(self, value: &str) -> Result<Rgba, E> {
+        if value.len() == 7 || value.len() == 9 {
+            let r = u8::from_str_radix(&value[1..3], 16).unwrap() as f32 / 255.0;
+            let g = u8::from_str_radix(&value[3..5], 16).unwrap() as f32 / 255.0;
+            let b = u8::from_str_radix(&value[5..7], 16).unwrap() as f32 / 255.0;
+            let a = if value.len() == 9 {
+                u8::from_str_radix(&value[7..9], 16).unwrap() as f32 / 255.0
+            } else {
+                1.0
+            };
+            Ok(Rgba { r, g, b, a })
+        } else {
+            Err(E::custom(
+                "Bad format for RGBA. Expected #rrggbb or #rrggbbaa.",
+            ))
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for Rgba {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        deserializer.deserialize_str(RgbaVisitor)
+    }
+}
+
 pub trait Lerp {
     fn lerp(&self, level: f32) -> Hsla;
 }
@@ -219,6 +254,19 @@ impl Into<gpui::color::Color> for Hsla {
     }
 }
 
+impl<'de> Deserialize<'de> for Hsla {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        // First, deserialize it into Rgba
+        let rgba = Rgba::deserialize(deserializer)?;
+
+        // Then, use the From<Rgba> for Hsla implementation to convert it
+        Ok(Hsla::from(rgba))
+    }
+}
+
 pub struct ColorScale {
     colors: SmallVec<[Hsla; 2]>,
     positions: SmallVec<[f32; 2]>,
diff --git a/crates/gpui/playground/src/components.rs b/crates/gpui/playground/src/components.rs
index 73dca57f359bc2b17bcbec45e0385cc7c103280c..8513a550c1c7a2ba0bfa648652b6bbec5abc94d2 100644
--- a/crates/gpui/playground/src/components.rs
+++ b/crates/gpui/playground/src/components.rs
@@ -4,7 +4,7 @@ use crate::{
     interactive::Interactive,
     style::StyleHelpers,
     text::ArcCow,
-    themes::Theme,
+    // themes::Theme,
 };
 use gpui::{platform::MouseButton, ViewContext};
 use playground_macros::Element;
@@ -82,10 +82,10 @@ impl<V: 'static, D: 'static> Button<V, D> {
         view: &mut V,
         cx: &mut ViewContext<V>,
     ) -> impl IntoElement<V> + Interactive<V> {
-        let colors = &cx.theme::<Theme>().colors;
+        // let colors = &cx.theme::<Theme>().colors;
 
         let button = div()
-            .fill(colors.error(0.5))
+            // .fill(colors.error(0.5))
             .h_4()
             .children(self.label.clone());
 
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 6d05d19a66cc789db6dc85aa9fa0ebe8d9173458..27ea6e22c9ee7e4ba57ce4dbe176dc175c6a840c 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -1,12 +1,12 @@
 #![allow(dead_code, unused_variables)]
-use element::Element;
+use crate::element::Element;
 use gpui::{
     geometry::{rect::RectF, vector::vec2f},
     platform::WindowOptions,
 };
 use log::LevelFilter;
 use simplelog::SimpleLogger;
-use themes::{rose_pine, Theme, ThemeColors};
+use themes::Theme;
 use view::view;
 use workspace::workspace;
 
@@ -39,13 +39,7 @@ fn main() {
                 center: true,
                 ..Default::default()
             },
-            |_| {
-                view(|cx| {
-                    playground(Theme {
-                        colors: rose_pine::dawn(),
-                    })
-                })
-            },
+            |_| view(|cx| playground(Theme::default())),
         );
         cx.platform().activate(true);
     });
diff --git a/crates/gpui/playground/src/themes.rs b/crates/gpui/playground/src/themes.rs
index 4057491eed33bcfd6722eba10454f84cf67cc948..34d430089ddb19022e88d8c4890a410f8a8debbf 100644
--- a/crates/gpui/playground/src/themes.rs
+++ b/crates/gpui/playground/src/themes.rs
@@ -1,107 +1,134 @@
 use crate::{
-    color::{Hsla, Lerp},
+    color::Hsla,
     element::{Element, PaintContext},
     layout_context::LayoutContext,
 };
-use gpui::{AppContext, WindowContext};
-use std::{marker::PhantomData, ops::Range};
+use gpui::WindowContext;
+use serde::{de::Visitor, Deserialize, Deserializer};
+use std::{collections::HashMap, fmt, marker::PhantomData};
 
-pub mod rose_pine;
-
-#[derive(Clone, Debug)]
+#[derive(Deserialize, Clone, Default, Debug)]
 pub struct Theme {
-    pub colors: ThemeColors,
+    name: String,
+    is_light: bool,
+    lowest: Layer,
+    middle: Layer,
+    highest: Layer,
+    popover_shadow: Shadow,
+    modal_shadow: Shadow,
+    #[serde(deserialize_with = "deserialize_player_colors")]
+    players: Vec<PlayerColors>,
+    #[serde(deserialize_with = "deserialize_syntax_colors")]
+    syntax: HashMap<String, Hsla>,
 }
 
-pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
-    cx.theme::<Theme>()
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct Layer {
+    base: StyleSet,
+    variant: StyleSet,
+    on: StyleSet,
+    accent: StyleSet,
+    positive: StyleSet,
+    warning: StyleSet,
+    negative: StyleSet,
 }
 
-#[derive(Clone, Debug)]
-pub struct ThemeColors {
-    pub base: Range<Hsla>,
-    pub surface: Range<Hsla>,
-    pub overlay: Range<Hsla>,
-    pub muted: Range<Hsla>,
-    pub subtle: Range<Hsla>,
-    pub text: Range<Hsla>,
-    pub highlight_low: Range<Hsla>,
-    pub highlight_med: Range<Hsla>,
-    pub highlight_high: Range<Hsla>,
-    pub success: Range<Hsla>,
-    pub warning: Range<Hsla>,
-    pub error: Range<Hsla>,
-    pub inserted: Range<Hsla>,
-    pub deleted: Range<Hsla>,
-    pub modified: Range<Hsla>,
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct StyleSet {
+    #[serde(rename = "default")]
+    default: ContainerColors,
+    hovered: ContainerColors,
+    pressed: ContainerColors,
+    active: ContainerColors,
+    disabled: ContainerColors,
+    inverted: ContainerColors,
 }
 
-impl ThemeColors {
-    fn current(cx: &AppContext) -> &Self {
-        cx.global::<Vec<Self>>()
-            .last()
-            .expect("must call within a theme provider")
-    }
-
-    pub fn base(&self, level: f32) -> Hsla {
-        self.base.lerp(level)
-    }
-
-    pub fn surface(&self, level: f32) -> Hsla {
-        self.surface.lerp(level)
-    }
-
-    pub fn overlay(&self, level: f32) -> Hsla {
-        self.overlay.lerp(level)
-    }
-
-    pub fn muted(&self, level: f32) -> Hsla {
-        self.muted.lerp(level)
-    }
-
-    pub fn subtle(&self, level: f32) -> Hsla {
-        self.subtle.lerp(level)
-    }
-
-    pub fn text(&self, level: f32) -> Hsla {
-        self.text.lerp(level)
-    }
-
-    pub fn highlight_low(&self, level: f32) -> Hsla {
-        self.highlight_low.lerp(level)
-    }
-
-    pub fn highlight_med(&self, level: f32) -> Hsla {
-        self.highlight_med.lerp(level)
-    }
-
-    pub fn highlight_high(&self, level: f32) -> Hsla {
-        self.highlight_high.lerp(level)
-    }
-
-    pub fn success(&self, level: f32) -> Hsla {
-        self.success.lerp(level)
-    }
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct ContainerColors {
+    background: Hsla,
+    foreground: Hsla,
+    border: Hsla,
+}
 
-    pub fn warning(&self, level: f32) -> Hsla {
-        self.warning.lerp(level)
-    }
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct PlayerColors {
+    selection: Hsla,
+    cursor: Hsla,
+}
 
-    pub fn error(&self, level: f32) -> Hsla {
-        self.error.lerp(level)
-    }
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct Shadow {
+    blur: u8,
+    color: Hsla,
+    offset: Vec<u8>,
+}
 
-    pub fn inserted(&self, level: f32) -> Hsla {
-        self.inserted.lerp(level)
-    }
+pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
+    cx.theme::<Theme>()
+}
 
-    pub fn deleted(&self, level: f32) -> Hsla {
-        self.deleted.lerp(level)
-    }
+fn deserialize_player_colors<'de, D>(deserializer: D) -> Result<Vec<PlayerColors>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    struct PlayerArrayVisitor;
+
+    impl<'de> Visitor<'de> for PlayerArrayVisitor {
+        type Value = Vec<PlayerColors>;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("an object with integer keys")
+        }
+
+        fn visit_map<A: serde::de::MapAccess<'de>>(
+            self,
+            mut map: A,
+        ) -> Result<Self::Value, A::Error> {
+            let mut players = Vec::with_capacity(8);
+            while let Some((key, value)) = map.next_entry::<usize, PlayerColors>()? {
+                if key < 8 {
+                    players.push(value);
+                } else {
+                    return Err(serde::de::Error::invalid_value(
+                        serde::de::Unexpected::Unsigned(key as u64),
+                        &"a key in range 0..7",
+                    ));
+                }
+            }
+            Ok(players)
+        }
+    }
+
+    deserializer.deserialize_map(PlayerArrayVisitor)
+}
 
-    pub fn modified(&self, level: f32) -> Hsla {
-        self.modified.lerp(level)
-    }
+fn deserialize_syntax_colors<'de, D>(deserializer: D) -> Result<HashMap<String, Hsla>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    struct SyntaxVisitor;
+
+    impl<'de> Visitor<'de> for SyntaxVisitor {
+        type Value = HashMap<String, Hsla>;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("a map with keys and objects with a single color field as values")
+        }
+
+        fn visit_map<M>(self, mut map: M) -> Result<HashMap<String, Hsla>, M::Error>
+        where
+            M: serde::de::MapAccess<'de>,
+        {
+            let mut result = HashMap::new();
+            while let Some(key) = map.next_key()? {
+                let hsla: Hsla = map.next_value()?; // Deserialize values as Hsla
+                result.insert(key, hsla);
+            }
+            Ok(result)
+        }
+    }
+    deserializer.deserialize_map(SyntaxVisitor)
 }
 
 pub struct Themed<V: 'static, E> {
diff --git a/crates/gpui/playground/src/workspace.rs b/crates/gpui/playground/src/workspace.rs
index bae8f80c24ad17ba465f0a3ae6355334f3e90872..ab8a06a41d8db9705aae6224bd5565ea0497fb5c 100644
--- a/crates/gpui/playground/src/workspace.rs
+++ b/crates/gpui/playground/src/workspace.rs
@@ -1,10 +1,9 @@
-use crate::div::div;
-use crate::element::{IntoElement, ParentElement};
-use crate::style::StyleHelpers;
-use crate::themes::theme;
-use crate::{element::Element, themes::Theme};
-use gpui::geometry::pixels;
-use gpui::ViewContext;
+use crate::{
+    div::div,
+    element::{Element, IntoElement, ParentElement},
+    style::StyleHelpers,
+};
+use gpui::{geometry::pixels, ViewContext};
 use playground_macros::Element;
 
 use crate as playground;
@@ -17,29 +16,27 @@ pub fn workspace<V: 'static>() -> impl Element<V> {
 
 impl WorkspaceElement {
     fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        let theme = &cx.theme::<Theme>().colors;
+        // let theme = &cx.theme::<Theme>().colors;
         div()
             .full()
             .flex()
             .flex_col()
-            .fill(theme.base(0.5))
+            // .fill(theme.base(0.5))
             .child(self.title_bar(cx))
             .child(self.stage(cx))
             .child(self.status_bar(cx))
     }
 
     fn title_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        let colors = &theme(cx).colors;
-        div().h(pixels(cx.titlebar_height())).fill(colors.base(0.))
+        // let colors = &theme(cx).colors;
+        div().h(pixels(cx.titlebar_height())) //.fill(colors.base(0.))
     }
 
     fn status_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        let colors = &theme(cx).colors;
-        div().h(pixels(cx.titlebar_height())).fill(colors.base(0.))
+        div().h(pixels(cx.titlebar_height())) //.fill(colors.base(0.))
     }
 
     fn stage<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        let colors = &theme(cx).colors;
         div().flex_grow()
     }
 }

From 1d491fcd781be0b595d9058a177349cb87f28fe2 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 30 Aug 2023 11:09:34 -0600
Subject: [PATCH 020/109] Get playground rendering with backward compatible
 theming

---
 Cargo.lock                               |  3 ++
 crates/gpui/playground/Cargo.toml        |  3 ++
 crates/gpui/playground/src/playground.rs | 55 +++++++++++++++++--
 crates/gpui/playground/src/themes.rs     | 69 +++++++++++++-----------
 crates/gpui/playground/src/workspace.rs  | 11 ++--
 crates/theme/src/theme.rs                | 11 +++-
 styles/src/build_themes.ts               |  3 ++
 7 files changed, 115 insertions(+), 40 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c02500b53ddbd1c174df6aeccde9bf0bf714ae0..3fb2915d6dacb68f22f1bcbae0647506bad27036 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5176,9 +5176,12 @@ dependencies = [
  "parking_lot 0.11.2",
  "playground_macros",
  "refineable",
+ "rust-embed",
  "serde",
+ "settings",
  "simplelog",
  "smallvec",
+ "theme",
  "util",
 ]
 
diff --git a/crates/gpui/playground/Cargo.toml b/crates/gpui/playground/Cargo.toml
index d907d3d6b6f8ba6b37c404f33abeb23fd05d577f..1fee470d3d1b7177a64f83debbb270db08567c45 100644
--- a/crates/gpui/playground/Cargo.toml
+++ b/crates/gpui/playground/Cargo.toml
@@ -16,9 +16,12 @@ log.workspace = true
 playground_macros = { path = "../playground_macros" }
 parking_lot.workspace = true
 refineable.workspace = true
+rust-embed.workspace = true
 serde.workspace = true
+settings = { path = "../../settings" }
 simplelog = "0.9"
 smallvec.workspace = true
+theme = { path = "../../theme" }
 util = { path = "../../util" }
 
 [dev-dependencies]
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
index 27ea6e22c9ee7e4ba57ce4dbe176dc175c6a840c..43bd8d7b10a96c87bfc07579a359fd844e6bf6b2 100644
--- a/crates/gpui/playground/src/playground.rs
+++ b/crates/gpui/playground/src/playground.rs
@@ -3,9 +3,12 @@ use crate::element::Element;
 use gpui::{
     geometry::{rect::RectF, vector::vec2f},
     platform::WindowOptions,
+    serde_json, ViewContext,
 };
 use log::LevelFilter;
+use settings::{default_settings, SettingsStore};
 use simplelog::SimpleLogger;
+use theme::ThemeSettings;
 use themes::Theme;
 use view::view;
 use workspace::workspace;
@@ -30,6 +33,13 @@ fn main() {
     SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
 
     gpui::App::new(()).unwrap().run(|cx| {
+        let mut store = SettingsStore::default();
+        store
+            .set_default_settings(default_settings().as_ref(), cx)
+            .unwrap();
+        cx.set_global(store);
+        theme::init(Assets, cx);
+
         cx.add_window(
             WindowOptions {
                 bounds: gpui::platform::WindowBounds::Fixed(RectF::new(
@@ -39,12 +49,51 @@ fn main() {
                 center: true,
                 ..Default::default()
             },
-            |_| view(|cx| playground(Theme::default())),
+            |_| view(|cx| playground(cx)),
         );
         cx.platform().activate(true);
     });
 }
 
-fn playground<V: 'static>(theme: Theme) -> impl Element<V> {
-    workspace().themed(theme)
+fn playground<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
+    workspace().themed(current_theme(cx))
+}
+
+// Nathan: During the transition, we will include the base theme on the legacy Theme struct.
+fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
+    settings::get::<ThemeSettings>(cx)
+        .theme
+        .deserialized_base_theme
+        .lock()
+        .get_or_insert_with(|| {
+            let theme: Theme =
+                serde_json::from_value(settings::get::<ThemeSettings>(cx).theme.base_theme.clone())
+                    .unwrap();
+            Box::new(theme)
+        })
+        .downcast_ref::<Theme>()
+        .unwrap()
+        .clone()
+}
+
+use anyhow::{anyhow, Result};
+use gpui::AssetSource;
+use rust_embed::RustEmbed;
+
+#[derive(RustEmbed)]
+#[folder = "../../../assets"]
+#[include = "themes/**/*"]
+#[exclude = "*.DS_Store"]
+pub struct Assets;
+
+impl AssetSource for Assets {
+    fn load(&self, path: &str) -> Result<std::borrow::Cow<[u8]>> {
+        Self::get(path)
+            .map(|f| f.data)
+            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
+    }
+
+    fn list(&self, path: &str) -> Vec<std::borrow::Cow<'static, str>> {
+        Self::iter().filter(|p| p.starts_with(path)).collect()
+    }
 }
diff --git a/crates/gpui/playground/src/themes.rs b/crates/gpui/playground/src/themes.rs
index 34d430089ddb19022e88d8c4890a410f8a8debbf..e372e1e31bcaf1b99b51030eee4cf7f63739af0b 100644
--- a/crates/gpui/playground/src/themes.rs
+++ b/crates/gpui/playground/src/themes.rs
@@ -9,59 +9,59 @@ use std::{collections::HashMap, fmt, marker::PhantomData};
 
 #[derive(Deserialize, Clone, Default, Debug)]
 pub struct Theme {
-    name: String,
-    is_light: bool,
-    lowest: Layer,
-    middle: Layer,
-    highest: Layer,
-    popover_shadow: Shadow,
-    modal_shadow: Shadow,
+    pub name: String,
+    pub is_light: bool,
+    pub lowest: Layer,
+    pub middle: Layer,
+    pub highest: Layer,
+    pub popover_shadow: Shadow,
+    pub modal_shadow: Shadow,
     #[serde(deserialize_with = "deserialize_player_colors")]
-    players: Vec<PlayerColors>,
+    pub players: Vec<PlayerColors>,
     #[serde(deserialize_with = "deserialize_syntax_colors")]
-    syntax: HashMap<String, Hsla>,
+    pub syntax: HashMap<String, Hsla>,
 }
 
 #[derive(Deserialize, Clone, Default, Debug)]
 pub struct Layer {
-    base: StyleSet,
-    variant: StyleSet,
-    on: StyleSet,
-    accent: StyleSet,
-    positive: StyleSet,
-    warning: StyleSet,
-    negative: StyleSet,
+    pub base: StyleSet,
+    pub variant: StyleSet,
+    pub on: StyleSet,
+    pub accent: StyleSet,
+    pub positive: StyleSet,
+    pub warning: StyleSet,
+    pub negative: StyleSet,
 }
 
 #[derive(Deserialize, Clone, Default, Debug)]
 pub struct StyleSet {
     #[serde(rename = "default")]
-    default: ContainerColors,
-    hovered: ContainerColors,
-    pressed: ContainerColors,
-    active: ContainerColors,
-    disabled: ContainerColors,
-    inverted: ContainerColors,
+    pub default: ContainerColors,
+    pub hovered: ContainerColors,
+    pub pressed: ContainerColors,
+    pub active: ContainerColors,
+    pub disabled: ContainerColors,
+    pub inverted: ContainerColors,
 }
 
 #[derive(Deserialize, Clone, Default, Debug)]
 pub struct ContainerColors {
-    background: Hsla,
-    foreground: Hsla,
-    border: Hsla,
+    pub background: Hsla,
+    pub foreground: Hsla,
+    pub border: Hsla,
 }
 
 #[derive(Deserialize, Clone, Default, Debug)]
 pub struct PlayerColors {
-    selection: Hsla,
-    cursor: Hsla,
+    pub selection: Hsla,
+    pub cursor: Hsla,
 }
 
 #[derive(Deserialize, Clone, Default, Debug)]
 pub struct Shadow {
-    blur: u8,
-    color: Hsla,
-    offset: Vec<u8>,
+    pub blur: u8,
+    pub color: Hsla,
+    pub offset: Vec<u8>,
 }
 
 pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
@@ -107,6 +107,11 @@ fn deserialize_syntax_colors<'de, D>(deserializer: D) -> Result<HashMap<String,
 where
     D: serde::Deserializer<'de>,
 {
+    #[derive(Deserialize)]
+    struct ColorWrapper {
+        color: Hsla,
+    }
+
     struct SyntaxVisitor;
 
     impl<'de> Visitor<'de> for SyntaxVisitor {
@@ -122,8 +127,8 @@ where
         {
             let mut result = HashMap::new();
             while let Some(key) = map.next_key()? {
-                let hsla: Hsla = map.next_value()?; // Deserialize values as Hsla
-                result.insert(key, hsla);
+                let wrapper: ColorWrapper = map.next_value()?; // Deserialize values as Hsla
+                result.insert(key, wrapper.color);
             }
             Ok(result)
         }
diff --git a/crates/gpui/playground/src/workspace.rs b/crates/gpui/playground/src/workspace.rs
index ab8a06a41d8db9705aae6224bd5565ea0497fb5c..36a3caf1b703c8813f33f29a3aa3481090d49ff3 100644
--- a/crates/gpui/playground/src/workspace.rs
+++ b/crates/gpui/playground/src/workspace.rs
@@ -2,6 +2,7 @@ use crate::{
     div::div,
     element::{Element, IntoElement, ParentElement},
     style::StyleHelpers,
+    themes::theme,
 };
 use gpui::{geometry::pixels, ViewContext};
 use playground_macros::Element;
@@ -16,20 +17,22 @@ pub fn workspace<V: 'static>() -> impl Element<V> {
 
 impl WorkspaceElement {
     fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        // let theme = &cx.theme::<Theme>().colors;
+        let theme = theme(cx);
         div()
             .full()
             .flex()
             .flex_col()
-            // .fill(theme.base(0.5))
+            .fill(theme.middle.base.default.background)
             .child(self.title_bar(cx))
             .child(self.stage(cx))
             .child(self.status_bar(cx))
     }
 
     fn title_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        // let colors = &theme(cx).colors;
-        div().h(pixels(cx.titlebar_height())) //.fill(colors.base(0.))
+        let theme = theme(cx);
+        div()
+            .h(pixels(cx.titlebar_height()))
+            .fill(theme.lowest.base.default.background)
     }
 
     fn status_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index a5faba8eaf2016af7875665b679aa96de2518674..49d9fd25fe200283712e107b3ec2b9180b104a46 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -10,11 +10,12 @@ use gpui::{
     fonts::{HighlightStyle, TextStyle},
     platform, AppContext, AssetSource, Border, MouseState,
 };
+use parking_lot::Mutex;
 use schemars::JsonSchema;
 use serde::{de::DeserializeOwned, Deserialize};
 use serde_json::Value;
 use settings::SettingsStore;
-use std::{collections::HashMap, ops::Deref, sync::Arc};
+use std::{any::Any, collections::HashMap, ops::Deref, sync::Arc};
 use ui::{CheckboxStyle, CopilotCTAButton, IconStyle, ModalStyle};
 
 pub use theme_registry::*;
@@ -67,6 +68,14 @@ pub struct Theme {
     pub welcome: WelcomeStyle,
     pub titlebar: Titlebar,
     pub component_test: ComponentTest,
+    // Nathan: New elements are styled in Rust, directly from the base theme.
+    // We store it on the legacy theme so we can mix both kinds of elements during the transition.
+    #[schemars(skip)]
+    pub base_theme: serde_json::Value,
+    // A place to cache deserialized base theme.
+    #[serde(skip_deserializing)]
+    #[schemars(skip)]
+    pub deserialized_base_theme: Mutex<Option<Box<dyn Any + Send + Sync>>>,
 }
 
 #[derive(Deserialize, Default, Clone, JsonSchema)]
diff --git a/styles/src/build_themes.ts b/styles/src/build_themes.ts
index 17575663a1f88b17870b1b146b47e7086bf3e2ba..6a6c4e2abdae20080ef42c3105279c939a98798c 100644
--- a/styles/src/build_themes.ts
+++ b/styles/src/build_themes.ts
@@ -32,6 +32,9 @@ function write_themes(themes: Theme[], output_directory: string) {
         setTheme(theme)
 
         const style_tree = app()
+        // Nathan: New elements will read directly from the theme colors.
+        // Adding this during the transition. Afterwards, we can port all themes to Rust.
+        style_tree.base_theme = theme
         const style_tree_json = JSON.stringify(style_tree, null, 2)
         const temp_path = path.join(temp_directory, `${theme.name}.json`)
         const out_path = path.join(

From 746f77bf7c557a4dcc9f92ab65259709ec14aace Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 30 Aug 2023 14:40:43 -0600
Subject: [PATCH 021/109] Checkpoint

---
 Cargo.lock                                    |  24 +-
 Cargo.toml                                    |   3 +-
 crates/gpui/playground/Cargo.toml             |   2 +-
 crates/gpui/playground/src/components.rs      |   2 +-
 crates/gpui/playground/src/style.rs           |   2 +-
 crates/gpui/playground/src/workspace.rs       |   2 +-
 crates/gpui2/Cargo.toml                       |   9 +
 crates/gpui2/src/lib.rs                       |  14 +
 .../Cargo.toml                                |   4 +-
 .../src/derive_element.rs                     |   0
 .../src/derive_into_element.rs                |   0
 .../src/gpui2_macros.rs}                      |   0
 .../src/styleable_helpers.rs                  |   0
 test.rs                                       | 414 ++++++++----------
 14 files changed, 226 insertions(+), 250 deletions(-)
 create mode 100644 crates/gpui2/Cargo.toml
 create mode 100644 crates/gpui2/src/lib.rs
 rename crates/{gpui/playground_macros => gpui2_macros}/Cargo.toml (71%)
 rename crates/{gpui/playground_macros => gpui2_macros}/src/derive_element.rs (100%)
 rename crates/{gpui/playground_macros => gpui2_macros}/src/derive_into_element.rs (100%)
 rename crates/{gpui/playground_macros/src/playground_macros.rs => gpui2_macros/src/gpui2_macros.rs} (100%)
 rename crates/{gpui/playground_macros => gpui2_macros}/src/styleable_helpers.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 3fb2915d6dacb68f22f1bcbae0647506bad27036..cc02b70783e5455088c021d052e208a63fe283be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3163,6 +3163,19 @@ dependencies = [
  "waker-fn",
 ]
 
+[[package]]
+name = "gpui2"
+version = "0.1.0"
+
+[[package]]
+name = "gpui2_macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
@@ -5172,9 +5185,9 @@ dependencies = [
  "anyhow",
  "derive_more",
  "gpui",
+ "gpui2_macros",
  "log",
  "parking_lot 0.11.2",
- "playground_macros",
  "refineable",
  "rust-embed",
  "serde",
@@ -5185,15 +5198,6 @@ dependencies = [
  "util",
 ]
 
-[[package]]
-name = "playground_macros"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "plist"
 version = "1.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index 5938ecb40240765844c1849662b082afeae07a3a..119d0c894730f900bcb96294eb192375ceea307b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,8 +33,9 @@ members = [
     "crates/go_to_line",
     "crates/gpui",
     "crates/gpui/playground",
-    "crates/gpui/playground_macros",
     "crates/gpui_macros",
+    "crates/gpui2",
+    "crates/gpui2_macros",
     "crates/install_cli",
     "crates/journal",
     "crates/language",
diff --git a/crates/gpui/playground/Cargo.toml b/crates/gpui/playground/Cargo.toml
index 1fee470d3d1b7177a64f83debbb270db08567c45..a817387dc00eb10435e64bedb4b9cc39b53c64de 100644
--- a/crates/gpui/playground/Cargo.toml
+++ b/crates/gpui/playground/Cargo.toml
@@ -13,7 +13,7 @@ anyhow.workspace = true
 derive_more.workspace = true
 gpui = { path = ".." }
 log.workspace = true
-playground_macros = { path = "../playground_macros" }
+gpui2_macros = { path = "../../gpui2_macros" }
 parking_lot.workspace = true
 refineable.workspace = true
 rust-embed.workspace = true
diff --git a/crates/gpui/playground/src/components.rs b/crates/gpui/playground/src/components.rs
index 8513a550c1c7a2ba0bfa648652b6bbec5abc94d2..b2492a529271569d4f58bc5abf52475e11064728 100644
--- a/crates/gpui/playground/src/components.rs
+++ b/crates/gpui/playground/src/components.rs
@@ -7,7 +7,7 @@ use crate::{
     // themes::Theme,
 };
 use gpui::{platform::MouseButton, ViewContext};
-use playground_macros::Element;
+use gpui2_macros::Element;
 use std::{marker::PhantomData, rc::Rc};
 
 struct ButtonHandlers<V, D> {
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
index d2f639fdc2fa2e938cee5a71af5c25baf5779225..f0b631993df0c101c77002dd1cf703755a9fc404 100644
--- a/crates/gpui/playground/src/style.rs
+++ b/crates/gpui/playground/src/style.rs
@@ -16,7 +16,7 @@ use gpui::{
     },
     taffy,
 };
-use playground_macros::styleable_helpers;
+use gpui2_macros::styleable_helpers;
 use refineable::{Refineable, RefinementCascade};
 
 #[derive(Clone, Refineable)]
diff --git a/crates/gpui/playground/src/workspace.rs b/crates/gpui/playground/src/workspace.rs
index 36a3caf1b703c8813f33f29a3aa3481090d49ff3..c0185889c8f38498dbbd6d70a9c1aedad9c4b944 100644
--- a/crates/gpui/playground/src/workspace.rs
+++ b/crates/gpui/playground/src/workspace.rs
@@ -5,7 +5,7 @@ use crate::{
     themes::theme,
 };
 use gpui::{geometry::pixels, ViewContext};
-use playground_macros::Element;
+use gpui2_macros::Element;
 
 use crate as playground;
 #[derive(Element)]
diff --git a/crates/gpui2/Cargo.toml b/crates/gpui2/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..e7d6ba9f2327e9a2980f86b83efceb62540d2049
--- /dev/null
+++ b/crates/gpui2/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "gpui2"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/crates/gpui2/src/lib.rs b/crates/gpui2/src/lib.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7d12d9af8195bf5e19d10c7b592b359ccd014149
--- /dev/null
+++ b/crates/gpui2/src/lib.rs
@@ -0,0 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}
diff --git a/crates/gpui/playground_macros/Cargo.toml b/crates/gpui2_macros/Cargo.toml
similarity index 71%
rename from crates/gpui/playground_macros/Cargo.toml
rename to crates/gpui2_macros/Cargo.toml
index f85a622edde9cb3c50e6906e5b8c6c42294dfcc8..eb44334095d40f3231dfac5df498641699cbaba2 100644
--- a/crates/gpui/playground_macros/Cargo.toml
+++ b/crates/gpui2_macros/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "playground_macros"
+name = "gpui2_macros"
 version = "0.1.0"
 edition = "2021"
 publish = false
 
 [lib]
-path = "src/playground_macros.rs"
+path = "src/gpui2_macros.rs"
 proc-macro = true
 
 [dependencies]
diff --git a/crates/gpui/playground_macros/src/derive_element.rs b/crates/gpui2_macros/src/derive_element.rs
similarity index 100%
rename from crates/gpui/playground_macros/src/derive_element.rs
rename to crates/gpui2_macros/src/derive_element.rs
diff --git a/crates/gpui/playground_macros/src/derive_into_element.rs b/crates/gpui2_macros/src/derive_into_element.rs
similarity index 100%
rename from crates/gpui/playground_macros/src/derive_into_element.rs
rename to crates/gpui2_macros/src/derive_into_element.rs
diff --git a/crates/gpui/playground_macros/src/playground_macros.rs b/crates/gpui2_macros/src/gpui2_macros.rs
similarity index 100%
rename from crates/gpui/playground_macros/src/playground_macros.rs
rename to crates/gpui2_macros/src/gpui2_macros.rs
diff --git a/crates/gpui/playground_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
similarity index 100%
rename from crates/gpui/playground_macros/src/styleable_helpers.rs
rename to crates/gpui2_macros/src/styleable_helpers.rs
diff --git a/test.rs b/test.rs
index 1347f5dba08f2499fa9b5206580afe3d19b148ec..974c37c477347479bb3f47066423bad2853d782e 100644
--- a/test.rs
+++ b/test.rs
@@ -17,10 +17,10 @@ use simplelog::SimpleLogger;
 use themes::{rose_pine, ThemeColors};
 use view::view;
 mod adapter {
+    use crate::element::AnyElement;
     use crate::element::{LayoutContext, PaintContext};
     use gpui::{geometry::rect::RectF, LayoutEngine};
     use util::ResultExt;
-    use crate::element::AnyElement;
     pub struct Adapter<V>(pub(crate) AnyElement<V>);
     impl<V: 'static> gpui::Element<V> for Adapter<V> {
         type LayoutState = Option<LayoutEngine>;
@@ -90,8 +90,8 @@ mod adapter {
 }
 mod color {
     #![allow(dead_code)]
-    use std::{num::ParseIntError, ops::Range};
     use smallvec::SmallVec;
+    use std::{num::ParseIntError, ops::Range};
     pub fn rgb<C: From<Rgba>>(hex: u32) -> C {
         let r = ((hex >> 16) & 0xFF) as f32 / 255.0;
         let g = ((hex >> 8) & 0xFF) as f32 / 255.0;
@@ -130,16 +130,7 @@ mod color {
     impl ::core::fmt::Debug for Rgba {
         fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
             ::core::fmt::Formatter::debug_struct_field4_finish(
-                f,
-                "Rgba",
-                "r",
-                &self.r,
-                "g",
-                &self.g,
-                "b",
-                &self.b,
-                "a",
-                &&self.a,
+                f, "Rgba", "r", &self.r, "g", &self.g, "b", &self.b, "a", &&self.a,
             )
         }
     }
@@ -185,7 +176,12 @@ mod color {
                 4 => (xm, m, cm),
                 _ => (cm, m, xm),
             };
-            Rgba { r, g, b, a: color.a }
+            Rgba {
+                r,
+                g,
+                b,
+                a: color.a,
+            }
         }
     }
     impl TryFrom<&'_ str> for Rgba {
@@ -239,16 +235,7 @@ mod color {
     impl ::core::fmt::Debug for Hsla {
         fn fmt(&self, f: &mut ::core::fmt::Formatter) -> ::core::fmt::Result {
             ::core::fmt::Formatter::debug_struct_field4_finish(
-                f,
-                "Hsla",
-                "h",
-                &self.h,
-                "s",
-                &self.s,
-                "l",
-                &self.l,
-                "a",
-                &&self.a,
+                f, "Hsla", "h", &self.h, "s", &self.s, "l", &self.l, "a", &&self.a,
             )
         }
     }
@@ -258,8 +245,7 @@ mod color {
     impl ::core::cmp::PartialEq for Hsla {
         #[inline]
         fn eq(&self, other: &Hsla) -> bool {
-            self.h == other.h && self.s == other.s && self.l == other.l
-                && self.a == other.a
+            self.h == other.h && self.s == other.s && self.l == other.l && self.a == other.a
         }
     }
     pub fn hsla(h: f32, s: f32, l: f32, a: f32) -> Hsla {
@@ -271,7 +257,12 @@ mod color {
         }
     }
     pub fn black() -> Hsla {
-        Hsla { h: 0., s: 0., l: 0., a: 1. }
+        Hsla {
+            h: 0.,
+            s: 0.,
+            l: 0.,
+            a: 1.,
+        }
     }
     impl From<Rgba> for Hsla {
         fn from(color: Rgba) -> Self {
@@ -298,7 +289,12 @@ mod color {
             } else {
                 ((r - g) / delta + 4.0) / 6.0
             };
-            Hsla { h, s, l, a: color.a }
+            Hsla {
+                h,
+                s,
+                l,
+                a: color.a,
+            }
         }
     }
     impl Hsla {
@@ -364,8 +360,7 @@ mod color {
             positions: SmallVec::new(),
         };
         let num_colors: f32 = scale.colors.len() as f32 - 1.0;
-        scale
-            .positions = (0..scale.colors.len())
+        scale.positions = (0..scale.colors.len())
             .map(|i| i as f32 / num_colors)
             .collect();
         scale
@@ -375,12 +370,10 @@ mod color {
             if true {
                 if !(0.0 <= t && t <= 1.0) {
                     {
-                        ::core::panicking::panic_fmt(
-                            format_args!(
-                                "t value {0} is out of range. Expected value in range 0.0 to 1.0",
-                                t,
-                            ),
-                        );
+                        ::core::panicking::panic_fmt(format_args!(
+                            "t value {0} is out of range. Expected value in range 0.0 to 1.0",
+                            t,
+                        ));
                     }
                 }
             }
@@ -412,10 +405,12 @@ mod color {
 mod components {
     use crate::{
         element::{Element, ElementMetadata},
-        frame, text::ArcCow, themes::rose_pine,
+        frame,
+        text::ArcCow,
+        themes::rose_pine,
     };
     use gpui::{platform::MouseButton, ViewContext};
-    use playground_macros::Element;
+    use gpui2_macros::Element;
     use std::{marker::PhantomData, rc::Rc};
     struct ButtonHandlers<V, D> {
         click: Option<Rc<dyn Fn(&mut V, &D, &mut ViewContext<V>)>>,
@@ -498,18 +493,11 @@ mod components {
             self.icon = Some(icon.into());
             self
         }
-        pub fn click(
-            self,
-            handler: impl Fn(&mut V, &D, &mut ViewContext<V>) + 'static,
-        ) -> Self {
+        pub fn click(self, handler: impl Fn(&mut V, &D, &mut ViewContext<V>) + 'static) -> Self {
             let data = self.data.clone();
-            Element::click(
-                self,
-                MouseButton::Left,
-                move |view, _, cx| {
-                    handler(view, data.as_ref(), cx);
-                },
-            )
+            Element::click(self, MouseButton::Left, move |view, _, cx| {
+                handler(view, data.as_ref(), cx);
+            })
         }
     }
     pub fn button<V>() -> Button<V, ()> {
@@ -523,11 +511,9 @@ mod components {
                 .children(self.label.clone());
             if let Some(handler) = self.handlers.click.clone() {
                 let data = self.data.clone();
-                button
-                    .mouse_down(
-                        MouseButton::Left,
-                        move |view, event, cx| { handler(view, data.as_ref(), cx) },
-                    )
+                button.mouse_down(MouseButton::Left, move |view, event, cx| {
+                    handler(view, data.as_ref(), cx)
+                })
             } else {
                 button
             }
@@ -535,8 +521,11 @@ mod components {
     }
 }
 mod element {
+    pub use crate::paint_context::PaintContext;
     use crate::{
-        adapter::Adapter, color::Hsla, hoverable::Hoverable,
+        adapter::Adapter,
+        color::Hsla,
+        hoverable::Hoverable,
         style::{Display, Fill, OptionalStyle, Overflow, Position},
     };
     use anyhow::Result;
@@ -546,12 +535,12 @@ mod element {
         platform::{MouseButton, MouseButtonEvent},
         EngineLayout, EventContext, RenderContext, ViewContext,
     };
-    use playground_macros::tailwind_lengths;
+    use gpui2_macros::tailwind_lengths;
     use std::{
         any::{Any, TypeId},
-        cell::Cell, rc::Rc,
+        cell::Cell,
+        rc::Rc,
     };
-    pub use crate::paint_context::PaintContext;
     pub use taffy::tree::NodeId;
     pub struct Layout<'a, E: ?Sized> {
         pub from_engine: EngineLayout,
@@ -627,33 +616,24 @@ mod element {
             Self: Sized,
         {
             let pressed: Rc<Cell<bool>> = Default::default();
-            self.mouse_down(
-                    button,
-                    {
-                        let pressed = pressed.clone();
-                        move |_, _, _| {
-                            pressed.set(true);
-                        }
-                    },
-                )
-                .mouse_up_outside(
-                    button,
-                    {
-                        let pressed = pressed.clone();
-                        move |_, _, _| {
-                            pressed.set(false);
-                        }
-                    },
-                )
-                .mouse_up(
-                    button,
-                    move |view, event, event_cx| {
-                        if pressed.get() {
-                            pressed.set(false);
-                            handler(view, event, event_cx);
-                        }
-                    },
-                )
+            self.mouse_down(button, {
+                let pressed = pressed.clone();
+                move |_, _, _| {
+                    pressed.set(true);
+                }
+            })
+            .mouse_up_outside(button, {
+                let pressed = pressed.clone();
+                move |_, _, _| {
+                    pressed.set(false);
+                }
+            })
+            .mouse_up(button, move |view, event, event_cx| {
+                if pressed.get() {
+                    pressed.set(false);
+                    handler(view, event, event_cx);
+                }
+            })
         }
         fn mouse_down(
             mut self,
@@ -663,17 +643,16 @@ mod element {
         where
             Self: Sized,
         {
-            self.handlers_mut()
-                .push(EventHandler {
-                    handler: Rc::new(move |view, event, event_cx| {
-                        let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
-                        if event.button == button && event.is_down {
-                            handler(view, event, event_cx);
-                        }
-                    }),
-                    event_type: TypeId::of::<MouseButtonEvent>(),
-                    outside_bounds: false,
-                });
+            self.handlers_mut().push(EventHandler {
+                handler: Rc::new(move |view, event, event_cx| {
+                    let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
+                    if event.button == button && event.is_down {
+                        handler(view, event, event_cx);
+                    }
+                }),
+                event_type: TypeId::of::<MouseButtonEvent>(),
+                outside_bounds: false,
+            });
             self
         }
         fn mouse_down_outside(
@@ -684,17 +663,16 @@ mod element {
         where
             Self: Sized,
         {
-            self.handlers_mut()
-                .push(EventHandler {
-                    handler: Rc::new(move |view, event, event_cx| {
-                        let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
-                        if event.button == button && event.is_down {
-                            handler(view, event, event_cx);
-                        }
-                    }),
-                    event_type: TypeId::of::<MouseButtonEvent>(),
-                    outside_bounds: true,
-                });
+            self.handlers_mut().push(EventHandler {
+                handler: Rc::new(move |view, event, event_cx| {
+                    let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
+                    if event.button == button && event.is_down {
+                        handler(view, event, event_cx);
+                    }
+                }),
+                event_type: TypeId::of::<MouseButtonEvent>(),
+                outside_bounds: true,
+            });
             self
         }
         fn mouse_up(
@@ -705,17 +683,16 @@ mod element {
         where
             Self: Sized,
         {
-            self.handlers_mut()
-                .push(EventHandler {
-                    handler: Rc::new(move |view, event, event_cx| {
-                        let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
-                        if event.button == button && !event.is_down {
-                            handler(view, event, event_cx);
-                        }
-                    }),
-                    event_type: TypeId::of::<MouseButtonEvent>(),
-                    outside_bounds: false,
-                });
+            self.handlers_mut().push(EventHandler {
+                handler: Rc::new(move |view, event, event_cx| {
+                    let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
+                    if event.button == button && !event.is_down {
+                        handler(view, event, event_cx);
+                    }
+                }),
+                event_type: TypeId::of::<MouseButtonEvent>(),
+                outside_bounds: false,
+            });
             self
         }
         fn mouse_up_outside(
@@ -726,17 +703,16 @@ mod element {
         where
             Self: Sized,
         {
-            self.handlers_mut()
-                .push(EventHandler {
-                    handler: Rc::new(move |view, event, event_cx| {
-                        let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
-                        if event.button == button && !event.is_down {
-                            handler(view, event, event_cx);
-                        }
-                    }),
-                    event_type: TypeId::of::<MouseButtonEvent>(),
-                    outside_bounds: true,
-                });
+            self.handlers_mut().push(EventHandler {
+                handler: Rc::new(move |view, event, event_cx| {
+                    let event = event.downcast_ref::<MouseButtonEvent>().unwrap();
+                    if event.button == button && !event.is_down {
+                        handler(view, event, event_cx);
+                    }
+                }),
+                event_type: TypeId::of::<MouseButtonEvent>(),
+                outside_bounds: true,
+            });
             self
         }
         fn block(mut self) -> Self
@@ -764,9 +740,7 @@ mod element {
         where
             Self: Sized,
         {
-            self
-                .declared_style()
-                .overflow = OptionalPoint {
+            self.declared_style().overflow = OptionalPoint {
                 x: Some(Overflow::Visible),
                 y: Some(Overflow::Visible),
             };
@@ -776,9 +750,7 @@ mod element {
         where
             Self: Sized,
         {
-            self
-                .declared_style()
-                .overflow = OptionalPoint {
+            self.declared_style().overflow = OptionalPoint {
                 x: Some(Overflow::Hidden),
                 y: Some(Overflow::Hidden),
             };
@@ -788,9 +760,7 @@ mod element {
         where
             Self: Sized,
         {
-            self
-                .declared_style()
-                .overflow = OptionalPoint {
+            self.declared_style().overflow = OptionalPoint {
                 x: Some(Overflow::Scroll),
                 y: Some(Overflow::Scroll),
             };
@@ -4485,11 +4455,7 @@ mod element {
         layout: Option<(NodeId, Box<dyn Any>)>,
     }
     impl<V: 'static> AnyElement<V> {
-        pub fn layout(
-            &mut self,
-            view: &mut V,
-            cx: &mut LayoutContext<V>,
-        ) -> Result<NodeId> {
+        pub fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<NodeId> {
             let pushed_text_style = self.push_text_style(cx);
             let (node_id, layout) = self.element.layout(view, cx)?;
             self.layout = Some((node_id, layout));
@@ -4511,30 +4477,25 @@ mod element {
         }
         pub fn paint(&mut self, view: &mut V, cx: &mut PaintContext<V>) -> Result<()> {
             let pushed_text_style = self.push_text_style(cx);
-            let (layout_node_id, element_layout) = self
-                .layout
-                .as_mut()
-                .expect("paint called before layout");
+            let (layout_node_id, element_layout) =
+                self.layout.as_mut().expect("paint called before layout");
             let layout = Layout {
                 from_engine: cx
                     .layout_engine()
                     .unwrap()
                     .computed_layout(*layout_node_id)
-                    .expect(
-                        "you can currently only use playground elements within an adapter",
-                    ),
+                    .expect("you can currently only use playground elements within an adapter"),
                 from_element: element_layout.as_mut(),
             };
             let style = self.element.style();
             let fill_color = style.fill.flatten().and_then(|fill| fill.color());
             if let Some(fill_color) = fill_color {
-                cx.scene
-                    .push_quad(gpui::scene::Quad {
-                        bounds: layout.from_engine.bounds,
-                        background: Some(fill_color.into()),
-                        border: Default::default(),
-                        corner_radii: Default::default(),
-                    });
+                cx.scene.push_quad(gpui::scene::Quad {
+                    bounds: layout.from_engine.bounds,
+                    background: Some(fill_color.into()),
+                    border: Default::default(),
+                    corner_radii: Default::default(),
+                });
             }
             for event_handler in self.element.handlers_mut().iter().cloned() {
                 let EngineLayout { order, bounds } = layout.from_engine;
@@ -4547,10 +4508,7 @@ mod element {
                         bounds,
                         outside_bounds: event_handler.outside_bounds,
                         event_handler: Rc::new(move |view, event, window_cx, view_id| {
-                            let mut view_context = ViewContext::mutable(
-                                window_cx,
-                                view_id,
-                            );
+                            let mut view_context = ViewContext::mutable(window_cx, view_id);
                             let mut event_context = EventContext::new(&mut view_context);
                             view_event_handler(
                                 view.downcast_mut().unwrap(),
@@ -4607,14 +4565,14 @@ mod element {
 mod frame {
     use crate::{
         element::{
-            AnyElement, Element, EventHandler, IntoElement, Layout, LayoutContext,
-            NodeId, PaintContext,
+            AnyElement, Element, EventHandler, IntoElement, Layout, LayoutContext, NodeId,
+            PaintContext,
         },
         style::{OptionalStyle, Style},
     };
     use anyhow::{anyhow, Result};
     use gpui::LayoutNodeId;
-    use playground_macros::IntoElement;
+    use gpui2_macros::IntoElement;
     #[element_crate = "crate"]
     pub struct Frame<V: 'static> {
         style: OptionalStyle,
@@ -4656,12 +4614,13 @@ mod frame {
             let style: Style = self.style.into();
             let node_id = cx
                 .layout_engine()
-                .ok_or_else(|| ::anyhow::__private::must_use({
-                    let error = ::anyhow::__private::format_err(
-                        format_args!("no layout engine"),
-                    );
-                    error
-                }))?
+                .ok_or_else(|| {
+                    ::anyhow::__private::must_use({
+                        let error =
+                            ::anyhow::__private::format_err(format_args!("no layout engine"));
+                        error
+                    })
+                })?
                 .add_node(style.to_taffy(rem_size), child_layout_node_ids)?;
             Ok((node_id, ()))
         }
@@ -4687,18 +4646,23 @@ mod frame {
             I: IntoIterator<Item = E>,
             E: IntoElement<V>,
         {
-            self.children.extend(children.into_iter().map(|e| e.into_any_element()));
+            self.children
+                .extend(children.into_iter().map(|e| e.into_any_element()));
             self
         }
     }
 }
 mod hoverable {
-    use std::{cell::Cell, marker::PhantomData, rc::Rc};
+    use crate::{
+        element::Element,
+        style::{OptionalStyle, Style},
+    };
     use gpui::{
         geometry::{rect::RectF, vector::Vector2F},
-        scene::MouseMove, EngineLayout,
+        scene::MouseMove,
+        EngineLayout,
     };
-    use crate::{element::Element, style::{OptionalStyle, Style}};
+    use std::{cell::Cell, marker::PhantomData, rc::Rc};
     pub struct Hoverable<V, E> {
         hover_style: OptionalStyle,
         computed_style: Option<Style>,
@@ -4760,10 +4724,10 @@ mod hoverable {
     }
 }
 mod paint_context {
-    use std::{any::TypeId, rc::Rc};
     use derive_more::{Deref, DerefMut};
     use gpui::{geometry::rect::RectF, EventContext, RenderContext, ViewContext};
     pub use gpui::{LayoutContext, PaintContext as LegacyPaintContext};
+    use std::{any::TypeId, rc::Rc};
     pub use taffy::tree::NodeId;
     pub struct PaintContext<'a, 'b, 'c, 'd, V> {
         #[deref]
@@ -4833,13 +4797,12 @@ mod paint_context {
 mod style {
     use crate::color::Hsla;
     use gpui::geometry::{
-        DefinedLength, Edges, Length, OptionalEdges, OptionalPoint, OptionalSize, Point,
-        Size,
+        DefinedLength, Edges, Length, OptionalEdges, OptionalPoint, OptionalSize, Point, Size,
     };
     use optional::Optional;
     pub use taffy::style::{
-        AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap,
-        JustifyContent, Overflow, Position,
+        AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
+        Overflow, Position,
     };
     pub struct Style {
         /// What layout strategy should be used?
@@ -5194,9 +5157,7 @@ mod style {
         #[inline]
         fn clone(&self) -> Fill {
             match self {
-                Fill::Color(__self_0) => {
-                    Fill::Color(::core::clone::Clone::clone(__self_0))
-                }
+                Fill::Color(__self_0) => Fill::Color(::core::clone::Clone::clone(__self_0)),
             }
         }
     }
@@ -5257,32 +5218,25 @@ mod text {
             let text = self.text.clone();
             let layout = Arc::new(Mutex::new(None));
             let style: Style = self.metadata.style.into();
-            let node_id = layout_engine
-                .add_measured_node(
-                    style.to_taffy(rem_size),
-                    {
-                        let layout = layout.clone();
-                        move |params| {
-                            let line_layout = fonts
-                                .layout_line(
-                                    text.as_ref(),
-                                    text_style.font_size,
-                                    &[(text.len(), text_style.to_run())],
-                                );
-                            let size = Size {
-                                width: line_layout.width,
-                                height: line_height,
-                            };
-                            layout
-                                .lock()
-                                .replace(TextLayout {
-                                    line_layout: Arc::new(line_layout),
-                                    line_height,
-                                });
-                            size
-                        }
-                    },
-                )?;
+            let node_id = layout_engine.add_measured_node(style.to_taffy(rem_size), {
+                let layout = layout.clone();
+                move |params| {
+                    let line_layout = fonts.layout_line(
+                        text.as_ref(),
+                        text_style.font_size,
+                        &[(text.len(), text_style.to_run())],
+                    );
+                    let size = Size {
+                        width: line_layout.width,
+                        height: line_height,
+                    };
+                    layout.lock().replace(TextLayout {
+                        line_layout: Arc::new(line_layout),
+                        line_height,
+                    });
+                    size
+                }
+            })?;
             Ok((node_id, layout))
         }
         fn paint<'a>(
@@ -5369,11 +5323,11 @@ mod themes {
     use crate::color::{Hsla, Lerp};
     use std::ops::Range;
     pub mod rose_pine {
-        use std::ops::Range;
         use crate::{
             color::{hsla, rgb, Hsla},
             ThemeColors,
         };
+        use std::ops::Range;
         pub struct RosePineThemes {
             pub default: RosePinePalette,
             pub dawn: RosePinePalette,
@@ -5426,7 +5380,7 @@ mod themes {
                     "highlight_med",
                     "highlight_high",
                 ];
-                let values: &[&dyn ::core::fmt::Debug] = &[
+                let values: &[&dyn::core::fmt::Debug] = &[
                     &self.base,
                     &self.surface,
                     &self.overlay,
@@ -5636,23 +5590,21 @@ mod view {
     }
 }
 fn main() {
-    SimpleLogger::init(LevelFilter::Info, Default::default())
-        .expect("could not initialize logger");
-    gpui::App::new(())
-        .unwrap()
-        .run(|cx| {
-            cx.add_window(
-                WindowOptions {
-                    bounds: gpui::platform::WindowBounds::Fixed(
-                        RectF::new(vec2f(0., 0.), vec2f(400., 300.)),
-                    ),
-                    center: true,
-                    ..Default::default()
-                },
-                |_| view(|_| playground(&rose_pine::moon())),
-            );
-            cx.platform().activate(true);
-        });
+    SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
+    gpui::App::new(()).unwrap().run(|cx| {
+        cx.add_window(
+            WindowOptions {
+                bounds: gpui::platform::WindowBounds::Fixed(RectF::new(
+                    vec2f(0., 0.),
+                    vec2f(400., 300.),
+                )),
+                center: true,
+                ..Default::default()
+            },
+            |_| view(|_| playground(&rose_pine::moon())),
+        );
+        cx.platform().activate(true);
+    });
 }
 fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
     frame()
@@ -5660,11 +5612,7 @@ fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
         .h_full()
         .w_half()
         .fill(theme.success(0.5))
-        .child(
-            button()
-                .label("Hello")
-                .click(|_, _, _| {
-                    ::std::io::_print(format_args!("click!\n"));
-                }),
-        )
+        .child(button().label("Hello").click(|_, _, _| {
+            ::std::io::_print(format_args!("click!\n"));
+        }))
 }

From ee11be98e599405074d78272d1cbb67400f0287b Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 30 Aug 2023 15:00:11 -0600
Subject: [PATCH 022/109] Add gpui2 crate

---
 Cargo.lock                                    |  16 +
 crates/gpui/playground/src/components.rs      |   2 +-
 crates/gpui2/Cargo.toml                       |  21 +-
 crates/gpui2/src/adapter.rs                   |  78 ++++
 .../{gpui/playground => gpui2}/src/color.rs   |   0
 crates/gpui2/src/components.rs                | 101 +++++
 crates/gpui2/src/div.rs                       | 116 ++++++
 crates/gpui2/src/element.rs                   | 170 ++++++++
 crates/gpui2/src/gpui2.rs                     |  36 ++
 crates/gpui2/src/hoverable.rs                 | 104 +++++
 crates/gpui2/src/interactive.rs               | 147 +++++++
 crates/gpui2/src/layout_context.rs            |  64 +++
 crates/gpui2/src/lib.rs                       |  14 -
 crates/gpui2/src/paint_context.rs             |  54 +++
 crates/gpui2/src/playground.rs                |  99 +++++
 crates/gpui2/src/pressable.rs                 | 107 +++++
 crates/gpui2/src/style.rs                     | 379 ++++++++++++++++++
 crates/gpui2/src/text.rs                      | 148 +++++++
 crates/gpui2/src/themes.rs                    | 175 ++++++++
 crates/gpui2/src/themes/rose_pine.rs          | 133 ++++++
 crates/gpui2/src/view.rs                      |  26 ++
 crates/gpui2_macros/src/derive_element.rs     |  12 +-
 .../gpui2_macros/src/derive_into_element.rs   |   2 +-
 23 files changed, 1981 insertions(+), 23 deletions(-)
 create mode 100644 crates/gpui2/src/adapter.rs
 rename crates/{gpui/playground => gpui2}/src/color.rs (100%)
 create mode 100644 crates/gpui2/src/components.rs
 create mode 100644 crates/gpui2/src/div.rs
 create mode 100644 crates/gpui2/src/element.rs
 create mode 100644 crates/gpui2/src/gpui2.rs
 create mode 100644 crates/gpui2/src/hoverable.rs
 create mode 100644 crates/gpui2/src/interactive.rs
 create mode 100644 crates/gpui2/src/layout_context.rs
 delete mode 100644 crates/gpui2/src/lib.rs
 create mode 100644 crates/gpui2/src/paint_context.rs
 create mode 100644 crates/gpui2/src/playground.rs
 create mode 100644 crates/gpui2/src/pressable.rs
 create mode 100644 crates/gpui2/src/style.rs
 create mode 100644 crates/gpui2/src/text.rs
 create mode 100644 crates/gpui2/src/themes.rs
 create mode 100644 crates/gpui2/src/themes/rose_pine.rs
 create mode 100644 crates/gpui2/src/view.rs

diff --git a/Cargo.lock b/Cargo.lock
index cc02b70783e5455088c021d052e208a63fe283be..bb0c39372d499ef56e6fbd6e5ddfd153e6de8289 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3166,6 +3166,22 @@ dependencies = [
 [[package]]
 name = "gpui2"
 version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "derive_more",
+ "gpui",
+ "gpui2_macros",
+ "log",
+ "parking_lot 0.11.2",
+ "refineable",
+ "rust-embed",
+ "serde",
+ "settings",
+ "simplelog",
+ "smallvec",
+ "theme",
+ "util",
+]
 
 [[package]]
 name = "gpui2_macros"
diff --git a/crates/gpui/playground/src/components.rs b/crates/gpui/playground/src/components.rs
index b2492a529271569d4f58bc5abf52475e11064728..a98fea33830ee382efb9cab25449227c8a716170 100644
--- a/crates/gpui/playground/src/components.rs
+++ b/crates/gpui/playground/src/components.rs
@@ -20,7 +20,7 @@ impl<V, D> Default for ButtonHandlers<V, D> {
     }
 }
 
-use crate as playground;
+use crate as gpui2;
 #[derive(Element)]
 pub struct Button<V: 'static, D: 'static> {
     handlers: ButtonHandlers<V, D>,
diff --git a/crates/gpui2/Cargo.toml b/crates/gpui2/Cargo.toml
index e7d6ba9f2327e9a2980f86b83efceb62540d2049..3145c186aa486af3228db86f9f63e1e2f3d68d9b 100644
--- a/crates/gpui2/Cargo.toml
+++ b/crates/gpui2/Cargo.toml
@@ -4,6 +4,25 @@ version = "0.1.0"
 edition = "2021"
 publish = false
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "gpui2"
+path = "src/gpui2.rs"
 
 [dependencies]
+anyhow.workspace = true
+derive_more.workspace = true
+gpui = { path = "../gpui" }
+log.workspace = true
+gpui2_macros = { path = "../gpui2_macros" }
+parking_lot.workspace = true
+refineable.workspace = true
+rust-embed.workspace = true
+serde.workspace = true
+settings = { path = "../settings" }
+simplelog = "0.9"
+smallvec.workspace = true
+theme = { path = "../theme" }
+util = { path = "../util" }
+
+[dev-dependencies]
+gpui = { path = "../gpui", features = ["test-support"] }
diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
new file mode 100644
index 0000000000000000000000000000000000000000..eff2356c94a36cffdcf08d13df9985fd7f9a025a
--- /dev/null
+++ b/crates/gpui2/src/adapter.rs
@@ -0,0 +1,78 @@
+use crate::{layout_context::LayoutContext, paint_context::PaintContext};
+use gpui::{geometry::rect::RectF, LayoutEngine, LayoutId};
+use util::ResultExt;
+
+/// Makes a new, playground-style element into a legacy element.
+pub struct AdapterElement<V>(pub(crate) crate::element::AnyElement<V>);
+
+impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
+    type LayoutState = Option<(LayoutEngine, LayoutId)>;
+    type PaintState = ();
+
+    fn layout(
+        &mut self,
+        constraint: gpui::SizeConstraint,
+        view: &mut V,
+        cx: &mut gpui::LayoutContext<V>,
+    ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
+        cx.push_layout_engine(LayoutEngine::new());
+
+        let size = constraint.max;
+        let mut cx = LayoutContext::new(cx);
+        let layout_id = self.0.layout(view, &mut cx).log_err();
+        if let Some(layout_id) = layout_id {
+            cx.layout_engine()
+                .unwrap()
+                .compute_layout(layout_id, constraint.max)
+                .log_err();
+        }
+
+        let layout_engine = cx.pop_layout_engine();
+        debug_assert!(layout_engine.is_some(),
+            "unexpected layout stack state. is there an unmatched pop_layout_engine in the called code?"
+        );
+
+        (constraint.max, layout_engine.zip(layout_id))
+    }
+
+    fn paint(
+        &mut self,
+        scene: &mut gpui::SceneBuilder,
+        bounds: RectF,
+        visible_bounds: RectF,
+        layout_data: &mut Option<(LayoutEngine, LayoutId)>,
+        view: &mut V,
+        legacy_cx: &mut gpui::PaintContext<V>,
+    ) -> Self::PaintState {
+        let (layout_engine, layout_id) = layout_data.take().unwrap();
+        legacy_cx.push_layout_engine(layout_engine);
+        let mut cx = PaintContext::new(legacy_cx, scene);
+        self.0.paint(view, bounds.origin(), &mut cx);
+        *layout_data = legacy_cx.pop_layout_engine().zip(Some(layout_id));
+        debug_assert!(layout_data.is_some());
+    }
+
+    fn rect_for_text_range(
+        &self,
+        range_utf16: std::ops::Range<usize>,
+        bounds: RectF,
+        visible_bounds: RectF,
+        layout: &Self::LayoutState,
+        paint: &Self::PaintState,
+        view: &V,
+        cx: &gpui::ViewContext<V>,
+    ) -> Option<RectF> {
+        todo!("implement before merging to main")
+    }
+
+    fn debug(
+        &self,
+        bounds: RectF,
+        layout: &Self::LayoutState,
+        paint: &Self::PaintState,
+        view: &V,
+        cx: &gpui::ViewContext<V>,
+    ) -> gpui::serde_json::Value {
+        todo!("implement before merging to main")
+    }
+}
diff --git a/crates/gpui/playground/src/color.rs b/crates/gpui2/src/color.rs
similarity index 100%
rename from crates/gpui/playground/src/color.rs
rename to crates/gpui2/src/color.rs
diff --git a/crates/gpui2/src/components.rs b/crates/gpui2/src/components.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a98fea33830ee382efb9cab25449227c8a716170
--- /dev/null
+++ b/crates/gpui2/src/components.rs
@@ -0,0 +1,101 @@
+use crate::{
+    div::div,
+    element::{IntoElement, ParentElement},
+    interactive::Interactive,
+    style::StyleHelpers,
+    text::ArcCow,
+    // themes::Theme,
+};
+use gpui::{platform::MouseButton, ViewContext};
+use gpui2_macros::Element;
+use std::{marker::PhantomData, rc::Rc};
+
+struct ButtonHandlers<V, D> {
+    click: Option<Rc<dyn Fn(&mut V, &D, &mut ViewContext<V>)>>,
+}
+
+impl<V, D> Default for ButtonHandlers<V, D> {
+    fn default() -> Self {
+        Self { click: None }
+    }
+}
+
+use crate as gpui2;
+#[derive(Element)]
+pub struct Button<V: 'static, D: 'static> {
+    handlers: ButtonHandlers<V, D>,
+    label: Option<ArcCow<'static, str>>,
+    icon: Option<ArcCow<'static, str>>,
+    data: Rc<D>,
+    view_type: PhantomData<V>,
+}
+
+// Impl block for buttons without data.
+// See below for an impl block for any button.
+impl<V: 'static> Button<V, ()> {
+    fn new() -> Self {
+        Self {
+            handlers: ButtonHandlers::default(),
+            label: None,
+            icon: None,
+            data: Rc::new(()),
+            view_type: PhantomData,
+        }
+    }
+
+    pub fn data<D: 'static>(self, data: D) -> Button<V, D> {
+        Button {
+            handlers: ButtonHandlers::default(),
+            label: self.label,
+            icon: self.icon,
+            data: Rc::new(data),
+            view_type: PhantomData,
+        }
+    }
+}
+
+// Impl block for button regardless of its data type.
+impl<V: 'static, D: 'static> Button<V, D> {
+    pub fn label(mut self, label: impl Into<ArcCow<'static, str>>) -> Self {
+        self.label = Some(label.into());
+        self
+    }
+
+    pub fn icon(mut self, icon: impl Into<ArcCow<'static, str>>) -> Self {
+        self.icon = Some(icon.into());
+        self
+    }
+
+    pub fn on_click(mut self, handler: impl Fn(&mut V, &D, &mut ViewContext<V>) + 'static) -> Self {
+        self.handlers.click = Some(Rc::new(handler));
+        self
+    }
+}
+
+pub fn button<V>() -> Button<V, ()> {
+    Button::new()
+}
+
+impl<V: 'static, D: 'static> Button<V, D> {
+    fn render(
+        &mut self,
+        view: &mut V,
+        cx: &mut ViewContext<V>,
+    ) -> impl IntoElement<V> + Interactive<V> {
+        // let colors = &cx.theme::<Theme>().colors;
+
+        let button = div()
+            // .fill(colors.error(0.5))
+            .h_4()
+            .children(self.label.clone());
+
+        if let Some(handler) = self.handlers.click.clone() {
+            let data = self.data.clone();
+            button.on_mouse_down(MouseButton::Left, move |view, event, cx| {
+                handler(view, data.as_ref(), cx)
+            })
+        } else {
+            button
+        }
+    }
+}
diff --git a/crates/gpui2/src/div.rs b/crates/gpui2/src/div.rs
new file mode 100644
index 0000000000000000000000000000000000000000..79d539b221354c568195aa8e9b4c111142063b08
--- /dev/null
+++ b/crates/gpui2/src/div.rs
@@ -0,0 +1,116 @@
+use crate::{
+    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
+    interactive::{InteractionHandlers, Interactive},
+    layout_context::LayoutContext,
+    paint_context::PaintContext,
+    style::{Style, StyleHelpers, Styleable},
+};
+use anyhow::Result;
+use gpui::{LayoutId, RenderContext};
+use refineable::{Refineable, RefinementCascade};
+use smallvec::SmallVec;
+
+pub struct Div<V: 'static> {
+    styles: RefinementCascade<Style>,
+    handlers: InteractionHandlers<V>,
+    children: SmallVec<[AnyElement<V>; 2]>,
+}
+
+pub fn div<V>() -> Div<V> {
+    Div {
+        styles: Default::default(),
+        handlers: Default::default(),
+        children: Default::default(),
+    }
+}
+
+impl<V: 'static> Element<V> for Div<V> {
+    type PaintState = ();
+
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)>
+    where
+        Self: Sized,
+    {
+        let style = self.computed_style();
+        let pop_text_style = style.text_style().map_or(false, |style| {
+            cx.push_text_style(cx.text_style().clone().refined(&style));
+            true
+        });
+
+        let children = self
+            .children
+            .iter_mut()
+            .map(|child| child.layout(view, cx))
+            .collect::<Result<Vec<LayoutId>>>()?;
+
+        if pop_text_style {
+            cx.pop_text_style();
+        }
+
+        Ok((cx.add_layout_node(style, children)?, ()))
+    }
+
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        let style = &self.computed_style();
+        let pop_text_style = style.text_style().map_or(false, |style| {
+            let style = cx.text_style().clone().refined(&style);
+            cx.push_text_style(style);
+            true
+        });
+        style.paint_background(layout.bounds, cx);
+        self.interaction_handlers()
+            .paint(layout.order, layout.bounds, cx);
+        for child in &mut self.children {
+            child.paint(view, layout.bounds.origin(), cx);
+        }
+        if pop_text_style {
+            cx.pop_text_style();
+        }
+    }
+}
+
+impl<V> Styleable for Div<V> {
+    type Style = Style;
+
+    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style> {
+        &mut self.styles
+    }
+
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
+        self.styles.base()
+    }
+}
+
+impl<V> StyleHelpers for Div<V> {}
+
+impl<V> Interactive<V> for Div<V> {
+    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
+        &mut self.handlers
+    }
+}
+
+impl<V: 'static> ParentElement<V> for Div<V> {
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
+        &mut self.children
+    }
+}
+
+impl<V: 'static> IntoElement<V> for Div<V> {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2ebe07f5fd75202110bc6785980ca23110baebb0
--- /dev/null
+++ b/crates/gpui2/src/element.rs
@@ -0,0 +1,170 @@
+use std::marker::PhantomData;
+
+pub use crate::layout_context::LayoutContext;
+pub use crate::paint_context::PaintContext;
+use crate::themes::{Theme, Themed};
+use anyhow::Result;
+use gpui::geometry::vector::Vector2F;
+pub use gpui::{Layout, LayoutId};
+use smallvec::SmallVec;
+
+pub trait Element<V: 'static>: 'static {
+    type PaintState;
+
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)>
+    where
+        Self: Sized;
+
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &Layout,
+        state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) where
+        Self: Sized;
+
+    fn into_any(self) -> AnyElement<V>
+    where
+        Self: 'static + Sized,
+    {
+        AnyElement(Box::new(StatefulElement {
+            element: self,
+            phase: ElementPhase::Init,
+        }))
+    }
+
+    fn themed(self, theme: Theme) -> Themed<V, Self>
+    where
+        Self: Sized,
+    {
+        crate::themes::Themed {
+            child: self,
+            theme,
+            view_type: PhantomData,
+        }
+    }
+}
+
+/// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
+trait AnyStatefulElement<V> {
+    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId>;
+    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>);
+}
+
+/// A wrapper around an element that stores its layout state.
+struct StatefulElement<V: 'static, E: Element<V>> {
+    element: E,
+    phase: ElementPhase<V, E>,
+}
+
+enum ElementPhase<V: 'static, E: Element<V>> {
+    Init,
+    PostLayout {
+        layout_id: LayoutId,
+        paint_state: E::PaintState,
+    },
+    PostPaint {
+        layout: Layout,
+        paint_state: E::PaintState,
+    },
+    Error(String),
+}
+
+impl<V: 'static, E: Element<V>> Default for ElementPhase<V, E> {
+    fn default() -> Self {
+        Self::Init
+    }
+}
+
+/// We blanket-implement the object-safe ElementStateObject interface to make ElementStates into trait objects
+impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
+    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
+        let result;
+        self.phase = match self.element.layout(view, cx) {
+            Ok((layout_id, paint_state)) => {
+                result = Ok(layout_id);
+                ElementPhase::PostLayout {
+                    layout_id,
+                    paint_state,
+                }
+            }
+            Err(error) => {
+                let message = error.to_string();
+                result = Err(error);
+                ElementPhase::Error(message)
+            }
+        };
+        result
+    }
+
+    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
+        self.phase = match std::mem::take(&mut self.phase) {
+            ElementPhase::PostLayout {
+                layout_id,
+                mut paint_state,
+            } => match cx.computed_layout(layout_id) {
+                Ok(mut layout) => {
+                    layout.bounds = layout.bounds + parent_origin;
+                    self.element.paint(view, &layout, &mut paint_state, cx);
+                    ElementPhase::PostPaint {
+                        layout,
+                        paint_state,
+                    }
+                }
+                Err(error) => ElementPhase::Error(error.to_string()),
+            },
+            phase @ ElementPhase::Error(_) => phase,
+            _ => panic!("invalid element phase to call paint"),
+        };
+    }
+}
+
+/// A dynamic element.
+pub struct AnyElement<V>(Box<dyn AnyStatefulElement<V>>);
+
+impl<V> AnyElement<V> {
+    pub fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
+        self.0.layout(view, cx)
+    }
+
+    pub fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
+        self.0.paint(view, parent_origin, cx)
+    }
+}
+
+pub trait ParentElement<V: 'static> {
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]>;
+
+    fn child(mut self, child: impl IntoElement<V>) -> Self
+    where
+        Self: Sized,
+    {
+        self.children_mut().push(child.into_element().into_any());
+        self
+    }
+
+    fn children<I, E>(mut self, children: I) -> Self
+    where
+        I: IntoIterator<Item = E>,
+        E: IntoElement<V>,
+        Self: Sized,
+    {
+        self.children_mut().extend(
+            children
+                .into_iter()
+                .map(|child| child.into_element().into_any()),
+        );
+        self
+    }
+}
+
+pub trait IntoElement<V: 'static> {
+    type Element: Element<V>;
+
+    fn into_element(self) -> Self::Element;
+}
diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3b5908508ff76e656f243d829a64207b4eb57680
--- /dev/null
+++ b/crates/gpui2/src/gpui2.rs
@@ -0,0 +1,36 @@
+#![allow(dead_code, unused_variables)]
+use gpui::{serde_json, ViewContext};
+use theme::ThemeSettings;
+use themes::Theme;
+
+mod adapter;
+mod color;
+mod components;
+mod div;
+mod element;
+mod hoverable;
+mod interactive;
+mod layout_context;
+mod paint_context;
+mod pressable;
+mod style;
+mod text;
+mod themes;
+mod view;
+
+// Nathan: During the transition, we will include the base theme on the legacy Theme struct.
+fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
+    settings::get::<ThemeSettings>(cx)
+        .theme
+        .deserialized_base_theme
+        .lock()
+        .get_or_insert_with(|| {
+            let theme: Theme =
+                serde_json::from_value(settings::get::<ThemeSettings>(cx).theme.base_theme.clone())
+                    .unwrap();
+            Box::new(theme)
+        })
+        .downcast_ref::<Theme>()
+        .unwrap()
+        .clone()
+}
diff --git a/crates/gpui2/src/hoverable.rs b/crates/gpui2/src/hoverable.rs
new file mode 100644
index 0000000000000000000000000000000000000000..8ed06b7cbe6019d2118577c76dc955a54a85c48c
--- /dev/null
+++ b/crates/gpui2/src/hoverable.rs
@@ -0,0 +1,104 @@
+use crate::{
+    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
+    interactive::{InteractionHandlers, Interactive},
+    layout_context::LayoutContext,
+    paint_context::PaintContext,
+    style::{Style, StyleHelpers, Styleable},
+};
+use anyhow::Result;
+use gpui::{platform::MouseMovedEvent, LayoutId};
+use refineable::{CascadeSlot, Refineable, RefinementCascade};
+use smallvec::SmallVec;
+use std::{cell::Cell, rc::Rc};
+
+pub struct Hoverable<E: Styleable> {
+    hovered: Rc<Cell<bool>>,
+    cascade_slot: CascadeSlot,
+    hovered_style: <E::Style as Refineable>::Refinement,
+    child: E,
+}
+
+pub fn hoverable<E: Styleable>(mut child: E) -> Hoverable<E> {
+    Hoverable {
+        hovered: Rc::new(Cell::new(false)),
+        cascade_slot: child.style_cascade().reserve(),
+        hovered_style: Default::default(),
+        child,
+    }
+}
+
+impl<E: Styleable> Styleable for Hoverable<E> {
+    type Style = E::Style;
+
+    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style> {
+        self.child.style_cascade()
+    }
+
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
+        &mut self.hovered_style
+    }
+}
+
+impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
+    type PaintState = E::PaintState;
+
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)>
+    where
+        Self: Sized,
+    {
+        Ok(self.child.layout(view, cx)?)
+    }
+
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        self.hovered
+            .set(layout.bounds.contains_point(cx.mouse_position()));
+
+        let slot = self.cascade_slot;
+        let style = self.hovered.get().then_some(self.hovered_style.clone());
+        self.style_cascade().set(slot, style);
+
+        let hovered = self.hovered.clone();
+        let bounds = layout.bounds;
+        cx.on_event(layout.order, move |view, event: &MouseMovedEvent, cx| {
+            if bounds.contains_point(cx.mouse_position()) != hovered.get() {
+                cx.repaint();
+            }
+        });
+
+        self.child.paint(view, layout, paint_state, cx);
+    }
+}
+
+impl<E: Styleable<Style = Style>> StyleHelpers for Hoverable<E> {}
+
+impl<V: 'static, E: Interactive<V> + Styleable> Interactive<V> for Hoverable<E> {
+    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
+        self.child.interaction_handlers()
+    }
+}
+
+impl<V: 'static, E: ParentElement<V> + Styleable> ParentElement<V> for Hoverable<E> {
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
+        self.child.children_mut()
+    }
+}
+
+impl<V: 'static, E: Element<V> + Styleable> IntoElement<V> for Hoverable<E> {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
diff --git a/crates/gpui2/src/interactive.rs b/crates/gpui2/src/interactive.rs
new file mode 100644
index 0000000000000000000000000000000000000000..3afe928b3e6dad9f09abac49c768df106903b2dd
--- /dev/null
+++ b/crates/gpui2/src/interactive.rs
@@ -0,0 +1,147 @@
+use gpui::{
+    geometry::rect::RectF,
+    platform::{MouseButton, MouseButtonEvent},
+    EventContext,
+};
+use smallvec::SmallVec;
+use std::{cell::Cell, rc::Rc};
+
+use crate::element::PaintContext;
+
+pub trait Interactive<V: 'static> {
+    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V>;
+
+    fn on_mouse_down(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        self.interaction_handlers()
+            .mouse_down
+            .push(Rc::new(handler));
+        self
+    }
+
+    fn on_mouse_up(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        self.interaction_handlers().mouse_up.push(Rc::new(handler));
+        self
+    }
+
+    fn on_mouse_down_out(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        self.interaction_handlers()
+            .mouse_down_out
+            .push(Rc::new(handler));
+        self
+    }
+
+    fn on_mouse_up_out(
+        mut self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        self.interaction_handlers()
+            .mouse_up_out
+            .push(Rc::new(handler));
+        self
+    }
+
+    fn on_click(
+        self,
+        button: MouseButton,
+        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
+    ) -> Self
+    where
+        Self: Sized,
+    {
+        let pressed = Rc::new(Cell::new(false));
+        self.on_mouse_down(button, {
+            let pressed = pressed.clone();
+            move |_, _, _| {
+                pressed.set(true);
+            }
+        })
+        .on_mouse_up_out(button, {
+            let pressed = pressed.clone();
+            move |_, _, _| {
+                pressed.set(false);
+            }
+        })
+        .on_mouse_up(button, move |view, event, cx| {
+            if pressed.get() {
+                pressed.set(false);
+                handler(view, event, cx);
+            }
+        })
+    }
+}
+
+pub struct InteractionHandlers<V: 'static> {
+    mouse_down: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+    mouse_down_out: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+    mouse_up: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+    mouse_up_out: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
+}
+
+impl<V: 'static> InteractionHandlers<V> {
+    pub fn paint(&self, order: u32, bounds: RectF, cx: &mut PaintContext<V>) {
+        for handler in self.mouse_down.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if event.is_down && bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+        for handler in self.mouse_up.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if !event.is_down && bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+        for handler in self.mouse_down_out.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if event.is_down && !bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+        for handler in self.mouse_up_out.iter().cloned() {
+            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
+                if !event.is_down && !bounds.contains_point(event.position) {
+                    handler(view, event, cx);
+                }
+            })
+        }
+    }
+}
+
+impl<V> Default for InteractionHandlers<V> {
+    fn default() -> Self {
+        Self {
+            mouse_down: Default::default(),
+            mouse_up: Default::default(),
+            mouse_down_out: Default::default(),
+            mouse_up_out: Default::default(),
+        }
+    }
+}
diff --git a/crates/gpui2/src/layout_context.rs b/crates/gpui2/src/layout_context.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a08efdac3451e2a0a9566d7daa25f5a574d8464a
--- /dev/null
+++ b/crates/gpui2/src/layout_context.rs
@@ -0,0 +1,64 @@
+use crate::{element::LayoutId, style::Style};
+use anyhow::{anyhow, Result};
+use derive_more::{Deref, DerefMut};
+use gpui::{geometry::Size, MeasureParams, RenderContext, ViewContext};
+pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
+
+#[derive(Deref, DerefMut)]
+pub struct LayoutContext<'a, 'b, 'c, 'd, V> {
+    #[deref]
+    #[deref_mut]
+    pub(crate) legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>,
+}
+
+impl<'a, 'b, V> RenderContext<'a, 'b, V> for LayoutContext<'a, 'b, '_, '_, V> {
+    fn text_style(&self) -> gpui::fonts::TextStyle {
+        self.legacy_cx.text_style()
+    }
+
+    fn push_text_style(&mut self, style: gpui::fonts::TextStyle) {
+        self.legacy_cx.push_text_style(style)
+    }
+
+    fn pop_text_style(&mut self) {
+        self.legacy_cx.pop_text_style()
+    }
+
+    fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
+        &mut self.view_context
+    }
+}
+
+impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
+    pub fn new(legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>) -> Self {
+        Self { legacy_cx }
+    }
+
+    pub fn add_layout_node(
+        &mut self,
+        style: Style,
+        children: impl IntoIterator<Item = NodeId>,
+    ) -> Result<LayoutId> {
+        let rem_size = self.rem_pixels();
+        let id = self
+            .legacy_cx
+            .layout_engine()
+            .ok_or_else(|| anyhow!("no layout engine"))?
+            .add_node(style.to_taffy(rem_size), children)?;
+
+        Ok(id)
+    }
+
+    pub fn add_measured_layout_node<F>(&mut self, style: Style, measure: F) -> Result<LayoutId>
+    where
+        F: Fn(MeasureParams) -> Size<f32> + Sync + Send + 'static,
+    {
+        let rem_size = self.rem_pixels();
+        let layout_id = self
+            .layout_engine()
+            .ok_or_else(|| anyhow!("no layout engine"))?
+            .add_measured_node(style.to_taffy(rem_size), measure)?;
+
+        Ok(layout_id)
+    }
+}
diff --git a/crates/gpui2/src/lib.rs b/crates/gpui2/src/lib.rs
deleted file mode 100644
index 7d12d9af8195bf5e19d10c7b592b359ccd014149..0000000000000000000000000000000000000000
--- a/crates/gpui2/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-pub fn add(left: usize, right: usize) -> usize {
-    left + right
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}
diff --git a/crates/gpui2/src/paint_context.rs b/crates/gpui2/src/paint_context.rs
new file mode 100644
index 0000000000000000000000000000000000000000..0760b13cd33396b3d8c14e907c7ea8dc46eca1ae
--- /dev/null
+++ b/crates/gpui2/src/paint_context.rs
@@ -0,0 +1,54 @@
+use anyhow::{anyhow, Result};
+use derive_more::{Deref, DerefMut};
+pub use gpui::taffy::tree::NodeId;
+use gpui::{
+    scene::EventHandler, EventContext, Layout, LayoutId, PaintContext as LegacyPaintContext,
+};
+use std::{any::TypeId, rc::Rc};
+
+#[derive(Deref, DerefMut)]
+pub struct PaintContext<'a, 'b, 'c, 'd, V> {
+    #[deref]
+    #[deref_mut]
+    pub(crate) legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
+    pub(crate) scene: &'d mut gpui::SceneBuilder,
+}
+
+impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
+    pub fn new(
+        legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
+        scene: &'d mut gpui::SceneBuilder,
+    ) -> Self {
+        Self { legacy_cx, scene }
+    }
+
+    pub fn on_event<E: 'static>(
+        &mut self,
+        order: u32,
+        handler: impl Fn(&mut V, &E, &mut EventContext<V>) + 'static,
+    ) {
+        let view = self.weak_handle();
+
+        self.scene.event_handlers.push(EventHandler {
+            order,
+            handler: Rc::new(move |event, window_cx| {
+                if let Some(view) = view.upgrade(window_cx) {
+                    view.update(window_cx, |view, view_cx| {
+                        let mut event_cx = EventContext::new(view_cx);
+                        handler(view, event.downcast_ref().unwrap(), &mut event_cx);
+                        event_cx.bubble
+                    })
+                } else {
+                    true
+                }
+            }),
+            event_type: TypeId::of::<E>(),
+        })
+    }
+
+    pub(crate) fn computed_layout(&mut self, layout_id: LayoutId) -> Result<Layout> {
+        self.layout_engine()
+            .ok_or_else(|| anyhow!("no layout engine present"))?
+            .computed_layout(layout_id)
+    }
+}
diff --git a/crates/gpui2/src/playground.rs b/crates/gpui2/src/playground.rs
new file mode 100644
index 0000000000000000000000000000000000000000..43bd8d7b10a96c87bfc07579a359fd844e6bf6b2
--- /dev/null
+++ b/crates/gpui2/src/playground.rs
@@ -0,0 +1,99 @@
+#![allow(dead_code, unused_variables)]
+use crate::element::Element;
+use gpui::{
+    geometry::{rect::RectF, vector::vec2f},
+    platform::WindowOptions,
+    serde_json, ViewContext,
+};
+use log::LevelFilter;
+use settings::{default_settings, SettingsStore};
+use simplelog::SimpleLogger;
+use theme::ThemeSettings;
+use themes::Theme;
+use view::view;
+use workspace::workspace;
+
+mod adapter;
+mod color;
+mod components;
+mod div;
+mod element;
+mod hoverable;
+mod interactive;
+mod layout_context;
+mod paint_context;
+mod pressable;
+mod style;
+mod text;
+mod themes;
+mod view;
+mod workspace;
+
+fn main() {
+    SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
+
+    gpui::App::new(()).unwrap().run(|cx| {
+        let mut store = SettingsStore::default();
+        store
+            .set_default_settings(default_settings().as_ref(), cx)
+            .unwrap();
+        cx.set_global(store);
+        theme::init(Assets, cx);
+
+        cx.add_window(
+            WindowOptions {
+                bounds: gpui::platform::WindowBounds::Fixed(RectF::new(
+                    vec2f(0., 0.),
+                    vec2f(400., 300.),
+                )),
+                center: true,
+                ..Default::default()
+            },
+            |_| view(|cx| playground(cx)),
+        );
+        cx.platform().activate(true);
+    });
+}
+
+fn playground<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
+    workspace().themed(current_theme(cx))
+}
+
+// Nathan: During the transition, we will include the base theme on the legacy Theme struct.
+fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
+    settings::get::<ThemeSettings>(cx)
+        .theme
+        .deserialized_base_theme
+        .lock()
+        .get_or_insert_with(|| {
+            let theme: Theme =
+                serde_json::from_value(settings::get::<ThemeSettings>(cx).theme.base_theme.clone())
+                    .unwrap();
+            Box::new(theme)
+        })
+        .downcast_ref::<Theme>()
+        .unwrap()
+        .clone()
+}
+
+use anyhow::{anyhow, Result};
+use gpui::AssetSource;
+use rust_embed::RustEmbed;
+
+#[derive(RustEmbed)]
+#[folder = "../../../assets"]
+#[include = "themes/**/*"]
+#[exclude = "*.DS_Store"]
+pub struct Assets;
+
+impl AssetSource for Assets {
+    fn load(&self, path: &str) -> Result<std::borrow::Cow<[u8]>> {
+        Self::get(path)
+            .map(|f| f.data)
+            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
+    }
+
+    fn list(&self, path: &str) -> Vec<std::borrow::Cow<'static, str>> {
+        Self::iter().filter(|p| p.starts_with(path)).collect()
+    }
+}
diff --git a/crates/gpui2/src/pressable.rs b/crates/gpui2/src/pressable.rs
new file mode 100644
index 0000000000000000000000000000000000000000..261ec310832363de0b334b3d6986035286125d46
--- /dev/null
+++ b/crates/gpui2/src/pressable.rs
@@ -0,0 +1,107 @@
+use crate::{
+    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
+    interactive::{InteractionHandlers, Interactive},
+    layout_context::LayoutContext,
+    paint_context::PaintContext,
+    style::{Style, StyleHelpers, Styleable},
+};
+use anyhow::Result;
+use gpui::{platform::MouseButtonEvent, LayoutId};
+use refineable::{CascadeSlot, Refineable, RefinementCascade};
+use smallvec::SmallVec;
+use std::{cell::Cell, rc::Rc};
+
+pub struct Pressable<E: Styleable> {
+    pressed: Rc<Cell<bool>>,
+    pressed_style: <E::Style as Refineable>::Refinement,
+    cascade_slot: CascadeSlot,
+    child: E,
+}
+
+pub fn pressable<E: Styleable>(mut child: E) -> Pressable<E> {
+    Pressable {
+        pressed: Rc::new(Cell::new(false)),
+        pressed_style: Default::default(),
+        cascade_slot: child.style_cascade().reserve(),
+        child,
+    }
+}
+
+impl<E: Styleable> Styleable for Pressable<E> {
+    type Style = E::Style;
+
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
+        &mut self.pressed_style
+    }
+
+    fn style_cascade(&mut self) -> &mut RefinementCascade<E::Style> {
+        self.child.style_cascade()
+    }
+}
+
+impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
+    type PaintState = E::PaintState;
+
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)>
+    where
+        Self: Sized,
+    {
+        self.child.layout(view, cx)
+    }
+
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        let slot = self.cascade_slot;
+        let style = self.pressed.get().then_some(self.pressed_style.clone());
+        self.style_cascade().set(slot, style);
+
+        let pressed = self.pressed.clone();
+        let bounds = layout.bounds;
+        cx.on_event(layout.order, move |view, event: &MouseButtonEvent, cx| {
+            if event.is_down {
+                if bounds.contains_point(event.position) {
+                    pressed.set(true);
+                    cx.repaint();
+                }
+            } else if pressed.get() {
+                pressed.set(false);
+                cx.repaint();
+            }
+        });
+
+        self.child.paint(view, layout, paint_state, cx);
+    }
+}
+
+impl<E: Styleable<Style = Style>> StyleHelpers for Pressable<E> {}
+
+impl<V: 'static, E: Interactive<V> + Styleable> Interactive<V> for Pressable<E> {
+    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
+        self.child.interaction_handlers()
+    }
+}
+
+impl<V: 'static, E: ParentElement<V> + Styleable> ParentElement<V> for Pressable<E> {
+    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
+        self.child.children_mut()
+    }
+}
+
+impl<V: 'static, E: Element<V> + Styleable> IntoElement<V> for Pressable<E> {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
new file mode 100644
index 0000000000000000000000000000000000000000..f0b631993df0c101c77002dd1cf703755a9fc404
--- /dev/null
+++ b/crates/gpui2/src/style.rs
@@ -0,0 +1,379 @@
+use crate::{
+    color::Hsla,
+    hoverable::{hoverable, Hoverable},
+    paint_context::PaintContext,
+    pressable::{pressable, Pressable},
+};
+pub use gpui::taffy::style::{
+    AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
+    Overflow, Position,
+};
+use gpui::{
+    fonts::TextStyleRefinement,
+    geometry::{
+        rect::RectF, relative, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length,
+        Point, PointRefinement, Size, SizeRefinement,
+    },
+    taffy,
+};
+use gpui2_macros::styleable_helpers;
+use refineable::{Refineable, RefinementCascade};
+
+#[derive(Clone, Refineable)]
+pub struct Style {
+    /// What layout strategy should be used?
+    pub display: Display,
+
+    // Overflow properties
+    /// How children overflowing their container should affect layout
+    #[refineable]
+    pub overflow: Point<Overflow>,
+    /// How much space (in points) should be reserved for the scrollbars of `Overflow::Scroll` and `Overflow::Auto` nodes.
+    pub scrollbar_width: f32,
+
+    // Position properties
+    /// What should the `position` value of this struct use as a base offset?
+    pub position: Position,
+    /// How should the position of this element be tweaked relative to the layout defined?
+    #[refineable]
+    pub inset: Edges<Length>,
+
+    // Size properies
+    /// Sets the initial size of the item
+    #[refineable]
+    pub size: Size<Length>,
+    /// Controls the minimum size of the item
+    #[refineable]
+    pub min_size: Size<Length>,
+    /// Controls the maximum size of the item
+    #[refineable]
+    pub max_size: Size<Length>,
+    /// Sets the preferred aspect ratio for the item. The ratio is calculated as width divided by height.
+    pub aspect_ratio: Option<f32>,
+
+    // Spacing Properties
+    /// How large should the margin be on each side?
+    #[refineable]
+    pub margin: Edges<Length>,
+    /// How large should the padding be on each side?
+    #[refineable]
+    pub padding: Edges<DefiniteLength>,
+    /// How large should the border be on each side?
+    #[refineable]
+    pub border: Edges<DefiniteLength>,
+
+    // Alignment properties
+    /// How this node's children aligned in the cross/block axis?
+    pub align_items: Option<AlignItems>,
+    /// How this node should be aligned in the cross/block axis. Falls back to the parents [`AlignItems`] if not set
+    pub align_self: Option<AlignSelf>,
+    /// How should content contained within this item be aligned in the cross/block axis
+    pub align_content: Option<AlignContent>,
+    /// How should contained within this item be aligned in the main/inline axis
+    pub justify_content: Option<JustifyContent>,
+    /// How large should the gaps between items in a flex container be?
+    #[refineable]
+    pub gap: Size<DefiniteLength>,
+
+    // Flexbox properies
+    /// Which direction does the main axis flow in?
+    pub flex_direction: FlexDirection,
+    /// Should elements wrap, or stay in a single line?
+    pub flex_wrap: FlexWrap,
+    /// Sets the initial main axis size of the item
+    pub flex_basis: Length,
+    /// The relative rate at which this item grows when it is expanding to fill space, 0.0 is the default value, and this value must be positive.
+    pub flex_grow: f32,
+    /// The relative rate at which this item shrinks when it is contracting to fit into space, 1.0 is the default value, and this value must be positive.
+    pub flex_shrink: f32,
+
+    /// The fill color of this element
+    pub fill: Option<Fill>,
+    /// The radius of the corners of this element
+    #[refineable]
+    pub corner_radii: CornerRadii,
+    /// The color of text within this element. Cascades to children unless overridden.
+    pub text_color: Option<Hsla>,
+}
+
+impl Style {
+    pub fn to_taffy(&self, rem_size: f32) -> taffy::style::Style {
+        taffy::style::Style {
+            display: self.display,
+            overflow: self.overflow.clone().into(),
+            scrollbar_width: self.scrollbar_width,
+            position: self.position,
+            inset: self.inset.to_taffy(rem_size),
+            size: self.size.to_taffy(rem_size),
+            min_size: self.min_size.to_taffy(rem_size),
+            max_size: self.max_size.to_taffy(rem_size),
+            aspect_ratio: self.aspect_ratio,
+            margin: self.margin.to_taffy(rem_size),
+            padding: self.padding.to_taffy(rem_size),
+            border: self.border.to_taffy(rem_size),
+            align_items: self.align_items,
+            align_self: self.align_self,
+            align_content: self.align_content,
+            justify_content: self.justify_content,
+            gap: self.gap.to_taffy(rem_size),
+            flex_direction: self.flex_direction,
+            flex_wrap: self.flex_wrap,
+            flex_basis: self.flex_basis.to_taffy(rem_size).into(),
+            flex_grow: self.flex_grow,
+            flex_shrink: self.flex_shrink,
+            ..Default::default() // Ignore grid properties for now
+        }
+    }
+
+    /// Paints the background of an element styled with this style.
+    /// Return the bounds in which to paint the content.
+    pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
+        let rem_size = cx.rem_pixels();
+        if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
+            cx.scene.push_quad(gpui::Quad {
+                bounds,
+                background: Some(color.into()),
+                corner_radii: self.corner_radii.to_gpui(rem_size),
+                border: Default::default(),
+            });
+        }
+    }
+
+    pub fn text_style(&self) -> Option<TextStyleRefinement> {
+        if let Some(color) = self.text_color {
+            Some(TextStyleRefinement {
+                color: Some(color.into()),
+                ..Default::default()
+            })
+        } else {
+            None
+        }
+    }
+}
+
+impl Default for Style {
+    fn default() -> Self {
+        Style {
+            display: Display::Block,
+            overflow: Point {
+                x: Overflow::Visible,
+                y: Overflow::Visible,
+            },
+            scrollbar_width: 0.0,
+            position: Position::Relative,
+            inset: Edges::auto(),
+            margin: Edges::<Length>::zero(),
+            padding: Edges::<DefiniteLength>::zero(),
+            border: Edges::<DefiniteLength>::zero(),
+            size: Size::auto(),
+            min_size: Size::auto(),
+            max_size: Size::auto(),
+            aspect_ratio: None,
+            gap: Size::zero(),
+            // Aligment
+            align_items: None,
+            align_self: None,
+            align_content: None,
+            justify_content: None,
+            // Flexbox
+            flex_direction: FlexDirection::Row,
+            flex_wrap: FlexWrap::NoWrap,
+            flex_grow: 0.0,
+            flex_shrink: 1.0,
+            flex_basis: Length::Auto,
+            fill: None,
+            text_color: None,
+            corner_radii: CornerRadii::default(),
+        }
+    }
+}
+
+impl StyleRefinement {
+    pub fn text_style(&self) -> Option<TextStyleRefinement> {
+        self.text_color.map(|color| TextStyleRefinement {
+            color: Some(color.into()),
+            ..Default::default()
+        })
+    }
+}
+
+pub struct OptionalTextStyle {
+    color: Option<Hsla>,
+}
+
+impl OptionalTextStyle {
+    pub fn apply(&self, style: &mut gpui::fonts::TextStyle) {
+        if let Some(color) = self.color {
+            style.color = color.into();
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub enum Fill {
+    Color(Hsla),
+}
+
+impl Fill {
+    pub fn color(&self) -> Option<Hsla> {
+        match self {
+            Fill::Color(color) => Some(*color),
+        }
+    }
+}
+
+impl Default for Fill {
+    fn default() -> Self {
+        Self::Color(Hsla::default())
+    }
+}
+
+impl From<Hsla> for Fill {
+    fn from(color: Hsla) -> Self {
+        Self::Color(color)
+    }
+}
+
+#[derive(Clone, Refineable, Default)]
+pub struct CornerRadii {
+    top_left: AbsoluteLength,
+    top_right: AbsoluteLength,
+    bottom_left: AbsoluteLength,
+    bottom_right: AbsoluteLength,
+}
+
+impl CornerRadii {
+    pub fn to_gpui(&self, rem_size: f32) -> gpui::scene::CornerRadii {
+        gpui::scene::CornerRadii {
+            top_left: self.top_left.to_pixels(rem_size),
+            top_right: self.top_right.to_pixels(rem_size),
+            bottom_left: self.bottom_left.to_pixels(rem_size),
+            bottom_right: self.bottom_right.to_pixels(rem_size),
+        }
+    }
+}
+
+pub trait Styleable {
+    type Style: Refineable + Default;
+
+    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style>;
+    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement;
+
+    fn computed_style(&mut self) -> Self::Style {
+        Self::Style::from_refinement(&self.style_cascade().merged())
+    }
+
+    fn hovered(self) -> Hoverable<Self>
+    where
+        Self: Sized,
+    {
+        hoverable(self)
+    }
+
+    fn pressed(self) -> Pressable<Self>
+    where
+        Self: Sized,
+    {
+        pressable(self)
+    }
+}
+
+// Helpers methods that take and return mut self. This includes tailwind style methods for standard sizes etc.
+//
+// Example:
+// // Sets the padding to 0.5rem, just like class="p-2" in Tailwind.
+// fn p_2(mut self) -> Self where Self: Sized;
+pub trait StyleHelpers: Styleable<Style = Style> {
+    styleable_helpers!();
+
+    fn h(mut self, height: Length) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().size.height = Some(height);
+        self
+    }
+
+    fn full(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().size.width = Some(relative(1.));
+        self.declared_style().size.height = Some(relative(1.));
+        self
+    }
+
+    fn relative(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().position = Some(Position::Relative);
+        self
+    }
+
+    fn absolute(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().position = Some(Position::Absolute);
+        self
+    }
+
+    fn block(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().display = Some(Display::Block);
+        self
+    }
+
+    fn flex(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().display = Some(Display::Flex);
+        self
+    }
+
+    fn flex_col(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_direction = Some(FlexDirection::Column);
+        self
+    }
+
+    fn flex_row(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_direction = Some(FlexDirection::Row);
+        self
+    }
+
+    fn flex_grow(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_grow = Some(1.);
+        self
+    }
+
+    fn fill<F>(mut self, fill: F) -> Self
+    where
+        F: Into<Fill>,
+        Self: Sized,
+    {
+        self.declared_style().fill = Some(fill.into());
+        self
+    }
+
+    fn text_color<C>(mut self, color: C) -> Self
+    where
+        C: Into<Hsla>,
+        Self: Sized,
+    {
+        self.declared_style().text_color = Some(color.into());
+        self
+    }
+}
diff --git a/crates/gpui2/src/text.rs b/crates/gpui2/src/text.rs
new file mode 100644
index 0000000000000000000000000000000000000000..d43ecb0329a441356ed02b73fc49e1ba7d9cee22
--- /dev/null
+++ b/crates/gpui2/src/text.rs
@@ -0,0 +1,148 @@
+use crate::{
+    element::{Element, IntoElement, Layout},
+    layout_context::LayoutContext,
+    paint_context::PaintContext,
+};
+use anyhow::Result;
+use gpui::{geometry::Size, text_layout::LineLayout, LayoutId, RenderContext};
+use parking_lot::Mutex;
+use std::sync::Arc;
+
+impl<V: 'static, S: Into<ArcCow<'static, str>>> IntoElement<V> for S {
+    type Element = Text;
+
+    fn into_element(self) -> Self::Element {
+        Text { text: self.into() }
+    }
+}
+
+pub struct Text {
+    text: ArcCow<'static, str>,
+}
+
+impl<V: 'static> Element<V> for Text {
+    type PaintState = Arc<Mutex<Option<TextLayout>>>;
+
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> Result<(LayoutId, Self::PaintState)> {
+        let rem_size = cx.rem_pixels();
+        let fonts = cx.platform().fonts();
+        let text_style = cx.text_style();
+        let line_height = cx.font_cache().line_height(text_style.font_size);
+        let text = self.text.clone();
+        let paint_state = Arc::new(Mutex::new(None));
+
+        let layout_id = cx.add_measured_layout_node(Default::default(), {
+            let paint_state = paint_state.clone();
+            move |params| {
+                let line_layout = fonts.layout_line(
+                    text.as_ref(),
+                    text_style.font_size,
+                    &[(text.len(), text_style.to_run())],
+                );
+
+                let size = Size {
+                    width: line_layout.width,
+                    height: line_height,
+                };
+
+                paint_state.lock().replace(TextLayout {
+                    line_layout: Arc::new(line_layout),
+                    line_height,
+                });
+
+                size
+            }
+        });
+
+        Ok((layout_id?, paint_state))
+    }
+
+    fn paint<'a>(
+        &mut self,
+        view: &mut V,
+        layout: &Layout,
+        paint_state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) {
+        let line_layout;
+        let line_height;
+        {
+            let paint_state = paint_state.lock();
+            let paint_state = paint_state
+                .as_ref()
+                .expect("measurement has not been performed");
+            line_layout = paint_state.line_layout.clone();
+            line_height = paint_state.line_height;
+        }
+
+        let text_style = cx.text_style();
+        let line =
+            gpui::text_layout::Line::new(line_layout, &[(self.text.len(), text_style.to_run())]);
+
+        let origin = layout.bounds.origin();
+        // TODO: We haven't added visible bounds to the new element system yet, so this is a placeholder.
+        let visible_bounds = layout.bounds;
+        line.paint(cx.scene, origin, visible_bounds, line_height, cx.legacy_cx);
+    }
+}
+
+pub struct TextLayout {
+    line_layout: Arc<LineLayout>,
+    line_height: f32,
+}
+
+pub enum ArcCow<'a, T: ?Sized> {
+    Borrowed(&'a T),
+    Owned(Arc<T>),
+}
+
+impl<'a, T: ?Sized> Clone for ArcCow<'a, T> {
+    fn clone(&self) -> Self {
+        match self {
+            Self::Borrowed(borrowed) => Self::Borrowed(borrowed),
+            Self::Owned(owned) => Self::Owned(owned.clone()),
+        }
+    }
+}
+
+impl<'a, T: ?Sized> From<&'a T> for ArcCow<'a, T> {
+    fn from(s: &'a T) -> Self {
+        Self::Borrowed(s)
+    }
+}
+
+impl<T> From<Arc<T>> for ArcCow<'_, T> {
+    fn from(s: Arc<T>) -> Self {
+        Self::Owned(s)
+    }
+}
+
+impl From<String> for ArcCow<'_, str> {
+    fn from(value: String) -> Self {
+        Self::Owned(value.into())
+    }
+}
+
+impl<T: ?Sized> std::ops::Deref for ArcCow<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            ArcCow::Borrowed(s) => s,
+            ArcCow::Owned(s) => s.as_ref(),
+        }
+    }
+}
+
+impl<T: ?Sized> AsRef<T> for ArcCow<'_, T> {
+    fn as_ref(&self) -> &T {
+        match self {
+            ArcCow::Borrowed(borrowed) => borrowed,
+            ArcCow::Owned(owned) => owned.as_ref(),
+        }
+    }
+}
diff --git a/crates/gpui2/src/themes.rs b/crates/gpui2/src/themes.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e372e1e31bcaf1b99b51030eee4cf7f63739af0b
--- /dev/null
+++ b/crates/gpui2/src/themes.rs
@@ -0,0 +1,175 @@
+use crate::{
+    color::Hsla,
+    element::{Element, PaintContext},
+    layout_context::LayoutContext,
+};
+use gpui::WindowContext;
+use serde::{de::Visitor, Deserialize, Deserializer};
+use std::{collections::HashMap, fmt, marker::PhantomData};
+
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct Theme {
+    pub name: String,
+    pub is_light: bool,
+    pub lowest: Layer,
+    pub middle: Layer,
+    pub highest: Layer,
+    pub popover_shadow: Shadow,
+    pub modal_shadow: Shadow,
+    #[serde(deserialize_with = "deserialize_player_colors")]
+    pub players: Vec<PlayerColors>,
+    #[serde(deserialize_with = "deserialize_syntax_colors")]
+    pub syntax: HashMap<String, Hsla>,
+}
+
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct Layer {
+    pub base: StyleSet,
+    pub variant: StyleSet,
+    pub on: StyleSet,
+    pub accent: StyleSet,
+    pub positive: StyleSet,
+    pub warning: StyleSet,
+    pub negative: StyleSet,
+}
+
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct StyleSet {
+    #[serde(rename = "default")]
+    pub default: ContainerColors,
+    pub hovered: ContainerColors,
+    pub pressed: ContainerColors,
+    pub active: ContainerColors,
+    pub disabled: ContainerColors,
+    pub inverted: ContainerColors,
+}
+
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct ContainerColors {
+    pub background: Hsla,
+    pub foreground: Hsla,
+    pub border: Hsla,
+}
+
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct PlayerColors {
+    pub selection: Hsla,
+    pub cursor: Hsla,
+}
+
+#[derive(Deserialize, Clone, Default, Debug)]
+pub struct Shadow {
+    pub blur: u8,
+    pub color: Hsla,
+    pub offset: Vec<u8>,
+}
+
+pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
+    cx.theme::<Theme>()
+}
+
+fn deserialize_player_colors<'de, D>(deserializer: D) -> Result<Vec<PlayerColors>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    struct PlayerArrayVisitor;
+
+    impl<'de> Visitor<'de> for PlayerArrayVisitor {
+        type Value = Vec<PlayerColors>;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("an object with integer keys")
+        }
+
+        fn visit_map<A: serde::de::MapAccess<'de>>(
+            self,
+            mut map: A,
+        ) -> Result<Self::Value, A::Error> {
+            let mut players = Vec::with_capacity(8);
+            while let Some((key, value)) = map.next_entry::<usize, PlayerColors>()? {
+                if key < 8 {
+                    players.push(value);
+                } else {
+                    return Err(serde::de::Error::invalid_value(
+                        serde::de::Unexpected::Unsigned(key as u64),
+                        &"a key in range 0..7",
+                    ));
+                }
+            }
+            Ok(players)
+        }
+    }
+
+    deserializer.deserialize_map(PlayerArrayVisitor)
+}
+
+fn deserialize_syntax_colors<'de, D>(deserializer: D) -> Result<HashMap<String, Hsla>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    #[derive(Deserialize)]
+    struct ColorWrapper {
+        color: Hsla,
+    }
+
+    struct SyntaxVisitor;
+
+    impl<'de> Visitor<'de> for SyntaxVisitor {
+        type Value = HashMap<String, Hsla>;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("a map with keys and objects with a single color field as values")
+        }
+
+        fn visit_map<M>(self, mut map: M) -> Result<HashMap<String, Hsla>, M::Error>
+        where
+            M: serde::de::MapAccess<'de>,
+        {
+            let mut result = HashMap::new();
+            while let Some(key) = map.next_key()? {
+                let wrapper: ColorWrapper = map.next_value()?; // Deserialize values as Hsla
+                result.insert(key, wrapper.color);
+            }
+            Ok(result)
+        }
+    }
+    deserializer.deserialize_map(SyntaxVisitor)
+}
+
+pub struct Themed<V: 'static, E> {
+    pub(crate) theme: Theme,
+    pub(crate) child: E,
+    pub(crate) view_type: PhantomData<V>,
+}
+
+impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
+    type PaintState = E::PaintState;
+
+    fn layout(
+        &mut self,
+        view: &mut V,
+        cx: &mut LayoutContext<V>,
+    ) -> anyhow::Result<(gpui::LayoutId, Self::PaintState)>
+    where
+        Self: Sized,
+    {
+        cx.push_theme(self.theme.clone());
+        let result = self.child.layout(view, cx);
+        cx.pop_theme();
+        result
+    }
+
+    fn paint(
+        &mut self,
+        view: &mut V,
+        layout: &gpui::Layout,
+        state: &mut Self::PaintState,
+        cx: &mut PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        cx.push_theme(self.theme.clone());
+        self.child.paint(view, layout, state, cx);
+        cx.pop_theme();
+    }
+}
diff --git a/crates/gpui2/src/themes/rose_pine.rs b/crates/gpui2/src/themes/rose_pine.rs
new file mode 100644
index 0000000000000000000000000000000000000000..628a93227968ce141fb932d5f9a2f37990e899a2
--- /dev/null
+++ b/crates/gpui2/src/themes/rose_pine.rs
@@ -0,0 +1,133 @@
+use std::ops::Range;
+
+use crate::{
+    color::{hsla, rgb, Hsla},
+    ThemeColors,
+};
+
+pub struct RosePineThemes {
+    pub default: RosePinePalette,
+    pub dawn: RosePinePalette,
+    pub moon: RosePinePalette,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct RosePinePalette {
+    pub base: Hsla,
+    pub surface: Hsla,
+    pub overlay: Hsla,
+    pub muted: Hsla,
+    pub subtle: Hsla,
+    pub text: Hsla,
+    pub love: Hsla,
+    pub gold: Hsla,
+    pub rose: Hsla,
+    pub pine: Hsla,
+    pub foam: Hsla,
+    pub iris: Hsla,
+    pub highlight_low: Hsla,
+    pub highlight_med: Hsla,
+    pub highlight_high: Hsla,
+}
+
+impl RosePinePalette {
+    pub fn default() -> RosePinePalette {
+        RosePinePalette {
+            base: rgb(0x191724),
+            surface: rgb(0x1f1d2e),
+            overlay: rgb(0x26233a),
+            muted: rgb(0x6e6a86),
+            subtle: rgb(0x908caa),
+            text: rgb(0xe0def4),
+            love: rgb(0xeb6f92),
+            gold: rgb(0xf6c177),
+            rose: rgb(0xebbcba),
+            pine: rgb(0x31748f),
+            foam: rgb(0x9ccfd8),
+            iris: rgb(0xc4a7e7),
+            highlight_low: rgb(0x21202e),
+            highlight_med: rgb(0x403d52),
+            highlight_high: rgb(0x524f67),
+        }
+    }
+
+    pub fn moon() -> RosePinePalette {
+        RosePinePalette {
+            base: rgb(0x232136),
+            surface: rgb(0x2a273f),
+            overlay: rgb(0x393552),
+            muted: rgb(0x6e6a86),
+            subtle: rgb(0x908caa),
+            text: rgb(0xe0def4),
+            love: rgb(0xeb6f92),
+            gold: rgb(0xf6c177),
+            rose: rgb(0xea9a97),
+            pine: rgb(0x3e8fb0),
+            foam: rgb(0x9ccfd8),
+            iris: rgb(0xc4a7e7),
+            highlight_low: rgb(0x2a283e),
+            highlight_med: rgb(0x44415a),
+            highlight_high: rgb(0x56526e),
+        }
+    }
+
+    pub fn dawn() -> RosePinePalette {
+        RosePinePalette {
+            base: rgb(0xfaf4ed),
+            surface: rgb(0xfffaf3),
+            overlay: rgb(0xf2e9e1),
+            muted: rgb(0x9893a5),
+            subtle: rgb(0x797593),
+            text: rgb(0x575279),
+            love: rgb(0xb4637a),
+            gold: rgb(0xea9d34),
+            rose: rgb(0xd7827e),
+            pine: rgb(0x286983),
+            foam: rgb(0x56949f),
+            iris: rgb(0x907aa9),
+            highlight_low: rgb(0xf4ede8),
+            highlight_med: rgb(0xdfdad9),
+            highlight_high: rgb(0xcecacd),
+        }
+    }
+}
+
+pub fn default() -> ThemeColors {
+    theme_colors(&RosePinePalette::default())
+}
+
+pub fn moon() -> ThemeColors {
+    theme_colors(&RosePinePalette::moon())
+}
+
+pub fn dawn() -> ThemeColors {
+    theme_colors(&RosePinePalette::dawn())
+}
+
+fn theme_colors(p: &RosePinePalette) -> ThemeColors {
+    ThemeColors {
+        base: scale_sl(p.base, (0.8, 0.8), (1.2, 1.2)),
+        surface: scale_sl(p.surface, (0.8, 0.8), (1.2, 1.2)),
+        overlay: scale_sl(p.overlay, (0.8, 0.8), (1.2, 1.2)),
+        muted: scale_sl(p.muted, (0.8, 0.8), (1.2, 1.2)),
+        subtle: scale_sl(p.subtle, (0.8, 0.8), (1.2, 1.2)),
+        text: scale_sl(p.text, (0.8, 0.8), (1.2, 1.2)),
+        highlight_low: scale_sl(p.highlight_low, (0.8, 0.8), (1.2, 1.2)),
+        highlight_med: scale_sl(p.highlight_med, (0.8, 0.8), (1.2, 1.2)),
+        highlight_high: scale_sl(p.highlight_high, (0.8, 0.8), (1.2, 1.2)),
+        success: scale_sl(p.foam, (0.8, 0.8), (1.2, 1.2)),
+        warning: scale_sl(p.gold, (0.8, 0.8), (1.2, 1.2)),
+        error: scale_sl(p.love, (0.8, 0.8), (1.2, 1.2)),
+        inserted: scale_sl(p.foam, (0.8, 0.8), (1.2, 1.2)),
+        deleted: scale_sl(p.love, (0.8, 0.8), (1.2, 1.2)),
+        modified: scale_sl(p.rose, (0.8, 0.8), (1.2, 1.2)),
+    }
+}
+
+/// Produces a range by multiplying the saturation and lightness of the base color by the given
+/// start and end factors.
+fn scale_sl(base: Hsla, (start_s, start_l): (f32, f32), (end_s, end_l): (f32, f32)) -> Range<Hsla> {
+    let start = hsla(base.h, base.s * start_s, base.l * start_l, base.a);
+    let end = hsla(base.h, base.s * end_s, base.l * end_l, base.a);
+    Range { start, end }
+}
diff --git a/crates/gpui2/src/view.rs b/crates/gpui2/src/view.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cb0eebed7b55ce98e03e0e6384967e2d8492d721
--- /dev/null
+++ b/crates/gpui2/src/view.rs
@@ -0,0 +1,26 @@
+use crate::{
+    adapter::AdapterElement,
+    element::{AnyElement, Element},
+};
+use gpui::ViewContext;
+
+pub fn view<F, E>(mut render: F) -> ViewFn
+where
+    F: 'static + FnMut(&mut ViewContext<ViewFn>) -> E,
+    E: Element<ViewFn>,
+{
+    ViewFn(Box::new(move |cx| (render)(cx).into_any()))
+}
+
+pub struct ViewFn(Box<dyn FnMut(&mut ViewContext<ViewFn>) -> AnyElement<ViewFn>>);
+
+impl gpui::Entity for ViewFn {
+    type Event = ();
+}
+
+impl gpui::View for ViewFn {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> gpui::AnyElement<Self> {
+        use gpui::Element as _;
+        AdapterElement((self.0)(cx)).into_any()
+    }
+}
diff --git a/crates/gpui2_macros/src/derive_element.rs b/crates/gpui2_macros/src/derive_element.rs
index 82fb63574a0d63d2969d3b9cb352fba737f8a860..63d1ca62ee6e9b44f5302a331a1bb7c71da1e782 100644
--- a/crates/gpui2_macros/src/derive_element.rs
+++ b/crates/gpui2_macros/src/derive_element.rs
@@ -59,16 +59,16 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
     );
 
     let gen = quote! {
-        impl #impl_generics playground::element::Element<#view_type_name> for #type_name #type_generics
+        impl #impl_generics gpui2::element::Element<#view_type_name> for #type_name #type_generics
         #where_clause
         {
-            type PaintState = playground::element::AnyElement<#view_type_name #lifetimes>;
+            type PaintState = gpui2::element::AnyElement<#view_type_name #lifetimes>;
 
             fn layout(
                 &mut self,
                 view: &mut V,
-                cx: &mut playground::element::LayoutContext<V>,
-            ) -> anyhow::Result<(playground::element::LayoutId, Self::PaintState)> {
+                cx: &mut gpui2::element::LayoutContext<V>,
+            ) -> anyhow::Result<(gpui2::element::LayoutId, Self::PaintState)> {
                 let mut rendered_element = self.render(view, cx).into_element().into_any();
                 let layout_id = rendered_element.layout(view, cx)?;
                 Ok((layout_id, rendered_element))
@@ -77,9 +77,9 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
             fn paint(
                 &mut self,
                 view: &mut V,
-                layout: &playground::element::Layout,
+                layout: &gpui2::element::Layout,
                 rendered_element: &mut Self::PaintState,
-                cx: &mut playground::element::PaintContext<V>,
+                cx: &mut gpui2::element::PaintContext<V>,
             ) {
                 rendered_element.paint(view, layout.bounds.origin(), cx);
             }
diff --git a/crates/gpui2_macros/src/derive_into_element.rs b/crates/gpui2_macros/src/derive_into_element.rs
index e0b62cdf981ed81db21e61a866524195c1f51801..6ede89e284c152eaf8aafc3c6bea4dae30436e86 100644
--- a/crates/gpui2_macros/src/derive_into_element.rs
+++ b/crates/gpui2_macros/src/derive_into_element.rs
@@ -56,7 +56,7 @@ pub fn impl_into_element(
     where_clause: &Option<&WhereClause>,
 ) -> proc_macro2::TokenStream {
     quote! {
-        impl #impl_generics playground::element::IntoElement<#view_type_name> for #type_name #type_generics
+        impl #impl_generics gpui2::element::IntoElement<#view_type_name> for #type_name #type_generics
         #where_clause
         {
             type Element = Self;

From 3b5ee59273b0f6d36e95678311896936a9f107a8 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 30 Aug 2023 16:12:14 -0600
Subject: [PATCH 023/109] Split playground into gpui2 and storybook

---
 Cargo.lock                                    |  35 +-
 Cargo.toml                                    |   2 +-
 crates/gpui/playground/Cargo.toml             |  28 --
 crates/gpui/playground/src/adapter.rs         |  78 ----
 crates/gpui/playground/src/components.rs      | 101 -----
 crates/gpui/playground/src/div.rs             | 116 ------
 crates/gpui/playground/src/element.rs         | 170 --------
 crates/gpui/playground/src/hoverable.rs       | 104 -----
 crates/gpui/playground/src/interactive.rs     | 147 -------
 crates/gpui/playground/src/layout_context.rs  |  64 ---
 crates/gpui/playground/src/paint_context.rs   |  54 ---
 crates/gpui/playground/src/playground.rs      |  99 -----
 crates/gpui/playground/src/style.rs           | 379 ------------------
 crates/gpui/playground/src/themes.rs          | 175 --------
 .../gpui/playground/src/themes/rose_pine.rs   | 133 ------
 crates/gpui/playground/src/view.rs            |  26 --
 crates/gpui/src/app.rs                        |   2 +-
 crates/gpui/src/scene.rs                      |   2 +-
 crates/gpui2/Cargo.toml                       |   3 +
 crates/gpui2/src/adapter.rs                   |   3 +-
 crates/gpui2/src/element.rs                   |  12 -
 crates/gpui2/src/elements.rs                  |   6 +
 crates/gpui2/src/{ => elements}/div.rs        |   4 +-
 crates/gpui2/src/{ => elements}/hoverable.rs  |   2 +-
 .../src => gpui2/src/elements}/pressable.rs   |   2 +-
 .../src => gpui2/src/elements}/text.rs        |   5 +-
 crates/gpui2/src/gpui2.rs                     |  56 +--
 crates/gpui2/src/interactive.rs               |  26 +-
 crates/gpui2/src/pressable.rs                 | 107 -----
 crates/gpui2/src/style.rs                     |   4 +-
 crates/gpui2/src/text.rs                      | 148 -------
 crates/gpui2/src/themes/rose_pine.rs          | 133 ------
 .../{gpui/playground => storybook}/Cargo.lock |   2 +-
 crates/storybook/Cargo.toml                   |  23 ++
 .../playground => storybook}/docs/thoughts.md |   0
 crates/{gpui2 => storybook}/src/components.rs |  13 +-
 crates/storybook/src/element_ext.rs           |  22 +
 .../src/storybook.rs}                         |  48 +--
 .../src/themes.rs => storybook/src/theme.rs}  |  33 +-
 .../playground => storybook}/src/workspace.rs |  12 +-
 test.rs                                       |   6 +-
 41 files changed, 175 insertions(+), 2210 deletions(-)
 delete mode 100644 crates/gpui/playground/Cargo.toml
 delete mode 100644 crates/gpui/playground/src/adapter.rs
 delete mode 100644 crates/gpui/playground/src/components.rs
 delete mode 100644 crates/gpui/playground/src/div.rs
 delete mode 100644 crates/gpui/playground/src/element.rs
 delete mode 100644 crates/gpui/playground/src/hoverable.rs
 delete mode 100644 crates/gpui/playground/src/interactive.rs
 delete mode 100644 crates/gpui/playground/src/layout_context.rs
 delete mode 100644 crates/gpui/playground/src/paint_context.rs
 delete mode 100644 crates/gpui/playground/src/playground.rs
 delete mode 100644 crates/gpui/playground/src/style.rs
 delete mode 100644 crates/gpui/playground/src/themes.rs
 delete mode 100644 crates/gpui/playground/src/themes/rose_pine.rs
 delete mode 100644 crates/gpui/playground/src/view.rs
 create mode 100644 crates/gpui2/src/elements.rs
 rename crates/gpui2/src/{ => elements}/div.rs (96%)
 rename crates/gpui2/src/{ => elements}/hoverable.rs (97%)
 rename crates/{gpui/playground/src => gpui2/src/elements}/pressable.rs (97%)
 rename crates/{gpui/playground/src => gpui2/src/elements}/text.rs (97%)
 delete mode 100644 crates/gpui2/src/pressable.rs
 delete mode 100644 crates/gpui2/src/text.rs
 delete mode 100644 crates/gpui2/src/themes/rose_pine.rs
 rename crates/{gpui/playground => storybook}/Cargo.lock (99%)
 create mode 100644 crates/storybook/Cargo.toml
 rename crates/{gpui/playground => storybook}/docs/thoughts.md (100%)
 rename crates/{gpui2 => storybook}/src/components.rs (90%)
 create mode 100644 crates/storybook/src/element_ext.rs
 rename crates/{gpui2/src/playground.rs => storybook/src/storybook.rs} (68%)
 rename crates/{gpui2/src/themes.rs => storybook/src/theme.rs} (87%)
 rename crates/{gpui/playground => storybook}/src/workspace.rs (83%)

diff --git a/Cargo.lock b/Cargo.lock
index bb0c39372d499ef56e6fbd6e5ddfd153e6de8289..496567459a67d83d7d5faadeae9d8be04a2bcd74 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5194,26 +5194,6 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
-[[package]]
-name = "playground"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "derive_more",
- "gpui",
- "gpui2_macros",
- "log",
- "parking_lot 0.11.2",
- "refineable",
- "rust-embed",
- "serde",
- "settings",
- "simplelog",
- "smallvec",
- "theme",
- "util",
-]
-
 [[package]]
 name = "plist"
 version = "1.5.0"
@@ -7320,6 +7300,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "storybook"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "gpui2",
+ "log",
+ "rust-embed",
+ "serde",
+ "settings",
+ "simplelog",
+ "theme",
+ "util",
+]
+
 [[package]]
 name = "stringprep"
 version = "0.1.3"
diff --git a/Cargo.toml b/Cargo.toml
index 119d0c894730f900bcb96294eb192375ceea307b..789652f3797fc4c1496099ede65cb493015fa6b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,6 @@ members = [
     "crates/git",
     "crates/go_to_line",
     "crates/gpui",
-    "crates/gpui/playground",
     "crates/gpui_macros",
     "crates/gpui2",
     "crates/gpui2_macros",
@@ -64,6 +63,7 @@ members = [
     "crates/sqlez",
     "crates/sqlez_macros",
     "crates/feature_flags",
+    "crates/storybook",
     "crates/sum_tree",
     "crates/terminal",
     "crates/text",
diff --git a/crates/gpui/playground/Cargo.toml b/crates/gpui/playground/Cargo.toml
deleted file mode 100644
index a817387dc00eb10435e64bedb4b9cc39b53c64de..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-name = "playground"
-version = "0.1.0"
-edition = "2021"
-publish = false
-
-[[bin]]
-name = "playground"
-path = "src/playground.rs"
-
-[dependencies]
-anyhow.workspace = true
-derive_more.workspace = true
-gpui = { path = ".." }
-log.workspace = true
-gpui2_macros = { path = "../../gpui2_macros" }
-parking_lot.workspace = true
-refineable.workspace = true
-rust-embed.workspace = true
-serde.workspace = true
-settings = { path = "../../settings" }
-simplelog = "0.9"
-smallvec.workspace = true
-theme = { path = "../../theme" }
-util = { path = "../../util" }
-
-[dev-dependencies]
-gpui = { path = "..", features = ["test-support"] }
diff --git a/crates/gpui/playground/src/adapter.rs b/crates/gpui/playground/src/adapter.rs
deleted file mode 100644
index eff2356c94a36cffdcf08d13df9985fd7f9a025a..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/adapter.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::{layout_context::LayoutContext, paint_context::PaintContext};
-use gpui::{geometry::rect::RectF, LayoutEngine, LayoutId};
-use util::ResultExt;
-
-/// Makes a new, playground-style element into a legacy element.
-pub struct AdapterElement<V>(pub(crate) crate::element::AnyElement<V>);
-
-impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
-    type LayoutState = Option<(LayoutEngine, LayoutId)>;
-    type PaintState = ();
-
-    fn layout(
-        &mut self,
-        constraint: gpui::SizeConstraint,
-        view: &mut V,
-        cx: &mut gpui::LayoutContext<V>,
-    ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
-        cx.push_layout_engine(LayoutEngine::new());
-
-        let size = constraint.max;
-        let mut cx = LayoutContext::new(cx);
-        let layout_id = self.0.layout(view, &mut cx).log_err();
-        if let Some(layout_id) = layout_id {
-            cx.layout_engine()
-                .unwrap()
-                .compute_layout(layout_id, constraint.max)
-                .log_err();
-        }
-
-        let layout_engine = cx.pop_layout_engine();
-        debug_assert!(layout_engine.is_some(),
-            "unexpected layout stack state. is there an unmatched pop_layout_engine in the called code?"
-        );
-
-        (constraint.max, layout_engine.zip(layout_id))
-    }
-
-    fn paint(
-        &mut self,
-        scene: &mut gpui::SceneBuilder,
-        bounds: RectF,
-        visible_bounds: RectF,
-        layout_data: &mut Option<(LayoutEngine, LayoutId)>,
-        view: &mut V,
-        legacy_cx: &mut gpui::PaintContext<V>,
-    ) -> Self::PaintState {
-        let (layout_engine, layout_id) = layout_data.take().unwrap();
-        legacy_cx.push_layout_engine(layout_engine);
-        let mut cx = PaintContext::new(legacy_cx, scene);
-        self.0.paint(view, bounds.origin(), &mut cx);
-        *layout_data = legacy_cx.pop_layout_engine().zip(Some(layout_id));
-        debug_assert!(layout_data.is_some());
-    }
-
-    fn rect_for_text_range(
-        &self,
-        range_utf16: std::ops::Range<usize>,
-        bounds: RectF,
-        visible_bounds: RectF,
-        layout: &Self::LayoutState,
-        paint: &Self::PaintState,
-        view: &V,
-        cx: &gpui::ViewContext<V>,
-    ) -> Option<RectF> {
-        todo!("implement before merging to main")
-    }
-
-    fn debug(
-        &self,
-        bounds: RectF,
-        layout: &Self::LayoutState,
-        paint: &Self::PaintState,
-        view: &V,
-        cx: &gpui::ViewContext<V>,
-    ) -> gpui::serde_json::Value {
-        todo!("implement before merging to main")
-    }
-}
diff --git a/crates/gpui/playground/src/components.rs b/crates/gpui/playground/src/components.rs
deleted file mode 100644
index a98fea33830ee382efb9cab25449227c8a716170..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/components.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use crate::{
-    div::div,
-    element::{IntoElement, ParentElement},
-    interactive::Interactive,
-    style::StyleHelpers,
-    text::ArcCow,
-    // themes::Theme,
-};
-use gpui::{platform::MouseButton, ViewContext};
-use gpui2_macros::Element;
-use std::{marker::PhantomData, rc::Rc};
-
-struct ButtonHandlers<V, D> {
-    click: Option<Rc<dyn Fn(&mut V, &D, &mut ViewContext<V>)>>,
-}
-
-impl<V, D> Default for ButtonHandlers<V, D> {
-    fn default() -> Self {
-        Self { click: None }
-    }
-}
-
-use crate as gpui2;
-#[derive(Element)]
-pub struct Button<V: 'static, D: 'static> {
-    handlers: ButtonHandlers<V, D>,
-    label: Option<ArcCow<'static, str>>,
-    icon: Option<ArcCow<'static, str>>,
-    data: Rc<D>,
-    view_type: PhantomData<V>,
-}
-
-// Impl block for buttons without data.
-// See below for an impl block for any button.
-impl<V: 'static> Button<V, ()> {
-    fn new() -> Self {
-        Self {
-            handlers: ButtonHandlers::default(),
-            label: None,
-            icon: None,
-            data: Rc::new(()),
-            view_type: PhantomData,
-        }
-    }
-
-    pub fn data<D: 'static>(self, data: D) -> Button<V, D> {
-        Button {
-            handlers: ButtonHandlers::default(),
-            label: self.label,
-            icon: self.icon,
-            data: Rc::new(data),
-            view_type: PhantomData,
-        }
-    }
-}
-
-// Impl block for button regardless of its data type.
-impl<V: 'static, D: 'static> Button<V, D> {
-    pub fn label(mut self, label: impl Into<ArcCow<'static, str>>) -> Self {
-        self.label = Some(label.into());
-        self
-    }
-
-    pub fn icon(mut self, icon: impl Into<ArcCow<'static, str>>) -> Self {
-        self.icon = Some(icon.into());
-        self
-    }
-
-    pub fn on_click(mut self, handler: impl Fn(&mut V, &D, &mut ViewContext<V>) + 'static) -> Self {
-        self.handlers.click = Some(Rc::new(handler));
-        self
-    }
-}
-
-pub fn button<V>() -> Button<V, ()> {
-    Button::new()
-}
-
-impl<V: 'static, D: 'static> Button<V, D> {
-    fn render(
-        &mut self,
-        view: &mut V,
-        cx: &mut ViewContext<V>,
-    ) -> impl IntoElement<V> + Interactive<V> {
-        // let colors = &cx.theme::<Theme>().colors;
-
-        let button = div()
-            // .fill(colors.error(0.5))
-            .h_4()
-            .children(self.label.clone());
-
-        if let Some(handler) = self.handlers.click.clone() {
-            let data = self.data.clone();
-            button.on_mouse_down(MouseButton::Left, move |view, event, cx| {
-                handler(view, data.as_ref(), cx)
-            })
-        } else {
-            button
-        }
-    }
-}
diff --git a/crates/gpui/playground/src/div.rs b/crates/gpui/playground/src/div.rs
deleted file mode 100644
index 79d539b221354c568195aa8e9b4c111142063b08..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/div.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use crate::{
-    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
-    interactive::{InteractionHandlers, Interactive},
-    layout_context::LayoutContext,
-    paint_context::PaintContext,
-    style::{Style, StyleHelpers, Styleable},
-};
-use anyhow::Result;
-use gpui::{LayoutId, RenderContext};
-use refineable::{Refineable, RefinementCascade};
-use smallvec::SmallVec;
-
-pub struct Div<V: 'static> {
-    styles: RefinementCascade<Style>,
-    handlers: InteractionHandlers<V>,
-    children: SmallVec<[AnyElement<V>; 2]>,
-}
-
-pub fn div<V>() -> Div<V> {
-    Div {
-        styles: Default::default(),
-        handlers: Default::default(),
-        children: Default::default(),
-    }
-}
-
-impl<V: 'static> Element<V> for Div<V> {
-    type PaintState = ();
-
-    fn layout(
-        &mut self,
-        view: &mut V,
-        cx: &mut LayoutContext<V>,
-    ) -> Result<(LayoutId, Self::PaintState)>
-    where
-        Self: Sized,
-    {
-        let style = self.computed_style();
-        let pop_text_style = style.text_style().map_or(false, |style| {
-            cx.push_text_style(cx.text_style().clone().refined(&style));
-            true
-        });
-
-        let children = self
-            .children
-            .iter_mut()
-            .map(|child| child.layout(view, cx))
-            .collect::<Result<Vec<LayoutId>>>()?;
-
-        if pop_text_style {
-            cx.pop_text_style();
-        }
-
-        Ok((cx.add_layout_node(style, children)?, ()))
-    }
-
-    fn paint(
-        &mut self,
-        view: &mut V,
-        layout: &Layout,
-        paint_state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
-    ) where
-        Self: Sized,
-    {
-        let style = &self.computed_style();
-        let pop_text_style = style.text_style().map_or(false, |style| {
-            let style = cx.text_style().clone().refined(&style);
-            cx.push_text_style(style);
-            true
-        });
-        style.paint_background(layout.bounds, cx);
-        self.interaction_handlers()
-            .paint(layout.order, layout.bounds, cx);
-        for child in &mut self.children {
-            child.paint(view, layout.bounds.origin(), cx);
-        }
-        if pop_text_style {
-            cx.pop_text_style();
-        }
-    }
-}
-
-impl<V> Styleable for Div<V> {
-    type Style = Style;
-
-    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style> {
-        &mut self.styles
-    }
-
-    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
-        self.styles.base()
-    }
-}
-
-impl<V> StyleHelpers for Div<V> {}
-
-impl<V> Interactive<V> for Div<V> {
-    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
-        &mut self.handlers
-    }
-}
-
-impl<V: 'static> ParentElement<V> for Div<V> {
-    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
-        &mut self.children
-    }
-}
-
-impl<V: 'static> IntoElement<V> for Div<V> {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
diff --git a/crates/gpui/playground/src/element.rs b/crates/gpui/playground/src/element.rs
deleted file mode 100644
index 2ebe07f5fd75202110bc6785980ca23110baebb0..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/element.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-use std::marker::PhantomData;
-
-pub use crate::layout_context::LayoutContext;
-pub use crate::paint_context::PaintContext;
-use crate::themes::{Theme, Themed};
-use anyhow::Result;
-use gpui::geometry::vector::Vector2F;
-pub use gpui::{Layout, LayoutId};
-use smallvec::SmallVec;
-
-pub trait Element<V: 'static>: 'static {
-    type PaintState;
-
-    fn layout(
-        &mut self,
-        view: &mut V,
-        cx: &mut LayoutContext<V>,
-    ) -> Result<(LayoutId, Self::PaintState)>
-    where
-        Self: Sized;
-
-    fn paint(
-        &mut self,
-        view: &mut V,
-        layout: &Layout,
-        state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
-    ) where
-        Self: Sized;
-
-    fn into_any(self) -> AnyElement<V>
-    where
-        Self: 'static + Sized,
-    {
-        AnyElement(Box::new(StatefulElement {
-            element: self,
-            phase: ElementPhase::Init,
-        }))
-    }
-
-    fn themed(self, theme: Theme) -> Themed<V, Self>
-    where
-        Self: Sized,
-    {
-        crate::themes::Themed {
-            child: self,
-            theme,
-            view_type: PhantomData,
-        }
-    }
-}
-
-/// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
-trait AnyStatefulElement<V> {
-    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId>;
-    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>);
-}
-
-/// A wrapper around an element that stores its layout state.
-struct StatefulElement<V: 'static, E: Element<V>> {
-    element: E,
-    phase: ElementPhase<V, E>,
-}
-
-enum ElementPhase<V: 'static, E: Element<V>> {
-    Init,
-    PostLayout {
-        layout_id: LayoutId,
-        paint_state: E::PaintState,
-    },
-    PostPaint {
-        layout: Layout,
-        paint_state: E::PaintState,
-    },
-    Error(String),
-}
-
-impl<V: 'static, E: Element<V>> Default for ElementPhase<V, E> {
-    fn default() -> Self {
-        Self::Init
-    }
-}
-
-/// We blanket-implement the object-safe ElementStateObject interface to make ElementStates into trait objects
-impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
-    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
-        let result;
-        self.phase = match self.element.layout(view, cx) {
-            Ok((layout_id, paint_state)) => {
-                result = Ok(layout_id);
-                ElementPhase::PostLayout {
-                    layout_id,
-                    paint_state,
-                }
-            }
-            Err(error) => {
-                let message = error.to_string();
-                result = Err(error);
-                ElementPhase::Error(message)
-            }
-        };
-        result
-    }
-
-    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
-        self.phase = match std::mem::take(&mut self.phase) {
-            ElementPhase::PostLayout {
-                layout_id,
-                mut paint_state,
-            } => match cx.computed_layout(layout_id) {
-                Ok(mut layout) => {
-                    layout.bounds = layout.bounds + parent_origin;
-                    self.element.paint(view, &layout, &mut paint_state, cx);
-                    ElementPhase::PostPaint {
-                        layout,
-                        paint_state,
-                    }
-                }
-                Err(error) => ElementPhase::Error(error.to_string()),
-            },
-            phase @ ElementPhase::Error(_) => phase,
-            _ => panic!("invalid element phase to call paint"),
-        };
-    }
-}
-
-/// A dynamic element.
-pub struct AnyElement<V>(Box<dyn AnyStatefulElement<V>>);
-
-impl<V> AnyElement<V> {
-    pub fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
-        self.0.layout(view, cx)
-    }
-
-    pub fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
-        self.0.paint(view, parent_origin, cx)
-    }
-}
-
-pub trait ParentElement<V: 'static> {
-    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]>;
-
-    fn child(mut self, child: impl IntoElement<V>) -> Self
-    where
-        Self: Sized,
-    {
-        self.children_mut().push(child.into_element().into_any());
-        self
-    }
-
-    fn children<I, E>(mut self, children: I) -> Self
-    where
-        I: IntoIterator<Item = E>,
-        E: IntoElement<V>,
-        Self: Sized,
-    {
-        self.children_mut().extend(
-            children
-                .into_iter()
-                .map(|child| child.into_element().into_any()),
-        );
-        self
-    }
-}
-
-pub trait IntoElement<V: 'static> {
-    type Element: Element<V>;
-
-    fn into_element(self) -> Self::Element;
-}
diff --git a/crates/gpui/playground/src/hoverable.rs b/crates/gpui/playground/src/hoverable.rs
deleted file mode 100644
index 8ed06b7cbe6019d2118577c76dc955a54a85c48c..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/hoverable.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use crate::{
-    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
-    interactive::{InteractionHandlers, Interactive},
-    layout_context::LayoutContext,
-    paint_context::PaintContext,
-    style::{Style, StyleHelpers, Styleable},
-};
-use anyhow::Result;
-use gpui::{platform::MouseMovedEvent, LayoutId};
-use refineable::{CascadeSlot, Refineable, RefinementCascade};
-use smallvec::SmallVec;
-use std::{cell::Cell, rc::Rc};
-
-pub struct Hoverable<E: Styleable> {
-    hovered: Rc<Cell<bool>>,
-    cascade_slot: CascadeSlot,
-    hovered_style: <E::Style as Refineable>::Refinement,
-    child: E,
-}
-
-pub fn hoverable<E: Styleable>(mut child: E) -> Hoverable<E> {
-    Hoverable {
-        hovered: Rc::new(Cell::new(false)),
-        cascade_slot: child.style_cascade().reserve(),
-        hovered_style: Default::default(),
-        child,
-    }
-}
-
-impl<E: Styleable> Styleable for Hoverable<E> {
-    type Style = E::Style;
-
-    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style> {
-        self.child.style_cascade()
-    }
-
-    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
-        &mut self.hovered_style
-    }
-}
-
-impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
-    type PaintState = E::PaintState;
-
-    fn layout(
-        &mut self,
-        view: &mut V,
-        cx: &mut LayoutContext<V>,
-    ) -> Result<(LayoutId, Self::PaintState)>
-    where
-        Self: Sized,
-    {
-        Ok(self.child.layout(view, cx)?)
-    }
-
-    fn paint(
-        &mut self,
-        view: &mut V,
-        layout: &Layout,
-        paint_state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
-    ) where
-        Self: Sized,
-    {
-        self.hovered
-            .set(layout.bounds.contains_point(cx.mouse_position()));
-
-        let slot = self.cascade_slot;
-        let style = self.hovered.get().then_some(self.hovered_style.clone());
-        self.style_cascade().set(slot, style);
-
-        let hovered = self.hovered.clone();
-        let bounds = layout.bounds;
-        cx.on_event(layout.order, move |view, event: &MouseMovedEvent, cx| {
-            if bounds.contains_point(cx.mouse_position()) != hovered.get() {
-                cx.repaint();
-            }
-        });
-
-        self.child.paint(view, layout, paint_state, cx);
-    }
-}
-
-impl<E: Styleable<Style = Style>> StyleHelpers for Hoverable<E> {}
-
-impl<V: 'static, E: Interactive<V> + Styleable> Interactive<V> for Hoverable<E> {
-    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
-        self.child.interaction_handlers()
-    }
-}
-
-impl<V: 'static, E: ParentElement<V> + Styleable> ParentElement<V> for Hoverable<E> {
-    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
-        self.child.children_mut()
-    }
-}
-
-impl<V: 'static, E: Element<V> + Styleable> IntoElement<V> for Hoverable<E> {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
diff --git a/crates/gpui/playground/src/interactive.rs b/crates/gpui/playground/src/interactive.rs
deleted file mode 100644
index 3afe928b3e6dad9f09abac49c768df106903b2dd..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/interactive.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-use gpui::{
-    geometry::rect::RectF,
-    platform::{MouseButton, MouseButtonEvent},
-    EventContext,
-};
-use smallvec::SmallVec;
-use std::{cell::Cell, rc::Rc};
-
-use crate::element::PaintContext;
-
-pub trait Interactive<V: 'static> {
-    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V>;
-
-    fn on_mouse_down(
-        mut self,
-        button: MouseButton,
-        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        self.interaction_handlers()
-            .mouse_down
-            .push(Rc::new(handler));
-        self
-    }
-
-    fn on_mouse_up(
-        mut self,
-        button: MouseButton,
-        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        self.interaction_handlers().mouse_up.push(Rc::new(handler));
-        self
-    }
-
-    fn on_mouse_down_out(
-        mut self,
-        button: MouseButton,
-        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        self.interaction_handlers()
-            .mouse_down_out
-            .push(Rc::new(handler));
-        self
-    }
-
-    fn on_mouse_up_out(
-        mut self,
-        button: MouseButton,
-        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        self.interaction_handlers()
-            .mouse_up_out
-            .push(Rc::new(handler));
-        self
-    }
-
-    fn on_click(
-        self,
-        button: MouseButton,
-        handler: impl Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>) + 'static,
-    ) -> Self
-    where
-        Self: Sized,
-    {
-        let pressed = Rc::new(Cell::new(false));
-        self.on_mouse_down(button, {
-            let pressed = pressed.clone();
-            move |_, _, _| {
-                pressed.set(true);
-            }
-        })
-        .on_mouse_up_out(button, {
-            let pressed = pressed.clone();
-            move |_, _, _| {
-                pressed.set(false);
-            }
-        })
-        .on_mouse_up(button, move |view, event, cx| {
-            if pressed.get() {
-                pressed.set(false);
-                handler(view, event, cx);
-            }
-        })
-    }
-}
-
-pub struct InteractionHandlers<V: 'static> {
-    mouse_down: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
-    mouse_down_out: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
-    mouse_up: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
-    mouse_up_out: SmallVec<[Rc<dyn Fn(&mut V, &MouseButtonEvent, &mut EventContext<V>)>; 2]>,
-}
-
-impl<V: 'static> InteractionHandlers<V> {
-    pub fn paint(&self, order: u32, bounds: RectF, cx: &mut PaintContext<V>) {
-        for handler in self.mouse_down.iter().cloned() {
-            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
-                if event.is_down && bounds.contains_point(event.position) {
-                    handler(view, event, cx);
-                }
-            })
-        }
-        for handler in self.mouse_up.iter().cloned() {
-            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
-                if !event.is_down && bounds.contains_point(event.position) {
-                    handler(view, event, cx);
-                }
-            })
-        }
-        for handler in self.mouse_down_out.iter().cloned() {
-            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
-                if event.is_down && !bounds.contains_point(event.position) {
-                    handler(view, event, cx);
-                }
-            })
-        }
-        for handler in self.mouse_up_out.iter().cloned() {
-            cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
-                if !event.is_down && !bounds.contains_point(event.position) {
-                    handler(view, event, cx);
-                }
-            })
-        }
-    }
-}
-
-impl<V> Default for InteractionHandlers<V> {
-    fn default() -> Self {
-        Self {
-            mouse_down: Default::default(),
-            mouse_up: Default::default(),
-            mouse_down_out: Default::default(),
-            mouse_up_out: Default::default(),
-        }
-    }
-}
diff --git a/crates/gpui/playground/src/layout_context.rs b/crates/gpui/playground/src/layout_context.rs
deleted file mode 100644
index a08efdac3451e2a0a9566d7daa25f5a574d8464a..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/layout_context.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use crate::{element::LayoutId, style::Style};
-use anyhow::{anyhow, Result};
-use derive_more::{Deref, DerefMut};
-use gpui::{geometry::Size, MeasureParams, RenderContext, ViewContext};
-pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
-
-#[derive(Deref, DerefMut)]
-pub struct LayoutContext<'a, 'b, 'c, 'd, V> {
-    #[deref]
-    #[deref_mut]
-    pub(crate) legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>,
-}
-
-impl<'a, 'b, V> RenderContext<'a, 'b, V> for LayoutContext<'a, 'b, '_, '_, V> {
-    fn text_style(&self) -> gpui::fonts::TextStyle {
-        self.legacy_cx.text_style()
-    }
-
-    fn push_text_style(&mut self, style: gpui::fonts::TextStyle) {
-        self.legacy_cx.push_text_style(style)
-    }
-
-    fn pop_text_style(&mut self) {
-        self.legacy_cx.pop_text_style()
-    }
-
-    fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
-        &mut self.view_context
-    }
-}
-
-impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
-    pub fn new(legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>) -> Self {
-        Self { legacy_cx }
-    }
-
-    pub fn add_layout_node(
-        &mut self,
-        style: Style,
-        children: impl IntoIterator<Item = NodeId>,
-    ) -> Result<LayoutId> {
-        let rem_size = self.rem_pixels();
-        let id = self
-            .legacy_cx
-            .layout_engine()
-            .ok_or_else(|| anyhow!("no layout engine"))?
-            .add_node(style.to_taffy(rem_size), children)?;
-
-        Ok(id)
-    }
-
-    pub fn add_measured_layout_node<F>(&mut self, style: Style, measure: F) -> Result<LayoutId>
-    where
-        F: Fn(MeasureParams) -> Size<f32> + Sync + Send + 'static,
-    {
-        let rem_size = self.rem_pixels();
-        let layout_id = self
-            .layout_engine()
-            .ok_or_else(|| anyhow!("no layout engine"))?
-            .add_measured_node(style.to_taffy(rem_size), measure)?;
-
-        Ok(layout_id)
-    }
-}
diff --git a/crates/gpui/playground/src/paint_context.rs b/crates/gpui/playground/src/paint_context.rs
deleted file mode 100644
index 0760b13cd33396b3d8c14e907c7ea8dc46eca1ae..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/paint_context.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use anyhow::{anyhow, Result};
-use derive_more::{Deref, DerefMut};
-pub use gpui::taffy::tree::NodeId;
-use gpui::{
-    scene::EventHandler, EventContext, Layout, LayoutId, PaintContext as LegacyPaintContext,
-};
-use std::{any::TypeId, rc::Rc};
-
-#[derive(Deref, DerefMut)]
-pub struct PaintContext<'a, 'b, 'c, 'd, V> {
-    #[deref]
-    #[deref_mut]
-    pub(crate) legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
-    pub(crate) scene: &'d mut gpui::SceneBuilder,
-}
-
-impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
-    pub fn new(
-        legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
-        scene: &'d mut gpui::SceneBuilder,
-    ) -> Self {
-        Self { legacy_cx, scene }
-    }
-
-    pub fn on_event<E: 'static>(
-        &mut self,
-        order: u32,
-        handler: impl Fn(&mut V, &E, &mut EventContext<V>) + 'static,
-    ) {
-        let view = self.weak_handle();
-
-        self.scene.event_handlers.push(EventHandler {
-            order,
-            handler: Rc::new(move |event, window_cx| {
-                if let Some(view) = view.upgrade(window_cx) {
-                    view.update(window_cx, |view, view_cx| {
-                        let mut event_cx = EventContext::new(view_cx);
-                        handler(view, event.downcast_ref().unwrap(), &mut event_cx);
-                        event_cx.bubble
-                    })
-                } else {
-                    true
-                }
-            }),
-            event_type: TypeId::of::<E>(),
-        })
-    }
-
-    pub(crate) fn computed_layout(&mut self, layout_id: LayoutId) -> Result<Layout> {
-        self.layout_engine()
-            .ok_or_else(|| anyhow!("no layout engine present"))?
-            .computed_layout(layout_id)
-    }
-}
diff --git a/crates/gpui/playground/src/playground.rs b/crates/gpui/playground/src/playground.rs
deleted file mode 100644
index 43bd8d7b10a96c87bfc07579a359fd844e6bf6b2..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/playground.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-#![allow(dead_code, unused_variables)]
-use crate::element::Element;
-use gpui::{
-    geometry::{rect::RectF, vector::vec2f},
-    platform::WindowOptions,
-    serde_json, ViewContext,
-};
-use log::LevelFilter;
-use settings::{default_settings, SettingsStore};
-use simplelog::SimpleLogger;
-use theme::ThemeSettings;
-use themes::Theme;
-use view::view;
-use workspace::workspace;
-
-mod adapter;
-mod color;
-mod components;
-mod div;
-mod element;
-mod hoverable;
-mod interactive;
-mod layout_context;
-mod paint_context;
-mod pressable;
-mod style;
-mod text;
-mod themes;
-mod view;
-mod workspace;
-
-fn main() {
-    SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
-
-    gpui::App::new(()).unwrap().run(|cx| {
-        let mut store = SettingsStore::default();
-        store
-            .set_default_settings(default_settings().as_ref(), cx)
-            .unwrap();
-        cx.set_global(store);
-        theme::init(Assets, cx);
-
-        cx.add_window(
-            WindowOptions {
-                bounds: gpui::platform::WindowBounds::Fixed(RectF::new(
-                    vec2f(0., 0.),
-                    vec2f(400., 300.),
-                )),
-                center: true,
-                ..Default::default()
-            },
-            |_| view(|cx| playground(cx)),
-        );
-        cx.platform().activate(true);
-    });
-}
-
-fn playground<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
-    workspace().themed(current_theme(cx))
-}
-
-// Nathan: During the transition, we will include the base theme on the legacy Theme struct.
-fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
-    settings::get::<ThemeSettings>(cx)
-        .theme
-        .deserialized_base_theme
-        .lock()
-        .get_or_insert_with(|| {
-            let theme: Theme =
-                serde_json::from_value(settings::get::<ThemeSettings>(cx).theme.base_theme.clone())
-                    .unwrap();
-            Box::new(theme)
-        })
-        .downcast_ref::<Theme>()
-        .unwrap()
-        .clone()
-}
-
-use anyhow::{anyhow, Result};
-use gpui::AssetSource;
-use rust_embed::RustEmbed;
-
-#[derive(RustEmbed)]
-#[folder = "../../../assets"]
-#[include = "themes/**/*"]
-#[exclude = "*.DS_Store"]
-pub struct Assets;
-
-impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<std::borrow::Cow<[u8]>> {
-        Self::get(path)
-            .map(|f| f.data)
-            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
-    }
-
-    fn list(&self, path: &str) -> Vec<std::borrow::Cow<'static, str>> {
-        Self::iter().filter(|p| p.starts_with(path)).collect()
-    }
-}
diff --git a/crates/gpui/playground/src/style.rs b/crates/gpui/playground/src/style.rs
deleted file mode 100644
index f0b631993df0c101c77002dd1cf703755a9fc404..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/style.rs
+++ /dev/null
@@ -1,379 +0,0 @@
-use crate::{
-    color::Hsla,
-    hoverable::{hoverable, Hoverable},
-    paint_context::PaintContext,
-    pressable::{pressable, Pressable},
-};
-pub use gpui::taffy::style::{
-    AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
-    Overflow, Position,
-};
-use gpui::{
-    fonts::TextStyleRefinement,
-    geometry::{
-        rect::RectF, relative, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length,
-        Point, PointRefinement, Size, SizeRefinement,
-    },
-    taffy,
-};
-use gpui2_macros::styleable_helpers;
-use refineable::{Refineable, RefinementCascade};
-
-#[derive(Clone, Refineable)]
-pub struct Style {
-    /// What layout strategy should be used?
-    pub display: Display,
-
-    // Overflow properties
-    /// How children overflowing their container should affect layout
-    #[refineable]
-    pub overflow: Point<Overflow>,
-    /// How much space (in points) should be reserved for the scrollbars of `Overflow::Scroll` and `Overflow::Auto` nodes.
-    pub scrollbar_width: f32,
-
-    // Position properties
-    /// What should the `position` value of this struct use as a base offset?
-    pub position: Position,
-    /// How should the position of this element be tweaked relative to the layout defined?
-    #[refineable]
-    pub inset: Edges<Length>,
-
-    // Size properies
-    /// Sets the initial size of the item
-    #[refineable]
-    pub size: Size<Length>,
-    /// Controls the minimum size of the item
-    #[refineable]
-    pub min_size: Size<Length>,
-    /// Controls the maximum size of the item
-    #[refineable]
-    pub max_size: Size<Length>,
-    /// Sets the preferred aspect ratio for the item. The ratio is calculated as width divided by height.
-    pub aspect_ratio: Option<f32>,
-
-    // Spacing Properties
-    /// How large should the margin be on each side?
-    #[refineable]
-    pub margin: Edges<Length>,
-    /// How large should the padding be on each side?
-    #[refineable]
-    pub padding: Edges<DefiniteLength>,
-    /// How large should the border be on each side?
-    #[refineable]
-    pub border: Edges<DefiniteLength>,
-
-    // Alignment properties
-    /// How this node's children aligned in the cross/block axis?
-    pub align_items: Option<AlignItems>,
-    /// How this node should be aligned in the cross/block axis. Falls back to the parents [`AlignItems`] if not set
-    pub align_self: Option<AlignSelf>,
-    /// How should content contained within this item be aligned in the cross/block axis
-    pub align_content: Option<AlignContent>,
-    /// How should contained within this item be aligned in the main/inline axis
-    pub justify_content: Option<JustifyContent>,
-    /// How large should the gaps between items in a flex container be?
-    #[refineable]
-    pub gap: Size<DefiniteLength>,
-
-    // Flexbox properies
-    /// Which direction does the main axis flow in?
-    pub flex_direction: FlexDirection,
-    /// Should elements wrap, or stay in a single line?
-    pub flex_wrap: FlexWrap,
-    /// Sets the initial main axis size of the item
-    pub flex_basis: Length,
-    /// The relative rate at which this item grows when it is expanding to fill space, 0.0 is the default value, and this value must be positive.
-    pub flex_grow: f32,
-    /// The relative rate at which this item shrinks when it is contracting to fit into space, 1.0 is the default value, and this value must be positive.
-    pub flex_shrink: f32,
-
-    /// The fill color of this element
-    pub fill: Option<Fill>,
-    /// The radius of the corners of this element
-    #[refineable]
-    pub corner_radii: CornerRadii,
-    /// The color of text within this element. Cascades to children unless overridden.
-    pub text_color: Option<Hsla>,
-}
-
-impl Style {
-    pub fn to_taffy(&self, rem_size: f32) -> taffy::style::Style {
-        taffy::style::Style {
-            display: self.display,
-            overflow: self.overflow.clone().into(),
-            scrollbar_width: self.scrollbar_width,
-            position: self.position,
-            inset: self.inset.to_taffy(rem_size),
-            size: self.size.to_taffy(rem_size),
-            min_size: self.min_size.to_taffy(rem_size),
-            max_size: self.max_size.to_taffy(rem_size),
-            aspect_ratio: self.aspect_ratio,
-            margin: self.margin.to_taffy(rem_size),
-            padding: self.padding.to_taffy(rem_size),
-            border: self.border.to_taffy(rem_size),
-            align_items: self.align_items,
-            align_self: self.align_self,
-            align_content: self.align_content,
-            justify_content: self.justify_content,
-            gap: self.gap.to_taffy(rem_size),
-            flex_direction: self.flex_direction,
-            flex_wrap: self.flex_wrap,
-            flex_basis: self.flex_basis.to_taffy(rem_size).into(),
-            flex_grow: self.flex_grow,
-            flex_shrink: self.flex_shrink,
-            ..Default::default() // Ignore grid properties for now
-        }
-    }
-
-    /// Paints the background of an element styled with this style.
-    /// Return the bounds in which to paint the content.
-    pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
-        let rem_size = cx.rem_pixels();
-        if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
-            cx.scene.push_quad(gpui::Quad {
-                bounds,
-                background: Some(color.into()),
-                corner_radii: self.corner_radii.to_gpui(rem_size),
-                border: Default::default(),
-            });
-        }
-    }
-
-    pub fn text_style(&self) -> Option<TextStyleRefinement> {
-        if let Some(color) = self.text_color {
-            Some(TextStyleRefinement {
-                color: Some(color.into()),
-                ..Default::default()
-            })
-        } else {
-            None
-        }
-    }
-}
-
-impl Default for Style {
-    fn default() -> Self {
-        Style {
-            display: Display::Block,
-            overflow: Point {
-                x: Overflow::Visible,
-                y: Overflow::Visible,
-            },
-            scrollbar_width: 0.0,
-            position: Position::Relative,
-            inset: Edges::auto(),
-            margin: Edges::<Length>::zero(),
-            padding: Edges::<DefiniteLength>::zero(),
-            border: Edges::<DefiniteLength>::zero(),
-            size: Size::auto(),
-            min_size: Size::auto(),
-            max_size: Size::auto(),
-            aspect_ratio: None,
-            gap: Size::zero(),
-            // Aligment
-            align_items: None,
-            align_self: None,
-            align_content: None,
-            justify_content: None,
-            // Flexbox
-            flex_direction: FlexDirection::Row,
-            flex_wrap: FlexWrap::NoWrap,
-            flex_grow: 0.0,
-            flex_shrink: 1.0,
-            flex_basis: Length::Auto,
-            fill: None,
-            text_color: None,
-            corner_radii: CornerRadii::default(),
-        }
-    }
-}
-
-impl StyleRefinement {
-    pub fn text_style(&self) -> Option<TextStyleRefinement> {
-        self.text_color.map(|color| TextStyleRefinement {
-            color: Some(color.into()),
-            ..Default::default()
-        })
-    }
-}
-
-pub struct OptionalTextStyle {
-    color: Option<Hsla>,
-}
-
-impl OptionalTextStyle {
-    pub fn apply(&self, style: &mut gpui::fonts::TextStyle) {
-        if let Some(color) = self.color {
-            style.color = color.into();
-        }
-    }
-}
-
-#[derive(Clone, Debug)]
-pub enum Fill {
-    Color(Hsla),
-}
-
-impl Fill {
-    pub fn color(&self) -> Option<Hsla> {
-        match self {
-            Fill::Color(color) => Some(*color),
-        }
-    }
-}
-
-impl Default for Fill {
-    fn default() -> Self {
-        Self::Color(Hsla::default())
-    }
-}
-
-impl From<Hsla> for Fill {
-    fn from(color: Hsla) -> Self {
-        Self::Color(color)
-    }
-}
-
-#[derive(Clone, Refineable, Default)]
-pub struct CornerRadii {
-    top_left: AbsoluteLength,
-    top_right: AbsoluteLength,
-    bottom_left: AbsoluteLength,
-    bottom_right: AbsoluteLength,
-}
-
-impl CornerRadii {
-    pub fn to_gpui(&self, rem_size: f32) -> gpui::scene::CornerRadii {
-        gpui::scene::CornerRadii {
-            top_left: self.top_left.to_pixels(rem_size),
-            top_right: self.top_right.to_pixels(rem_size),
-            bottom_left: self.bottom_left.to_pixels(rem_size),
-            bottom_right: self.bottom_right.to_pixels(rem_size),
-        }
-    }
-}
-
-pub trait Styleable {
-    type Style: Refineable + Default;
-
-    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style>;
-    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement;
-
-    fn computed_style(&mut self) -> Self::Style {
-        Self::Style::from_refinement(&self.style_cascade().merged())
-    }
-
-    fn hovered(self) -> Hoverable<Self>
-    where
-        Self: Sized,
-    {
-        hoverable(self)
-    }
-
-    fn pressed(self) -> Pressable<Self>
-    where
-        Self: Sized,
-    {
-        pressable(self)
-    }
-}
-
-// Helpers methods that take and return mut self. This includes tailwind style methods for standard sizes etc.
-//
-// Example:
-// // Sets the padding to 0.5rem, just like class="p-2" in Tailwind.
-// fn p_2(mut self) -> Self where Self: Sized;
-pub trait StyleHelpers: Styleable<Style = Style> {
-    styleable_helpers!();
-
-    fn h(mut self, height: Length) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().size.height = Some(height);
-        self
-    }
-
-    fn full(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().size.width = Some(relative(1.));
-        self.declared_style().size.height = Some(relative(1.));
-        self
-    }
-
-    fn relative(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().position = Some(Position::Relative);
-        self
-    }
-
-    fn absolute(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().position = Some(Position::Absolute);
-        self
-    }
-
-    fn block(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().display = Some(Display::Block);
-        self
-    }
-
-    fn flex(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().display = Some(Display::Flex);
-        self
-    }
-
-    fn flex_col(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().flex_direction = Some(FlexDirection::Column);
-        self
-    }
-
-    fn flex_row(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().flex_direction = Some(FlexDirection::Row);
-        self
-    }
-
-    fn flex_grow(mut self) -> Self
-    where
-        Self: Sized,
-    {
-        self.declared_style().flex_grow = Some(1.);
-        self
-    }
-
-    fn fill<F>(mut self, fill: F) -> Self
-    where
-        F: Into<Fill>,
-        Self: Sized,
-    {
-        self.declared_style().fill = Some(fill.into());
-        self
-    }
-
-    fn text_color<C>(mut self, color: C) -> Self
-    where
-        C: Into<Hsla>,
-        Self: Sized,
-    {
-        self.declared_style().text_color = Some(color.into());
-        self
-    }
-}
diff --git a/crates/gpui/playground/src/themes.rs b/crates/gpui/playground/src/themes.rs
deleted file mode 100644
index e372e1e31bcaf1b99b51030eee4cf7f63739af0b..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/themes.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use crate::{
-    color::Hsla,
-    element::{Element, PaintContext},
-    layout_context::LayoutContext,
-};
-use gpui::WindowContext;
-use serde::{de::Visitor, Deserialize, Deserializer};
-use std::{collections::HashMap, fmt, marker::PhantomData};
-
-#[derive(Deserialize, Clone, Default, Debug)]
-pub struct Theme {
-    pub name: String,
-    pub is_light: bool,
-    pub lowest: Layer,
-    pub middle: Layer,
-    pub highest: Layer,
-    pub popover_shadow: Shadow,
-    pub modal_shadow: Shadow,
-    #[serde(deserialize_with = "deserialize_player_colors")]
-    pub players: Vec<PlayerColors>,
-    #[serde(deserialize_with = "deserialize_syntax_colors")]
-    pub syntax: HashMap<String, Hsla>,
-}
-
-#[derive(Deserialize, Clone, Default, Debug)]
-pub struct Layer {
-    pub base: StyleSet,
-    pub variant: StyleSet,
-    pub on: StyleSet,
-    pub accent: StyleSet,
-    pub positive: StyleSet,
-    pub warning: StyleSet,
-    pub negative: StyleSet,
-}
-
-#[derive(Deserialize, Clone, Default, Debug)]
-pub struct StyleSet {
-    #[serde(rename = "default")]
-    pub default: ContainerColors,
-    pub hovered: ContainerColors,
-    pub pressed: ContainerColors,
-    pub active: ContainerColors,
-    pub disabled: ContainerColors,
-    pub inverted: ContainerColors,
-}
-
-#[derive(Deserialize, Clone, Default, Debug)]
-pub struct ContainerColors {
-    pub background: Hsla,
-    pub foreground: Hsla,
-    pub border: Hsla,
-}
-
-#[derive(Deserialize, Clone, Default, Debug)]
-pub struct PlayerColors {
-    pub selection: Hsla,
-    pub cursor: Hsla,
-}
-
-#[derive(Deserialize, Clone, Default, Debug)]
-pub struct Shadow {
-    pub blur: u8,
-    pub color: Hsla,
-    pub offset: Vec<u8>,
-}
-
-pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
-    cx.theme::<Theme>()
-}
-
-fn deserialize_player_colors<'de, D>(deserializer: D) -> Result<Vec<PlayerColors>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    struct PlayerArrayVisitor;
-
-    impl<'de> Visitor<'de> for PlayerArrayVisitor {
-        type Value = Vec<PlayerColors>;
-
-        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            formatter.write_str("an object with integer keys")
-        }
-
-        fn visit_map<A: serde::de::MapAccess<'de>>(
-            self,
-            mut map: A,
-        ) -> Result<Self::Value, A::Error> {
-            let mut players = Vec::with_capacity(8);
-            while let Some((key, value)) = map.next_entry::<usize, PlayerColors>()? {
-                if key < 8 {
-                    players.push(value);
-                } else {
-                    return Err(serde::de::Error::invalid_value(
-                        serde::de::Unexpected::Unsigned(key as u64),
-                        &"a key in range 0..7",
-                    ));
-                }
-            }
-            Ok(players)
-        }
-    }
-
-    deserializer.deserialize_map(PlayerArrayVisitor)
-}
-
-fn deserialize_syntax_colors<'de, D>(deserializer: D) -> Result<HashMap<String, Hsla>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    #[derive(Deserialize)]
-    struct ColorWrapper {
-        color: Hsla,
-    }
-
-    struct SyntaxVisitor;
-
-    impl<'de> Visitor<'de> for SyntaxVisitor {
-        type Value = HashMap<String, Hsla>;
-
-        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-            formatter.write_str("a map with keys and objects with a single color field as values")
-        }
-
-        fn visit_map<M>(self, mut map: M) -> Result<HashMap<String, Hsla>, M::Error>
-        where
-            M: serde::de::MapAccess<'de>,
-        {
-            let mut result = HashMap::new();
-            while let Some(key) = map.next_key()? {
-                let wrapper: ColorWrapper = map.next_value()?; // Deserialize values as Hsla
-                result.insert(key, wrapper.color);
-            }
-            Ok(result)
-        }
-    }
-    deserializer.deserialize_map(SyntaxVisitor)
-}
-
-pub struct Themed<V: 'static, E> {
-    pub(crate) theme: Theme,
-    pub(crate) child: E,
-    pub(crate) view_type: PhantomData<V>,
-}
-
-impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
-    type PaintState = E::PaintState;
-
-    fn layout(
-        &mut self,
-        view: &mut V,
-        cx: &mut LayoutContext<V>,
-    ) -> anyhow::Result<(gpui::LayoutId, Self::PaintState)>
-    where
-        Self: Sized,
-    {
-        cx.push_theme(self.theme.clone());
-        let result = self.child.layout(view, cx);
-        cx.pop_theme();
-        result
-    }
-
-    fn paint(
-        &mut self,
-        view: &mut V,
-        layout: &gpui::Layout,
-        state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
-    ) where
-        Self: Sized,
-    {
-        cx.push_theme(self.theme.clone());
-        self.child.paint(view, layout, state, cx);
-        cx.pop_theme();
-    }
-}
diff --git a/crates/gpui/playground/src/themes/rose_pine.rs b/crates/gpui/playground/src/themes/rose_pine.rs
deleted file mode 100644
index 628a93227968ce141fb932d5f9a2f37990e899a2..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/themes/rose_pine.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use std::ops::Range;
-
-use crate::{
-    color::{hsla, rgb, Hsla},
-    ThemeColors,
-};
-
-pub struct RosePineThemes {
-    pub default: RosePinePalette,
-    pub dawn: RosePinePalette,
-    pub moon: RosePinePalette,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct RosePinePalette {
-    pub base: Hsla,
-    pub surface: Hsla,
-    pub overlay: Hsla,
-    pub muted: Hsla,
-    pub subtle: Hsla,
-    pub text: Hsla,
-    pub love: Hsla,
-    pub gold: Hsla,
-    pub rose: Hsla,
-    pub pine: Hsla,
-    pub foam: Hsla,
-    pub iris: Hsla,
-    pub highlight_low: Hsla,
-    pub highlight_med: Hsla,
-    pub highlight_high: Hsla,
-}
-
-impl RosePinePalette {
-    pub fn default() -> RosePinePalette {
-        RosePinePalette {
-            base: rgb(0x191724),
-            surface: rgb(0x1f1d2e),
-            overlay: rgb(0x26233a),
-            muted: rgb(0x6e6a86),
-            subtle: rgb(0x908caa),
-            text: rgb(0xe0def4),
-            love: rgb(0xeb6f92),
-            gold: rgb(0xf6c177),
-            rose: rgb(0xebbcba),
-            pine: rgb(0x31748f),
-            foam: rgb(0x9ccfd8),
-            iris: rgb(0xc4a7e7),
-            highlight_low: rgb(0x21202e),
-            highlight_med: rgb(0x403d52),
-            highlight_high: rgb(0x524f67),
-        }
-    }
-
-    pub fn moon() -> RosePinePalette {
-        RosePinePalette {
-            base: rgb(0x232136),
-            surface: rgb(0x2a273f),
-            overlay: rgb(0x393552),
-            muted: rgb(0x6e6a86),
-            subtle: rgb(0x908caa),
-            text: rgb(0xe0def4),
-            love: rgb(0xeb6f92),
-            gold: rgb(0xf6c177),
-            rose: rgb(0xea9a97),
-            pine: rgb(0x3e8fb0),
-            foam: rgb(0x9ccfd8),
-            iris: rgb(0xc4a7e7),
-            highlight_low: rgb(0x2a283e),
-            highlight_med: rgb(0x44415a),
-            highlight_high: rgb(0x56526e),
-        }
-    }
-
-    pub fn dawn() -> RosePinePalette {
-        RosePinePalette {
-            base: rgb(0xfaf4ed),
-            surface: rgb(0xfffaf3),
-            overlay: rgb(0xf2e9e1),
-            muted: rgb(0x9893a5),
-            subtle: rgb(0x797593),
-            text: rgb(0x575279),
-            love: rgb(0xb4637a),
-            gold: rgb(0xea9d34),
-            rose: rgb(0xd7827e),
-            pine: rgb(0x286983),
-            foam: rgb(0x56949f),
-            iris: rgb(0x907aa9),
-            highlight_low: rgb(0xf4ede8),
-            highlight_med: rgb(0xdfdad9),
-            highlight_high: rgb(0xcecacd),
-        }
-    }
-}
-
-pub fn default() -> ThemeColors {
-    theme_colors(&RosePinePalette::default())
-}
-
-pub fn moon() -> ThemeColors {
-    theme_colors(&RosePinePalette::moon())
-}
-
-pub fn dawn() -> ThemeColors {
-    theme_colors(&RosePinePalette::dawn())
-}
-
-fn theme_colors(p: &RosePinePalette) -> ThemeColors {
-    ThemeColors {
-        base: scale_sl(p.base, (0.8, 0.8), (1.2, 1.2)),
-        surface: scale_sl(p.surface, (0.8, 0.8), (1.2, 1.2)),
-        overlay: scale_sl(p.overlay, (0.8, 0.8), (1.2, 1.2)),
-        muted: scale_sl(p.muted, (0.8, 0.8), (1.2, 1.2)),
-        subtle: scale_sl(p.subtle, (0.8, 0.8), (1.2, 1.2)),
-        text: scale_sl(p.text, (0.8, 0.8), (1.2, 1.2)),
-        highlight_low: scale_sl(p.highlight_low, (0.8, 0.8), (1.2, 1.2)),
-        highlight_med: scale_sl(p.highlight_med, (0.8, 0.8), (1.2, 1.2)),
-        highlight_high: scale_sl(p.highlight_high, (0.8, 0.8), (1.2, 1.2)),
-        success: scale_sl(p.foam, (0.8, 0.8), (1.2, 1.2)),
-        warning: scale_sl(p.gold, (0.8, 0.8), (1.2, 1.2)),
-        error: scale_sl(p.love, (0.8, 0.8), (1.2, 1.2)),
-        inserted: scale_sl(p.foam, (0.8, 0.8), (1.2, 1.2)),
-        deleted: scale_sl(p.love, (0.8, 0.8), (1.2, 1.2)),
-        modified: scale_sl(p.rose, (0.8, 0.8), (1.2, 1.2)),
-    }
-}
-
-/// Produces a range by multiplying the saturation and lightness of the base color by the given
-/// start and end factors.
-fn scale_sl(base: Hsla, (start_s, start_l): (f32, f32), (end_s, end_l): (f32, f32)) -> Range<Hsla> {
-    let start = hsla(base.h, base.s * start_s, base.l * start_l, base.a);
-    let end = hsla(base.h, base.s * end_s, base.l * end_l, base.a);
-    Range { start, end }
-}
diff --git a/crates/gpui/playground/src/view.rs b/crates/gpui/playground/src/view.rs
deleted file mode 100644
index cb0eebed7b55ce98e03e0e6384967e2d8492d721..0000000000000000000000000000000000000000
--- a/crates/gpui/playground/src/view.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use crate::{
-    adapter::AdapterElement,
-    element::{AnyElement, Element},
-};
-use gpui::ViewContext;
-
-pub fn view<F, E>(mut render: F) -> ViewFn
-where
-    F: 'static + FnMut(&mut ViewContext<ViewFn>) -> E,
-    E: Element<ViewFn>,
-{
-    ViewFn(Box::new(move |cx| (render)(cx).into_any()))
-}
-
-pub struct ViewFn(Box<dyn FnMut(&mut ViewContext<ViewFn>) -> AnyElement<ViewFn>>);
-
-impl gpui::Entity for ViewFn {
-    type Event = ();
-}
-
-impl gpui::View for ViewFn {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> gpui::AnyElement<Self> {
-        use gpui::Element as _;
-        AdapterElement((self.0)(cx)).into_any()
-    }
-}
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index cbf2c775c5c06b89c53fe28201146a1540248ca4..10d1dc69972453011a5f40180e1e98141da49c57 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3459,7 +3459,7 @@ pub trait RenderContext<'a, 'b, V> {
 }
 
 pub struct LayoutContext<'a, 'b, 'c, V> {
-    // Nathan: Making this is public while I work on playground.
+    // Nathan: Making this is public while I work on gpui2.
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
     pub refreshing: bool,
 }
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index 9f326c170807a7661918575bb7b853cefbab9472..3beb60a9fe4427996b5d15533695441128bcd453 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -31,7 +31,7 @@ pub struct SceneBuilder {
     scale_factor: f32,
     stacking_contexts: Vec<StackingContext>,
     active_stacking_context_stack: Vec<usize>,
-    /// Used by the playground crate.
+    /// Used by the gpui2 crate.
     pub event_handlers: Vec<EventHandler>,
     #[cfg(debug_assertions)]
     mouse_region_ids: HashSet<MouseRegionId>,
diff --git a/crates/gpui2/Cargo.toml b/crates/gpui2/Cargo.toml
index 3145c186aa486af3228db86f9f63e1e2f3d68d9b..7d95c1e76515958a6343e3d876f99bd8f877e342 100644
--- a/crates/gpui2/Cargo.toml
+++ b/crates/gpui2/Cargo.toml
@@ -8,6 +8,9 @@ publish = false
 name = "gpui2"
 path = "src/gpui2.rs"
 
+[features]
+test-support = ["gpui/test-support"]
+
 [dependencies]
 anyhow.workspace = true
 derive_more.workspace = true
diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
index eff2356c94a36cffdcf08d13df9985fd7f9a025a..dee1fd48695365c11acca1f465f4fffda62e20a1 100644
--- a/crates/gpui2/src/adapter.rs
+++ b/crates/gpui2/src/adapter.rs
@@ -2,7 +2,7 @@ use crate::{layout_context::LayoutContext, paint_context::PaintContext};
 use gpui::{geometry::rect::RectF, LayoutEngine, LayoutId};
 use util::ResultExt;
 
-/// Makes a new, playground-style element into a legacy element.
+/// Makes a new, gpui2-style element into a legacy element.
 pub struct AdapterElement<V>(pub(crate) crate::element::AnyElement<V>);
 
 impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
@@ -17,7 +17,6 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
     ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
         cx.push_layout_engine(LayoutEngine::new());
 
-        let size = constraint.max;
         let mut cx = LayoutContext::new(cx);
         let layout_id = self.0.layout(view, &mut cx).log_err();
         if let Some(layout_id) = layout_id {
diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index 2ebe07f5fd75202110bc6785980ca23110baebb0..fdf06597ca455d4e7865a3c1a39bdd0085528f30 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -2,7 +2,6 @@ use std::marker::PhantomData;
 
 pub use crate::layout_context::LayoutContext;
 pub use crate::paint_context::PaintContext;
-use crate::themes::{Theme, Themed};
 use anyhow::Result;
 use gpui::geometry::vector::Vector2F;
 pub use gpui::{Layout, LayoutId};
@@ -37,17 +36,6 @@ pub trait Element<V: 'static>: 'static {
             phase: ElementPhase::Init,
         }))
     }
-
-    fn themed(self, theme: Theme) -> Themed<V, Self>
-    where
-        Self: Sized,
-    {
-        crate::themes::Themed {
-            child: self,
-            theme,
-            view_type: PhantomData,
-        }
-    }
 }
 
 /// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
diff --git a/crates/gpui2/src/elements.rs b/crates/gpui2/src/elements.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1bff85259f1949e75e9a50c3ef4cba7d3f97f18f
--- /dev/null
+++ b/crates/gpui2/src/elements.rs
@@ -0,0 +1,6 @@
+pub mod div;
+pub mod hoverable;
+pub mod pressable;
+pub mod text;
+
+pub use div::div;
diff --git a/crates/gpui2/src/div.rs b/crates/gpui2/src/elements/div.rs
similarity index 96%
rename from crates/gpui2/src/div.rs
rename to crates/gpui2/src/elements/div.rs
index 79d539b221354c568195aa8e9b4c111142063b08..5058907eec96a99accc977defea837e9b8b55ac4 100644
--- a/crates/gpui2/src/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -1,9 +1,9 @@
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
-    interactive::{InteractionHandlers, Interactive},
     layout_context::LayoutContext,
     paint_context::PaintContext,
     style::{Style, StyleHelpers, Styleable},
+    InteractionHandlers, Interactive,
 };
 use anyhow::Result;
 use gpui::{LayoutId, RenderContext};
@@ -58,7 +58,7 @@ impl<V: 'static> Element<V> for Div<V> {
         &mut self,
         view: &mut V,
         layout: &Layout,
-        paint_state: &mut Self::PaintState,
+        _: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) where
         Self: Sized,
diff --git a/crates/gpui2/src/hoverable.rs b/crates/gpui2/src/elements/hoverable.rs
similarity index 97%
rename from crates/gpui2/src/hoverable.rs
rename to crates/gpui2/src/elements/hoverable.rs
index 8ed06b7cbe6019d2118577c76dc955a54a85c48c..e97c66113cf5688ea4fc440778b0f8cf8b124b15 100644
--- a/crates/gpui2/src/hoverable.rs
+++ b/crates/gpui2/src/elements/hoverable.rs
@@ -71,7 +71,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
 
         let hovered = self.hovered.clone();
         let bounds = layout.bounds;
-        cx.on_event(layout.order, move |view, event: &MouseMovedEvent, cx| {
+        cx.on_event(layout.order, move |_view, _: &MouseMovedEvent, cx| {
             if bounds.contains_point(cx.mouse_position()) != hovered.get() {
                 cx.repaint();
             }
diff --git a/crates/gpui/playground/src/pressable.rs b/crates/gpui2/src/elements/pressable.rs
similarity index 97%
rename from crates/gpui/playground/src/pressable.rs
rename to crates/gpui2/src/elements/pressable.rs
index 261ec310832363de0b334b3d6986035286125d46..ebe330c79b79b163d2d29ceff0af4836bdbf4786 100644
--- a/crates/gpui/playground/src/pressable.rs
+++ b/crates/gpui2/src/elements/pressable.rs
@@ -68,7 +68,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
 
         let pressed = self.pressed.clone();
         let bounds = layout.bounds;
-        cx.on_event(layout.order, move |view, event: &MouseButtonEvent, cx| {
+        cx.on_event(layout.order, move |_view, event: &MouseButtonEvent, cx| {
             if event.is_down {
                 if bounds.contains_point(event.position) {
                     pressed.set(true);
diff --git a/crates/gpui/playground/src/text.rs b/crates/gpui2/src/elements/text.rs
similarity index 97%
rename from crates/gpui/playground/src/text.rs
rename to crates/gpui2/src/elements/text.rs
index d43ecb0329a441356ed02b73fc49e1ba7d9cee22..ab89b6d897a6952b2fdb72a3099fdbe2c18d9832 100644
--- a/crates/gpui/playground/src/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -25,10 +25,9 @@ impl<V: 'static> Element<V> for Text {
 
     fn layout(
         &mut self,
-        view: &mut V,
+        _view: &mut V,
         cx: &mut LayoutContext<V>,
     ) -> Result<(LayoutId, Self::PaintState)> {
-        let rem_size = cx.rem_pixels();
         let fonts = cx.platform().fonts();
         let text_style = cx.text_style();
         let line_height = cx.font_cache().line_height(text_style.font_size);
@@ -63,7 +62,7 @@ impl<V: 'static> Element<V> for Text {
 
     fn paint<'a>(
         &mut self,
-        view: &mut V,
+        _view: &mut V,
         layout: &Layout,
         paint_state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs
index 3b5908508ff76e656f243d829a64207b4eb57680..184a73c7c08c9b9b746dacd1a2f22c2484ca12fa 100644
--- a/crates/gpui2/src/gpui2.rs
+++ b/crates/gpui2/src/gpui2.rs
@@ -1,36 +1,22 @@
-#![allow(dead_code, unused_variables)]
-use gpui::{serde_json, ViewContext};
-use theme::ThemeSettings;
-use themes::Theme;
+pub mod adapter;
+pub mod color;
+pub mod element;
+pub mod elements;
+pub mod interactive;
+pub mod layout_context;
+pub mod paint_context;
+pub mod style;
+pub mod view;
 
-mod adapter;
-mod color;
-mod components;
-mod div;
-mod element;
-mod hoverable;
-mod interactive;
-mod layout_context;
-mod paint_context;
-mod pressable;
-mod style;
-mod text;
-mod themes;
-mod view;
-
-// Nathan: During the transition, we will include the base theme on the legacy Theme struct.
-fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
-    settings::get::<ThemeSettings>(cx)
-        .theme
-        .deserialized_base_theme
-        .lock()
-        .get_or_insert_with(|| {
-            let theme: Theme =
-                serde_json::from_value(settings::get::<ThemeSettings>(cx).theme.base_theme.clone())
-                    .unwrap();
-            Box::new(theme)
-        })
-        .downcast_ref::<Theme>()
-        .unwrap()
-        .clone()
-}
+pub use color::*;
+pub use element::{AnyElement, Element, IntoElement, Layout, ParentElement};
+pub use geometry::{
+    rect::RectF,
+    vector::{vec2f, Vector2F},
+};
+pub use gpui::*;
+pub use gpui2_macros::{Element, *};
+pub use interactive::*;
+pub use layout_context::LayoutContext;
+pub use platform::{WindowBounds, WindowOptions};
+pub use view::*;
diff --git a/crates/gpui2/src/interactive.rs b/crates/gpui2/src/interactive.rs
index 3afe928b3e6dad9f09abac49c768df106903b2dd..aa9627286077cbd43064c7c39f72c58a3c6fe064 100644
--- a/crates/gpui2/src/interactive.rs
+++ b/crates/gpui2/src/interactive.rs
@@ -21,7 +21,11 @@ pub trait Interactive<V: 'static> {
     {
         self.interaction_handlers()
             .mouse_down
-            .push(Rc::new(handler));
+            .push(Rc::new(move |view, event, cx| {
+                if event.button == button {
+                    handler(view, event, cx)
+                }
+            }));
         self
     }
 
@@ -33,7 +37,13 @@ pub trait Interactive<V: 'static> {
     where
         Self: Sized,
     {
-        self.interaction_handlers().mouse_up.push(Rc::new(handler));
+        self.interaction_handlers()
+            .mouse_up
+            .push(Rc::new(move |view, event, cx| {
+                if event.button == button {
+                    handler(view, event, cx)
+                }
+            }));
         self
     }
 
@@ -47,7 +57,11 @@ pub trait Interactive<V: 'static> {
     {
         self.interaction_handlers()
             .mouse_down_out
-            .push(Rc::new(handler));
+            .push(Rc::new(move |view, event, cx| {
+                if event.button == button {
+                    handler(view, event, cx)
+                }
+            }));
         self
     }
 
@@ -61,7 +75,11 @@ pub trait Interactive<V: 'static> {
     {
         self.interaction_handlers()
             .mouse_up_out
-            .push(Rc::new(handler));
+            .push(Rc::new(move |view, event, cx| {
+                if event.button == button {
+                    handler(view, event, cx)
+                }
+            }));
         self
     }
 
diff --git a/crates/gpui2/src/pressable.rs b/crates/gpui2/src/pressable.rs
deleted file mode 100644
index 261ec310832363de0b334b3d6986035286125d46..0000000000000000000000000000000000000000
--- a/crates/gpui2/src/pressable.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use crate::{
-    element::{AnyElement, Element, IntoElement, Layout, ParentElement},
-    interactive::{InteractionHandlers, Interactive},
-    layout_context::LayoutContext,
-    paint_context::PaintContext,
-    style::{Style, StyleHelpers, Styleable},
-};
-use anyhow::Result;
-use gpui::{platform::MouseButtonEvent, LayoutId};
-use refineable::{CascadeSlot, Refineable, RefinementCascade};
-use smallvec::SmallVec;
-use std::{cell::Cell, rc::Rc};
-
-pub struct Pressable<E: Styleable> {
-    pressed: Rc<Cell<bool>>,
-    pressed_style: <E::Style as Refineable>::Refinement,
-    cascade_slot: CascadeSlot,
-    child: E,
-}
-
-pub fn pressable<E: Styleable>(mut child: E) -> Pressable<E> {
-    Pressable {
-        pressed: Rc::new(Cell::new(false)),
-        pressed_style: Default::default(),
-        cascade_slot: child.style_cascade().reserve(),
-        child,
-    }
-}
-
-impl<E: Styleable> Styleable for Pressable<E> {
-    type Style = E::Style;
-
-    fn declared_style(&mut self) -> &mut <Self::Style as Refineable>::Refinement {
-        &mut self.pressed_style
-    }
-
-    fn style_cascade(&mut self) -> &mut RefinementCascade<E::Style> {
-        self.child.style_cascade()
-    }
-}
-
-impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
-    type PaintState = E::PaintState;
-
-    fn layout(
-        &mut self,
-        view: &mut V,
-        cx: &mut LayoutContext<V>,
-    ) -> Result<(LayoutId, Self::PaintState)>
-    where
-        Self: Sized,
-    {
-        self.child.layout(view, cx)
-    }
-
-    fn paint(
-        &mut self,
-        view: &mut V,
-        layout: &Layout,
-        paint_state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
-    ) where
-        Self: Sized,
-    {
-        let slot = self.cascade_slot;
-        let style = self.pressed.get().then_some(self.pressed_style.clone());
-        self.style_cascade().set(slot, style);
-
-        let pressed = self.pressed.clone();
-        let bounds = layout.bounds;
-        cx.on_event(layout.order, move |view, event: &MouseButtonEvent, cx| {
-            if event.is_down {
-                if bounds.contains_point(event.position) {
-                    pressed.set(true);
-                    cx.repaint();
-                }
-            } else if pressed.get() {
-                pressed.set(false);
-                cx.repaint();
-            }
-        });
-
-        self.child.paint(view, layout, paint_state, cx);
-    }
-}
-
-impl<E: Styleable<Style = Style>> StyleHelpers for Pressable<E> {}
-
-impl<V: 'static, E: Interactive<V> + Styleable> Interactive<V> for Pressable<E> {
-    fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V> {
-        self.child.interaction_handlers()
-    }
-}
-
-impl<V: 'static, E: ParentElement<V> + Styleable> ParentElement<V> for Pressable<E> {
-    fn children_mut(&mut self) -> &mut SmallVec<[AnyElement<V>; 2]> {
-        self.child.children_mut()
-    }
-}
-
-impl<V: 'static, E: Element<V> + Styleable> IntoElement<V> for Pressable<E> {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index f0b631993df0c101c77002dd1cf703755a9fc404..704147d3f2464e1f414bb43ce8fa498121d16982 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -1,8 +1,8 @@
 use crate::{
     color::Hsla,
-    hoverable::{hoverable, Hoverable},
+    elements::hoverable::{hoverable, Hoverable},
+    elements::pressable::{pressable, Pressable},
     paint_context::PaintContext,
-    pressable::{pressable, Pressable},
 };
 pub use gpui::taffy::style::{
     AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
diff --git a/crates/gpui2/src/text.rs b/crates/gpui2/src/text.rs
deleted file mode 100644
index d43ecb0329a441356ed02b73fc49e1ba7d9cee22..0000000000000000000000000000000000000000
--- a/crates/gpui2/src/text.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use crate::{
-    element::{Element, IntoElement, Layout},
-    layout_context::LayoutContext,
-    paint_context::PaintContext,
-};
-use anyhow::Result;
-use gpui::{geometry::Size, text_layout::LineLayout, LayoutId, RenderContext};
-use parking_lot::Mutex;
-use std::sync::Arc;
-
-impl<V: 'static, S: Into<ArcCow<'static, str>>> IntoElement<V> for S {
-    type Element = Text;
-
-    fn into_element(self) -> Self::Element {
-        Text { text: self.into() }
-    }
-}
-
-pub struct Text {
-    text: ArcCow<'static, str>,
-}
-
-impl<V: 'static> Element<V> for Text {
-    type PaintState = Arc<Mutex<Option<TextLayout>>>;
-
-    fn layout(
-        &mut self,
-        view: &mut V,
-        cx: &mut LayoutContext<V>,
-    ) -> Result<(LayoutId, Self::PaintState)> {
-        let rem_size = cx.rem_pixels();
-        let fonts = cx.platform().fonts();
-        let text_style = cx.text_style();
-        let line_height = cx.font_cache().line_height(text_style.font_size);
-        let text = self.text.clone();
-        let paint_state = Arc::new(Mutex::new(None));
-
-        let layout_id = cx.add_measured_layout_node(Default::default(), {
-            let paint_state = paint_state.clone();
-            move |params| {
-                let line_layout = fonts.layout_line(
-                    text.as_ref(),
-                    text_style.font_size,
-                    &[(text.len(), text_style.to_run())],
-                );
-
-                let size = Size {
-                    width: line_layout.width,
-                    height: line_height,
-                };
-
-                paint_state.lock().replace(TextLayout {
-                    line_layout: Arc::new(line_layout),
-                    line_height,
-                });
-
-                size
-            }
-        });
-
-        Ok((layout_id?, paint_state))
-    }
-
-    fn paint<'a>(
-        &mut self,
-        view: &mut V,
-        layout: &Layout,
-        paint_state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
-    ) {
-        let line_layout;
-        let line_height;
-        {
-            let paint_state = paint_state.lock();
-            let paint_state = paint_state
-                .as_ref()
-                .expect("measurement has not been performed");
-            line_layout = paint_state.line_layout.clone();
-            line_height = paint_state.line_height;
-        }
-
-        let text_style = cx.text_style();
-        let line =
-            gpui::text_layout::Line::new(line_layout, &[(self.text.len(), text_style.to_run())]);
-
-        let origin = layout.bounds.origin();
-        // TODO: We haven't added visible bounds to the new element system yet, so this is a placeholder.
-        let visible_bounds = layout.bounds;
-        line.paint(cx.scene, origin, visible_bounds, line_height, cx.legacy_cx);
-    }
-}
-
-pub struct TextLayout {
-    line_layout: Arc<LineLayout>,
-    line_height: f32,
-}
-
-pub enum ArcCow<'a, T: ?Sized> {
-    Borrowed(&'a T),
-    Owned(Arc<T>),
-}
-
-impl<'a, T: ?Sized> Clone for ArcCow<'a, T> {
-    fn clone(&self) -> Self {
-        match self {
-            Self::Borrowed(borrowed) => Self::Borrowed(borrowed),
-            Self::Owned(owned) => Self::Owned(owned.clone()),
-        }
-    }
-}
-
-impl<'a, T: ?Sized> From<&'a T> for ArcCow<'a, T> {
-    fn from(s: &'a T) -> Self {
-        Self::Borrowed(s)
-    }
-}
-
-impl<T> From<Arc<T>> for ArcCow<'_, T> {
-    fn from(s: Arc<T>) -> Self {
-        Self::Owned(s)
-    }
-}
-
-impl From<String> for ArcCow<'_, str> {
-    fn from(value: String) -> Self {
-        Self::Owned(value.into())
-    }
-}
-
-impl<T: ?Sized> std::ops::Deref for ArcCow<'_, T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            ArcCow::Borrowed(s) => s,
-            ArcCow::Owned(s) => s.as_ref(),
-        }
-    }
-}
-
-impl<T: ?Sized> AsRef<T> for ArcCow<'_, T> {
-    fn as_ref(&self) -> &T {
-        match self {
-            ArcCow::Borrowed(borrowed) => borrowed,
-            ArcCow::Owned(owned) => owned.as_ref(),
-        }
-    }
-}
diff --git a/crates/gpui2/src/themes/rose_pine.rs b/crates/gpui2/src/themes/rose_pine.rs
deleted file mode 100644
index 628a93227968ce141fb932d5f9a2f37990e899a2..0000000000000000000000000000000000000000
--- a/crates/gpui2/src/themes/rose_pine.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use std::ops::Range;
-
-use crate::{
-    color::{hsla, rgb, Hsla},
-    ThemeColors,
-};
-
-pub struct RosePineThemes {
-    pub default: RosePinePalette,
-    pub dawn: RosePinePalette,
-    pub moon: RosePinePalette,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub struct RosePinePalette {
-    pub base: Hsla,
-    pub surface: Hsla,
-    pub overlay: Hsla,
-    pub muted: Hsla,
-    pub subtle: Hsla,
-    pub text: Hsla,
-    pub love: Hsla,
-    pub gold: Hsla,
-    pub rose: Hsla,
-    pub pine: Hsla,
-    pub foam: Hsla,
-    pub iris: Hsla,
-    pub highlight_low: Hsla,
-    pub highlight_med: Hsla,
-    pub highlight_high: Hsla,
-}
-
-impl RosePinePalette {
-    pub fn default() -> RosePinePalette {
-        RosePinePalette {
-            base: rgb(0x191724),
-            surface: rgb(0x1f1d2e),
-            overlay: rgb(0x26233a),
-            muted: rgb(0x6e6a86),
-            subtle: rgb(0x908caa),
-            text: rgb(0xe0def4),
-            love: rgb(0xeb6f92),
-            gold: rgb(0xf6c177),
-            rose: rgb(0xebbcba),
-            pine: rgb(0x31748f),
-            foam: rgb(0x9ccfd8),
-            iris: rgb(0xc4a7e7),
-            highlight_low: rgb(0x21202e),
-            highlight_med: rgb(0x403d52),
-            highlight_high: rgb(0x524f67),
-        }
-    }
-
-    pub fn moon() -> RosePinePalette {
-        RosePinePalette {
-            base: rgb(0x232136),
-            surface: rgb(0x2a273f),
-            overlay: rgb(0x393552),
-            muted: rgb(0x6e6a86),
-            subtle: rgb(0x908caa),
-            text: rgb(0xe0def4),
-            love: rgb(0xeb6f92),
-            gold: rgb(0xf6c177),
-            rose: rgb(0xea9a97),
-            pine: rgb(0x3e8fb0),
-            foam: rgb(0x9ccfd8),
-            iris: rgb(0xc4a7e7),
-            highlight_low: rgb(0x2a283e),
-            highlight_med: rgb(0x44415a),
-            highlight_high: rgb(0x56526e),
-        }
-    }
-
-    pub fn dawn() -> RosePinePalette {
-        RosePinePalette {
-            base: rgb(0xfaf4ed),
-            surface: rgb(0xfffaf3),
-            overlay: rgb(0xf2e9e1),
-            muted: rgb(0x9893a5),
-            subtle: rgb(0x797593),
-            text: rgb(0x575279),
-            love: rgb(0xb4637a),
-            gold: rgb(0xea9d34),
-            rose: rgb(0xd7827e),
-            pine: rgb(0x286983),
-            foam: rgb(0x56949f),
-            iris: rgb(0x907aa9),
-            highlight_low: rgb(0xf4ede8),
-            highlight_med: rgb(0xdfdad9),
-            highlight_high: rgb(0xcecacd),
-        }
-    }
-}
-
-pub fn default() -> ThemeColors {
-    theme_colors(&RosePinePalette::default())
-}
-
-pub fn moon() -> ThemeColors {
-    theme_colors(&RosePinePalette::moon())
-}
-
-pub fn dawn() -> ThemeColors {
-    theme_colors(&RosePinePalette::dawn())
-}
-
-fn theme_colors(p: &RosePinePalette) -> ThemeColors {
-    ThemeColors {
-        base: scale_sl(p.base, (0.8, 0.8), (1.2, 1.2)),
-        surface: scale_sl(p.surface, (0.8, 0.8), (1.2, 1.2)),
-        overlay: scale_sl(p.overlay, (0.8, 0.8), (1.2, 1.2)),
-        muted: scale_sl(p.muted, (0.8, 0.8), (1.2, 1.2)),
-        subtle: scale_sl(p.subtle, (0.8, 0.8), (1.2, 1.2)),
-        text: scale_sl(p.text, (0.8, 0.8), (1.2, 1.2)),
-        highlight_low: scale_sl(p.highlight_low, (0.8, 0.8), (1.2, 1.2)),
-        highlight_med: scale_sl(p.highlight_med, (0.8, 0.8), (1.2, 1.2)),
-        highlight_high: scale_sl(p.highlight_high, (0.8, 0.8), (1.2, 1.2)),
-        success: scale_sl(p.foam, (0.8, 0.8), (1.2, 1.2)),
-        warning: scale_sl(p.gold, (0.8, 0.8), (1.2, 1.2)),
-        error: scale_sl(p.love, (0.8, 0.8), (1.2, 1.2)),
-        inserted: scale_sl(p.foam, (0.8, 0.8), (1.2, 1.2)),
-        deleted: scale_sl(p.love, (0.8, 0.8), (1.2, 1.2)),
-        modified: scale_sl(p.rose, (0.8, 0.8), (1.2, 1.2)),
-    }
-}
-
-/// Produces a range by multiplying the saturation and lightness of the base color by the given
-/// start and end factors.
-fn scale_sl(base: Hsla, (start_s, start_l): (f32, f32), (end_s, end_l): (f32, f32)) -> Range<Hsla> {
-    let start = hsla(base.h, base.s * start_s, base.l * start_l, base.a);
-    let end = hsla(base.h, base.s * end_s, base.l * end_l, base.a);
-    Range { start, end }
-}
diff --git a/crates/gpui/playground/Cargo.lock b/crates/storybook/Cargo.lock
similarity index 99%
rename from crates/gpui/playground/Cargo.lock
rename to crates/storybook/Cargo.lock
index 95e0b10c625ae380e0090c01e50d37ed2bd3f398..b652dbbd132575197b77521df34d1df0785ffa09 100644
--- a/crates/gpui/playground/Cargo.lock
+++ b/crates/storybook/Cargo.lock
@@ -1686,7 +1686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
-name = "playground"
+name = "storybook"
 version = "0.1.0"
 dependencies = [
  "gpui",
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
new file mode 100644
index 0000000000000000000000000000000000000000..f634ea4eca1cb58056f9a14769dfadfcba83a118
--- /dev/null
+++ b/crates/storybook/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "storybook"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[[bin]]
+name = "storybook"
+path = "src/storybook.rs"
+
+[dependencies]
+gpui2 = { path = "../gpui2" }
+anyhow.workspace = true
+log.workspace = true
+rust-embed.workspace = true
+serde.workspace = true
+settings = { path = "../settings" }
+simplelog = "0.9"
+theme = { path = "../theme" }
+util = { path = "../util" }
+
+[dev-dependencies]
+gpui2 = { path = "../gpui2", features = ["test-support"] }
diff --git a/crates/gpui/playground/docs/thoughts.md b/crates/storybook/docs/thoughts.md
similarity index 100%
rename from crates/gpui/playground/docs/thoughts.md
rename to crates/storybook/docs/thoughts.md
diff --git a/crates/gpui2/src/components.rs b/crates/storybook/src/components.rs
similarity index 90%
rename from crates/gpui2/src/components.rs
rename to crates/storybook/src/components.rs
index a98fea33830ee382efb9cab25449227c8a716170..142bc363126edae6c5401bb63d8ce999701315d0 100644
--- a/crates/gpui2/src/components.rs
+++ b/crates/storybook/src/components.rs
@@ -1,13 +1,7 @@
-use crate::{
-    div::div,
-    element::{IntoElement, ParentElement},
-    interactive::Interactive,
-    style::StyleHelpers,
-    text::ArcCow,
-    // themes::Theme,
+use gpui2::{
+    elements::div, elements::text::ArcCow, interactive::Interactive, platform::MouseButton,
+    style::StyleHelpers, Element, IntoElement, ParentElement, ViewContext,
 };
-use gpui::{platform::MouseButton, ViewContext};
-use gpui2_macros::Element;
 use std::{marker::PhantomData, rc::Rc};
 
 struct ButtonHandlers<V, D> {
@@ -20,7 +14,6 @@ impl<V, D> Default for ButtonHandlers<V, D> {
     }
 }
 
-use crate as gpui2;
 #[derive(Element)]
 pub struct Button<V: 'static, D: 'static> {
     handlers: ButtonHandlers<V, D>,
diff --git a/crates/storybook/src/element_ext.rs b/crates/storybook/src/element_ext.rs
new file mode 100644
index 0000000000000000000000000000000000000000..72ec5b328af00279427795a13e12cd969c34688c
--- /dev/null
+++ b/crates/storybook/src/element_ext.rs
@@ -0,0 +1,22 @@
+use crate::theme::{Theme, Themed};
+use gpui2::Element;
+use std::marker::PhantomData;
+
+pub trait ElementExt<V: 'static>: Element<V> {
+    fn themed(self, theme: Theme) -> Themed<V, Self>
+    where
+        Self: Sized;
+}
+
+impl<V: 'static, E: Element<V>> ElementExt<V> for E {
+    fn themed(self, theme: Theme) -> Themed<V, Self>
+    where
+        Self: Sized,
+    {
+        Themed {
+            child: self,
+            theme,
+            view_type: PhantomData,
+        }
+    }
+}
diff --git a/crates/gpui2/src/playground.rs b/crates/storybook/src/storybook.rs
similarity index 68%
rename from crates/gpui2/src/playground.rs
rename to crates/storybook/src/storybook.rs
index 43bd8d7b10a96c87bfc07579a359fd844e6bf6b2..d1b97ec9f19290b2629df7628a74cf6dceb6bb47 100644
--- a/crates/gpui2/src/playground.rs
+++ b/crates/storybook/src/storybook.rs
@@ -1,61 +1,43 @@
 #![allow(dead_code, unused_variables)]
-use crate::element::Element;
-use gpui::{
-    geometry::{rect::RectF, vector::vec2f},
-    platform::WindowOptions,
-    serde_json, ViewContext,
-};
+use crate::theme::Theme;
+use ::theme as legacy_theme;
+use element_ext::ElementExt;
+use gpui2::{serde_json, vec2f, view, Element, RectF, ViewContext, WindowBounds};
+use legacy_theme::ThemeSettings;
 use log::LevelFilter;
 use settings::{default_settings, SettingsStore};
 use simplelog::SimpleLogger;
-use theme::ThemeSettings;
-use themes::Theme;
-use view::view;
 use workspace::workspace;
 
-mod adapter;
-mod color;
 mod components;
-mod div;
-mod element;
-mod hoverable;
-mod interactive;
-mod layout_context;
-mod paint_context;
-mod pressable;
-mod style;
-mod text;
-mod themes;
-mod view;
+mod element_ext;
+mod theme;
 mod workspace;
 
 fn main() {
     SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
 
-    gpui::App::new(()).unwrap().run(|cx| {
+    gpui2::App::new(()).unwrap().run(|cx| {
         let mut store = SettingsStore::default();
         store
             .set_default_settings(default_settings().as_ref(), cx)
             .unwrap();
         cx.set_global(store);
-        theme::init(Assets, cx);
+        legacy_theme::init(Assets, cx);
 
         cx.add_window(
-            WindowOptions {
-                bounds: gpui::platform::WindowBounds::Fixed(RectF::new(
-                    vec2f(0., 0.),
-                    vec2f(400., 300.),
-                )),
+            gpui2::WindowOptions {
+                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(400., 300.))),
                 center: true,
                 ..Default::default()
             },
-            |_| view(|cx| playground(cx)),
+            |_| view(|cx| storybook(cx)),
         );
         cx.platform().activate(true);
     });
 }
 
-fn playground<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
+fn storybook<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
     workspace().themed(current_theme(cx))
 }
 
@@ -77,11 +59,11 @@ fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
 }
 
 use anyhow::{anyhow, Result};
-use gpui::AssetSource;
+use gpui2::AssetSource;
 use rust_embed::RustEmbed;
 
 #[derive(RustEmbed)]
-#[folder = "../../../assets"]
+#[folder = "../../assets"]
 #[include = "themes/**/*"]
 #[exclude = "*.DS_Store"]
 pub struct Assets;
diff --git a/crates/gpui2/src/themes.rs b/crates/storybook/src/theme.rs
similarity index 87%
rename from crates/gpui2/src/themes.rs
rename to crates/storybook/src/theme.rs
index e372e1e31bcaf1b99b51030eee4cf7f63739af0b..921a8453087b3153e21c62684bcc212ecc28fb63 100644
--- a/crates/gpui2/src/themes.rs
+++ b/crates/storybook/src/theme.rs
@@ -1,11 +1,12 @@
-use crate::{
+use gpui2::{
     color::Hsla,
     element::{Element, PaintContext},
     layout_context::LayoutContext,
+    serde_json, AppContext, WindowContext,
 };
-use gpui::WindowContext;
 use serde::{de::Visitor, Deserialize, Deserializer};
 use std::{collections::HashMap, fmt, marker::PhantomData};
+use theme::ThemeSettings;
 
 #[derive(Deserialize, Clone, Default, Debug)]
 pub struct Theme {
@@ -64,10 +65,6 @@ pub struct Shadow {
     pub offset: Vec<u8>,
 }
 
-pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
-    cx.theme::<Theme>()
-}
-
 fn deserialize_player_colors<'de, D>(deserializer: D) -> Result<Vec<PlayerColors>, D::Error>
 where
     D: Deserializer<'de>,
@@ -149,7 +146,7 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
         &mut self,
         view: &mut V,
         cx: &mut LayoutContext<V>,
-    ) -> anyhow::Result<(gpui::LayoutId, Self::PaintState)>
+    ) -> anyhow::Result<(gpui2::LayoutId, Self::PaintState)>
     where
         Self: Sized,
     {
@@ -162,7 +159,7 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
     fn paint(
         &mut self,
         view: &mut V,
-        layout: &gpui::Layout,
+        layout: &gpui2::Layout,
         state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) where
@@ -173,3 +170,23 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
         cx.pop_theme();
     }
 }
+
+fn preferred_theme<V: 'static>(cx: &AppContext) -> Theme {
+    settings::get::<ThemeSettings>(cx)
+        .theme
+        .deserialized_base_theme
+        .lock()
+        .get_or_insert_with(|| {
+            let theme: Theme =
+                serde_json::from_value(settings::get::<ThemeSettings>(cx).theme.base_theme.clone())
+                    .unwrap();
+            Box::new(theme)
+        })
+        .downcast_ref::<Theme>()
+        .unwrap()
+        .clone()
+}
+
+pub fn theme<'a>(cx: &'a WindowContext) -> &'a Theme {
+    cx.theme::<Theme>()
+}
diff --git a/crates/gpui/playground/src/workspace.rs b/crates/storybook/src/workspace.rs
similarity index 83%
rename from crates/gpui/playground/src/workspace.rs
rename to crates/storybook/src/workspace.rs
index c0185889c8f38498dbbd6d70a9c1aedad9c4b944..a7a3f379ddf07a68f9b67bb48a12bf4faddd8c74 100644
--- a/crates/gpui/playground/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,13 +1,9 @@
-use crate::{
-    div::div,
-    element::{Element, IntoElement, ParentElement},
-    style::StyleHelpers,
-    themes::theme,
+use crate::theme::theme;
+use gpui2::{
+    elements::div, geometry::pixels, style::StyleHelpers, Element, IntoElement, ParentElement,
+    ViewContext,
 };
-use gpui::{geometry::pixels, ViewContext};
-use gpui2_macros::Element;
 
-use crate as playground;
 #[derive(Element)]
 struct WorkspaceElement;
 
diff --git a/test.rs b/test.rs
index 974c37c477347479bb3f47066423bad2853d782e..6553e633c8e82597b9ca32b34d68a2f475d586ce 100644
--- a/test.rs
+++ b/test.rs
@@ -4484,7 +4484,7 @@ mod element {
                     .layout_engine()
                     .unwrap()
                     .computed_layout(*layout_node_id)
-                    .expect("you can currently only use playground elements within an adapter"),
+                    .expect("make sure you're using this within a gpui2 adapter element"),
                 from_element: element_layout.as_mut(),
             };
             let style = self.element.style();
@@ -5601,12 +5601,12 @@ fn main() {
                 center: true,
                 ..Default::default()
             },
-            |_| view(|_| playground(&rose_pine::moon())),
+            |_| view(|_| storybook(&rose_pine::moon())),
         );
         cx.platform().activate(true);
     });
 }
-fn playground<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
+fn storybook<V: 'static>(theme: &ThemeColors) -> impl Element<V> {
     frame()
         .text_color(black())
         .h_full()

From 6275c560e7707b18a168dffa1b895aed53ac00d4 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 1 Sep 2023 10:08:41 -0600
Subject: [PATCH 024/109] Fix warnings for a clean build

---
 crates/gpui2/src/adapter.rs       | 26 +++++++++++++-------------
 crates/gpui2/src/element.rs       |  3 +--
 crates/gpui2/src/elements/text.rs |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
index dee1fd48695365c11acca1f465f4fffda62e20a1..6aa89385af4e9f22297264080ab3761e3365acef 100644
--- a/crates/gpui2/src/adapter.rs
+++ b/crates/gpui2/src/adapter.rs
@@ -38,7 +38,7 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
         &mut self,
         scene: &mut gpui::SceneBuilder,
         bounds: RectF,
-        visible_bounds: RectF,
+        _visible_bounds: RectF,
         layout_data: &mut Option<(LayoutEngine, LayoutId)>,
         view: &mut V,
         legacy_cx: &mut gpui::PaintContext<V>,
@@ -53,24 +53,24 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
 
     fn rect_for_text_range(
         &self,
-        range_utf16: std::ops::Range<usize>,
-        bounds: RectF,
-        visible_bounds: RectF,
-        layout: &Self::LayoutState,
-        paint: &Self::PaintState,
-        view: &V,
-        cx: &gpui::ViewContext<V>,
+        _range_utf16: std::ops::Range<usize>,
+        _bounds: RectF,
+        _visible_bounds: RectF,
+        _layout: &Self::LayoutState,
+        _paint: &Self::PaintState,
+        _view: &V,
+        _cx: &gpui::ViewContext<V>,
     ) -> Option<RectF> {
         todo!("implement before merging to main")
     }
 
     fn debug(
         &self,
-        bounds: RectF,
-        layout: &Self::LayoutState,
-        paint: &Self::PaintState,
-        view: &V,
-        cx: &gpui::ViewContext<V>,
+        _bounds: RectF,
+        _layout: &Self::LayoutState,
+        _paint: &Self::PaintState,
+        _view: &V,
+        _cx: &gpui::ViewContext<V>,
     ) -> gpui::serde_json::Value {
         todo!("implement before merging to main")
     }
diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index fdf06597ca455d4e7865a3c1a39bdd0085528f30..6394064f2f254c8ce9c6e2b2cd7d550bae9fdfad 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 pub use crate::layout_context::LayoutContext;
 pub use crate::paint_context::PaintContext;
 use anyhow::Result;
@@ -56,6 +54,7 @@ enum ElementPhase<V: 'static, E: Element<V>> {
         layout_id: LayoutId,
         paint_state: E::PaintState,
     },
+    #[allow(dead_code)]
     PostPaint {
         layout: Layout,
         paint_state: E::PaintState,
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index ab89b6d897a6952b2fdb72a3099fdbe2c18d9832..531c87bd1eb9524628986f8c80f368fea3feab17 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -36,7 +36,7 @@ impl<V: 'static> Element<V> for Text {
 
         let layout_id = cx.add_measured_layout_node(Default::default(), {
             let paint_state = paint_state.clone();
-            move |params| {
+            move |_params| {
                 let line_layout = fonts.layout_line(
                     text.as_ref(),
                     text_style.font_size,

From 0307cb8a88ea461f06d5c0a4482e952a35e733b1 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 5 Sep 2023 10:02:36 -0600
Subject: [PATCH 025/109] Start sketching a collab panel in storybook

Co-Authored-By: Nate Butler <nate@zed.dev>
---
 crates/gpui2/src/style.rs                    | 40 ++++++++++++++++++++
 crates/gpui2_macros/src/styleable_helpers.rs |  5 +++
 crates/storybook/src/collab_panel.rs         | 34 +++++++++++++++++
 crates/storybook/src/storybook.rs            |  7 ++--
 4 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 crates/storybook/src/collab_panel.rs

diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 704147d3f2464e1f414bb43ce8fa498121d16982..1b7e0e2460ad17296b8efc57d00daf01c370d0ed 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -359,6 +359,46 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
+    fn justify_between(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().justify_content = Some(JustifyContent::SpaceBetween);
+        self
+    }
+
+    fn justify_center(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().justify_content = Some(JustifyContent::Center);
+        self
+    }
+
+    fn justify_start(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().justify_content = Some(JustifyContent::Start);
+        self
+    }
+
+    fn justify_end(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().justify_content = Some(JustifyContent::End);
+        self
+    }
+
+    fn justify_around(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().justify_content = Some(JustifyContent::SpaceAround);
+        self
+    }
+
     fn fill<F>(mut self, fill: F) -> Self
     where
         F: Into<Fill>,
diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index 9b1a4b714a44be50ba07dae3b0c21e56faf892ef..c7942c7da3e57b80dcd7c5297036667f89196266 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -138,6 +138,11 @@ fn tailwind_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
             false,
             vec![quote! { padding.left }, quote! { padding.right }],
         ),
+        (
+            "py",
+            false,
+            vec![quote! { padding.top }, quote! { padding.bottom }],
+        ),
         ("pl", false, vec![quote! { padding.left }]),
         ("pr", false, vec![quote! { padding.right }]),
         ("top", true, vec![quote! { inset.top }]),
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
new file mode 100644
index 0000000000000000000000000000000000000000..714d52dc2d36ec16df92604808ece25041796f0a
--- /dev/null
+++ b/crates/storybook/src/collab_panel.rs
@@ -0,0 +1,34 @@
+use crate::theme::theme;
+use gpui2::{elements::div, style::StyleHelpers, Element, IntoElement, ParentElement, ViewContext};
+use std::marker::PhantomData;
+
+#[derive(Element)]
+pub struct CollabPanelElement<V: 'static> {
+    view_type: PhantomData<V>,
+}
+
+pub fn collab_panel<V: 'static>() -> CollabPanelElement<V> {
+    CollabPanelElement {
+        view_type: PhantomData,
+    }
+}
+
+impl<V: 'static> CollabPanelElement<V> {
+    fn render(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+
+        div()
+            .full()
+            .text_color(theme.middle.variant.default.foreground)
+            .fill(theme.middle.base.default.background)
+            .py_2()
+            .child(
+                div()
+                    .px_2()
+                    .flex()
+                    .justify_between()
+                    .child("#CRDB")
+                    .child("V"),
+            )
+    }
+}
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index d1b97ec9f19290b2629df7628a74cf6dceb6bb47..fed8d2cbdc8f0cccc9da624ad373b547c7a35d0f 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -1,14 +1,15 @@
 #![allow(dead_code, unused_variables)]
 use crate::theme::Theme;
 use ::theme as legacy_theme;
+use collab_panel::collab_panel;
 use element_ext::ElementExt;
 use gpui2::{serde_json, vec2f, view, Element, RectF, ViewContext, WindowBounds};
 use legacy_theme::ThemeSettings;
 use log::LevelFilter;
 use settings::{default_settings, SettingsStore};
 use simplelog::SimpleLogger;
-use workspace::workspace;
 
+mod collab_panel;
 mod components;
 mod element_ext;
 mod theme;
@@ -27,7 +28,7 @@ fn main() {
 
         cx.add_window(
             gpui2::WindowOptions {
-                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(400., 300.))),
+                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(260., 800.))),
                 center: true,
                 ..Default::default()
             },
@@ -38,7 +39,7 @@ fn main() {
 }
 
 fn storybook<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
-    workspace().themed(current_theme(cx))
+    collab_panel().themed(current_theme(cx))
 }
 
 // Nathan: During the transition, we will include the base theme on the legacy Theme struct.

From 9ec7569e0992a74a870b4ee992e5208e3176427c Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 5 Sep 2023 12:16:21 -0600
Subject: [PATCH 026/109] Checkpoint

---
 crates/gpui/src/app.rs               |  48 ---------
 crates/gpui/src/app/window.rs        |  14 ++-
 crates/gpui/src/fonts.rs             |  85 +++++++++++++---
 crates/gpui2/src/elements/div.rs     |  14 ++-
 crates/gpui2/src/elements/text.rs    |   2 +-
 crates/gpui2/src/gpui2.rs            |   2 +-
 crates/gpui2/src/layout_context.rs   |  24 +----
 crates/gpui2/src/style.rs            | 141 ++++++++++++++++++++-------
 crates/storybook/src/collab_panel.rs |   1 +
 crates/storybook/src/storybook.rs    |  16 +++
 10 files changed, 217 insertions(+), 130 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 10d1dc69972453011a5f40180e1e98141da49c57..dda02fa4d6d3dc569e73ee09a333602d42993078 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -10,7 +10,6 @@ mod window_input_handler;
 use crate::{
     elements::{AnyElement, AnyRootElement, RootElement},
     executor::{self, Task},
-    fonts::TextStyle,
     json,
     keymap_matcher::{self, Binding, KeymapContext, KeymapMatcher, Keystroke, MatchResult},
     platform::{
@@ -3345,10 +3344,6 @@ impl<'a, 'b, V: 'static> ViewContext<'a, 'b, V> {
         self.element_state::<Tag, T>(element_id, T::default())
     }
 
-    pub fn rem_pixels(&self) -> f32 {
-        16.
-    }
-
     pub fn default_element_state_dynamic<T: 'static + Default>(
         &mut self,
         tag: TypeTag,
@@ -3447,17 +3442,6 @@ impl<V> BorrowWindowContext for ViewContext<'_, '_, V> {
     }
 }
 
-/// Methods shared by both LayoutContext and PaintContext
-///
-/// It's that PaintContext should be implemented in terms of layout context and
-/// deref to it, in which case we wouldn't need this.
-pub trait RenderContext<'a, 'b, V> {
-    fn text_style(&self) -> TextStyle;
-    fn push_text_style(&mut self, style: TextStyle);
-    fn pop_text_style(&mut self);
-    fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V>;
-}
-
 pub struct LayoutContext<'a, 'b, 'c, V> {
     // Nathan: Making this is public while I work on gpui2.
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
@@ -3520,38 +3504,6 @@ impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
             .or_default()
             .push(self_view_id);
     }
-
-    pub fn with_text_style<F, T>(&mut self, style: TextStyle, f: F) -> T
-    where
-        F: FnOnce(&mut Self) -> T,
-    {
-        self.push_text_style(style);
-        let result = f(self);
-        self.pop_text_style();
-        result
-    }
-}
-
-impl<'a, 'b, 'c, V> RenderContext<'a, 'b, V> for LayoutContext<'a, 'b, 'c, V> {
-    fn text_style(&self) -> TextStyle {
-        self.window
-            .text_style_stack
-            .last()
-            .cloned()
-            .unwrap_or(TextStyle::default(&self.font_cache))
-    }
-
-    fn push_text_style(&mut self, style: TextStyle) {
-        self.window.text_style_stack.push(style);
-    }
-
-    fn pop_text_style(&mut self) {
-        self.window.text_style_stack.pop();
-    }
-
-    fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
-        &mut self.view_context
-    }
 }
 
 impl<'a, 'b, 'c, V> Deref for LayoutContext<'a, 'b, 'c, V> {
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 61a468d11b564af4181870ed735b7a86b25dffb8..18691934e5992d34f3ff80c1ef9e35f4f6235b88 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1,6 +1,6 @@
 use crate::{
     elements::AnyRootElement,
-    fonts::TextStyle,
+    fonts::{TextStyle, TextStyleRefinement},
     geometry::{rect::RectF, Size},
     json::ToJson,
     keymap_matcher::{Binding, KeymapContext, Keystroke, MatchResult},
@@ -235,6 +235,10 @@ impl<'a> WindowContext<'a> {
             .push_back(Effect::RepaintWindow { window });
     }
 
+    pub fn rem_size(&self) -> f32 {
+        16.
+    }
+
     pub fn layout_engine(&mut self) -> Option<&mut LayoutEngine> {
         self.window.layout_engines.last_mut()
     }
@@ -1284,8 +1288,14 @@ impl<'a> WindowContext<'a> {
             .unwrap_or(TextStyle::default(&self.font_cache))
     }
 
-    pub fn push_text_style(&mut self, style: TextStyle) {
+    pub fn push_text_style(&mut self, refinement: &TextStyleRefinement) -> Result<()> {
+        let mut style = self.text_style();
+        style.refine(refinement, self.font_cache())?;
+
+        dbg!(&style);
+
         self.window.text_style_stack.push(style);
+        Ok(())
     }
 
     pub fn pop_text_style(&mut self) {
diff --git a/crates/gpui/src/fonts.rs b/crates/gpui/src/fonts.rs
index 4b89dab6eacb2368bfbb8e5af67e2124563f6fba..4b46f8eb792c0efa6a0c1d1176d0f85607d031a2 100644
--- a/crates/gpui/src/fonts.rs
+++ b/crates/gpui/src/fonts.rs
@@ -60,7 +60,7 @@ pub struct Features {
     pub zero: Option<bool>,
 }
 
-#[derive(Clone, Debug, JsonSchema, Refineable)]
+#[derive(Clone, Debug, JsonSchema)]
 pub struct TextStyle {
     pub color: Color,
     pub font_family_name: Arc<str>,
@@ -80,19 +80,78 @@ impl TextStyle {
             ..Default::default()
         }
     }
+}
+
+impl TextStyle {
+    pub fn refine(
+        &mut self,
+        refinement: &TextStyleRefinement,
+        font_cache: &FontCache,
+    ) -> Result<()> {
+        if let Some(font_size) = refinement.font_size {
+            self.font_size = font_size;
+        }
+        if let Some(color) = refinement.color {
+            self.color = color;
+        }
+        if let Some(underline) = refinement.underline {
+            self.underline = underline;
+        }
+
+        let mut update_font_id = false;
+        if let Some(font_family) = refinement.font_family.clone() {
+            self.font_family_id = font_cache.load_family(&[&font_family], &Default::default())?;
+            self.font_family_name = font_family;
+            update_font_id = true;
+        }
+        if let Some(font_weight) = refinement.font_weight {
+            self.font_properties.weight = font_weight;
+            update_font_id = true;
+        }
+        if let Some(font_style) = refinement.font_style {
+            self.font_properties.style = font_style;
+            update_font_id = true;
+        }
+
+        if update_font_id {
+            self.font_id = font_cache.select_font(self.font_family_id, &self.font_properties)?;
+        }
 
-    pub fn refine(self, refinement: TextStyleRefinement) -> TextStyle {
-        TextStyle {
-            color: refinement.color.unwrap_or(self.color),
-            font_family_name: refinement
-                .font_family_name
-                .unwrap_or_else(|| self.font_family_name.clone()),
-            font_family_id: refinement.font_family_id.unwrap_or(self.font_family_id),
-            font_id: refinement.font_id.unwrap_or(self.font_id),
-            font_size: refinement.font_size.unwrap_or(self.font_size),
-            font_properties: refinement.font_properties.unwrap_or(self.font_properties),
-            underline: refinement.underline.unwrap_or(self.underline),
-            soft_wrap: refinement.soft_wrap.unwrap_or(self.soft_wrap),
+        Ok(())
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct TextStyleRefinement {
+    pub color: Option<Color>,
+    pub font_family: Option<Arc<str>>,
+    pub font_size: Option<f32>,
+    pub font_weight: Option<Weight>,
+    pub font_style: Option<Style>,
+    pub underline: Option<Underline>,
+}
+
+impl Refineable for TextStyleRefinement {
+    type Refinement = Self;
+
+    fn refine(&mut self, refinement: &Self::Refinement) {
+        if refinement.color.is_some() {
+            self.color = refinement.color;
+        }
+        if refinement.font_family.is_some() {
+            self.font_family = refinement.font_family.clone();
+        }
+        if refinement.font_size.is_some() {
+            self.font_size = refinement.font_size;
+        }
+        if refinement.font_weight.is_some() {
+            self.font_weight = refinement.font_weight;
+        }
+        if refinement.font_style.is_some() {
+            self.font_style = refinement.font_style;
+        }
+        if refinement.underline.is_some() {
+            self.underline = refinement.underline;
         }
     }
 }
diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index 5058907eec96a99accc977defea837e9b8b55ac4..baf816ab77771e52cc71329d837b520dc2c71b51 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -6,9 +6,10 @@ use crate::{
     InteractionHandlers, Interactive,
 };
 use anyhow::Result;
-use gpui::{LayoutId, RenderContext};
+use gpui::LayoutId;
 use refineable::{Refineable, RefinementCascade};
 use smallvec::SmallVec;
+use util::ResultExt;
 
 pub struct Div<V: 'static> {
     styles: RefinementCascade<Style>,
@@ -36,9 +37,8 @@ impl<V: 'static> Element<V> for Div<V> {
         Self: Sized,
     {
         let style = self.computed_style();
-        let pop_text_style = style.text_style().map_or(false, |style| {
-            cx.push_text_style(cx.text_style().clone().refined(&style));
-            true
+        let pop_text_style = style.text_style(cx).map_or(false, |style| {
+            cx.push_text_style(&style).log_err().is_some()
         });
 
         let children = self
@@ -64,10 +64,8 @@ impl<V: 'static> Element<V> for Div<V> {
         Self: Sized,
     {
         let style = &self.computed_style();
-        let pop_text_style = style.text_style().map_or(false, |style| {
-            let style = cx.text_style().clone().refined(&style);
-            cx.push_text_style(style);
-            true
+        let pop_text_style = style.text_style(cx).map_or(false, |style| {
+            cx.push_text_style(&style).log_err().is_some()
         });
         style.paint_background(layout.bounds, cx);
         self.interaction_handlers()
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 531c87bd1eb9524628986f8c80f368fea3feab17..8bbec8e645bc8279b76d718430020c973c385471 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -4,7 +4,7 @@ use crate::{
     paint_context::PaintContext,
 };
 use anyhow::Result;
-use gpui::{geometry::Size, text_layout::LineLayout, LayoutId, RenderContext};
+use gpui::{geometry::Size, text_layout::LineLayout, LayoutId};
 use parking_lot::Mutex;
 use std::sync::Arc;
 
diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs
index 184a73c7c08c9b9b746dacd1a2f22c2484ca12fa..a37f8cc50f5563d0fdba0e8368f8ead8849714bb 100644
--- a/crates/gpui2/src/gpui2.rs
+++ b/crates/gpui2/src/gpui2.rs
@@ -18,5 +18,5 @@ pub use gpui::*;
 pub use gpui2_macros::{Element, *};
 pub use interactive::*;
 pub use layout_context::LayoutContext;
-pub use platform::{WindowBounds, WindowOptions};
+pub use platform::{Platform, WindowBounds, WindowOptions};
 pub use view::*;
diff --git a/crates/gpui2/src/layout_context.rs b/crates/gpui2/src/layout_context.rs
index a08efdac3451e2a0a9566d7daa25f5a574d8464a..bba39d4b0db40be59d53c0f8b69bcef6f466287a 100644
--- a/crates/gpui2/src/layout_context.rs
+++ b/crates/gpui2/src/layout_context.rs
@@ -1,7 +1,7 @@
 use crate::{element::LayoutId, style::Style};
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
-use gpui::{geometry::Size, MeasureParams, RenderContext, ViewContext};
+use gpui::{geometry::Size, MeasureParams};
 pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
 
 #[derive(Deref, DerefMut)]
@@ -11,24 +11,6 @@ pub struct LayoutContext<'a, 'b, 'c, 'd, V> {
     pub(crate) legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>,
 }
 
-impl<'a, 'b, V> RenderContext<'a, 'b, V> for LayoutContext<'a, 'b, '_, '_, V> {
-    fn text_style(&self) -> gpui::fonts::TextStyle {
-        self.legacy_cx.text_style()
-    }
-
-    fn push_text_style(&mut self, style: gpui::fonts::TextStyle) {
-        self.legacy_cx.push_text_style(style)
-    }
-
-    fn pop_text_style(&mut self) {
-        self.legacy_cx.pop_text_style()
-    }
-
-    fn as_view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
-        &mut self.view_context
-    }
-}
-
 impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
     pub fn new(legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>) -> Self {
         Self { legacy_cx }
@@ -39,7 +21,7 @@ impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
         style: Style,
         children: impl IntoIterator<Item = NodeId>,
     ) -> Result<LayoutId> {
-        let rem_size = self.rem_pixels();
+        let rem_size = self.rem_size();
         let id = self
             .legacy_cx
             .layout_engine()
@@ -53,7 +35,7 @@ impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
     where
         F: Fn(MeasureParams) -> Size<f32> + Sync + Send + 'static,
     {
-        let rem_size = self.rem_pixels();
+        let rem_size = self.rem_size();
         let layout_id = self
             .layout_engine()
             .ok_or_else(|| anyhow!("no layout engine"))?
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 1b7e0e2460ad17296b8efc57d00daf01c370d0ed..b2ab208199dc0df1aeb9f337e1e3c54d54bf9e18 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -4,20 +4,23 @@ use crate::{
     elements::pressable::{pressable, Pressable},
     paint_context::PaintContext,
 };
+pub use fonts::Style as FontStyle;
+pub use fonts::Weight as FontWeight;
 pub use gpui::taffy::style::{
     AlignContent, AlignItems, AlignSelf, Display, FlexDirection, FlexWrap, JustifyContent,
     Overflow, Position,
 };
 use gpui::{
-    fonts::TextStyleRefinement,
+    fonts::{self, TextStyleRefinement},
     geometry::{
         rect::RectF, relative, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length,
         Point, PointRefinement, Size, SizeRefinement,
     },
-    taffy,
+    taffy, WindowContext,
 };
 use gpui2_macros::styleable_helpers;
 use refineable::{Refineable, RefinementCascade};
+use std::sync::Arc;
 
 #[derive(Clone, Refineable)]
 pub struct Style {
@@ -92,11 +95,41 @@ pub struct Style {
     /// The radius of the corners of this element
     #[refineable]
     pub corner_radii: CornerRadii,
+
     /// The color of text within this element. Cascades to children unless overridden.
     pub text_color: Option<Hsla>,
+
+    /// The font size in rems.
+    pub font_size: Option<f32>,
+
+    pub font_family: Option<Arc<str>>,
+
+    pub font_weight: Option<FontWeight>,
+
+    pub font_style: Option<FontStyle>,
 }
 
 impl Style {
+    pub fn text_style(&self, cx: &WindowContext) -> Option<TextStyleRefinement> {
+        if self.text_color.is_none()
+            && self.font_size.is_none()
+            && self.font_family.is_none()
+            && self.font_weight.is_none()
+            && self.font_style.is_none()
+        {
+            return None;
+        }
+
+        Some(TextStyleRefinement {
+            color: self.text_color.map(Into::into),
+            font_family: self.font_family.clone(),
+            font_size: self.font_size.map(|size| size * cx.rem_size()),
+            font_weight: self.font_weight,
+            font_style: self.font_style,
+            underline: None,
+        })
+    }
+
     pub fn to_taffy(&self, rem_size: f32) -> taffy::style::Style {
         taffy::style::Style {
             display: self.display,
@@ -128,7 +161,7 @@ impl Style {
     /// Paints the background of an element styled with this style.
     /// Return the bounds in which to paint the content.
     pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
-        let rem_size = cx.rem_pixels();
+        let rem_size = cx.rem_size();
         if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
             cx.scene.push_quad(gpui::Quad {
                 bounds,
@@ -138,17 +171,6 @@ impl Style {
             });
         }
     }
-
-    pub fn text_style(&self) -> Option<TextStyleRefinement> {
-        if let Some(color) = self.text_color {
-            Some(TextStyleRefinement {
-                color: Some(color.into()),
-                ..Default::default()
-            })
-        } else {
-            None
-        }
-    }
 }
 
 impl Default for Style {
@@ -182,29 +204,12 @@ impl Default for Style {
             flex_shrink: 1.0,
             flex_basis: Length::Auto,
             fill: None,
-            text_color: None,
             corner_radii: CornerRadii::default(),
-        }
-    }
-}
-
-impl StyleRefinement {
-    pub fn text_style(&self) -> Option<TextStyleRefinement> {
-        self.text_color.map(|color| TextStyleRefinement {
-            color: Some(color.into()),
-            ..Default::default()
-        })
-    }
-}
-
-pub struct OptionalTextStyle {
-    color: Option<Hsla>,
-}
-
-impl OptionalTextStyle {
-    pub fn apply(&self, style: &mut gpui::fonts::TextStyle) {
-        if let Some(color) = self.color {
-            style.color = color.into();
+            text_color: None,
+            font_size: Some(1.),
+            font_family: None,
+            font_weight: None,
+            font_style: None,
         }
     }
 }
@@ -416,4 +421,68 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self.declared_style().text_color = Some(color.into());
         self
     }
+
+    fn text_xs(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_size = Some(0.75);
+        self
+    }
+
+    fn text_sm(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_size = Some(0.875);
+        self
+    }
+
+    fn text_base(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_size = Some(1.0);
+        self
+    }
+
+    fn text_lg(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_size = Some(1.125);
+        self
+    }
+
+    fn text_xl(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_size = Some(1.25);
+        self
+    }
+
+    fn text_2xl(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_size = Some(1.5);
+        self
+    }
+
+    fn text_3xl(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_size = Some(1.875);
+        self
+    }
+
+    fn font(mut self, family_name: impl Into<Arc<str>>) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().font_family = Some(family_name.into());
+        self
+    }
 }
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 714d52dc2d36ec16df92604808ece25041796f0a..7e8b6fe397d297866d39f4b9363d2332cc24ebaf 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -19,6 +19,7 @@ impl<V: 'static> CollabPanelElement<V> {
 
         div()
             .full()
+            .font("Zed Mono")
             .text_color(theme.middle.variant.default.foreground)
             .fill(theme.middle.base.default.background)
             .py_2()
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index fed8d2cbdc8f0cccc9da624ad373b547c7a35d0f..669da5da2d0951344bd36b5988b6cac854497ed6 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -1,4 +1,5 @@
 #![allow(dead_code, unused_variables)]
+
 use crate::theme::Theme;
 use ::theme as legacy_theme;
 use collab_panel::collab_panel;
@@ -25,6 +26,7 @@ fn main() {
             .unwrap();
         cx.set_global(store);
         legacy_theme::init(Assets, cx);
+        // load_embedded_fonts(cx.platform().as_ref());
 
         cx.add_window(
             gpui2::WindowOptions {
@@ -66,6 +68,7 @@ use rust_embed::RustEmbed;
 #[derive(RustEmbed)]
 #[folder = "../../assets"]
 #[include = "themes/**/*"]
+#[include = "fonts/**/*"]
 #[exclude = "*.DS_Store"]
 pub struct Assets;
 
@@ -80,3 +83,16 @@ impl AssetSource for Assets {
         Self::iter().filter(|p| p.starts_with(path)).collect()
     }
 }
+
+// fn load_embedded_fonts(platform: &dyn gpui2::Platform) {
+//     let font_paths = Assets.list("fonts");
+//     let mut embedded_fonts = Vec::new();
+//     for font_path in &font_paths {
+//         if font_path.ends_with(".ttf") {
+//             let font_path = &*font_path;
+//             let font_bytes = Assets.load(font_path).unwrap().to_vec();
+//             embedded_fonts.push(Arc::from(font_bytes));
+//         }
+//     }
+//     platform.fonts().add_fonts(&embedded_fonts).unwrap();
+// }

From e08c0fc4ce831df8ab9d5c842ed028093ab4b94e Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 5 Sep 2023 12:50:07 -0600
Subject: [PATCH 027/109] Checkpoint

---
 crates/gpui/src/gpui.rs              |  1 +
 crates/gpui2/src/arc_cow.rs          | 53 ++++++++++++++++++++++++++++
 crates/gpui2/src/elements/text.rs    | 53 +---------------------------
 crates/gpui2/src/gpui2.rs            |  2 ++
 crates/storybook/src/collab_panel.rs |  2 +-
 crates/storybook/src/components.rs   |  4 +--
 crates/storybook/src/storybook.rs    |  2 +-
 7 files changed, 61 insertions(+), 56 deletions(-)
 create mode 100644 crates/gpui2/src/arc_cow.rs

diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index a0e7804a149c7482d7b2f7a353211ea8362e9128..74a50e9e64cae2e4f27c9adbdb7ada000e284f9d 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -28,6 +28,7 @@ pub mod json;
 pub mod keymap_matcher;
 pub mod platform;
 pub use gpui_macros::{test, Element};
+pub use usvg;
 pub use window::{
     Axis, Layout, LayoutEngine, LayoutId, RectFExt, SizeConstraint, Vector2FExt, WindowContext,
 };
diff --git a/crates/gpui2/src/arc_cow.rs b/crates/gpui2/src/arc_cow.rs
new file mode 100644
index 0000000000000000000000000000000000000000..26c9870ee086db5dbf9a6868763401f603d82cce
--- /dev/null
+++ b/crates/gpui2/src/arc_cow.rs
@@ -0,0 +1,53 @@
+use std::sync::Arc;
+
+pub enum ArcCow<'a, T: ?Sized> {
+    Borrowed(&'a T),
+    Owned(Arc<T>),
+}
+
+impl<'a, T: ?Sized> Clone for ArcCow<'a, T> {
+    fn clone(&self) -> Self {
+        match self {
+            Self::Borrowed(borrowed) => Self::Borrowed(borrowed),
+            Self::Owned(owned) => Self::Owned(owned.clone()),
+        }
+    }
+}
+
+impl<'a, T: ?Sized> From<&'a T> for ArcCow<'a, T> {
+    fn from(s: &'a T) -> Self {
+        Self::Borrowed(s)
+    }
+}
+
+impl<T> From<Arc<T>> for ArcCow<'_, T> {
+    fn from(s: Arc<T>) -> Self {
+        Self::Owned(s)
+    }
+}
+
+impl From<String> for ArcCow<'_, str> {
+    fn from(value: String) -> Self {
+        Self::Owned(value.into())
+    }
+}
+
+impl<T: ?Sized> std::ops::Deref for ArcCow<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            ArcCow::Borrowed(s) => s,
+            ArcCow::Owned(s) => s.as_ref(),
+        }
+    }
+}
+
+impl<T: ?Sized> AsRef<T> for ArcCow<'_, T> {
+    fn as_ref(&self) -> &T {
+        match self {
+            ArcCow::Borrowed(borrowed) => borrowed,
+            ArcCow::Owned(owned) => owned.as_ref(),
+        }
+    }
+}
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 8bbec8e645bc8279b76d718430020c973c385471..82527d8dc064e39eae849144c44d32f52b18508b 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -2,6 +2,7 @@ use crate::{
     element::{Element, IntoElement, Layout},
     layout_context::LayoutContext,
     paint_context::PaintContext,
+    ArcCow,
 };
 use anyhow::Result;
 use gpui::{geometry::Size, text_layout::LineLayout, LayoutId};
@@ -93,55 +94,3 @@ pub struct TextLayout {
     line_layout: Arc<LineLayout>,
     line_height: f32,
 }
-
-pub enum ArcCow<'a, T: ?Sized> {
-    Borrowed(&'a T),
-    Owned(Arc<T>),
-}
-
-impl<'a, T: ?Sized> Clone for ArcCow<'a, T> {
-    fn clone(&self) -> Self {
-        match self {
-            Self::Borrowed(borrowed) => Self::Borrowed(borrowed),
-            Self::Owned(owned) => Self::Owned(owned.clone()),
-        }
-    }
-}
-
-impl<'a, T: ?Sized> From<&'a T> for ArcCow<'a, T> {
-    fn from(s: &'a T) -> Self {
-        Self::Borrowed(s)
-    }
-}
-
-impl<T> From<Arc<T>> for ArcCow<'_, T> {
-    fn from(s: Arc<T>) -> Self {
-        Self::Owned(s)
-    }
-}
-
-impl From<String> for ArcCow<'_, str> {
-    fn from(value: String) -> Self {
-        Self::Owned(value.into())
-    }
-}
-
-impl<T: ?Sized> std::ops::Deref for ArcCow<'_, T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            ArcCow::Borrowed(s) => s,
-            ArcCow::Owned(s) => s.as_ref(),
-        }
-    }
-}
-
-impl<T: ?Sized> AsRef<T> for ArcCow<'_, T> {
-    fn as_ref(&self) -> &T {
-        match self {
-            ArcCow::Borrowed(borrowed) => borrowed,
-            ArcCow::Owned(owned) => owned.as_ref(),
-        }
-    }
-}
diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs
index a37f8cc50f5563d0fdba0e8368f8ead8849714bb..e9cddb65c872d1e955f1f53fd922d0d00eff0517 100644
--- a/crates/gpui2/src/gpui2.rs
+++ b/crates/gpui2/src/gpui2.rs
@@ -1,4 +1,5 @@
 pub mod adapter;
+mod arc_cow;
 pub mod color;
 pub mod element;
 pub mod elements;
@@ -8,6 +9,7 @@ pub mod paint_context;
 pub mod style;
 pub mod view;
 
+pub use arc_cow::ArcCow;
 pub use color::*;
 pub use element::{AnyElement, Element, IntoElement, Layout, ParentElement};
 pub use geometry::{
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 7e8b6fe397d297866d39f4b9363d2332cc24ebaf..a3b12af81cadc1bf8256fc657ff5b16a3bb897fc 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -19,7 +19,7 @@ impl<V: 'static> CollabPanelElement<V> {
 
         div()
             .full()
-            .font("Zed Mono")
+            .font("Zed Sans")
             .text_color(theme.middle.variant.default.foreground)
             .fill(theme.middle.base.default.background)
             .py_2()
diff --git a/crates/storybook/src/components.rs b/crates/storybook/src/components.rs
index 142bc363126edae6c5401bb63d8ce999701315d0..c24f9d672b88fb59773096bc30502da64d3cfd91 100644
--- a/crates/storybook/src/components.rs
+++ b/crates/storybook/src/components.rs
@@ -1,6 +1,6 @@
 use gpui2::{
-    elements::div, elements::text::ArcCow, interactive::Interactive, platform::MouseButton,
-    style::StyleHelpers, Element, IntoElement, ParentElement, ViewContext,
+    elements::div, interactive::Interactive, platform::MouseButton, style::StyleHelpers, ArcCow,
+    Element, IntoElement, ParentElement, ViewContext,
 };
 use std::{marker::PhantomData, rc::Rc};
 
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 669da5da2d0951344bd36b5988b6cac854497ed6..5fe45af3b9e8fade436a8d27ac6c8ed54a39f62a 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -44,7 +44,7 @@ fn storybook<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
     collab_panel().themed(current_theme(cx))
 }
 
-// Nathan: During the transition, we will include the base theme on the legacy Theme struct.
+// Nathan: During the transition to gpui2, we will include the base theme on the legacy Theme struct.
 fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
     settings::get::<ThemeSettings>(cx)
         .theme

From 0695e8d3b9c5cbf64defaa1b0240b764a2448c7f Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Tue, 5 Sep 2023 15:19:44 -0400
Subject: [PATCH 028/109] Work on sample `collab_panel` story in the storybook

Co-Authored-By: Nathan Sobo <1789+nathansobo@users.noreply.github.com>
---
 crates/gpui2/src/element.rs                  | 31 +++++++-
 crates/gpui2/src/style.rs                    |  4 +-
 crates/gpui2_macros/src/styleable_helpers.rs | 10 +++
 crates/storybook/src/collab_panel.rs         | 82 ++++++++++++++++++--
 4 files changed, 117 insertions(+), 10 deletions(-)

diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index 6394064f2f254c8ce9c6e2b2cd7d550bae9fdfad..68d1bcbdcf4e31acaa8c96957d177857671cfde2 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -62,6 +62,21 @@ enum ElementPhase<V: 'static, E: Element<V>> {
     Error(String),
 }
 
+impl<V: 'static, E: Element<V>> std::fmt::Debug for ElementPhase<V, E> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ElementPhase::Init => write!(f, "Init"),
+            ElementPhase::PostLayout { layout_id, .. } => {
+                write!(f, "PostLayout with layout id: {:?}", layout_id)
+            }
+            ElementPhase::PostPaint { layout, .. } => {
+                write!(f, "PostPaint with layout: {:?}", layout)
+            }
+            ElementPhase::Error(err) => write!(f, "Error: {}", err),
+        }
+    }
+}
+
 impl<V: 'static, E: Element<V>> Default for ElementPhase<V, E> {
     fn default() -> Self {
         Self::Init
@@ -105,8 +120,22 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
                 }
                 Err(error) => ElementPhase::Error(error.to_string()),
             },
+            ElementPhase::PostPaint {
+                mut layout,
+                mut paint_state,
+            } => {
+                layout.bounds = layout.bounds + parent_origin;
+                self.element.paint(view, &layout, &mut paint_state, cx);
+                ElementPhase::PostPaint {
+                    layout,
+                    paint_state,
+                }
+            }
             phase @ ElementPhase::Error(_) => phase,
-            _ => panic!("invalid element phase to call paint"),
+
+            phase @ _ => {
+                panic!("invalid element phase to call paint: {:?}", phase);
+            }
         };
     }
 }
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index b2ab208199dc0df1aeb9f337e1e3c54d54bf9e18..128136305d81fddb91ba87cc90d1c3dcb0b79388 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -268,14 +268,14 @@ pub trait Styleable {
         Self::Style::from_refinement(&self.style_cascade().merged())
     }
 
-    fn hovered(self) -> Hoverable<Self>
+    fn hover(self) -> Hoverable<Self>
     where
         Self: Sized,
     {
         hoverable(self)
     }
 
-    fn pressed(self) -> Pressable<Self>
+    fn active(self) -> Pressable<Self>
     where
         Self: Sized,
     {
diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index c7942c7da3e57b80dcd7c5297036667f89196266..7ce3800150385510da0c7c9b874e7b05b58fddca 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -68,8 +68,11 @@ fn tailwind_lengths() -> Vec<(&'static str, TokenStream2)> {
         ("4", quote! { rems(1.) }),
         ("5", quote! { rems(1.25) }),
         ("6", quote! { rems(1.5) }),
+        ("7", quote! { rems(1.75) }),
         ("8", quote! { rems(2.0) }),
+        ("9", quote! { rems(2.25) }),
         ("10", quote! { rems(2.5) }),
+        ("11", quote! { rems(2.75) }),
         ("12", quote! { rems(3.) }),
         ("16", quote! { rems(4.) }),
         ("20", quote! { rems(5.) }),
@@ -149,5 +152,12 @@ fn tailwind_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
         ("bottom", true, vec![quote! { inset.bottom }]),
         ("left", true, vec![quote! { inset.left }]),
         ("right", true, vec![quote! { inset.right }]),
+        (
+            "gap",
+            false,
+            vec![quote! { gap.width }, quote! { gap.height }],
+        ),
+        ("gap_x", false, vec![quote! { gap.width }]),
+        ("gap_y", false, vec![quote! { gap.height }]),
     ]
 }
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index a3b12af81cadc1bf8256fc657ff5b16a3bb897fc..7b26494eff666fef374c57cb8f5cacee521401e7 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -1,5 +1,9 @@
 use crate::theme::theme;
-use gpui2::{elements::div, style::StyleHelpers, Element, IntoElement, ParentElement, ViewContext};
+use gpui2::{
+    elements::div,
+    style::{StyleHelpers, Styleable},
+    Element, IntoElement, ParentElement, ViewContext,
+};
 use std::marker::PhantomData;
 
 #[derive(Element)]
@@ -13,23 +17,87 @@ pub fn collab_panel<V: 'static>() -> CollabPanelElement<V> {
     }
 }
 
+// fn list_item<V: 'static>(cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+//     let theme = theme(cx);
+//     div()
+//         .px_2()
+//         .flex()
+//         .justify_between()
+//         //:: States - https://tailwindcss.com/docs/hover-focus-and-other-states#hover-focus-and-active
+//         .hover()
+//         .fill(theme.middle.variant.hovered.background)
+//         .active()
+//         .fill(theme.middle.variant.pressed.background)
+//         .child(div().flex().gap_1().child("#").child("Collab Panel"))
+//         .child(div().flex().gap_1().child("v"))
+// }
+
+// Macros to impl:
+// - border (b, t, l, r, x, y)
+// - border_[foo]_[size] (border_b_2, border_t_4, etc)
+// - border_color
+// - items_[center, start, end]
+
 impl<V: 'static> CollabPanelElement<V> {
     fn render(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
 
+        // Panel
         div()
             .full()
             .font("Zed Sans")
             .text_color(theme.middle.variant.default.foreground)
+            // .border_color(theme.middle.base.default.border)
             .fill(theme.middle.base.default.background)
-            .py_2()
+            // List Container
             .child(
                 div()
-                    .px_2()
-                    .flex()
-                    .justify_between()
-                    .child("#CRDB")
-                    .child("V"),
+                    .full()
+                    .fill(theme.middle.variant.default.background)
+                    .py_2()
+                    // .border_b()
+                    //:: https://tailwindcss.com/docs/hover-focus-and-other-states#styling-based-on-parent-state
+                    // .group()
+                    // List Section Header
+                    .child(
+                        div()
+                            .px_2()
+                            .flex()
+                            .justify_between()
+                            //:: States - https://tailwindcss.com/docs/hover-focus-and-other-states#hover-focus-and-active
+                            .hover()
+                            .fill(theme.middle.variant.hovered.background)
+                            // .focus().fill(theme.middle.variant.active.background)
+                            .active()
+                            .fill(theme.middle.variant.pressed.background)
+                            .child(
+                                div()
+                                    .flex()
+                                    .gap_1()
+                                    //:: State based on group interaction state
+                                    // .group_hover().text_color(theme.middle.variant.hovered.foreground)
+                                    .child("#")
+                                    .child("Collab Panel"),
+                            )
+                            .child(div().flex().gap_1().child("v")),
+                    )
+                    // List Item Large
+                    .child(
+                        div()
+                            .px_2()
+                            .h_7()
+                            .flex()
+                            .justify_between()
+                            // .items_center()
+                            .child(
+                                div()
+                                    .flex()
+                                    .gap_1()
+                                    .child(div().w_4().h_4().child("img"))
+                                    .child("maxbrunsfeld"),
+                            )
+                            .child(div().flex().gap_2().child("icon")),
+                    ),
             )
     }
 }

From 477f4ddbbd79471d51f0ed908f3d256b96ee1a8c Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Tue, 5 Sep 2023 17:13:33 -0400
Subject: [PATCH 029/109] Continue `collab_panel`

---
 crates/gpui2/src/style.rs            |  24 ++++++
 crates/storybook/src/collab_panel.rs | 122 ++++++++++++++++++++++-----
 2 files changed, 125 insertions(+), 21 deletions(-)

diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 128136305d81fddb91ba87cc90d1c3dcb0b79388..fbc0edbbf4702d532685663b254a1bd045af41bd 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -364,6 +364,30 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
+    fn items_start(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().align_items = Some(AlignItems::FlexStart);
+        self
+    }
+
+    fn items_end(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().align_items = Some(AlignItems::FlexEnd);
+        self
+    }
+
+    fn items_center(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().align_items = Some(AlignItems::Center);
+        self
+    }
+
     fn justify_between(mut self) -> Self
     where
         Self: Sized,
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 7b26494eff666fef374c57cb8f5cacee521401e7..64be2db4f2f2481584233dfec282e48c606f5f78 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -1,9 +1,5 @@
 use crate::theme::theme;
-use gpui2::{
-    elements::div,
-    style::{StyleHelpers, Styleable},
-    Element, IntoElement, ParentElement, ViewContext,
-};
+use gpui2::{elements::div, style::StyleHelpers, Element, IntoElement, ParentElement, ViewContext};
 use std::marker::PhantomData;
 
 #[derive(Element)]
@@ -17,7 +13,42 @@ pub fn collab_panel<V: 'static>() -> CollabPanelElement<V> {
     }
 }
 
-// fn list_item<V: 'static>(cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+// #[derive(Element)]
+// struct ListItem {
+//     label: Option<ArcCow<'static, str>>,
+// }
+
+// pub fn list_item() -> ListItem {
+//     ListItem { label: None }
+// }
+
+// impl ListItem {
+//     pub fn render<V: 'static>(
+//         &mut self,
+//         view: &mut V,
+//         cx: &mut ViewContext<Self>,
+//     ) -> impl Element<V> {
+//         let theme = theme(cx);
+
+//         div()
+//             .px_2()
+//             .flex()
+//             .justify_between()
+//             .hover()
+//             .fill(theme.middle.variant.hovered.background)
+//             .active()
+//             .fill(theme.middle.variant.pressed.background)
+//             .child(div().flex().gap_1().child("#").child(self.label))
+//             .child(div().flex().gap_1().child("v"))
+//     }
+
+//     pub fn label(mut self, label: impl Into<ArcCow<'static, str>>) -> Self {
+//         self.label = Some(label.into());
+//         self
+//     }
+// }
+
+// fn list_item<V: 'static>(cx: &mut ViewContext<V>, label: &mut str) -> impl IntoElement<V> {
 //     let theme = theme(cx);
 //     div()
 //         .px_2()
@@ -36,7 +67,6 @@ pub fn collab_panel<V: 'static>() -> CollabPanelElement<V> {
 // - border (b, t, l, r, x, y)
 // - border_[foo]_[size] (border_b_2, border_t_4, etc)
 // - border_color
-// - items_[center, start, end]
 
 impl<V: 'static> CollabPanelElement<V> {
     fn render(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
@@ -45,16 +75,17 @@ impl<V: 'static> CollabPanelElement<V> {
         // Panel
         div()
             .full()
-            .font("Zed Sans")
+            .flex()
+            .flex_col()
+            .font("Zed Sans Extended")
             .text_color(theme.middle.variant.default.foreground)
             // .border_color(theme.middle.base.default.border)
             .fill(theme.middle.base.default.background)
             // List Container
             .child(
                 div()
-                    .full()
-                    .fill(theme.middle.variant.default.background)
-                    .py_2()
+                    .fill(theme.lowest.base.default.background)
+                    .pb_1()
                     // .border_b()
                     //:: https://tailwindcss.com/docs/hover-focus-and-other-states#styling-based-on-parent-state
                     // .group()
@@ -64,20 +95,19 @@ impl<V: 'static> CollabPanelElement<V> {
                             .px_2()
                             .flex()
                             .justify_between()
-                            //:: States - https://tailwindcss.com/docs/hover-focus-and-other-states#hover-focus-and-active
-                            .hover()
-                            .fill(theme.middle.variant.hovered.background)
-                            // .focus().fill(theme.middle.variant.active.background)
-                            .active()
-                            .fill(theme.middle.variant.pressed.background)
+                            // .hover()
+                            // .fill(theme.middle.variant.hovered.background)
+                            // .active()
+                            // .fill(theme.middle.variant.pressed.background)
                             .child(
                                 div()
                                     .flex()
                                     .gap_1()
                                     //:: State based on group interaction state
                                     // .group_hover().text_color(theme.middle.variant.hovered.foreground)
+                                    .text_sm()
                                     .child("#")
-                                    .child("Collab Panel"),
+                                    .child("CRDB"),
                             )
                             .child(div().flex().gap_1().child("v")),
                     )
@@ -88,16 +118,66 @@ impl<V: 'static> CollabPanelElement<V> {
                             .h_7()
                             .flex()
                             .justify_between()
-                            // .items_center()
+                            .items_center()
                             .child(
                                 div()
                                     .flex()
+                                    .h_full()
                                     .gap_1()
-                                    .child(div().w_4().h_4().child("img"))
+                                    .items_center()
+                                    .text_sm()
+                                    .child(
+                                        div()
+                                            .w_4()
+                                            .h_4()
+                                            .fill(theme.middle.negative.default.foreground),
+                                    )
                                     .child("maxbrunsfeld"),
                             )
-                            .child(div().flex().gap_2().child("icon")),
+                            .child(
+                                div()
+                                    .flex()
+                                    .h_full()
+                                    .gap_2()
+                                    .items_center()
+                                    .child(
+                                        div()
+                                            .w_3_5()
+                                            .h_3_5()
+                                            .fill(theme.middle.negative.default.foreground),
+                                    )
+                                    .child("i"),
+                            ),
                     ),
             )
+            .child(
+                div()
+                    .w_full()
+                    .flex()
+                    .flex_col()
+                    .gap_y_1()
+                    // List Section Header
+                    .child(
+                        div()
+                            .h_7()
+                            .px_2()
+                            .flex()
+                            .justify_between()
+                            .items_center()
+                            .child(div().flex().gap_1().text_sm().child("CHANNELS"))
+                            .child(div().flex().gap_1().text_sm().child("v")),
+                    ),
+            )
+            // Large List Item
+            .child(
+                div()
+                    .h_7()
+                    .px_2()
+                    .flex()
+                    .justify_between()
+                    .items_center()
+                    .child(div().flex().gap_1().text_sm().child("CONTACTS"))
+                    .child(div().flex().gap_1().text_sm().child("v")),
+            )
     }
 }

From 5a9c76e080624675e71498f6f3ffc1ff2d58fa17 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 5 Sep 2023 15:16:41 -0600
Subject: [PATCH 030/109] Fix hoverable elements moving on hover

---
 crates/gpui2/src/element.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index 68d1bcbdcf4e31acaa8c96957d177857671cfde2..d893b6794ca021f65338058a9b3b6903eb41befd 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -121,10 +121,9 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
                 Err(error) => ElementPhase::Error(error.to_string()),
             },
             ElementPhase::PostPaint {
-                mut layout,
+                layout,
                 mut paint_state,
             } => {
-                layout.bounds = layout.bounds + parent_origin;
                 self.element.paint(view, &layout, &mut paint_state, cx);
                 ElementPhase::PostPaint {
                     layout,

From 7f85780c78c359e126c26263ed32cbbbb4f7726e Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Tue, 5 Sep 2023 17:27:00 -0400
Subject: [PATCH 031/109] Add fraction sizes for tailwind lengths

---
 crates/gpui2_macros/src/styleable_helpers.rs | 4 ++++
 crates/storybook/src/collab_panel.rs         | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index 7ce3800150385510da0c7c9b874e7b05b58fddca..6aecbf62889d9eaa93bbb015105f0596af78f208 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -62,9 +62,13 @@ fn generate_methods() -> Vec<TokenStream2> {
 fn tailwind_lengths() -> Vec<(&'static str, TokenStream2)> {
     vec![
         ("0", quote! { pixels(0.) }),
+        ("0p5", quote! { rems(0.125) }),
         ("1", quote! { rems(0.25) }),
+        ("1p5", quote! { rems(0.375) }),
         ("2", quote! { rems(0.5) }),
+        ("2p5", quote! { rems(0.625) }),
         ("3", quote! { rems(0.75) }),
+        ("3p5", quote! { rems(0.875) }),
         ("4", quote! { rems(1.) }),
         ("5", quote! { rems(1.25) }),
         ("6", quote! { rems(1.5) }),
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 64be2db4f2f2481584233dfec282e48c606f5f78..cc45dc6c4c6c6d310524305ec1b574e430dff054 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -128,8 +128,8 @@ impl<V: 'static> CollabPanelElement<V> {
                                     .text_sm()
                                     .child(
                                         div()
-                                            .w_4()
-                                            .h_4()
+                                            .w_3p5()
+                                            .h_3p5()
                                             .fill(theme.middle.negative.default.foreground),
                                     )
                                     .child("maxbrunsfeld"),
@@ -142,8 +142,8 @@ impl<V: 'static> CollabPanelElement<V> {
                                     .items_center()
                                     .child(
                                         div()
-                                            .w_3_5()
-                                            .h_3_5()
+                                            .w_4()
+                                            .h_4()
                                             .fill(theme.middle.negative.default.foreground),
                                     )
                                     .child("i"),

From 1ea0d500bed21536db3aac1299792fb5778f6a4c Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Tue, 5 Sep 2023 17:27:09 -0400
Subject: [PATCH 032/109] Ignore `cargo-target`

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index dbffa0f829cffe77c976a95d13f339be367e8840..15a0a9f5f2f02bee670d6b23dbfc4116ccd20448 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 **/target
+**/cargo-target
 /zed.xcworkspace
 .DS_Store
 /plugins/bin

From 6cb9cf70b79c2c856777e16bd9ebab3e28794def Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Tue, 5 Sep 2023 17:32:59 -0400
Subject: [PATCH 033/109] Mark placeholder SVGs

---
 crates/storybook/src/collab_panel.rs | 50 ++++++++++++++++++----------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index cc45dc6c4c6c6d310524305ec1b574e430dff054..e67ac09558e7fd39f86d9a3658cc341cbd10bf9c 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -95,6 +95,7 @@ impl<V: 'static> CollabPanelElement<V> {
                             .px_2()
                             .flex()
                             .justify_between()
+                            .items_center()
                             // .hover()
                             // .fill(theme.middle.variant.hovered.background)
                             // .active()
@@ -109,7 +110,14 @@ impl<V: 'static> CollabPanelElement<V> {
                                     .child("#")
                                     .child("CRDB"),
                             )
-                            .child(div().flex().gap_1().child("v")),
+                            .child(
+                                div().flex().h_full().gap_1().items_center().child(
+                                    div()
+                                        .w_3p5()
+                                        .h_3p5()
+                                        .fill(theme.middle.positive.default.foreground),
+                                ),
+                            ),
                     )
                     // List Item Large
                     .child(
@@ -128,25 +136,19 @@ impl<V: 'static> CollabPanelElement<V> {
                                     .text_sm()
                                     .child(
                                         div()
-                                            .w_3p5()
-                                            .h_3p5()
+                                            .w_4()
+                                            .h_4()
                                             .fill(theme.middle.negative.default.foreground),
                                     )
                                     .child("maxbrunsfeld"),
                             )
                             .child(
-                                div()
-                                    .flex()
-                                    .h_full()
-                                    .gap_2()
-                                    .items_center()
-                                    .child(
-                                        div()
-                                            .w_4()
-                                            .h_4()
-                                            .fill(theme.middle.negative.default.foreground),
-                                    )
-                                    .child("i"),
+                                div().flex().h_full().gap_1().items_center().child(
+                                    div()
+                                        .w_3p5()
+                                        .h_3p5()
+                                        .fill(theme.middle.positive.default.foreground),
+                                ),
                             ),
                     ),
             )
@@ -165,7 +167,14 @@ impl<V: 'static> CollabPanelElement<V> {
                             .justify_between()
                             .items_center()
                             .child(div().flex().gap_1().text_sm().child("CHANNELS"))
-                            .child(div().flex().gap_1().text_sm().child("v")),
+                            .child(
+                                div().flex().h_full().gap_1().items_center().child(
+                                    div()
+                                        .w_3p5()
+                                        .h_3p5()
+                                        .fill(theme.middle.positive.default.foreground),
+                                ),
+                            ),
                     ),
             )
             // Large List Item
@@ -177,7 +186,14 @@ impl<V: 'static> CollabPanelElement<V> {
                     .justify_between()
                     .items_center()
                     .child(div().flex().gap_1().text_sm().child("CONTACTS"))
-                    .child(div().flex().gap_1().text_sm().child("v")),
+                    .child(
+                        div().flex().h_full().gap_1().items_center().child(
+                            div()
+                                .w_3p5()
+                                .h_3p5()
+                                .fill(theme.middle.positive.default.foreground),
+                        ),
+                    ),
             )
     }
 }

From 85aedf9bed1d4284a3a682e2fd120da765ea2485 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 5 Sep 2023 16:40:52 -0600
Subject: [PATCH 034/109] WIP: Icons not yet rendering

---
 crates/gpui/src/app/window.rs        |  3 --
 crates/gpui2/src/element.rs          |  2 +-
 crates/gpui2/src/elements.rs         |  2 +
 crates/gpui2/src/elements/svg.rs     | 81 ++++++++++++++++++++++++++++
 crates/gpui2/src/elements/text.rs    |  8 +++
 crates/storybook/src/collab_panel.rs | 53 ++++++++++--------
 crates/storybook/src/storybook.rs    |  1 +
 crates/storybook/src/theme.rs        |  5 +-
 8 files changed, 126 insertions(+), 29 deletions(-)
 create mode 100644 crates/gpui2/src/elements/svg.rs

diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 18691934e5992d34f3ff80c1ef9e35f4f6235b88..2c4a758c7f45a433e6ff3d6366eae14ab5c7627e 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1291,9 +1291,6 @@ impl<'a> WindowContext<'a> {
     pub fn push_text_style(&mut self, refinement: &TextStyleRefinement) -> Result<()> {
         let mut style = self.text_style();
         style.refine(refinement, self.font_cache())?;
-
-        dbg!(&style);
-
         self.window.text_style_stack.push(style);
         Ok(())
     }
diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index d893b6794ca021f65338058a9b3b6903eb41befd..92a981fc5c2200257119d6d201d27f00179a6d84 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -5,7 +5,7 @@ use gpui::geometry::vector::Vector2F;
 pub use gpui::{Layout, LayoutId};
 use smallvec::SmallVec;
 
-pub trait Element<V: 'static>: 'static {
+pub trait Element<V: 'static>: 'static + IntoElement<V> {
     type PaintState;
 
     fn layout(
diff --git a/crates/gpui2/src/elements.rs b/crates/gpui2/src/elements.rs
index 1bff85259f1949e75e9a50c3ef4cba7d3f97f18f..65b8c7119fbaeb06251f52817eb68cc7cdf483fa 100644
--- a/crates/gpui2/src/elements.rs
+++ b/crates/gpui2/src/elements.rs
@@ -1,6 +1,8 @@
 pub mod div;
 pub mod hoverable;
 pub mod pressable;
+pub mod svg;
 pub mod text;
 
 pub use div::div;
+pub use svg::svg;
diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c9ee84f8c54b04c61737a10abd831f4ae04dd00c
--- /dev/null
+++ b/crates/gpui2/src/elements/svg.rs
@@ -0,0 +1,81 @@
+use crate::{
+    self as gpui2, scene,
+    style::{Style, StyleHelpers, Styleable},
+    Element, IntoElement, Layout, LayoutId, Rgba,
+};
+use refineable::RefinementCascade;
+use std::borrow::Cow;
+
+#[derive(IntoElement)]
+pub struct Svg {
+    path: Option<Cow<'static, str>>,
+    style: RefinementCascade<Style>,
+}
+
+pub fn svg() -> Svg {
+    Svg {
+        path: None,
+        style: RefinementCascade::<Style>::default(),
+    }
+}
+
+impl Svg {
+    pub fn path(mut self, path: impl Into<Cow<'static, str>>) -> Self {
+        self.path = Some(path.into());
+        self
+    }
+}
+
+impl<V: 'static> Element<V> for Svg {
+    type PaintState = ();
+
+    fn layout(
+        &mut self,
+        _: &mut V,
+        cx: &mut crate::LayoutContext<V>,
+    ) -> anyhow::Result<(LayoutId, Self::PaintState)>
+    where
+        Self: Sized,
+    {
+        let style = self.computed_style();
+        Ok((cx.add_layout_node(style, [])?, ()))
+    }
+
+    fn paint(
+        &mut self,
+        _: &mut V,
+        layout: &Layout,
+        _: &mut Self::PaintState,
+        cx: &mut crate::paint_context::PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        let fill_color = self.computed_style().fill.and_then(|fill| fill.color());
+        if let Some((path, fill_color)) = self.path.as_ref().zip(fill_color) {
+            if let Ok(svg_tree) = cx.asset_cache.svg(path) {
+                let icon = scene::Icon {
+                    bounds: layout.bounds,
+                    svg: svg_tree,
+                    path: path.clone(),
+                    color: Rgba::from(fill_color).into(),
+                };
+
+                cx.scene.push_icon(icon);
+            }
+        }
+    }
+}
+
+impl Styleable for Svg {
+    type Style = Style;
+
+    fn style_cascade(&mut self) -> &mut refineable::RefinementCascade<Self::Style> {
+        &mut self.style
+    }
+
+    fn declared_style(&mut self) -> &mut <Self::Style as refineable::Refineable>::Refinement {
+        self.style.base()
+    }
+}
+
+impl StyleHelpers for Svg {}
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 82527d8dc064e39eae849144c44d32f52b18508b..545ca508730f46ce1ea5073b24a47dc2a440568f 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -90,6 +90,14 @@ impl<V: 'static> Element<V> for Text {
     }
 }
 
+impl<V: 'static> IntoElement<V> for Text {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
+
 pub struct TextLayout {
     line_layout: Arc<LineLayout>,
     line_height: f32,
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index e67ac09558e7fd39f86d9a3658cc341cbd10bf9c..d9a01c2af9a747b40564e884cf08799c777a9f67 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -1,5 +1,9 @@
-use crate::theme::theme;
-use gpui2::{elements::div, style::StyleHelpers, Element, IntoElement, ParentElement, ViewContext};
+use crate::theme::{theme, Theme};
+use gpui2::{
+    elements::{div, svg},
+    style::StyleHelpers,
+    Element, IntoElement, ParentElement, ViewContext,
+};
 use std::marker::PhantomData;
 
 #[derive(Element)]
@@ -112,10 +116,11 @@ impl<V: 'static> CollabPanelElement<V> {
                             )
                             .child(
                                 div().flex().h_full().gap_1().items_center().child(
-                                    div()
-                                        .w_3p5()
-                                        .h_3p5()
-                                        .fill(theme.middle.positive.default.foreground),
+                                    svg()
+                                        .path("icons/radix/caret-down.svg")
+                                        .h_3()
+                                        .w_3()
+                                        .fill(theme.middle.variant.default.foreground),
                                 ),
                             ),
                     )
@@ -159,23 +164,7 @@ impl<V: 'static> CollabPanelElement<V> {
                     .flex_col()
                     .gap_y_1()
                     // List Section Header
-                    .child(
-                        div()
-                            .h_7()
-                            .px_2()
-                            .flex()
-                            .justify_between()
-                            .items_center()
-                            .child(div().flex().gap_1().text_sm().child("CHANNELS"))
-                            .child(
-                                div().flex().h_full().gap_1().items_center().child(
-                                    div()
-                                        .w_3p5()
-                                        .h_3p5()
-                                        .fill(theme.middle.positive.default.foreground),
-                                ),
-                            ),
-                    ),
+                    .child(self.list_section_header(theme)),
             )
             // Large List Item
             .child(
@@ -196,4 +185,22 @@ impl<V: 'static> CollabPanelElement<V> {
                     ),
             )
     }
+
+    fn list_section_header(&self, theme: &Theme) -> impl Element<V> {
+        div()
+            .h_7()
+            .px_2()
+            .flex()
+            .justify_between()
+            .items_center()
+            .child(div().flex().gap_1().text_sm().child("CHANNELS"))
+            .child(
+                div().flex().h_full().gap_1().items_center().child(
+                    div()
+                        .w_3p5()
+                        .h_3p5()
+                        .fill(theme.middle.positive.default.foreground),
+                ),
+            )
+    }
 }
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 5fe45af3b9e8fade436a8d27ac6c8ed54a39f62a..03a8cfce0d933c4e34caa745c8ea3f49901a5b5c 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -69,6 +69,7 @@ use rust_embed::RustEmbed;
 #[folder = "../../assets"]
 #[include = "themes/**/*"]
 #[include = "fonts/**/*"]
+#[include = "icons/**/*"]
 #[exclude = "*.DS_Store"]
 pub struct Assets;
 
diff --git a/crates/storybook/src/theme.rs b/crates/storybook/src/theme.rs
index 921a8453087b3153e21c62684bcc212ecc28fb63..b17abd3138212d70e8bdc8b0a7fa30ed1be33b36 100644
--- a/crates/storybook/src/theme.rs
+++ b/crates/storybook/src/theme.rs
@@ -2,7 +2,7 @@ use gpui2::{
     color::Hsla,
     element::{Element, PaintContext},
     layout_context::LayoutContext,
-    serde_json, AppContext, WindowContext,
+    serde_json, AppContext, IntoElement, WindowContext,
 };
 use serde::{de::Visitor, Deserialize, Deserializer};
 use std::{collections::HashMap, fmt, marker::PhantomData};
@@ -133,7 +133,8 @@ where
     deserializer.deserialize_map(SyntaxVisitor)
 }
 
-pub struct Themed<V: 'static, E> {
+#[derive(IntoElement)]
+pub struct Themed<V: 'static, E: Element<V>> {
     pub(crate) theme: Theme,
     pub(crate) child: E,
     pub(crate) view_type: PhantomData<V>,

From a3039ad95b35d2f5433b222bd7e7a402e7250e50 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Tue, 5 Sep 2023 18:52:05 -0400
Subject: [PATCH 035/109] Add list items for scroll testing

---
 crates/storybook/src/collab_panel.rs | 304 ++++++++++++++-------------
 1 file changed, 156 insertions(+), 148 deletions(-)

diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index d9a01c2af9a747b40564e884cf08799c777a9f67..4677b60145ad095b8f7113602532575e32d73c69 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -1,7 +1,7 @@
 use crate::theme::{theme, Theme};
 use gpui2::{
-    elements::{div, svg},
-    style::StyleHelpers,
+    elements::div,
+    style::{StyleHelpers, Styleable},
     Element, IntoElement, ParentElement, ViewContext,
 };
 use std::marker::PhantomData;
@@ -17,62 +17,51 @@ pub fn collab_panel<V: 'static>() -> CollabPanelElement<V> {
     }
 }
 
-// #[derive(Element)]
-// struct ListItem {
-//     label: Option<ArcCow<'static, str>>,
-// }
-
-// pub fn list_item() -> ListItem {
-//     ListItem { label: None }
-// }
-
-// impl ListItem {
-//     pub fn render<V: 'static>(
-//         &mut self,
-//         view: &mut V,
-//         cx: &mut ViewContext<Self>,
-//     ) -> impl Element<V> {
-//         let theme = theme(cx);
-
-//         div()
-//             .px_2()
-//             .flex()
-//             .justify_between()
-//             .hover()
-//             .fill(theme.middle.variant.hovered.background)
-//             .active()
-//             .fill(theme.middle.variant.pressed.background)
-//             .child(div().flex().gap_1().child("#").child(self.label))
-//             .child(div().flex().gap_1().child("v"))
-//     }
-
-//     pub fn label(mut self, label: impl Into<ArcCow<'static, str>>) -> Self {
-//         self.label = Some(label.into());
-//         self
-//     }
-// }
-
-// fn list_item<V: 'static>(cx: &mut ViewContext<V>, label: &mut str) -> impl IntoElement<V> {
-//     let theme = theme(cx);
-//     div()
-//         .px_2()
-//         .flex()
-//         .justify_between()
-//         //:: States - https://tailwindcss.com/docs/hover-focus-and-other-states#hover-focus-and-active
-//         .hover()
-//         .fill(theme.middle.variant.hovered.background)
-//         .active()
-//         .fill(theme.middle.variant.pressed.background)
-//         .child(div().flex().gap_1().child("#").child("Collab Panel"))
-//         .child(div().flex().gap_1().child("v"))
-// }
+impl<V: 'static> CollabPanelElement<V> {
+    fn list_section_header(&self, theme: &Theme) -> impl Element<V> {
+        div()
+            .h_7()
+            .px_2()
+            .flex()
+            .justify_between()
+            .items_center()
+            .child(div().flex().gap_1().text_sm().child("CHANNELS"))
+            .child(
+                div().flex().h_full().gap_1().items_center().child(
+                    div()
+                        .w_3p5()
+                        .h_3p5()
+                        .fill(theme.middle.positive.default.foreground),
+                ),
+            )
+    }
 
-// Macros to impl:
-// - border (b, t, l, r, x, y)
-// - border_[foo]_[size] (border_b_2, border_t_4, etc)
-// - border_color
+    fn list_item_channel(&self, theme: &Theme) -> impl Element<V> {
+        div()
+            .h_7()
+            .px_2()
+            .flex()
+            .items_center()
+            .hover()
+            .fill(theme.lowest.variant.hovered.background)
+            .active()
+            .fill(theme.lowest.variant.pressed.background)
+            .child(
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_1()
+                    .text_sm()
+                    .child(
+                        div()
+                            .w_3p5()
+                            .h_3p5()
+                            .fill(theme.middle.positive.default.foreground),
+                    )
+                    .child("zed-industries"),
+            )
+    }
 
-impl<V: 'static> CollabPanelElement<V> {
     fn render(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
 
@@ -82,124 +71,143 @@ impl<V: 'static> CollabPanelElement<V> {
             .flex()
             .flex_col()
             .font("Zed Sans Extended")
-            .text_color(theme.middle.variant.default.foreground)
+            .text_color(theme.middle.base.default.foreground)
             // .border_color(theme.middle.base.default.border)
             .fill(theme.middle.base.default.background)
-            // List Container
             .child(
                 div()
-                    .fill(theme.lowest.base.default.background)
-                    .pb_1()
-                    // .border_b()
-                    //:: https://tailwindcss.com/docs/hover-focus-and-other-states#styling-based-on-parent-state
-                    // .group()
-                    // List Section Header
+                    .full()
+                    .flex()
+                    .flex_col()
+                    // List Container
                     .child(
                         div()
-                            .px_2()
-                            .flex()
-                            .justify_between()
-                            .items_center()
-                            // .hover()
-                            // .fill(theme.middle.variant.hovered.background)
-                            // .active()
-                            // .fill(theme.middle.variant.pressed.background)
+                            .fill(theme.lowest.base.default.background)
+                            .pb_1()
+                            // .border_b()
+                            //:: https://tailwindcss.com/docs/hover-focus-and-other-states#styling-based-on-parent-state
+                            // .group()
+                            // List Section Header
                             .child(
                                 div()
+                                    .px_2()
                                     .flex()
-                                    .gap_1()
-                                    //:: State based on group interaction state
-                                    // .group_hover().text_color(theme.middle.variant.hovered.foreground)
-                                    .text_sm()
-                                    .child("#")
-                                    .child("CRDB"),
+                                    .justify_between()
+                                    .items_center()
+                                    .hover()
+                                    .fill(theme.lowest.variant.hovered.background)
+                                    .active()
+                                    .fill(theme.lowest.variant.pressed.background)
+                                    .child(
+                                        div()
+                                            .flex()
+                                            .gap_1()
+                                            //:: State based on group interaction state
+                                            // .group_hover().text_color(theme.middle.variant.hovered.foreground)
+                                            .text_sm()
+                                            .child("#")
+                                            .child("CRDB"),
+                                    )
+                                    .child(
+                                        div().flex().h_full().gap_1().items_center().child(
+                                            div()
+                                                .w_3p5()
+                                                .h_3p5()
+                                                .fill(theme.middle.positive.default.foreground),
+                                        ),
+                                    ),
                             )
+                            // List Item Large
                             .child(
-                                div().flex().h_full().gap_1().items_center().child(
-                                    svg()
-                                        .path("icons/radix/caret-down.svg")
-                                        .h_3()
-                                        .w_3()
-                                        .fill(theme.middle.variant.default.foreground),
-                                ),
+                                div()
+                                    .px_2()
+                                    .h_7()
+                                    .flex()
+                                    .justify_between()
+                                    .items_center()
+                                    .child(
+                                        div()
+                                            .flex()
+                                            .h_full()
+                                            .gap_1()
+                                            .items_center()
+                                            .text_sm()
+                                            .child(
+                                                div()
+                                                    .w_4()
+                                                    .h_4()
+                                                    .fill(theme.middle.negative.default.foreground),
+                                            )
+                                            .child("maxbrunsfeld"),
+                                    )
+                                    .child(
+                                        div().flex().h_full().gap_1().items_center().child(
+                                            div()
+                                                .w_3p5()
+                                                .h_3p5()
+                                                .fill(theme.middle.positive.default.foreground),
+                                        ),
+                                    ),
                             ),
                     )
-                    // List Item Large
+                    .child(self.list_section_header(theme))
                     .child(
                         div()
-                            .px_2()
-                            .h_7()
+                            .py_2()
                             .flex()
-                            .justify_between()
-                            .items_center()
+                            .flex_col()
                             .child(
                                 div()
+                                    .h_5()
+                                    .px_2()
                                     .flex()
-                                    .h_full()
-                                    .gap_1()
+                                    .justify_between()
                                     .items_center()
-                                    .text_sm()
+                                    .child(div().flex().gap_1().text_sm().child("CONTACTS"))
                                     .child(
-                                        div()
-                                            .w_4()
-                                            .h_4()
-                                            .fill(theme.middle.negative.default.foreground),
-                                    )
-                                    .child("maxbrunsfeld"),
+                                        div().flex().h_full().gap_1().items_center().child(
+                                            div()
+                                                .w_3p5()
+                                                .h_3p5()
+                                                .fill(theme.middle.positive.default.foreground),
+                                        ),
+                                    ),
                             )
-                            .child(
-                                div().flex().h_full().gap_1().items_center().child(
-                                    div()
-                                        .w_3p5()
-                                        .h_3p5()
-                                        .fill(theme.middle.positive.default.foreground),
-                                ),
-                            ),
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme))
+                            .child(self.list_item_channel(theme)),
                     ),
             )
             .child(
-                div()
-                    .w_full()
-                    .flex()
-                    .flex_col()
-                    .gap_y_1()
-                    // List Section Header
-                    .child(self.list_section_header(theme)),
-            )
-            // Large List Item
-            .child(
-                div()
-                    .h_7()
-                    .px_2()
-                    .flex()
-                    .justify_between()
-                    .items_center()
-                    .child(div().flex().gap_1().text_sm().child("CONTACTS"))
-                    .child(
-                        div().flex().h_full().gap_1().items_center().child(
-                            div()
-                                .w_3p5()
-                                .h_3p5()
-                                .fill(theme.middle.positive.default.foreground),
-                        ),
-                    ),
-            )
-    }
-
-    fn list_section_header(&self, theme: &Theme) -> impl Element<V> {
-        div()
-            .h_7()
-            .px_2()
-            .flex()
-            .justify_between()
-            .items_center()
-            .child(div().flex().gap_1().text_sm().child("CHANNELS"))
-            .child(
-                div().flex().h_full().gap_1().items_center().child(
+                div().h_7().px_2().flex().items_center().child(
                     div()
-                        .w_3p5()
-                        .h_3p5()
-                        .fill(theme.middle.positive.default.foreground),
+                        .text_sm()
+                        .text_color(theme.middle.variant.default.foreground)
+                        .child("Find..."),
                 ),
             )
     }

From de77e56dc689f105608eb9bcea58fee8f82d5941 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 5 Sep 2023 18:53:25 -0600
Subject: [PATCH 036/109] Checkpoint

---
 crates/gpui2/src/elements/svg.rs     |   3 +-
 crates/storybook/src/collab_panel.rs | 215 ++++++++-------------------
 crates/storybook/src/storybook.rs    |   2 +-
 3 files changed, 67 insertions(+), 153 deletions(-)

diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs
index c9ee84f8c54b04c61737a10abd831f4ae04dd00c..bbd45098e41ef9f0354e4cfe2407b2f8e756d423 100644
--- a/crates/gpui2/src/elements/svg.rs
+++ b/crates/gpui2/src/elements/svg.rs
@@ -5,6 +5,7 @@ use crate::{
 };
 use refineable::RefinementCascade;
 use std::borrow::Cow;
+use util::ResultExt;
 
 #[derive(IntoElement)]
 pub struct Svg {
@@ -52,7 +53,7 @@ impl<V: 'static> Element<V> for Svg {
     {
         let fill_color = self.computed_style().fill.and_then(|fill| fill.color());
         if let Some((path, fill_color)) = self.path.as_ref().zip(fill_color) {
-            if let Ok(svg_tree) = cx.asset_cache.svg(path) {
+            if let Some(svg_tree) = cx.asset_cache.svg(path).log_err() {
                 let icon = scene::Icon {
                     bounds: layout.bounds,
                     svg: svg_tree,
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 4677b60145ad095b8f7113602532575e32d73c69..f38668368611044ecbd03e98db49e0ba4ac4c4d4 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -1,8 +1,8 @@
 use crate::theme::{theme, Theme};
 use gpui2::{
-    elements::div,
+    elements::{div, svg},
     style::{StyleHelpers, Styleable},
-    Element, IntoElement, ParentElement, ViewContext,
+    ArcCow, Element, IntoElement, ParentElement, ViewContext,
 };
 use std::marker::PhantomData;
 
@@ -18,50 +18,6 @@ pub fn collab_panel<V: 'static>() -> CollabPanelElement<V> {
 }
 
 impl<V: 'static> CollabPanelElement<V> {
-    fn list_section_header(&self, theme: &Theme) -> impl Element<V> {
-        div()
-            .h_7()
-            .px_2()
-            .flex()
-            .justify_between()
-            .items_center()
-            .child(div().flex().gap_1().text_sm().child("CHANNELS"))
-            .child(
-                div().flex().h_full().gap_1().items_center().child(
-                    div()
-                        .w_3p5()
-                        .h_3p5()
-                        .fill(theme.middle.positive.default.foreground),
-                ),
-            )
-    }
-
-    fn list_item_channel(&self, theme: &Theme) -> impl Element<V> {
-        div()
-            .h_7()
-            .px_2()
-            .flex()
-            .items_center()
-            .hover()
-            .fill(theme.lowest.variant.hovered.background)
-            .active()
-            .fill(theme.lowest.variant.pressed.background)
-            .child(
-                div()
-                    .flex()
-                    .items_center()
-                    .gap_1()
-                    .text_sm()
-                    .child(
-                        div()
-                            .w_3p5()
-                            .h_3p5()
-                            .fill(theme.middle.positive.default.foreground),
-                    )
-                    .child("zed-industries"),
-            )
-    }
-
     fn render(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
 
@@ -88,118 +44,26 @@ impl<V: 'static> CollabPanelElement<V> {
                             //:: https://tailwindcss.com/docs/hover-focus-and-other-states#styling-based-on-parent-state
                             // .group()
                             // List Section Header
-                            .child(
-                                div()
-                                    .px_2()
-                                    .flex()
-                                    .justify_between()
-                                    .items_center()
-                                    .hover()
-                                    .fill(theme.lowest.variant.hovered.background)
-                                    .active()
-                                    .fill(theme.lowest.variant.pressed.background)
-                                    .child(
-                                        div()
-                                            .flex()
-                                            .gap_1()
-                                            //:: State based on group interaction state
-                                            // .group_hover().text_color(theme.middle.variant.hovered.foreground)
-                                            .text_sm()
-                                            .child("#")
-                                            .child("CRDB"),
-                                    )
-                                    .child(
-                                        div().flex().h_full().gap_1().items_center().child(
-                                            div()
-                                                .w_3p5()
-                                                .h_3p5()
-                                                .fill(theme.middle.positive.default.foreground),
-                                        ),
-                                    ),
-                            )
+                            .child(self.list_section_header("#CRDB", theme))
                             // List Item Large
-                            .child(
-                                div()
-                                    .px_2()
-                                    .h_7()
-                                    .flex()
-                                    .justify_between()
-                                    .items_center()
-                                    .child(
-                                        div()
-                                            .flex()
-                                            .h_full()
-                                            .gap_1()
-                                            .items_center()
-                                            .text_sm()
-                                            .child(
-                                                div()
-                                                    .w_4()
-                                                    .h_4()
-                                                    .fill(theme.middle.negative.default.foreground),
-                                            )
-                                            .child("maxbrunsfeld"),
-                                    )
-                                    .child(
-                                        div().flex().h_full().gap_1().items_center().child(
-                                            div()
-                                                .w_3p5()
-                                                .h_3p5()
-                                                .fill(theme.middle.positive.default.foreground),
-                                        ),
-                                    ),
-                            ),
+                            .child(self.list_item("maxbrunsfeld", theme)),
                     )
-                    .child(self.list_section_header(theme))
                     .child(
                         div()
                             .py_2()
                             .flex()
                             .flex_col()
-                            .child(
-                                div()
-                                    .h_5()
-                                    .px_2()
-                                    .flex()
-                                    .justify_between()
-                                    .items_center()
-                                    .child(div().flex().gap_1().text_sm().child("CONTACTS"))
-                                    .child(
-                                        div().flex().h_full().gap_1().items_center().child(
-                                            div()
-                                                .w_3p5()
-                                                .h_3p5()
-                                                .fill(theme.middle.positive.default.foreground),
-                                        ),
-                                    ),
-                            )
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme))
-                            .child(self.list_item_channel(theme)),
+                            .child(self.list_section_header("CHANNELS", theme)),
+                    )
+                    .child(
+                        div()
+                            .py_2()
+                            .flex()
+                            .flex_col()
+                            .child(self.list_section_header("CONTACTS", theme))
+                            .child(self.list_item("as-cii", theme))
+                            .child(self.list_item("nathansobo", theme))
+                            .child(self.list_item("maxbrunsfeld", theme)),
                     ),
             )
             .child(
@@ -211,4 +75,53 @@ impl<V: 'static> CollabPanelElement<V> {
                 ),
             )
     }
+
+    fn list_section_header(
+        &self,
+        label: impl Into<ArcCow<'static, str>>,
+        theme: &Theme,
+    ) -> impl Element<V> {
+        div()
+            .h_7()
+            .px_2()
+            .flex()
+            .justify_between()
+            .items_center()
+            .child(div().flex().gap_1().text_sm().child(label))
+            .child(
+                div().flex().h_full().gap_1().items_center().child(
+                    svg()
+                        .path("icons/radix/caret-down.svg")
+                        .w_3p5()
+                        .h_3p5()
+                        .fill(theme.middle.positive.default.foreground),
+                ),
+            )
+    }
+
+    fn list_item(&self, label: impl Into<ArcCow<'static, str>>, theme: &Theme) -> impl Element<V> {
+        div()
+            .h_7()
+            .px_2()
+            .flex()
+            .items_center()
+            .hover()
+            .fill(theme.lowest.variant.hovered.background)
+            .active()
+            .fill(theme.lowest.variant.pressed.background)
+            .child(
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_1()
+                    .text_sm()
+                    .child(
+                        div()
+                            .w_3p5()
+                            .h_3p5()
+                            .fill(theme.middle.positive.default.foreground),
+                    )
+                    .child(label),
+            )
+    }
 }
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 03a8cfce0d933c4e34caa745c8ea3f49901a5b5c..6913e1c0b6f3a0bb27de6aa2bf010c2b99016179 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -19,7 +19,7 @@ mod workspace;
 fn main() {
     SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
 
-    gpui2::App::new(()).unwrap().run(|cx| {
+    gpui2::App::new(Assets).unwrap().run(|cx| {
         let mut store = SettingsStore::default();
         store
             .set_default_settings(default_settings().as_ref(), cx)

From 707427d9f5051ea3d9ec64d9a908299909a43524 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 6 Sep 2023 10:24:22 -0600
Subject: [PATCH 037/109] Select caret based on expanded boolean

---
 crates/storybook/src/collab_panel.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index f38668368611044ecbd03e98db49e0ba4ac4c4d4..429529b3c18c22414810d06a1f8d15c52e045754 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -44,7 +44,7 @@ impl<V: 'static> CollabPanelElement<V> {
                             //:: https://tailwindcss.com/docs/hover-focus-and-other-states#styling-based-on-parent-state
                             // .group()
                             // List Section Header
-                            .child(self.list_section_header("#CRDB", theme))
+                            .child(self.list_section_header("#CRDB", true, theme))
                             // List Item Large
                             .child(self.list_item("maxbrunsfeld", theme)),
                     )
@@ -53,14 +53,14 @@ impl<V: 'static> CollabPanelElement<V> {
                             .py_2()
                             .flex()
                             .flex_col()
-                            .child(self.list_section_header("CHANNELS", theme)),
+                            .child(self.list_section_header("CHANNELS", true, theme)),
                     )
                     .child(
                         div()
                             .py_2()
                             .flex()
                             .flex_col()
-                            .child(self.list_section_header("CONTACTS", theme))
+                            .child(self.list_section_header("CONTACTS", true, theme))
                             .child(self.list_item("as-cii", theme))
                             .child(self.list_item("nathansobo", theme))
                             .child(self.list_item("maxbrunsfeld", theme)),
@@ -79,6 +79,7 @@ impl<V: 'static> CollabPanelElement<V> {
     fn list_section_header(
         &self,
         label: impl Into<ArcCow<'static, str>>,
+        expanded: bool,
         theme: &Theme,
     ) -> impl Element<V> {
         div()
@@ -91,7 +92,11 @@ impl<V: 'static> CollabPanelElement<V> {
             .child(
                 div().flex().h_full().gap_1().items_center().child(
                     svg()
-                        .path("icons/radix/caret-down.svg")
+                        .path(if expanded {
+                            "icons/radix/caret-down.svg"
+                        } else {
+                            "icons/radix/caret-up.svg"
+                        })
                         .w_3p5()
                         .h_3p5()
                         .fill(theme.middle.positive.default.foreground),

From 5337d9605ade1c52718392940923d95671fefce7 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Wed, 6 Sep 2023 14:18:29 -0400
Subject: [PATCH 038/109] Add `size` `rounded` prefixes

Co-Authored-By: Nathan Sobo <1789+nathansobo@users.noreply.github.com>
---
 crates/gpui2/src/style.rs                    |  13 ++
 crates/gpui2_macros/src/styleable_helpers.rs | 204 +++++++++++++------
 2 files changed, 154 insertions(+), 63 deletions(-)

diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index fbc0edbbf4702d532685663b254a1bd045af41bd..a0797fcb2a2a292ab06623cd1dbb4bf48b16702d 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -299,6 +299,19 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
+    /// size_{n}: Sets width & height to {n}
+    ///
+    /// Example:
+    /// size_1: Sets width & height to 1
+    fn size(mut self, size: Length) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().size.height = Some(size);
+        self.declared_style().size.width = Some(size);
+        self
+    }
+
     fn full(mut self) -> Self
     where
         Self: Sized,
diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index 6aecbf62889d9eaa93bbb015105f0596af78f208..04c4681ae6d98a907248c095be7c996d2e8d7075 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -27,31 +27,18 @@ pub fn styleable_helpers(input: TokenStream) -> TokenStream {
 fn generate_methods() -> Vec<TokenStream2> {
     let mut methods = Vec::new();
 
-    for (prefix, auto_allowed, fields) in tailwind_prefixes() {
+    for (prefix, auto_allowed, fields) in tailwind_length_prefixes() {
         for (suffix, length_tokens) in tailwind_lengths() {
-            if !auto_allowed && suffix == "auto" {
-                // Conditional to skip "auto"
-                continue;
+            if auto_allowed || suffix != "auto" {
+                let method = generate_method(prefix, suffix, &fields, length_tokens);
+                methods.push(method);
             }
+        }
+    }
 
-            let method_name = format_ident!("{}_{}", prefix, suffix);
-            let field_assignments = fields
-                .iter()
-                .map(|field_tokens| {
-                    quote! {
-                        style.#field_tokens = Some(gpui::geometry::#length_tokens);
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            let method = quote! {
-                fn #method_name(mut self) -> Self where Self: std::marker::Sized {
-                    let mut style = self.declared_style();
-                    #(#field_assignments)*
-                    self
-                }
-            };
-
+    for (prefix, fields) in tailwind_corner_prefixes() {
+        for (suffix, radius_tokens) in tailwind_corner_radii() {
+            let method = generate_method(prefix, suffix, &fields, radius_tokens);
             methods.push(method);
         }
     }
@@ -59,6 +46,93 @@ fn generate_methods() -> Vec<TokenStream2> {
     methods
 }
 
+fn generate_method(
+    prefix: &'static str,
+    suffix: &'static str,
+    fields: &Vec<TokenStream2>,
+    length_tokens: TokenStream2,
+) -> TokenStream2 {
+    let method_name = format_ident!("{}_{}", prefix, suffix);
+    let field_assignments = fields
+        .iter()
+        .map(|field_tokens| {
+            quote! {
+                style.#field_tokens = Some(gpui::geometry::#length_tokens);
+            }
+        })
+        .collect::<Vec<_>>();
+
+    let method = quote! {
+        fn #method_name(mut self) -> Self where Self: std::marker::Sized {
+            let mut style = self.declared_style();
+            #(#field_assignments)*
+            self
+        }
+    };
+
+    method
+}
+
+fn tailwind_length_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
+    vec![
+        ("w", true, vec![quote! { size.width }]),
+        ("h", true, vec![quote! { size.height }]),
+        (
+            "size",
+            true,
+            vec![quote! {size.width}, quote! {size.height}],
+        ),
+        ("min_w", false, vec![quote! { min_size.width }]),
+        ("min_h", false, vec![quote! { min_size.height }]),
+        ("max_w", false, vec![quote! { max_size.width }]),
+        ("max_h", false, vec![quote! { max_size.height }]),
+        (
+            "m",
+            true,
+            vec![quote! { margin.top }, quote! { margin.bottom }],
+        ),
+        ("mt", true, vec![quote! { margin.top }]),
+        ("mb", true, vec![quote! { margin.bottom }]),
+        (
+            "mx",
+            true,
+            vec![quote! { margin.left }, quote! { margin.right }],
+        ),
+        ("ml", true, vec![quote! { margin.left }]),
+        ("mr", true, vec![quote! { margin.right }]),
+        (
+            "p",
+            false,
+            vec![quote! { padding.top }, quote! { padding.bottom }],
+        ),
+        ("pt", false, vec![quote! { padding.top }]),
+        ("pb", false, vec![quote! { padding.bottom }]),
+        (
+            "px",
+            false,
+            vec![quote! { padding.left }, quote! { padding.right }],
+        ),
+        (
+            "py",
+            false,
+            vec![quote! { padding.top }, quote! { padding.bottom }],
+        ),
+        ("pl", false, vec![quote! { padding.left }]),
+        ("pr", false, vec![quote! { padding.right }]),
+        ("top", true, vec![quote! { inset.top }]),
+        ("bottom", true, vec![quote! { inset.bottom }]),
+        ("left", true, vec![quote! { inset.left }]),
+        ("right", true, vec![quote! { inset.right }]),
+        (
+            "gap",
+            false,
+            vec![quote! { gap.width }, quote! { gap.height }],
+        ),
+        ("gap_x", false, vec![quote! { gap.width }]),
+        ("gap_y", false, vec![quote! { gap.height }]),
+    ]
+}
+
 fn tailwind_lengths() -> Vec<(&'static str, TokenStream2)> {
     vec![
         ("0", quote! { pixels(0.) }),
@@ -111,57 +185,61 @@ fn tailwind_lengths() -> Vec<(&'static str, TokenStream2)> {
     ]
 }
 
-fn tailwind_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
+fn tailwind_corner_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
     vec![
-        ("w", true, vec![quote! { size.width }]),
-        ("h", true, vec![quote! { size.height }]),
-        ("min_w", false, vec![quote! { min_size.width }]),
-        ("min_h", false, vec![quote! { min_size.height }]),
-        ("max_w", false, vec![quote! { max_size.width }]),
-        ("max_h", false, vec![quote! { max_size.height }]),
-        (
-            "m",
-            true,
-            vec![quote! { margin.top }, quote! { margin.bottom }],
-        ),
-        ("mt", true, vec![quote! { margin.top }]),
-        ("mb", true, vec![quote! { margin.bottom }]),
         (
-            "mx",
-            true,
-            vec![quote! { margin.left }, quote! { margin.right }],
+            "rounded",
+            vec![
+                quote! { corner_radii.top_left },
+                quote! { corner_radii.top_right },
+                quote! { corner_radii.bottom_right },
+                quote! { corner_radii.bottom_left },
+            ],
         ),
-        ("ml", true, vec![quote! { margin.left }]),
-        ("mr", true, vec![quote! { margin.right }]),
         (
-            "p",
-            false,
-            vec![quote! { padding.top }, quote! { padding.bottom }],
+            "rounded_t",
+            vec![
+                quote! { corner_radii.top_left },
+                quote! { corner_radii.top_right },
+            ],
         ),
-        ("pt", false, vec![quote! { padding.top }]),
-        ("pb", false, vec![quote! { padding.bottom }]),
         (
-            "px",
-            false,
-            vec![quote! { padding.left }, quote! { padding.right }],
+            "rounded_b",
+            vec![
+                quote! { corner_radii.bottom_left },
+                quote! { corner_radii.bottom_right },
+            ],
         ),
         (
-            "py",
-            false,
-            vec![quote! { padding.top }, quote! { padding.bottom }],
+            "rounded_r",
+            vec![
+                quote! { corner_radii.top_right },
+                quote! { corner_radii.bottom_right },
+            ],
         ),
-        ("pl", false, vec![quote! { padding.left }]),
-        ("pr", false, vec![quote! { padding.right }]),
-        ("top", true, vec![quote! { inset.top }]),
-        ("bottom", true, vec![quote! { inset.bottom }]),
-        ("left", true, vec![quote! { inset.left }]),
-        ("right", true, vec![quote! { inset.right }]),
         (
-            "gap",
-            false,
-            vec![quote! { gap.width }, quote! { gap.height }],
+            "rounded_l",
+            vec![
+                quote! { corner_radii.top_left },
+                quote! { corner_radii.bottom_left },
+            ],
         ),
-        ("gap_x", false, vec![quote! { gap.width }]),
-        ("gap_y", false, vec![quote! { gap.height }]),
+        ("rounded_tl", vec![quote! { corner_radii.top_left }]),
+        ("rounded_tr", vec![quote! { corner_radii.top_right }]),
+        ("rounded_bl", vec![quote! { corner_radii.bottom_left }]),
+        ("rounded_br", vec![quote! { corner_radii.bottom_right }]),
+    ]
+}
+
+fn tailwind_corner_radii() -> Vec<(&'static str, TokenStream2)> {
+    vec![
+        ("none", quote! { pixels(0.) }),
+        ("sm", quote! { rems(0.125) }),
+        ("md", quote! { rems(0.25) }),
+        ("lg", quote! { rems(0.5) }),
+        ("xl", quote! { rems(0.75) }),
+        ("2xl", quote! { rems(1.) }),
+        ("3xl", quote! { rems(1.5) }),
+        ("full", quote! {  pixels(9999.) }),
     ]
 }

From 0d1fb7f29e6580d2f5e18e6c4f62ed59a176981a Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Wed, 6 Sep 2023 15:44:14 -0400
Subject: [PATCH 039/109] WIP

---
 crates/storybook/src/storybook.rs |   6 +-
 crates/storybook/src/workspace.rs | 345 ++++++++++++++++++++++++++++--
 2 files changed, 330 insertions(+), 21 deletions(-)

diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 6913e1c0b6f3a0bb27de6aa2bf010c2b99016179..c13e5e0bc323c51c563018f886ea6b1e3b4358a5 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -2,7 +2,6 @@
 
 use crate::theme::Theme;
 use ::theme as legacy_theme;
-use collab_panel::collab_panel;
 use element_ext::ElementExt;
 use gpui2::{serde_json, vec2f, view, Element, RectF, ViewContext, WindowBounds};
 use legacy_theme::ThemeSettings;
@@ -30,7 +29,7 @@ fn main() {
 
         cx.add_window(
             gpui2::WindowOptions {
-                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(260., 800.))),
+                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(1400., 900.))),
                 center: true,
                 ..Default::default()
             },
@@ -41,7 +40,7 @@ fn main() {
 }
 
 fn storybook<V: 'static>(cx: &mut ViewContext<V>) -> impl Element<V> {
-    collab_panel().themed(current_theme(cx))
+    workspace().themed(current_theme(cx))
 }
 
 // Nathan: During the transition to gpui2, we will include the base theme on the legacy Theme struct.
@@ -64,6 +63,7 @@ fn current_theme<V: 'static>(cx: &mut ViewContext<V>) -> Theme {
 use anyhow::{anyhow, Result};
 use gpui2::AssetSource;
 use rust_embed::RustEmbed;
+use workspace::workspace;
 
 #[derive(RustEmbed)]
 #[folder = "../../assets"]
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index a7a3f379ddf07a68f9b67bb48a12bf4faddd8c74..c2416976104de0950fd195149865d304ca45f185 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,41 +1,350 @@
 use crate::theme::theme;
 use gpui2::{
-    elements::div, geometry::pixels, style::StyleHelpers, Element, IntoElement, ParentElement,
-    ViewContext,
+    elements::{div, svg},
+    geometry::pixels,
+    style::{StyleHelpers, Styleable},
+    Element, IntoElement, ParentElement, ViewContext,
 };
 
 #[derive(Element)]
-struct WorkspaceElement;
+struct TitleBar;
 
-pub fn workspace<V: 'static>() -> impl Element<V> {
-    WorkspaceElement
+pub fn titlebar<V: 'static>() -> impl Element<V> {
+    TitleBar
 }
 
-impl WorkspaceElement {
+impl TitleBar {
     fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
         div()
-            .full()
             .flex()
-            .flex_col()
-            .fill(theme.middle.base.default.background)
-            .child(self.title_bar(cx))
-            .child(self.stage(cx))
-            .child(self.status_bar(cx))
+            .items_center()
+            .justify_between()
+            .w_full()
+            .h_8()
+            .fill(theme.lowest.base.default.background)
+            .child(self.left_group(cx))
+            .child(self.right_group(cx))
     }
 
-    fn title_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+    fn left_group<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
         div()
-            .h(pixels(cx.titlebar_height()))
+            .flex()
+            .items_center()
+            .h_full()
+            .gap_4()
+            .px_2()
+            // === Traffic Lights === //
+            .child(
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_2()
+                    .child(
+                        div()
+                            .w_3()
+                            .h_3()
+                            // .rounded_full()
+                            .fill(theme.lowest.positive.default.foreground),
+                    )
+                    .child(
+                        div()
+                            .w_3()
+                            .h_3()
+                            // .rounded_full()
+                            .fill(theme.lowest.warning.default.foreground),
+                    )
+                    .child(
+                        div()
+                            .w_3()
+                            .h_3()
+                            // .rounded_full()
+                            .fill(theme.lowest.negative.default.foreground),
+                    ),
+            )
+            // === Project Info === //
+            .child(
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_1()
+                    .child(
+                        div()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .px_1()
+                            .hover()
+                            .fill(theme.lowest.base.hovered.background)
+                            .active()
+                            .fill(theme.lowest.base.pressed.background)
+                            .child(div().text_sm().child("project")),
+                    )
+                    .child(
+                        div()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .px_1()
+                            .text_color(theme.lowest.variant.default.foreground)
+                            .hover()
+                            .fill(theme.lowest.base.hovered.background)
+                            .active()
+                            .fill(theme.lowest.base.pressed.background)
+                            .child(div().text_sm().child("branch")),
+                    ),
+            )
+    }
+
+    fn right_group<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+        div()
+            .flex()
+            .items_center()
+            .h_full()
+            .gap_4()
+            .px_2()
+            // === Comms === //
+            .child(
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_1()
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/microphone.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.base.default.foreground),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/screen.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.base.default.foreground),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/exit.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.base.default.foreground),
+                            ),
+                    ),
+            )
+    }
+}
+
+// ================================================================================ //
+
+#[derive(Element)]
+struct StatusBar;
+
+pub fn statusbar<V: 'static>() -> impl Element<V> {
+    StatusBar
+}
+
+impl StatusBar {
+    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+        div()
+            .flex()
+            .items_center()
+            .justify_between()
+            .w_full()
+            .h_8()
             .fill(theme.lowest.base.default.background)
+            .child(self.left_group(cx))
+            .child(self.right_group(cx))
     }
 
-    fn status_bar<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        div().h(pixels(cx.titlebar_height())) //.fill(colors.base(0.))
+    fn left_group<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+        div()
+            .flex()
+            .items_center()
+            .h_full()
+            .gap_4()
+            .px_2()
+            // === Tools === //
+            .child(
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_1()
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/project.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.base.default.foreground),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/conversations.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.base.default.foreground),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/file_icons/notebook.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.accent.default.foreground),
+                            ),
+                    ),
+            )
+            // === Diagnostics === //
+            .child(
+                div().flex().items_center().gap_2()
+                .child(
+                    div()
+                        .h_full()
+                        .flex()
+                        .items_center()
+                        .justify_center()
+                        .gap_0p5()
+                        .px_1()
+                        .text_color(theme.lowest.variant.default.foreground)
+                        .hover()
+                        .fill(theme.lowest.base.hovered.background)
+                        .active()
+                        .fill(theme.lowest.base.pressed.background)
+                        .child(
+                            svg()
+                                .path("icons/error.svg")
+                                .w_4()
+                                .h_4()
+                                .fill(theme.lowest.negative.default.foreground),
+                        )
+                        .child(div().text_sm().child("2")),
+                )
+                .child(div().text_sm().text_color(theme.lowest.variant.default.foreground).child("Something is wrong")),
+
+            )
     }
 
-    fn stage<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        div().flex_grow()
+    fn right_group<V: 'static>(&mut self, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+        div()
+            .flex()
+            .items_center()
+            .h_full()
+            .gap_4()
+            .px_2()
+            // === Tools === //
+            .child(
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_1()
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/check_circle.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.base.default.foreground),
+                            ),
+                    )
+                    .child(
+                        div()
+                            .w_6()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .child(
+                                svg()
+                                    .path("icons/copilot.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.accent.default.foreground),
+                            ),
+                    ),
+            )
+    }
+}
+
+// ================================================================================ //
+
+#[derive(Element)]
+struct WorkspaceElement;
+
+pub fn workspace<V: 'static>() -> impl Element<V> {
+    WorkspaceElement
+}
+
+impl WorkspaceElement {
+    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+        div()
+            .h_full()
+            .w_full()
+            .flex()
+            .flex_col()
+            .font("Zed Sans Extended")
+            .text_color(theme.lowest.base.default.foreground)
+            .fill(theme.middle.base.default.background)
+            .child(titlebar())
+            .child(div().child("panes"))
+            .child(statusbar())
     }
 }

From 20f98e4d17032eac76a69e939eecf86dd06172b1 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 21 Aug 2023 16:10:13 -0600
Subject: [PATCH 040/109] vim . to replay

Co-Authored-By: maxbrunsfeld@gmail.com
---
 Cargo.lock                                |   2 +
 assets/keymaps/vim.json                   |   6 +-
 crates/editor/src/editor.rs               | 143 +++++++++++++---
 crates/editor/src/editor_tests.rs         |   2 +-
 crates/gpui/src/app/window.rs             |   2 +-
 crates/terminal_view/README.md            |   8 +-
 crates/vim/Cargo.toml                     |   2 +
 crates/vim/src/editor_events.rs           |   1 +
 crates/vim/src/insert.rs                  |   7 +-
 crates/vim/src/normal.rs                  |  31 +++-
 crates/vim/src/normal/case.rs             |   1 +
 crates/vim/src/normal/delete.rs           |   2 +
 crates/vim/src/normal/paste.rs            |   1 +
 crates/vim/src/normal/repeat.rs           | 200 ++++++++++++++++++++++
 crates/vim/src/state.rs                   |  34 +++-
 crates/vim/src/test/vim_test_context.rs   |  15 ++
 crates/vim/src/vim.rs                     |  85 ++++++++-
 crates/vim/src/visual.rs                  |   2 +
 crates/vim/test_data/test_dot_repeat.json |  38 ++++
 19 files changed, 543 insertions(+), 39 deletions(-)
 create mode 100644 crates/vim/src/normal/repeat.rs
 create mode 100644 crates/vim/test_data/test_dot_repeat.json

diff --git a/Cargo.lock b/Cargo.lock
index a185542c63d0226108eca3c22e769bfa10f37770..1353fd224008e350350d15461fbc8f90d2b6ae7b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8767,12 +8767,14 @@ dependencies = [
  "collections",
  "command_palette",
  "editor",
+ "futures 0.3.28",
  "gpui",
  "indoc",
  "itertools",
  "language",
  "language_selector",
  "log",
+ "lsp",
  "nvim-rs",
  "parking_lot 0.11.2",
  "project",
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index da094ea7e46ca4c8abc291a9381ac1318614bbd1..582171d8a23a6532be654a387f4a45b33f2530db 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -316,6 +316,7 @@
   {
     "context": "Editor && vim_mode == normal && (vim_operator == none || vim_operator == n) && !VimWaiting",
     "bindings": {
+      ".": "vim::Repeat",
       "c": [
         "vim::PushOperator",
         "Change"
@@ -331,10 +332,7 @@
         "vim::PushOperator",
         "Yank"
       ],
-      "i": [
-        "vim::SwitchMode",
-        "Insert"
-      ],
+      "i": "vim::InsertBefore",
       "shift-i": "vim::InsertFirstNonWhitespace",
       "a": "vim::InsertAfter",
       "shift-a": "vim::InsertEndOfLine",
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index bdd29b04fa20e2ecd2492d6554f5541b2bc99540..1e6e5685b93165bbfad166ac0c86bd54b4656f68 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2269,10 +2269,6 @@ impl Editor {
         if self.read_only {
             return;
         }
-        if !self.input_enabled {
-            cx.emit(Event::InputIgnored { text });
-            return;
-        }
 
         let selections = self.selections.all_adjusted(cx);
         let mut brace_inserted = false;
@@ -3207,17 +3203,30 @@ impl Editor {
             .count();
 
         let snapshot = self.buffer.read(cx).snapshot(cx);
+        let mut range_to_replace: Option<Range<isize>> = None;
         let mut ranges = Vec::new();
         for selection in &selections {
             if snapshot.contains_str_at(selection.start.saturating_sub(lookbehind), &old_text) {
                 let start = selection.start.saturating_sub(lookbehind);
                 let end = selection.end + lookahead;
+                if selection.id == newest_selection.id {
+                    range_to_replace = Some(
+                        ((start + common_prefix_len) as isize - selection.start as isize)
+                            ..(end as isize - selection.start as isize),
+                    );
+                }
                 ranges.push(start + common_prefix_len..end);
             } else {
                 common_prefix_len = 0;
                 ranges.clear();
                 ranges.extend(selections.iter().map(|s| {
                     if s.id == newest_selection.id {
+                        range_to_replace = Some(
+                            old_range.start.to_offset_utf16(&snapshot).0 as isize
+                                - selection.start as isize
+                                ..old_range.end.to_offset_utf16(&snapshot).0 as isize
+                                    - selection.start as isize,
+                        );
                         old_range.clone()
                     } else {
                         s.start..s.end
@@ -3228,6 +3237,11 @@ impl Editor {
         }
         let text = &text[common_prefix_len..];
 
+        cx.emit(Event::InputHandled {
+            utf16_range_to_replace: range_to_replace,
+            text: text.into(),
+        });
+
         self.transact(cx, |this, cx| {
             if let Some(mut snippet) = snippet {
                 snippet.text = text.to_string();
@@ -3685,6 +3699,10 @@ impl Editor {
 
                 self.report_copilot_event(Some(completion.uuid.clone()), true, cx)
             }
+            cx.emit(Event::InputHandled {
+                utf16_range_to_replace: None,
+                text: suggestion.text.to_string().into(),
+            });
             self.insert_with_autoindent_mode(&suggestion.text.to_string(), None, cx);
             cx.notify();
             true
@@ -8436,6 +8454,41 @@ impl Editor {
     pub fn inlay_hint_cache(&self) -> &InlayHintCache {
         &self.inlay_hint_cache
     }
+
+    pub fn replay_insert_event(
+        &mut self,
+        text: &str,
+        relative_utf16_range: Option<Range<isize>>,
+        cx: &mut ViewContext<Self>,
+    ) {
+        if !self.input_enabled {
+            cx.emit(Event::InputIgnored { text: text.into() });
+            return;
+        }
+        if let Some(relative_utf16_range) = relative_utf16_range {
+            let selections = self.selections.all::<OffsetUtf16>(cx);
+            self.change_selections(None, cx, |s| {
+                let new_ranges = selections.into_iter().map(|range| {
+                    let start = OffsetUtf16(
+                        range
+                            .head()
+                            .0
+                            .saturating_add_signed(relative_utf16_range.start),
+                    );
+                    let end = OffsetUtf16(
+                        range
+                            .head()
+                            .0
+                            .saturating_add_signed(relative_utf16_range.end),
+                    );
+                    start..end
+                });
+                s.select_ranges(new_ranges);
+            });
+        }
+
+        self.handle_input(text, cx);
+    }
 }
 
 fn document_to_inlay_range(
@@ -8524,6 +8577,10 @@ pub enum Event {
     InputIgnored {
         text: Arc<str>,
     },
+    InputHandled {
+        utf16_range_to_replace: Option<Range<isize>>,
+        text: Arc<str>,
+    },
     ExcerptsAdded {
         buffer: ModelHandle<Buffer>,
         predecessor: ExcerptId,
@@ -8744,29 +8801,51 @@ impl View for Editor {
         text: &str,
         cx: &mut ViewContext<Self>,
     ) {
+        if !self.input_enabled {
+            cx.emit(Event::InputIgnored { text: text.into() });
+            return;
+        }
+
         self.transact(cx, |this, cx| {
-            if this.input_enabled {
-                let new_selected_ranges = if let Some(range_utf16) = range_utf16 {
-                    let range_utf16 = OffsetUtf16(range_utf16.start)..OffsetUtf16(range_utf16.end);
-                    Some(this.selection_replacement_ranges(range_utf16, cx))
-                } else {
-                    this.marked_text_ranges(cx)
-                };
+            let new_selected_ranges = if let Some(range_utf16) = range_utf16 {
+                let range_utf16 = OffsetUtf16(range_utf16.start)..OffsetUtf16(range_utf16.end);
+                Some(this.selection_replacement_ranges(range_utf16, cx))
+            } else {
+                this.marked_text_ranges(cx)
+            };
 
-                if let Some(new_selected_ranges) = new_selected_ranges {
-                    this.change_selections(None, cx, |selections| {
-                        selections.select_ranges(new_selected_ranges)
-                    });
-                }
+            let range_to_replace = new_selected_ranges.as_ref().and_then(|ranges_to_replace| {
+                let newest_selection_id = this.selections.newest_anchor().id;
+                this.selections
+                    .all::<OffsetUtf16>(cx)
+                    .iter()
+                    .zip(ranges_to_replace.iter())
+                    .find_map(|(selection, range)| {
+                        if selection.id == newest_selection_id {
+                            Some(
+                                (range.start.0 as isize - selection.head().0 as isize)
+                                    ..(range.end.0 as isize - selection.head().0 as isize),
+                            )
+                        } else {
+                            None
+                        }
+                    })
+            });
+
+            cx.emit(Event::InputHandled {
+                utf16_range_to_replace: range_to_replace,
+                text: text.into(),
+            });
+
+            if let Some(new_selected_ranges) = new_selected_ranges {
+                this.change_selections(None, cx, |selections| {
+                    selections.select_ranges(new_selected_ranges)
+                });
             }
 
             this.handle_input(text, cx);
         });
 
-        if !self.input_enabled {
-            return;
-        }
-
         if let Some(transaction) = self.ime_transaction {
             self.buffer.update(cx, |buffer, cx| {
                 buffer.group_until_transaction(transaction, cx);
@@ -8784,6 +8863,7 @@ impl View for Editor {
         cx: &mut ViewContext<Self>,
     ) {
         if !self.input_enabled {
+            cx.emit(Event::InputIgnored { text: text.into() });
             return;
         }
 
@@ -8808,6 +8888,29 @@ impl View for Editor {
                 None
             };
 
+            let range_to_replace = ranges_to_replace.as_ref().and_then(|ranges_to_replace| {
+                let newest_selection_id = this.selections.newest_anchor().id;
+                this.selections
+                    .all::<OffsetUtf16>(cx)
+                    .iter()
+                    .zip(ranges_to_replace.iter())
+                    .find_map(|(selection, range)| {
+                        if selection.id == newest_selection_id {
+                            Some(
+                                (range.start.0 as isize - selection.head().0 as isize)
+                                    ..(range.end.0 as isize - selection.head().0 as isize),
+                            )
+                        } else {
+                            None
+                        }
+                    })
+            });
+
+            cx.emit(Event::InputHandled {
+                utf16_range_to_replace: range_to_replace,
+                text: text.into(),
+            });
+
             if let Some(ranges) = ranges_to_replace {
                 this.change_selections(None, cx, |s| s.select_ranges(ranges));
             }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 74bd67e03a70d20afeac7be9efdbd56eee77fc73..f11639a770193e905509d2bf142eec6564b84b46 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -7807,7 +7807,7 @@ fn assert_selection_ranges(marked_text: &str, view: &mut Editor, cx: &mut ViewCo
 /// Handle completion request passing a marked string specifying where the completion
 /// should be triggered from using '|' character, what range should be replaced, and what completions
 /// should be returned using '<' and '>' to delimit the range
-fn handle_completion_request<'a>(
+pub fn handle_completion_request<'a>(
     cx: &mut EditorLspTestContext<'a>,
     marked_string: &str,
     completions: Vec<&'static str>,
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 4b8b0534d53ae70c16093125b6afa7bbd38b5c7c..09744579a939ed0bb558ba0c040dcd51d3043c02 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1110,7 +1110,7 @@ impl<'a> WindowContext<'a> {
         self.window.is_fullscreen
     }
 
-    pub(crate) fn dispatch_action(&mut self, view_id: Option<usize>, action: &dyn Action) -> bool {
+    pub fn dispatch_action(&mut self, view_id: Option<usize>, action: &dyn Action) -> bool {
         if let Some(view_id) = view_id {
             self.halt_action_dispatch = false;
             self.visit_dispatch_path(view_id, |view_id, capture_phase, cx| {
diff --git a/crates/terminal_view/README.md b/crates/terminal_view/README.md
index 019460067ebf20f991b18a9cd5ce262ae7675504..ca48f545427993caf97f6f7670a23e3e309dc214 100644
--- a/crates/terminal_view/README.md
+++ b/crates/terminal_view/README.md
@@ -2,13 +2,13 @@ Design notes:
 
 This crate is split into two conceptual halves:
 - The terminal.rs file and the src/mappings/ folder, these contain the code for interacting with Alacritty and maintaining the pty event loop. Some behavior in this file is constrained by terminal protocols and standards. The Zed init function is also placed here.
-- Everything else. These other files integrate the `Terminal` struct created in terminal.rs into the rest of GPUI. The main entry point for GPUI is the terminal_view.rs file and the modal.rs file. 
+- Everything else. These other files integrate the `Terminal` struct created in terminal.rs into the rest of GPUI. The main entry point for GPUI is the terminal_view.rs file and the modal.rs file.
 
 ttys are created externally, and so can fail in unexpected ways. However, GPUI currently does not have an API for models than can fail to instantiate. `TerminalBuilder` solves this by using Rust's type system to split tty instantiation into a 2 step process: first attempt to create the file handles with `TerminalBuilder::new()`, check the result, then call `TerminalBuilder::subscribe(cx)` from within a model context.
 
 The TerminalView struct abstracts over failed and successful terminals, passing focus through to the associated view and allowing clients to build a terminal without worrying about errors.
 
-#Input 
+#Input
 
 There are currently many distinct paths for getting keystrokes to the terminal:
 
@@ -18,6 +18,6 @@ There are currently many distinct paths for getting keystrokes to the terminal:
 
 3. IME text. When the special character mappings fail, we pass the keystroke back to GPUI to hand it to the IME system. This comes back to us in the `View::replace_text_in_range()` method, and we then send that to the terminal directly, bypassing `try_keystroke()`.
 
-4. Pasted text has a separate pathway. 
+4. Pasted text has a separate pathway.
 
-Generally, there's a distinction between 'keystrokes that need to be mapped' and 'strings which need to be written'. I've attempted to unify these under the '.try_keystroke()' API and the `.input()` API (which try_keystroke uses) so we have consistent input handling across the terminal
\ No newline at end of file
+Generally, there's a distinction between 'keystrokes that need to be mapped' and 'strings which need to be written'. I've attempted to unify these under the '.try_keystroke()' API and the `.input()` API (which try_keystroke uses) so we have consistent input handling across the terminal
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index 2d394e3dcf8c127d48a010ce54c045d7d87a4aed..5d40032024b5f78758e25d6ba0a6e865c827cf5b 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -38,6 +38,7 @@ language_selector = { path = "../language_selector"}
 [dev-dependencies]
 indoc.workspace = true
 parking_lot.workspace = true
+futures.workspace = true
 
 editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
@@ -47,3 +48,4 @@ util = { path = "../util", features = ["test-support"] }
 settings = { path = "../settings" }
 workspace = { path = "../workspace", features = ["test-support"] }
 theme = { path = "../theme", features = ["test-support"] }
+lsp = { path = "../lsp", features = ["test-support"] }
diff --git a/crates/vim/src/editor_events.rs b/crates/vim/src/editor_events.rs
index 994a09aaf9439a57ed9e8cc6bd7682894d9edf19..da5c7d46eda3813c784eeff238c965528fb3cca3 100644
--- a/crates/vim/src/editor_events.rs
+++ b/crates/vim/src/editor_events.rs
@@ -34,6 +34,7 @@ fn focused(EditorFocused(editor): &EditorFocused, cx: &mut AppContext) {
 fn blurred(EditorBlurred(editor): &EditorBlurred, cx: &mut AppContext) {
     editor.window().update(cx, |cx| {
         Vim::update(cx, |vim, cx| {
+            vim.workspace_state.recording = false;
             if let Some(previous_editor) = vim.active_editor.clone() {
                 if previous_editor == editor.clone() {
                     vim.active_editor = None;
diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs
index 537f6a15f167718d7731d5c002916abf4a5510f7..9141a02ab3550c29262f235348e9beadfde15d9e 100644
--- a/crates/vim/src/insert.rs
+++ b/crates/vim/src/insert.rs
@@ -11,8 +11,9 @@ pub fn init(cx: &mut AppContext) {
 }
 
 fn normal_before(_: &mut Workspace, _: &NormalBefore, cx: &mut ViewContext<Workspace>) {
-    Vim::update(cx, |state, cx| {
-        state.update_active_editor(cx, |editor, cx| {
+    Vim::update(cx, |vim, cx| {
+        vim.stop_recording();
+        vim.update_active_editor(cx, |editor, cx| {
             editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
                 s.move_cursors_with(|map, mut cursor, _| {
                     *cursor.column_mut() = cursor.column().saturating_sub(1);
@@ -20,7 +21,7 @@ fn normal_before(_: &mut Workspace, _: &NormalBefore, cx: &mut ViewContext<Works
                 });
             });
         });
-        state.switch_mode(Mode::Normal, false, cx);
+        vim.switch_mode(Mode::Normal, false, cx);
     })
 }
 
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index ce1e4c3d6d50dfddda933be1fd3fe2f6bd448bbf..310883d1d69a8dac7f85eaa9908f89a6cb6379ac 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -2,6 +2,7 @@ mod case;
 mod change;
 mod delete;
 mod paste;
+mod repeat;
 mod scroll;
 mod search;
 pub mod substitute;
@@ -34,6 +35,7 @@ actions!(
     vim,
     [
         InsertAfter,
+        InsertBefore,
         InsertFirstNonWhitespace,
         InsertEndOfLine,
         InsertLineAbove,
@@ -48,28 +50,37 @@ actions!(
 );
 
 pub fn init(cx: &mut AppContext) {
+    paste::init(cx);
+    repeat::init(cx);
+    scroll::init(cx);
+    search::init(cx);
+    substitute::init(cx);
+
     cx.add_action(insert_after);
+    cx.add_action(insert_before);
     cx.add_action(insert_first_non_whitespace);
     cx.add_action(insert_end_of_line);
     cx.add_action(insert_line_above);
     cx.add_action(insert_line_below);
     cx.add_action(change_case);
-    substitute::init(cx);
-    search::init(cx);
+
     cx.add_action(|_: &mut Workspace, _: &DeleteLeft, cx| {
         Vim::update(cx, |vim, cx| {
+            vim.record_current_action();
             let times = vim.pop_number_operator(cx);
             delete_motion(vim, Motion::Left, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteRight, cx| {
         Vim::update(cx, |vim, cx| {
+            vim.record_current_action();
             let times = vim.pop_number_operator(cx);
             delete_motion(vim, Motion::Right, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &ChangeToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
+            vim.start_recording();
             let times = vim.pop_number_operator(cx);
             change_motion(
                 vim,
@@ -83,6 +94,7 @@ pub fn init(cx: &mut AppContext) {
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
+            vim.record_current_action();
             let times = vim.pop_number_operator(cx);
             delete_motion(
                 vim,
@@ -94,8 +106,6 @@ pub fn init(cx: &mut AppContext) {
             );
         })
     });
-    scroll::init(cx);
-    paste::init(cx);
 }
 
 pub fn normal_motion(
@@ -151,6 +161,7 @@ fn move_cursor(vim: &mut Vim, motion: Motion, times: Option<usize>, cx: &mut Win
 
 fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.start_recording();
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
@@ -162,12 +173,20 @@ fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext<Workspa
     });
 }
 
+fn insert_before(_: &mut Workspace, _: &InsertBefore, cx: &mut ViewContext<Workspace>) {
+    Vim::update(cx, |vim, cx| {
+        vim.start_recording();
+        vim.switch_mode(Mode::Insert, false, cx);
+    });
+}
+
 fn insert_first_non_whitespace(
     _: &mut Workspace,
     _: &InsertFirstNonWhitespace,
     cx: &mut ViewContext<Workspace>,
 ) {
     Vim::update(cx, |vim, cx| {
+        vim.start_recording();
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
@@ -184,6 +203,7 @@ fn insert_first_non_whitespace(
 
 fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.start_recording();
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
@@ -197,6 +217,7 @@ fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewConte
 
 fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.start_recording();
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
@@ -229,6 +250,7 @@ fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContex
 
 fn insert_line_below(_: &mut Workspace, _: &InsertLineBelow, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.start_recording();
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
@@ -260,6 +282,7 @@ fn insert_line_below(_: &mut Workspace, _: &InsertLineBelow, cx: &mut ViewContex
 
 pub(crate) fn normal_replace(text: Arc<str>, cx: &mut WindowContext) {
     Vim::update(cx, |vim, cx| {
+        vim.stop_recording();
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
                 editor.set_clip_at_line_ends(false, cx);
diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs
index 90967949bb99215ff25612b5d7c536a59369f19a..bca7af852db4b82958166f977c1b8d8816ae0f37 100644
--- a/crates/vim/src/normal/case.rs
+++ b/crates/vim/src/normal/case.rs
@@ -7,6 +7,7 @@ use crate::{normal::ChangeCase, state::Mode, Vim};
 
 pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.record_current_action();
         let count = vim.pop_number_operator(cx).unwrap_or(1) as u32;
         vim.update_active_editor(cx, |editor, cx| {
             let mut ranges = Vec::new();
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index 56fef78e1da3ce837fa6b5d9ae2a5e23fc4f3f26..ae85acaab55a5344281ebf8ad268f9ddc54b1f27 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -4,6 +4,7 @@ use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, Bias};
 use gpui::WindowContext;
 
 pub fn delete_motion(vim: &mut Vim, motion: Motion, times: Option<usize>, cx: &mut WindowContext) {
+    vim.stop_recording();
     vim.update_active_editor(cx, |editor, cx| {
         editor.transact(cx, |editor, cx| {
             editor.set_clip_at_line_ends(false, cx);
@@ -37,6 +38,7 @@ pub fn delete_motion(vim: &mut Vim, motion: Motion, times: Option<usize>, cx: &m
 }
 
 pub fn delete_object(vim: &mut Vim, object: Object, around: bool, cx: &mut WindowContext) {
+    vim.stop_recording();
     vim.update_active_editor(cx, |editor, cx| {
         editor.transact(cx, |editor, cx| {
             editor.set_clip_at_line_ends(false, cx);
diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs
index 3c437f91779ba27f2f2f36c555e6574b2158094b..db451cec12343576d8c275a13ae0238aba081dbf 100644
--- a/crates/vim/src/normal/paste.rs
+++ b/crates/vim/src/normal/paste.rs
@@ -28,6 +28,7 @@ pub(crate) fn init(cx: &mut AppContext) {
 
 fn paste(_: &mut Workspace, action: &Paste, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.record_current_action();
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
                 editor.set_clip_at_line_ends(false, cx);
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
new file mode 100644
index 0000000000000000000000000000000000000000..20b9966a41b9a4f22ab0d0fb71f19738abd4842c
--- /dev/null
+++ b/crates/vim/src/normal/repeat.rs
@@ -0,0 +1,200 @@
+use crate::{
+    state::{Mode, ReplayableAction},
+    Vim,
+};
+use gpui::{actions, AppContext};
+use workspace::Workspace;
+
+actions!(vim, [Repeat, EndRepeat,]);
+
+pub(crate) fn init(cx: &mut AppContext) {
+    cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| {
+        Vim::update(cx, |vim, cx| {
+            vim.workspace_state.replaying = false;
+            vim.switch_mode(Mode::Normal, false, cx)
+        });
+    });
+
+    cx.add_action(|_: &mut Workspace, _: &Repeat, cx| {
+        Vim::update(cx, |vim, cx| {
+            let actions = vim.workspace_state.repeat_actions.clone();
+            let Some(editor) = vim.active_editor.clone() else {
+                return;
+            };
+            if let Some(new_count) = vim.pop_number_operator(cx) {
+                vim.workspace_state.recorded_count = Some(new_count);
+            }
+            vim.workspace_state.replaying = true;
+
+            let window = cx.window();
+            cx.app_context()
+                .spawn(move |mut cx| async move {
+                    for action in actions {
+                        match action {
+                            ReplayableAction::Action(action) => window
+                                .dispatch_action(editor.id(), action.as_ref(), &mut cx)
+                                .ok_or_else(|| anyhow::anyhow!("window was closed")),
+                            ReplayableAction::Insertion {
+                                text,
+                                utf16_range_to_replace,
+                            } => editor.update(&mut cx, |editor, cx| {
+                                editor.replay_insert_event(
+                                    &text,
+                                    utf16_range_to_replace.clone(),
+                                    cx,
+                                )
+                            }),
+                        }?
+                    }
+                    window
+                        .dispatch_action(editor.id(), &EndRepeat, &mut cx)
+                        .ok_or_else(|| anyhow::anyhow!("window was closed"))
+                })
+                .detach_and_log_err(cx);
+        });
+    });
+}
+
+#[cfg(test)]
+mod test {
+    use std::sync::Arc;
+
+    use editor::test::editor_lsp_test_context::EditorLspTestContext;
+    use futures::StreamExt;
+    use indoc::indoc;
+
+    use gpui::{executor::Deterministic, View};
+
+    use crate::{
+        state::Mode,
+        test::{NeovimBackedTestContext, VimTestContext},
+    };
+
+    #[gpui::test]
+    async fn test_dot_repeat(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        // "o"
+        cx.set_shared_state("ˇhello").await;
+        cx.simulate_shared_keystrokes(["o", "w", "o", "r", "l", "d", "escape"])
+            .await;
+        cx.assert_shared_state("hello\nworlˇd").await;
+        cx.simulate_shared_keystrokes(["."]).await;
+        cx.assert_shared_state("hello\nworld\nworlˇd").await;
+
+        // "d"
+        cx.simulate_shared_keystrokes(["^", "d", "f", "o"]).await;
+        cx.simulate_shared_keystrokes(["g", "g", "."]).await;
+        cx.assert_shared_state("ˇ\nworld\nrld").await;
+
+        // "p" (note that it pastes the current clipboard)
+        cx.simulate_shared_keystrokes(["j", "y", "y", "p"]).await;
+        cx.simulate_shared_keystrokes(["shift-g", "y", "y", "."])
+            .await;
+        cx.assert_shared_state("\nworld\nworld\nrld\nˇrld").await;
+
+        // "~" (note that counts apply to the action taken, not . itself)
+        cx.set_shared_state("ˇthe quick brown fox").await;
+        cx.simulate_shared_keystrokes(["2", "~", "."]).await;
+        cx.set_shared_state("THE ˇquick brown fox").await;
+        cx.simulate_shared_keystrokes(["3", "."]).await;
+        cx.set_shared_state("THE QUIˇck brown fox").await;
+        cx.simulate_shared_keystrokes(["."]).await;
+        cx.set_shared_state("THE QUICK ˇbrown fox").await;
+    }
+
+    #[gpui::test]
+    async fn test_repeat_ime(deterministic: Arc<Deterministic>, cx: &mut gpui::TestAppContext) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        cx.set_state("hˇllo", Mode::Normal);
+        cx.simulate_keystrokes(["i"]);
+
+        // simulate brazilian input for ä.
+        cx.update_editor(|editor, cx| {
+            editor.replace_and_mark_text_in_range(None, "\"", Some(1..1), cx);
+            editor.replace_text_in_range(None, "ä", cx);
+        });
+        cx.simulate_keystrokes(["escape"]);
+        cx.assert_state("hˇällo", Mode::Normal);
+        cx.simulate_keystrokes(["."]);
+        deterministic.run_until_parked();
+        cx.assert_state("hˇäällo", Mode::Normal);
+    }
+
+    #[gpui::test]
+    async fn test_repeat_completion(
+        deterministic: Arc<Deterministic>,
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let cx = EditorLspTestContext::new_rust(
+            lsp::ServerCapabilities {
+                completion_provider: Some(lsp::CompletionOptions {
+                    trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
+                    resolve_provider: Some(true),
+                    ..Default::default()
+                }),
+                ..Default::default()
+            },
+            cx,
+        )
+        .await;
+        let mut cx = VimTestContext::new_with_lsp(cx, true);
+
+        cx.set_state(
+            indoc! {"
+            onˇe
+            two
+            three
+        "},
+            Mode::Normal,
+        );
+
+        let mut request =
+            cx.handle_request::<lsp::request::Completion, _, _>(move |_, params, _| async move {
+                let position = params.text_document_position.position;
+                Ok(Some(lsp::CompletionResponse::Array(vec![
+                    lsp::CompletionItem {
+                        label: "first".to_string(),
+                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                            range: lsp::Range::new(position.clone(), position.clone()),
+                            new_text: "first".to_string(),
+                        })),
+                        ..Default::default()
+                    },
+                    lsp::CompletionItem {
+                        label: "second".to_string(),
+                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                            range: lsp::Range::new(position.clone(), position.clone()),
+                            new_text: "second".to_string(),
+                        })),
+                        ..Default::default()
+                    },
+                ])))
+            });
+        cx.simulate_keystrokes(["a", "."]);
+        request.next().await;
+        cx.condition(|editor, _| editor.context_menu_visible())
+            .await;
+        cx.simulate_keystrokes(["down", "enter", "!", "escape"]);
+
+        cx.assert_state(
+            indoc! {"
+                one.secondˇ!
+                two
+                three
+            "},
+            Mode::Normal,
+        );
+        cx.simulate_keystrokes(["j", "."]);
+        deterministic.run_until_parked();
+        cx.assert_state(
+            indoc! {"
+                one.second!
+                two.secondˇ!
+                three
+            "},
+            Mode::Normal,
+        );
+    }
+}
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index aacd3d26e079515e19a48d870b76c3c4d69319af..0b4f19fe134e938d487663d9ff711778ebb925d7 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -1,4 +1,6 @@
-use gpui::keymap_matcher::KeymapContext;
+use std::{ops::Range, sync::Arc};
+
+use gpui::{keymap_matcher::KeymapContext, Action};
 use language::CursorShape;
 use serde::{Deserialize, Serialize};
 use workspace::searchable::Direction;
@@ -52,6 +54,36 @@ pub struct EditorState {
 pub struct WorkspaceState {
     pub search: SearchState,
     pub last_find: Option<Motion>,
+
+    pub recording: bool,
+    pub stop_recording_after_next_action: bool,
+    pub replaying: bool,
+    pub recorded_count: Option<usize>,
+    pub repeat_actions: Vec<ReplayableAction>,
+}
+
+#[derive(Debug)]
+pub enum ReplayableAction {
+    Action(Box<dyn Action>),
+    Insertion {
+        text: Arc<str>,
+        utf16_range_to_replace: Option<Range<isize>>,
+    },
+}
+
+impl Clone for ReplayableAction {
+    fn clone(&self) -> Self {
+        match self {
+            Self::Action(action) => Self::Action(action.boxed_clone()),
+            Self::Insertion {
+                text,
+                utf16_range_to_replace,
+            } => Self::Insertion {
+                text: text.clone(),
+                utf16_range_to_replace: utf16_range_to_replace.clone(),
+            },
+        }
+    }
 }
 
 #[derive(Clone)]
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index 9b0373957035213b6de019425f4484aaa647920a..7cee32037393e05e4b097826f71eaeb25f27bc65 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -3,7 +3,9 @@ use std::ops::{Deref, DerefMut};
 use editor::test::{
     editor_lsp_test_context::EditorLspTestContext, editor_test_context::EditorTestContext,
 };
+use futures::Future;
 use gpui::ContextHandle;
+use lsp::request;
 use search::{BufferSearchBar, ProjectSearchBar};
 
 use crate::{state::Operator, *};
@@ -124,6 +126,19 @@ impl<'a> VimTestContext<'a> {
         assert_eq!(self.mode(), mode_after, "{}", self.assertion_context());
         assert_eq!(self.active_operator(), None, "{}", self.assertion_context());
     }
+
+    pub fn handle_request<T, F, Fut>(
+        &self,
+        handler: F,
+    ) -> futures::channel::mpsc::UnboundedReceiver<()>
+    where
+        T: 'static + request::Request,
+        T::Params: 'static + Send,
+        F: 'static + Send + FnMut(lsp::Url, T::Params, gpui::AsyncAppContext) -> Fut,
+        Fut: 'static + Send + Future<Output = Result<T::Result>>,
+    {
+        self.cx.handle_request::<T, F, Fut>(handler)
+    }
 }
 
 impl<'a> Deref for VimTestContext<'a> {
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index da1c634682f1511c197cb32687502422606cf387..48d34d70940de76d208e644802bc9e6ca2b69f3d 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -25,10 +25,12 @@ use normal::normal_replace;
 use serde::Deserialize;
 use settings::{Setting, SettingsStore};
 use state::{EditorState, Mode, Operator, WorkspaceState};
-use std::sync::Arc;
+use std::{ops::Range, sync::Arc};
 use visual::{visual_block_motion, visual_replace};
 use workspace::{self, Workspace};
 
+use crate::state::ReplayableAction;
+
 struct VimModeSetting(bool);
 
 #[derive(Clone, Deserialize, PartialEq)]
@@ -102,6 +104,19 @@ pub fn observe_keystrokes(cx: &mut WindowContext) {
             return true;
         }
         if let Some(handled_by) = handled_by {
+            Vim::update(cx, |vim, _| {
+                if vim.workspace_state.recording {
+                    vim.workspace_state
+                        .repeat_actions
+                        .push(ReplayableAction::Action(handled_by.boxed_clone()));
+
+                    if vim.workspace_state.stop_recording_after_next_action {
+                        vim.workspace_state.recording = false;
+                        vim.workspace_state.stop_recording_after_next_action = false;
+                    }
+                }
+            });
+
             // Keystroke is handled by the vim system, so continue forward
             if handled_by.namespace() == "vim" {
                 return true;
@@ -156,7 +171,12 @@ impl Vim {
             }
             Event::InputIgnored { text } => {
                 Vim::active_editor_input_ignored(text.clone(), cx);
+                Vim::record_insertion(text, None, cx)
             }
+            Event::InputHandled {
+                text,
+                utf16_range_to_replace: range_to_replace,
+            } => Vim::record_insertion(text, range_to_replace.clone(), cx),
             _ => {}
         }));
 
@@ -176,6 +196,27 @@ impl Vim {
         self.sync_vim_settings(cx);
     }
 
+    fn record_insertion(
+        text: &Arc<str>,
+        range_to_replace: Option<Range<isize>>,
+        cx: &mut WindowContext,
+    ) {
+        Vim::update(cx, |vim, _| {
+            if vim.workspace_state.recording {
+                vim.workspace_state
+                    .repeat_actions
+                    .push(ReplayableAction::Insertion {
+                        text: text.clone(),
+                        utf16_range_to_replace: range_to_replace,
+                    });
+                if vim.workspace_state.stop_recording_after_next_action {
+                    vim.workspace_state.recording = false;
+                    vim.workspace_state.stop_recording_after_next_action = false;
+                }
+            }
+        });
+    }
+
     fn update_active_editor<S>(
         &self,
         cx: &mut WindowContext,
@@ -184,6 +225,36 @@ impl Vim {
         let editor = self.active_editor.clone()?.upgrade(cx)?;
         Some(editor.update(cx, update))
     }
+    // ~, shift-j, x, shift-x, p
+    // shift-c, shift-d, shift-i, i, a, o, shift-o, s
+    // c, d
+    // r
+
+    // TODO: shift-j?
+    //
+    pub fn start_recording(&mut self) {
+        if !self.workspace_state.replaying {
+            self.workspace_state.recording = true;
+            self.workspace_state.repeat_actions = Default::default();
+            self.workspace_state.recorded_count =
+                if let Some(Operator::Number(number)) = self.active_operator() {
+                    Some(number)
+                } else {
+                    None
+                }
+        }
+    }
+
+    pub fn stop_recording(&mut self) {
+        if self.workspace_state.recording {
+            self.workspace_state.stop_recording_after_next_action = true;
+        }
+    }
+
+    pub fn record_current_action(&mut self) {
+        self.start_recording();
+        self.stop_recording();
+    }
 
     fn switch_mode(&mut self, mode: Mode, leave_selections: bool, cx: &mut WindowContext) {
         let state = self.state();
@@ -247,6 +318,12 @@ impl Vim {
     }
 
     fn push_operator(&mut self, operator: Operator, cx: &mut WindowContext) {
+        if matches!(
+            operator,
+            Operator::Change | Operator::Delete | Operator::Replace
+        ) {
+            self.start_recording()
+        };
         self.update_state(|state| state.operator_stack.push(operator));
         self.sync_vim_settings(cx);
     }
@@ -272,6 +349,12 @@ impl Vim {
     }
 
     fn pop_number_operator(&mut self, cx: &mut WindowContext) -> Option<usize> {
+        if self.workspace_state.replaying {
+            if let Some(number) = self.workspace_state.recorded_count {
+                return Some(number);
+            }
+        }
+
         if let Some(Operator::Number(number)) = self.active_operator() {
             self.pop_operator(cx);
             return Some(number);
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index ee46a0d209f348f3fc25c2252ca9a8a06921fd68..b7ea0811f0a93ebec413e72bb5d088ab7ea8366f 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -277,6 +277,7 @@ pub fn other_end(_: &mut Workspace, _: &OtherEnd, cx: &mut ViewContext<Workspace
 
 pub fn delete(_: &mut Workspace, _: &VisualDelete, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
+        vim.record_current_action();
         vim.update_active_editor(cx, |editor, cx| {
             let mut original_columns: HashMap<_, _> = Default::default();
             let line_mode = editor.selections.line_mode;
@@ -339,6 +340,7 @@ pub fn yank(_: &mut Workspace, _: &VisualYank, cx: &mut ViewContext<Workspace>)
 
 pub(crate) fn visual_replace(text: Arc<str>, cx: &mut WindowContext) {
     Vim::update(cx, |vim, cx| {
+        vim.stop_recording();
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
                 let (display_map, selections) = editor.selections.all_adjusted_display(cx);
diff --git a/crates/vim/test_data/test_dot_repeat.json b/crates/vim/test_data/test_dot_repeat.json
new file mode 100644
index 0000000000000000000000000000000000000000..f1a1a3c138509420d6e0e92daf679fb347a6e673
--- /dev/null
+++ b/crates/vim/test_data/test_dot_repeat.json
@@ -0,0 +1,38 @@
+{"Put":{"state":"ˇhello"}}
+{"Key":"o"}
+{"Key":"w"}
+{"Key":"o"}
+{"Key":"r"}
+{"Key":"l"}
+{"Key":"d"}
+{"Key":"escape"}
+{"Get":{"state":"hello\nworlˇd","mode":"Normal"}}
+{"Key":"."}
+{"Get":{"state":"hello\nworld\nworlˇd","mode":"Normal"}}
+{"Key":"^"}
+{"Key":"d"}
+{"Key":"f"}
+{"Key":"o"}
+{"Key":"g"}
+{"Key":"g"}
+{"Key":"."}
+{"Get":{"state":"ˇ\nworld\nrld","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"y"}
+{"Key":"y"}
+{"Key":"p"}
+{"Key":"shift-g"}
+{"Key":"y"}
+{"Key":"y"}
+{"Key":"."}
+{"Get":{"state":"\nworld\nworld\nrld\nˇrld","mode":"Normal"}}
+{"Put":{"state":"ˇthe quick brown fox"}}
+{"Key":"2"}
+{"Key":"~"}
+{"Key":"."}
+{"Put":{"state":"THE ˇquick brown fox"}}
+{"Key":"3"}
+{"Key":"."}
+{"Put":{"state":"THE QUIˇck brown fox"}}
+{"Key":"."}
+{"Put":{"state":"THE QUICK ˇbrown fox"}}

From f22d53eef9198e64d7e1c72d7d3875af21727e26 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 6 Sep 2023 14:14:49 -0600
Subject: [PATCH 041/109] Make test more deterministic

Otherwise these pass only when --features=neovim is set
---
 crates/vim/src/normal/repeat.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index 20b9966a41b9a4f22ab0d0fb71f19738abd4842c..7f2b8c4434c7d2546eb9512b35154e0d1a89ee6a 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -71,7 +71,7 @@ mod test {
     };
 
     #[gpui::test]
-    async fn test_dot_repeat(cx: &mut gpui::TestAppContext) {
+    async fn test_dot_repeat(deterministic: Arc<Deterministic>, cx: &mut gpui::TestAppContext) {
         let mut cx = NeovimBackedTestContext::new(cx).await;
 
         // "o"
@@ -80,26 +80,33 @@ mod test {
             .await;
         cx.assert_shared_state("hello\nworlˇd").await;
         cx.simulate_shared_keystrokes(["."]).await;
+        deterministic.run_until_parked();
         cx.assert_shared_state("hello\nworld\nworlˇd").await;
 
         // "d"
         cx.simulate_shared_keystrokes(["^", "d", "f", "o"]).await;
         cx.simulate_shared_keystrokes(["g", "g", "."]).await;
+        deterministic.run_until_parked();
         cx.assert_shared_state("ˇ\nworld\nrld").await;
 
         // "p" (note that it pastes the current clipboard)
         cx.simulate_shared_keystrokes(["j", "y", "y", "p"]).await;
         cx.simulate_shared_keystrokes(["shift-g", "y", "y", "."])
             .await;
+        deterministic.run_until_parked();
         cx.assert_shared_state("\nworld\nworld\nrld\nˇrld").await;
 
         // "~" (note that counts apply to the action taken, not . itself)
         cx.set_shared_state("ˇthe quick brown fox").await;
         cx.simulate_shared_keystrokes(["2", "~", "."]).await;
+        deterministic.run_until_parked();
         cx.set_shared_state("THE ˇquick brown fox").await;
         cx.simulate_shared_keystrokes(["3", "."]).await;
+        deterministic.run_until_parked();
         cx.set_shared_state("THE QUIˇck brown fox").await;
+        deterministic.run_until_parked();
         cx.simulate_shared_keystrokes(["."]).await;
+        deterministic.run_until_parked();
         cx.set_shared_state("THE QUICK ˇbrown fox").await;
     }
 

From 5a778fbde6af3268f63a33819dbf09465f8bc294 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 6 Sep 2023 14:12:18 -0600
Subject: [PATCH 042/109] Checkpoint

---
 crates/editor/src/element.rs             |  30 ++---
 crates/gpui/src/elements/container.rs    | 163 ++++++++++++++++++++++-
 crates/gpui/src/elements/image.rs        |   6 +-
 crates/gpui/src/geometry.rs              |  66 +++++++--
 crates/gpui/src/platform/mac/renderer.rs |  18 ++-
 crates/gpui/src/scene.rs                 | 148 +-------------------
 crates/gpui2/src/style.rs                |  37 ++++-
 crates/theme/src/theme.rs                |   4 +-
 crates/workspace/src/pane_group.rs       |   2 +-
 9 files changed, 280 insertions(+), 194 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 743b8083541cbeffed718b6e51fe422ceee9ba98..9a6eb1116c1bcec556a35f875a9e0f046dbed54b 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -32,8 +32,8 @@ use gpui::{
     json::{self, ToJson},
     platform::{CursorStyle, Modifiers, MouseButton, MouseButtonEvent, MouseMovedEvent},
     text_layout::{self, Line, RunStyle, TextLayoutCache},
-    AnyElement, Axis, Border, CursorRegion, Element, EventContext, FontCache, LayoutContext,
-    MouseRegion, PaintContext, Quad, SceneBuilder, SizeConstraint, ViewContext, WindowContext,
+    AnyElement, Axis, CursorRegion, Element, EventContext, FontCache, LayoutContext, MouseRegion,
+    PaintContext, Quad, SceneBuilder, SizeConstraint, ViewContext, WindowContext,
 };
 use itertools::Itertools;
 use json::json;
@@ -539,13 +539,13 @@ impl EditorElement {
         scene.push_quad(Quad {
             bounds: gutter_bounds,
             background: Some(self.style.gutter_background),
-            border: Border::new(0., Color::transparent_black()),
+            border: Border::new(0., Color::transparent_black()).into(),
             corner_radii: Default::default(),
         });
         scene.push_quad(Quad {
             bounds: text_bounds,
             background: Some(self.style.background),
-            border: Border::new(0., Color::transparent_black()),
+            border: Border::new(0., Color::transparent_black()).into(),
             corner_radii: Default::default(),
         });
 
@@ -573,7 +573,7 @@ impl EditorElement {
                     scene.push_quad(Quad {
                         bounds: RectF::new(origin, size),
                         background: Some(self.style.active_line_background),
-                        border: Border::default(),
+                        border: Border::default().into(),
                         corner_radii: Default::default(),
                     });
                 }
@@ -593,7 +593,7 @@ impl EditorElement {
                 scene.push_quad(Quad {
                     bounds: RectF::new(origin, size),
                     background: Some(self.style.highlighted_line_background),
-                    border: Border::default(),
+                    border: Border::default().into(),
                     corner_radii: Default::default(),
                 });
             }
@@ -623,7 +623,7 @@ impl EditorElement {
                         vec2f(1., text_bounds.height()),
                     ),
                     background: Some(color),
-                    border: Border::new(0., Color::transparent_black()),
+                    border: Border::new(0., Color::transparent_black()).into(),
                     corner_radii: Default::default(),
                 });
             }
@@ -724,7 +724,7 @@ impl EditorElement {
                     scene.push_quad(Quad {
                         bounds: highlight_bounds,
                         background: Some(diff_style.modified),
-                        border: Border::new(0., Color::transparent_black()),
+                        border: Border::new(0., Color::transparent_black()).into(),
                         corner_radii: (1. * line_height).into(),
                     });
 
@@ -757,7 +757,7 @@ impl EditorElement {
                     scene.push_quad(Quad {
                         bounds: highlight_bounds,
                         background: Some(diff_style.deleted),
-                        border: Border::new(0., Color::transparent_black()),
+                        border: Border::new(0., Color::transparent_black()).into(),
                         corner_radii: (1. * line_height).into(),
                     });
 
@@ -779,7 +779,7 @@ impl EditorElement {
             scene.push_quad(Quad {
                 bounds: highlight_bounds,
                 background: Some(color),
-                border: Border::new(0., Color::transparent_black()),
+                border: Border::new(0., Color::transparent_black()).into(),
                 corner_radii: (diff_style.corner_radius * line_height).into(),
             });
         }
@@ -1149,7 +1149,7 @@ impl EditorElement {
         if layout.show_scrollbars {
             scene.push_quad(Quad {
                 bounds: track_bounds,
-                border: style.track.border,
+                border: style.track.border.into(),
                 background: style.track.background_color,
                 ..Default::default()
             });
@@ -1180,7 +1180,7 @@ impl EditorElement {
                     scene.push_quad(Quad {
                         bounds,
                         background: Some(color),
-                        border,
+                        border: border.into(),
                         corner_radii: style.thumb.corner_radii.into(),
                     })
                 };
@@ -1240,7 +1240,7 @@ impl EditorElement {
                     scene.push_quad(Quad {
                         bounds,
                         background: Some(color),
-                        border,
+                        border: border.into(),
                         corner_radii: style.thumb.corner_radii.into(),
                     })
                 }
@@ -1248,7 +1248,7 @@ impl EditorElement {
 
             scene.push_quad(Quad {
                 bounds: thumb_bounds,
-                border: style.thumb.border,
+                border: style.thumb.border.into(),
                 background: style.thumb.background_color,
                 corner_radii: style.thumb.corner_radii.into(),
             });
@@ -2891,7 +2891,7 @@ impl Cursor {
             scene.push_quad(Quad {
                 bounds,
                 background: None,
-                border: Border::all(1., self.color),
+                border: Border::all(1., self.color).into(),
                 corner_radii: Default::default(),
             });
         } else {
diff --git a/crates/gpui/src/elements/container.rs b/crates/gpui/src/elements/container.rs
index 9a590f3a5a5bedae21273011f237a2cce0c9eea3..82bf260fe15dfb8e29c7799a87f8a76d6f1ef6d3 100644
--- a/crates/gpui/src/elements/container.rs
+++ b/crates/gpui/src/elements/container.rs
@@ -9,7 +9,7 @@ use crate::{
     },
     json::ToJson,
     platform::CursorStyle,
-    scene::{self, Border, CornerRadii, CursorRegion, Quad},
+    scene::{self, CornerRadii, CursorRegion, Quad},
     AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
@@ -206,6 +206,163 @@ impl<V> Container<V> {
     }
 }
 
+#[derive(Copy, Clone, Debug, Default, JsonSchema)]
+pub struct Border {
+    pub color: Color,
+    pub width: f32,
+    pub overlay: bool,
+    pub top: bool,
+    pub bottom: bool,
+    pub left: bool,
+    pub right: bool,
+}
+
+impl Into<scene::Border> for Border {
+    fn into(self) -> scene::Border {
+        scene::Border {
+            color: self.color,
+            left: if self.left { self.width } else { 0.0 },
+            right: if self.right { self.width } else { 0.0 },
+            top: if self.top { self.width } else { 0.0 },
+            bottom: if self.bottom { self.width } else { 0.0 },
+        }
+    }
+}
+
+impl Border {
+    pub fn new(width: f32, color: Color) -> Self {
+        Self {
+            width,
+            color,
+            overlay: false,
+            top: false,
+            left: false,
+            bottom: false,
+            right: false,
+        }
+    }
+
+    pub fn all(width: f32, color: Color) -> Self {
+        Self {
+            width,
+            color,
+            overlay: false,
+            top: true,
+            left: true,
+            bottom: true,
+            right: true,
+        }
+    }
+
+    pub fn top(width: f32, color: Color) -> Self {
+        let mut border = Self::new(width, color);
+        border.top = true;
+        border
+    }
+
+    pub fn left(width: f32, color: Color) -> Self {
+        let mut border = Self::new(width, color);
+        border.left = true;
+        border
+    }
+
+    pub fn bottom(width: f32, color: Color) -> Self {
+        let mut border = Self::new(width, color);
+        border.bottom = true;
+        border
+    }
+
+    pub fn right(width: f32, color: Color) -> Self {
+        let mut border = Self::new(width, color);
+        border.right = true;
+        border
+    }
+
+    pub fn with_sides(mut self, top: bool, left: bool, bottom: bool, right: bool) -> Self {
+        self.top = top;
+        self.left = left;
+        self.bottom = bottom;
+        self.right = right;
+        self
+    }
+
+    pub fn top_width(&self) -> f32 {
+        if self.top {
+            self.width
+        } else {
+            0.0
+        }
+    }
+
+    pub fn left_width(&self) -> f32 {
+        if self.left {
+            self.width
+        } else {
+            0.0
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for Border {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        #[derive(Deserialize)]
+        struct BorderData {
+            pub width: f32,
+            pub color: Color,
+            #[serde(default)]
+            pub overlay: bool,
+            #[serde(default)]
+            pub top: bool,
+            #[serde(default)]
+            pub right: bool,
+            #[serde(default)]
+            pub bottom: bool,
+            #[serde(default)]
+            pub left: bool,
+        }
+
+        let data = BorderData::deserialize(deserializer)?;
+        let mut border = Border {
+            width: data.width,
+            color: data.color,
+            overlay: data.overlay,
+            top: data.top,
+            bottom: data.bottom,
+            left: data.left,
+            right: data.right,
+        };
+        if !border.top && !border.bottom && !border.left && !border.right {
+            border.top = true;
+            border.bottom = true;
+            border.left = true;
+            border.right = true;
+        }
+        Ok(border)
+    }
+}
+
+impl ToJson for Border {
+    fn to_json(&self) -> serde_json::Value {
+        let mut value = json!({});
+        if self.top {
+            value["top"] = json!(self.width);
+        }
+        if self.right {
+            value["right"] = json!(self.width);
+        }
+        if self.bottom {
+            value["bottom"] = json!(self.width);
+        }
+        if self.left {
+            value["left"] = json!(self.width);
+        }
+        value
+    }
+}
+
 impl<V: 'static> Element<V> for Container<V> {
     type LayoutState = ();
     type PaintState = ();
@@ -278,7 +435,7 @@ impl<V: 'static> Element<V> for Container<V> {
             scene.push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.overlay_color,
-                border: self.style.border,
+                border: self.style.border.into(),
                 corner_radii: self.style.corner_radii.into(),
             });
             scene.pop_layer();
@@ -286,7 +443,7 @@ impl<V: 'static> Element<V> for Container<V> {
             scene.push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.background_color,
-                border: self.style.border,
+                border: self.style.border.into(),
                 corner_radii: self.style.corner_radii.into(),
             });
 
diff --git a/crates/gpui/src/elements/image.rs b/crates/gpui/src/elements/image.rs
index 6723227efe4171bf5ccb8625c7f5fd3d4988395d..aabf5469371ba17f9e34784cfbff5c3c92eb8d96 100644
--- a/crates/gpui/src/elements/image.rs
+++ b/crates/gpui/src/elements/image.rs
@@ -1,11 +1,11 @@
-use super::constrain_size_preserving_aspect_ratio;
+use super::{constrain_size_preserving_aspect_ratio, Border};
 use crate::{
     geometry::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    scene, Border, Element, ImageData, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
+    scene, Element, ImageData, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
     ViewContext,
 };
 use schemars::JsonSchema;
@@ -102,7 +102,7 @@ impl<V: 'static> Element<V> for Image {
         if let Some(data) = layout {
             scene.push_image(scene::Image {
                 bounds,
-                border: self.style.border,
+                border: self.style.border.into(),
                 corner_radii: self.style.corner_radius.into(),
                 grayscale: self.style.grayscale,
                 data: data.clone(),
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index c6312b18c440bd7caf20f1396481c01a0cccc9c9..b05ec63f9714534c3b6bacc0c6b9421cc3e6cfac 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -230,7 +230,16 @@ pub struct Edges<T: Clone + Default> {
     pub left: T,
 }
 
-impl Edges<DefiniteLength> {
+impl Edges<Length> {
+    pub fn auto() -> Self {
+        Self {
+            top: Length::Auto,
+            right: Length::Auto,
+            bottom: Length::Auto,
+            left: Length::Auto,
+        }
+    }
+
     pub fn zero() -> Self {
         Self {
             top: pixels(0.),
@@ -240,7 +249,10 @@ impl Edges<DefiniteLength> {
         }
     }
 
-    pub fn to_taffy(&self, rem_size: f32) -> taffy::geometry::Rect<taffy::style::LengthPercentage> {
+    pub fn to_taffy(
+        &self,
+        rem_size: f32,
+    ) -> taffy::geometry::Rect<taffy::style::LengthPercentageAuto> {
         taffy::geometry::Rect {
             top: self.top.to_taffy(rem_size),
             right: self.right.to_taffy(rem_size),
@@ -250,16 +262,27 @@ impl Edges<DefiniteLength> {
     }
 }
 
-impl Edges<Length> {
-    pub fn auto() -> Self {
+impl Edges<DefiniteLength> {
+    pub fn zero() -> Self {
         Self {
-            top: Length::Auto,
-            right: Length::Auto,
-            bottom: Length::Auto,
-            left: Length::Auto,
+            top: pixels(0.),
+            right: pixels(0.),
+            bottom: pixels(0.),
+            left: pixels(0.),
         }
     }
 
+    pub fn to_taffy(&self, rem_size: f32) -> taffy::geometry::Rect<taffy::style::LengthPercentage> {
+        taffy::geometry::Rect {
+            top: self.top.to_taffy(rem_size),
+            right: self.right.to_taffy(rem_size),
+            bottom: self.bottom.to_taffy(rem_size),
+            left: self.left.to_taffy(rem_size),
+        }
+    }
+}
+
+impl Edges<AbsoluteLength> {
     pub fn zero() -> Self {
         Self {
             top: pixels(0.),
@@ -269,10 +292,7 @@ impl Edges<Length> {
         }
     }
 
-    pub fn to_taffy(
-        &self,
-        rem_size: f32,
-    ) -> taffy::geometry::Rect<taffy::style::LengthPercentageAuto> {
+    pub fn to_taffy(&self, rem_size: f32) -> taffy::geometry::Rect<taffy::style::LengthPercentage> {
         taffy::geometry::Rect {
             top: self.top.to_taffy(rem_size),
             right: self.right.to_taffy(rem_size),
@@ -280,6 +300,21 @@ impl Edges<Length> {
             left: self.left.to_taffy(rem_size),
         }
     }
+
+    pub fn to_pixels(&self, rem_size: f32) -> Edges<f32> {
+        Edges {
+            top: self.top.to_pixels(rem_size),
+            right: self.right.to_pixels(rem_size),
+            bottom: self.bottom.to_pixels(rem_size),
+            left: self.left.to_pixels(rem_size),
+        }
+    }
+}
+
+impl Edges<f32> {
+    pub fn is_empty(&self) -> bool {
+        self.top == 0.0 && self.right == 0.0 && self.bottom == 0.0 && self.left == 0.0
+    }
 }
 
 #[derive(Clone, Copy)]
@@ -295,6 +330,13 @@ impl AbsoluteLength {
             AbsoluteLength::Rems(rems) => rems * rem_size,
         }
     }
+
+    pub fn to_taffy(&self, rem_size: f32) -> taffy::style::LengthPercentage {
+        match self {
+            AbsoluteLength::Pixels(pixels) => taffy::style::LengthPercentage::Length(*pixels),
+            AbsoluteLength::Rems(rems) => taffy::style::LengthPercentage::Length(rems * rem_size),
+        }
+    }
 }
 
 impl Default for AbsoluteLength {
diff --git a/crates/gpui/src/platform/mac/renderer.rs b/crates/gpui/src/platform/mac/renderer.rs
index 5fe9e34ee484ba1b4285e430eeb6f519cbce7b9c..55ec3e9e9a2f3f72c03103adf045721105d3da83 100644
--- a/crates/gpui/src/platform/mac/renderer.rs
+++ b/crates/gpui/src/platform/mac/renderer.rs
@@ -577,7 +577,6 @@ impl Renderer {
         };
         for (ix, quad) in quads.iter().enumerate() {
             let bounds = quad.bounds * scale_factor;
-            let border_width = quad.border.width * scale_factor;
             let shader_quad = shaders::GPUIQuad {
                 origin: bounds.origin().round().to_float2(),
                 size: bounds.size().round().to_float2(),
@@ -585,10 +584,10 @@ impl Renderer {
                     .background
                     .unwrap_or_else(Color::transparent_black)
                     .to_uchar4(),
-                border_top: border_width * (quad.border.top as usize as f32),
-                border_right: border_width * (quad.border.right as usize as f32),
-                border_bottom: border_width * (quad.border.bottom as usize as f32),
-                border_left: border_width * (quad.border.left as usize as f32),
+                border_top: quad.border.top * scale_factor,
+                border_right: quad.border.right * scale_factor,
+                border_bottom: quad.border.bottom * scale_factor,
+                border_left: quad.border.left * scale_factor,
                 border_color: quad.border.color.to_uchar4(),
                 corner_radius_top_left: quad.corner_radii.top_left * scale_factor,
                 corner_radius_top_right: quad.corner_radii.top_right * scale_factor,
@@ -746,7 +745,6 @@ impl Renderer {
             let origin = image.bounds.origin() * scale_factor;
             let target_size = image.bounds.size() * scale_factor;
             let corner_radii = image.corner_radii * scale_factor;
-            let border_width = image.border.width * scale_factor;
             let (alloc_id, atlas_bounds) = self.image_cache.render(&image.data);
             images_by_atlas
                 .entry(alloc_id.atlas_id)
@@ -756,10 +754,10 @@ impl Renderer {
                     target_size: target_size.to_float2(),
                     source_size: atlas_bounds.size().to_float2(),
                     atlas_origin: atlas_bounds.origin().to_float2(),
-                    border_top: border_width * (image.border.top as usize as f32),
-                    border_right: border_width * (image.border.right as usize as f32),
-                    border_bottom: border_width * (image.border.bottom as usize as f32),
-                    border_left: border_width * (image.border.left as usize as f32),
+                    border_top: image.border.top * scale_factor,
+                    border_right: image.border.right * scale_factor,
+                    border_bottom: image.border.bottom * scale_factor,
+                    border_left: image.border.left * scale_factor,
                     border_color: image.border.color.to_uchar4(),
                     corner_radius_top_left: corner_radii.top_left,
                     corner_radius_top_right: corner_radii.top_right,
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index 3beb60a9fe4427996b5d15533695441128bcd453..e8b9936d8109c6c3acf22d156e8f360034218f16 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -8,7 +8,6 @@ use derive_more::Mul;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde_derive::Serialize;
-use serde_json::json;
 use std::{
     any::{Any, TypeId},
     borrow::Cow,
@@ -20,7 +19,6 @@ use crate::{
     color::Color,
     fonts::{FontId, GlyphId},
     geometry::{rect::RectF, vector::Vector2F},
-    json::ToJson,
     platform::{current::Surface, CursorStyle},
     ImageData, WindowContext,
 };
@@ -171,15 +169,13 @@ pub struct Icon {
     pub color: Color,
 }
 
-#[derive(Clone, Copy, Default, Debug, JsonSchema)]
+#[derive(Clone, Copy, Default, Debug)]
 pub struct Border {
-    pub width: f32,
     pub color: Color,
-    pub overlay: bool,
-    pub top: bool,
-    pub right: bool,
-    pub bottom: bool,
-    pub left: bool,
+    pub top: f32,
+    pub right: f32,
+    pub bottom: f32,
+    pub left: f32,
 }
 
 #[derive(Clone, Copy, Default, Debug)]
@@ -191,47 +187,6 @@ pub struct Underline {
     pub squiggly: bool,
 }
 
-impl<'de> Deserialize<'de> for Border {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        struct BorderData {
-            pub width: f32,
-            pub color: Color,
-            #[serde(default)]
-            pub overlay: bool,
-            #[serde(default)]
-            pub top: bool,
-            #[serde(default)]
-            pub right: bool,
-            #[serde(default)]
-            pub bottom: bool,
-            #[serde(default)]
-            pub left: bool,
-        }
-
-        let data = BorderData::deserialize(deserializer)?;
-        let mut border = Border {
-            width: data.width,
-            color: data.color,
-            overlay: data.overlay,
-            top: data.top,
-            bottom: data.bottom,
-            left: data.left,
-            right: data.right,
-        };
-        if !border.top && !border.bottom && !border.left && !border.right {
-            border.top = true;
-            border.bottom = true;
-            border.left = true;
-            border.right = true;
-        }
-        Ok(border)
-    }
-}
-
 #[derive(Debug)]
 pub struct Path {
     pub bounds: RectF,
@@ -606,99 +561,6 @@ impl Layer {
     }
 }
 
-impl Border {
-    pub fn new(width: f32, color: Color) -> Self {
-        Self {
-            width,
-            color,
-            overlay: false,
-            top: false,
-            left: false,
-            bottom: false,
-            right: false,
-        }
-    }
-
-    pub fn all(width: f32, color: Color) -> Self {
-        Self {
-            width,
-            color,
-            overlay: false,
-            top: true,
-            left: true,
-            bottom: true,
-            right: true,
-        }
-    }
-
-    pub fn top(width: f32, color: Color) -> Self {
-        let mut border = Self::new(width, color);
-        border.top = true;
-        border
-    }
-
-    pub fn left(width: f32, color: Color) -> Self {
-        let mut border = Self::new(width, color);
-        border.left = true;
-        border
-    }
-
-    pub fn bottom(width: f32, color: Color) -> Self {
-        let mut border = Self::new(width, color);
-        border.bottom = true;
-        border
-    }
-
-    pub fn right(width: f32, color: Color) -> Self {
-        let mut border = Self::new(width, color);
-        border.right = true;
-        border
-    }
-
-    pub fn with_sides(mut self, top: bool, left: bool, bottom: bool, right: bool) -> Self {
-        self.top = top;
-        self.left = left;
-        self.bottom = bottom;
-        self.right = right;
-        self
-    }
-
-    pub fn top_width(&self) -> f32 {
-        if self.top {
-            self.width
-        } else {
-            0.0
-        }
-    }
-
-    pub fn left_width(&self) -> f32 {
-        if self.left {
-            self.width
-        } else {
-            0.0
-        }
-    }
-}
-
-impl ToJson for Border {
-    fn to_json(&self) -> serde_json::Value {
-        let mut value = json!({});
-        if self.top {
-            value["top"] = json!(self.width);
-        }
-        if self.right {
-            value["right"] = json!(self.width);
-        }
-        if self.bottom {
-            value["bottom"] = json!(self.width);
-        }
-        if self.left {
-            value["left"] = json!(self.width);
-        }
-        value
-    }
-}
-
 impl MouseRegion {
     pub fn id(&self) -> MouseRegionId {
         self.id
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index a0797fcb2a2a292ab06623cd1dbb4bf48b16702d..90b8cdf49b02356e4f31a7c311733106835f58d1 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -16,7 +16,7 @@ use gpui::{
         rect::RectF, relative, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length,
         Point, PointRefinement, Size, SizeRefinement,
     },
-    taffy, WindowContext,
+    scene, taffy, WindowContext,
 };
 use gpui2_macros::styleable_helpers;
 use refineable::{Refineable, RefinementCascade};
@@ -63,7 +63,7 @@ pub struct Style {
     pub padding: Edges<DefiniteLength>,
     /// How large should the border be on each side?
     #[refineable]
-    pub border: Edges<DefiniteLength>,
+    pub border_widths: Edges<AbsoluteLength>,
 
     // Alignment properties
     /// How this node's children aligned in the cross/block axis?
@@ -92,6 +92,10 @@ pub struct Style {
 
     /// The fill color of this element
     pub fill: Option<Fill>,
+
+    /// The border color of this element
+    pub border_color: Option<Hsla>,
+
     /// The radius of the corners of this element
     #[refineable]
     pub corner_radii: CornerRadii,
@@ -143,7 +147,7 @@ impl Style {
             aspect_ratio: self.aspect_ratio,
             margin: self.margin.to_taffy(rem_size),
             padding: self.padding.to_taffy(rem_size),
-            border: self.border.to_taffy(rem_size),
+            border: self.border_widths.to_taffy(rem_size),
             align_items: self.align_items,
             align_self: self.align_self,
             align_content: self.align_content,
@@ -159,7 +163,6 @@ impl Style {
     }
 
     /// Paints the background of an element styled with this style.
-    /// Return the bounds in which to paint the content.
     pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
         let rem_size = cx.rem_size();
         if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
@@ -171,6 +174,29 @@ impl Style {
             });
         }
     }
+
+    /// Paints the foreground of an element styled with this style.
+    pub fn paint_foreground<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
+        let rem_size = cx.rem_size();
+
+        if let Some(color) = self.border_color {
+            let border = self.border_widths.to_pixels(rem_size);
+            if !border.is_empty() {
+                cx.scene.push_quad(gpui::Quad {
+                    bounds,
+                    background: None,
+                    corner_radii: self.corner_radii.to_gpui(rem_size),
+                    border: scene::Border {
+                        color: color.into(),
+                        top: border.top,
+                        right: border.right,
+                        bottom: border.bottom,
+                        left: border.left,
+                    },
+                });
+            }
+        }
+    }
 }
 
 impl Default for Style {
@@ -186,7 +212,7 @@ impl Default for Style {
             inset: Edges::auto(),
             margin: Edges::<Length>::zero(),
             padding: Edges::<DefiniteLength>::zero(),
-            border: Edges::<DefiniteLength>::zero(),
+            border_widths: Edges::<AbsoluteLength>::zero(),
             size: Size::auto(),
             min_size: Size::auto(),
             max_size: Size::auto(),
@@ -204,6 +230,7 @@ impl Default for Style {
             flex_shrink: 1.0,
             flex_basis: Length::Auto,
             fill: None,
+            border_color: None,
             corner_radii: CornerRadii::default(),
             text_color: None,
             font_size: Some(1.),
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index 5699f8df40de74ad91903cf00b34fcf1f7f47d7f..8edd795ffc4aa4f1a4aac5e554108b2041e32061 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -6,9 +6,9 @@ pub mod ui;
 use components::{action_button::ButtonStyle, disclosure::DisclosureStyle, ToggleIconButtonStyle};
 use gpui::{
     color::Color,
-    elements::{ContainerStyle, ImageStyle, LabelStyle, Shadow, SvgStyle, TooltipStyle},
+    elements::{Border, ContainerStyle, ImageStyle, LabelStyle, Shadow, SvgStyle, TooltipStyle},
     fonts::{HighlightStyle, TextStyle},
-    platform, AppContext, AssetSource, Border, MouseState,
+    platform, AppContext, AssetSource, MouseState,
 };
 use parking_lot::Mutex;
 use schemars::JsonSchema;
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 93fb484214fc181d4636845cf1e00a19760b2fb3..aa6ca143dfc4b982f8d458e19112edfe47c13387 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -9,7 +9,7 @@ use gpui::{
     elements::*,
     geometry::{rect::RectF, vector::Vector2F},
     platform::{CursorStyle, MouseButton},
-    AnyViewHandle, Axis, Border, ModelHandle, ViewContext, ViewHandle,
+    AnyViewHandle, Axis, ModelHandle, ViewContext, ViewHandle,
 };
 use project::Project;
 use serde::Deserialize;

From 46451f2a8b2f5462c2acba95f49bce813ad14372 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 6 Sep 2023 14:31:44 -0600
Subject: [PATCH 043/109] Render borders in gpui2 divs

---
 crates/gpui2/src/elements/div.rs             |  1 +
 crates/gpui2/src/style.rs                    |  9 +++
 crates/gpui2_macros/src/styleable_helpers.rs | 85 +++++++++++++++++---
 crates/storybook/src/collab_panel.rs         |  6 +-
 4 files changed, 90 insertions(+), 11 deletions(-)

diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index baf816ab77771e52cc71329d837b520dc2c71b51..081b4f65a3ae1f09e303877688eb66d898355ca1 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -73,6 +73,7 @@ impl<V: 'static> Element<V> for Div<V> {
         for child in &mut self.children {
             child.paint(view, layout.bounds.origin(), cx);
         }
+        style.paint_foreground(layout.bounds, cx);
         if pop_text_style {
             cx.pop_text_style();
         }
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 90b8cdf49b02356e4f31a7c311733106835f58d1..5ec08123929ac3d376ac6deb5ecdf8c7f013de6a 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -477,6 +477,15 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
+    fn border_color<C>(mut self, border_color: C) -> Self
+    where
+        C: Into<Hsla>,
+        Self: Sized,
+    {
+        self.declared_style().border_color = Some(border_color.into());
+        self
+    }
+
     fn text_color<C>(mut self, color: C) -> Self
     where
         C: Into<Hsla>,
diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index 04c4681ae6d98a907248c095be7c996d2e8d7075..41a7008fc16efb3ed5b3f1176a9d1821ec15bf01 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -27,8 +27,8 @@ pub fn styleable_helpers(input: TokenStream) -> TokenStream {
 fn generate_methods() -> Vec<TokenStream2> {
     let mut methods = Vec::new();
 
-    for (prefix, auto_allowed, fields) in tailwind_length_prefixes() {
-        for (suffix, length_tokens) in tailwind_lengths() {
+    for (prefix, auto_allowed, fields) in box_prefixes() {
+        for (suffix, length_tokens) in box_suffixes() {
             if auto_allowed || suffix != "auto" {
                 let method = generate_method(prefix, suffix, &fields, length_tokens);
                 methods.push(method);
@@ -36,13 +36,20 @@ fn generate_methods() -> Vec<TokenStream2> {
         }
     }
 
-    for (prefix, fields) in tailwind_corner_prefixes() {
-        for (suffix, radius_tokens) in tailwind_corner_radii() {
+    for (prefix, fields) in corner_prefixes() {
+        for (suffix, radius_tokens) in corner_suffixes() {
             let method = generate_method(prefix, suffix, &fields, radius_tokens);
             methods.push(method);
         }
     }
 
+    for (prefix, fields) in border_prefixes() {
+        for (suffix, width_tokens) in border_suffixes() {
+            let method = generate_method(prefix, suffix, &fields, width_tokens);
+            methods.push(method);
+        }
+    }
+
     methods
 }
 
@@ -52,7 +59,12 @@ fn generate_method(
     fields: &Vec<TokenStream2>,
     length_tokens: TokenStream2,
 ) -> TokenStream2 {
-    let method_name = format_ident!("{}_{}", prefix, suffix);
+    let method_name = if suffix.is_empty() {
+        format_ident!("{}", prefix)
+    } else {
+        format_ident!("{}_{}", prefix, suffix)
+    };
+
     let field_assignments = fields
         .iter()
         .map(|field_tokens| {
@@ -73,7 +85,7 @@ fn generate_method(
     method
 }
 
-fn tailwind_length_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
+fn box_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
     vec![
         ("w", true, vec![quote! { size.width }]),
         ("h", true, vec![quote! { size.height }]),
@@ -133,7 +145,7 @@ fn tailwind_length_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
     ]
 }
 
-fn tailwind_lengths() -> Vec<(&'static str, TokenStream2)> {
+fn box_suffixes() -> Vec<(&'static str, TokenStream2)> {
     vec![
         ("0", quote! { pixels(0.) }),
         ("0p5", quote! { rems(0.125) }),
@@ -185,7 +197,7 @@ fn tailwind_lengths() -> Vec<(&'static str, TokenStream2)> {
     ]
 }
 
-fn tailwind_corner_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
+fn corner_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
     vec![
         (
             "rounded",
@@ -231,7 +243,7 @@ fn tailwind_corner_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
     ]
 }
 
-fn tailwind_corner_radii() -> Vec<(&'static str, TokenStream2)> {
+fn corner_suffixes() -> Vec<(&'static str, TokenStream2)> {
     vec![
         ("none", quote! { pixels(0.) }),
         ("sm", quote! { rems(0.125) }),
@@ -243,3 +255,58 @@ fn tailwind_corner_radii() -> Vec<(&'static str, TokenStream2)> {
         ("full", quote! {  pixels(9999.) }),
     ]
 }
+
+fn border_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
+    vec![
+        (
+            "border",
+            vec![
+                quote! { border_widths.top },
+                quote! { border_widths.right },
+                quote! { border_widths.bottom },
+                quote! { border_widths.left },
+            ],
+        ),
+        ("border_t", vec![quote! { border_widths.top }]),
+        ("border_b", vec![quote! { border_widths.bottom }]),
+        ("border_r", vec![quote! { border_widths.right }]),
+        ("border_l", vec![quote! { border_widths.left }]),
+        (
+            "border_x",
+            vec![
+                quote! { border_widths.left },
+                quote! { border_widths.right },
+            ],
+        ),
+        (
+            "border_y",
+            vec![
+                quote! { border_widths.top },
+                quote! { border_widths.bottom },
+            ],
+        ),
+    ]
+}
+
+fn border_suffixes() -> Vec<(&'static str, TokenStream2)> {
+    vec![
+        ("", quote! { pixels(1.) }),
+        ("0", quote! { pixels(0.) }),
+        ("1", quote! { pixels(1.) }),
+        ("2", quote! { pixels(2.) }),
+        ("3", quote! { pixels(3.) }),
+        ("4", quote! { pixels(4.) }),
+        ("5", quote! { pixels(5.) }),
+        ("6", quote! { pixels(6.) }),
+        ("7", quote! { pixels(7.) }),
+        ("8", quote! { pixels(8.) }),
+        ("9", quote! { pixels(9.) }),
+        ("10", quote! { pixels(10.) }),
+        ("11", quote! { pixels(11.) }),
+        ("12", quote! { pixels(12.) }),
+        ("16", quote! { pixels(16.) }),
+        ("20", quote! { pixels(20.) }),
+        ("24", quote! { pixels(24.) }),
+        ("32", quote! { pixels(32.) }),
+    ]
+}
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 429529b3c18c22414810d06a1f8d15c52e045754..0b5f15cdbe9cf3d2ae27aa8db1b91f9034444016 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -28,7 +28,8 @@ impl<V: 'static> CollabPanelElement<V> {
             .flex_col()
             .font("Zed Sans Extended")
             .text_color(theme.middle.base.default.foreground)
-            // .border_color(theme.middle.base.default.border)
+            .border_color(theme.middle.base.default.border)
+            .border()
             .fill(theme.middle.base.default.background)
             .child(
                 div()
@@ -40,7 +41,8 @@ impl<V: 'static> CollabPanelElement<V> {
                         div()
                             .fill(theme.lowest.base.default.background)
                             .pb_1()
-                            // .border_b()
+                            .border_color(theme.lowest.base.default.border)
+                            .border_b()
                             //:: https://tailwindcss.com/docs/hover-focus-and-other-states#styling-based-on-parent-state
                             // .group()
                             // List Section Header

From 6d4dd0e7a4dae10edeea7c39cf9dc72c1ef26adc Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 6 Sep 2023 15:22:29 -0600
Subject: [PATCH 044/109] Checkpoint

---
 Cargo.lock                              |   1 +
 crates/gpui/Cargo.toml                  |   1 +
 crates/gpui/src/app.rs                  |  11 ++-
 crates/gpui/src/app/test_app_context.rs |   1 +
 crates/gpui/src/gpui.rs                 |   1 +
 crates/gpui/src/image_cache.rs          | 111 ++++++++++++++++++++++++
 crates/gpui2/src/elements/text.rs       |   2 +-
 crates/gpui2/src/gpui2.rs               |   3 +-
 crates/{gpui2 => util}/src/arc_cow.rs   |  10 +++
 crates/util/src/http.rs                 |   2 +-
 crates/util/src/util.rs                 |  17 +++-
 11 files changed, 151 insertions(+), 9 deletions(-)
 create mode 100644 crates/gpui/src/image_cache.rs
 rename crates/{gpui2 => util}/src/arc_cow.rs (80%)

diff --git a/Cargo.lock b/Cargo.lock
index 1906aeb6ab97cd62f8606f350ea8e32bbaff2a66..cf14fcf989e0d75e805ae8db43f5d1b6eb4442a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3162,6 +3162,7 @@ dependencies = [
  "sqlez",
  "sum_tree",
  "taffy",
+ "thiserror",
  "time 0.3.27",
  "tiny-skia",
  "usvg",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index a77c9e2237bdc372f24c27fdec3dd991d51daef2..705feb351d170efdd845537a24bd9b6c219ef08e 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -49,6 +49,7 @@ serde_json.workspace = true
 smallvec.workspace = true
 smol.workspace = true
 taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "4fb530bdd71609bb1d3f76c6a8bde1ba82805d5e" }
+thiserror.workspace = true
 time.workspace = true
 tiny-skia = "0.5"
 usvg = { version = "0.14", features = [] }
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index dda02fa4d6d3dc569e73ee09a333602d42993078..68b42f6e6e4ecd2fb870aaf87c93a20915323acc 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -10,6 +10,7 @@ mod window_input_handler;
 use crate::{
     elements::{AnyElement, AnyRootElement, RootElement},
     executor::{self, Task},
+    image_cache::ImageCache,
     json,
     keymap_matcher::{self, Binding, KeymapContext, KeymapMatcher, Keystroke, MatchResult},
     platform::{
@@ -50,7 +51,10 @@ use std::{
 };
 #[cfg(any(test, feature = "test-support"))]
 pub use test_app_context::{ContextHandle, TestAppContext};
-use util::ResultExt;
+use util::{
+    http::{self, HttpClient},
+    ResultExt,
+};
 use uuid::Uuid;
 pub use window::MeasureParams;
 use window_input_handler::WindowInputHandler;
@@ -154,12 +158,14 @@ impl App {
         let platform = platform::current::platform();
         let foreground = Rc::new(executor::Foreground::platform(platform.dispatcher())?);
         let foreground_platform = platform::current::foreground_platform(foreground.clone());
+        let http_client = http::client();
         let app = Self(Rc::new(RefCell::new(AppContext::new(
             foreground,
             Arc::new(executor::Background::new()),
             platform.clone(),
             foreground_platform.clone(),
             Arc::new(FontCache::new(platform.fonts())),
+            http_client,
             Default::default(),
             asset_source,
         ))));
@@ -456,6 +462,7 @@ pub struct AppContext {
     pub asset_cache: Arc<AssetCache>,
     font_system: Arc<dyn FontSystem>,
     pub font_cache: Arc<FontCache>,
+    pub image_cache: Arc<ImageCache>,
     action_deserializers: HashMap<&'static str, (TypeId, DeserializeActionCallback)>,
     capture_actions: HashMap<TypeId, HashMap<TypeId, Vec<Box<ActionCallback>>>>,
     // Entity Types -> { Action Types -> Action Handlers }
@@ -499,6 +506,7 @@ impl AppContext {
         platform: Arc<dyn platform::Platform>,
         foreground_platform: Rc<dyn platform::ForegroundPlatform>,
         font_cache: Arc<FontCache>,
+        http_client: Arc<dyn HttpClient>,
         ref_counts: RefCounts,
         asset_source: impl AssetSource,
     ) -> Self {
@@ -517,6 +525,7 @@ impl AppContext {
             platform,
             foreground_platform,
             font_cache,
+            image_cache: Arc::new(ImageCache::new(http_client)),
             asset_cache: Arc::new(AssetCache::new(asset_source)),
             action_deserializers: Default::default(),
             capture_actions: Default::default(),
diff --git a/crates/gpui/src/app/test_app_context.rs b/crates/gpui/src/app/test_app_context.rs
index 6d593c2e7247d6d6005b32320b2b4dd235b4cac8..0dc1d1eba437fb67beddbde47bd10bc497ed928a 100644
--- a/crates/gpui/src/app/test_app_context.rs
+++ b/crates/gpui/src/app/test_app_context.rs
@@ -57,6 +57,7 @@ impl TestAppContext {
             platform,
             foreground_platform.clone(),
             font_cache,
+            util::http::FakeHttpClient::with_404_response(),
             RefCounts::new(leak_detector),
             (),
         );
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 74a50e9e64cae2e4f27c9adbdb7ada000e284f9d..0139f6e4e002e04b196063ee17553f733a164d7a 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -1,4 +1,5 @@
 mod app;
+mod image_cache;
 pub use app::*;
 mod assets;
 #[cfg(any(test, feature = "test-support"))]
diff --git a/crates/gpui/src/image_cache.rs b/crates/gpui/src/image_cache.rs
new file mode 100644
index 0000000000000000000000000000000000000000..77195c493faa17075e71e1b5625c25e51bd0ba2d
--- /dev/null
+++ b/crates/gpui/src/image_cache.rs
@@ -0,0 +1,111 @@
+use std::sync::Arc;
+
+use crate::ImageData;
+use collections::HashMap;
+use futures::{
+    future::{BoxFuture, Shared},
+    AsyncReadExt, FutureExt,
+};
+use image::ImageError;
+use parking_lot::Mutex;
+use thiserror::Error;
+use util::{
+    arc_cow::ArcCow,
+    defer,
+    http::{self, HttpClient},
+};
+
+#[derive(Debug, Error, Clone)]
+pub enum Error {
+    #[error("http error: {0}")]
+    Client(#[from] http::Error),
+    #[error("IO error: {0}")]
+    Io(Arc<std::io::Error>),
+    #[error("unexpected http status: {status}, body: {body}")]
+    BadStatus {
+        status: http::StatusCode,
+        body: String,
+    },
+    #[error("image error: {0}")]
+    Image(Arc<ImageError>),
+}
+
+impl From<std::io::Error> for Error {
+    fn from(error: std::io::Error) -> Self {
+        Error::Io(Arc::new(error))
+    }
+}
+
+impl From<ImageError> for Error {
+    fn from(error: ImageError) -> Self {
+        Error::Image(Arc::new(error))
+    }
+}
+
+pub struct ImageCache {
+    client: Arc<dyn HttpClient>,
+    images: Arc<
+        Mutex<
+            HashMap<
+                ArcCow<'static, str>,
+                Shared<BoxFuture<'static, Result<Arc<ImageData>, Error>>>,
+            >,
+        >,
+    >,
+}
+
+impl ImageCache {
+    pub fn new(client: Arc<dyn HttpClient>) -> Self {
+        ImageCache {
+            client,
+            images: Default::default(),
+        }
+    }
+
+    pub fn get(
+        &self,
+        uri: ArcCow<'static, str>,
+    ) -> Shared<BoxFuture<'static, Result<Arc<ImageData>, Error>>> {
+        match self.images.lock().get(uri.as_ref()) {
+            Some(future) => future.clone(),
+            None => {
+                let client = self.client.clone();
+                let images = self.images.clone();
+                let future = {
+                    let uri = uri.clone();
+                    async move {
+                        // If we error, remove the cached future. Otherwise we cancel before returning.
+                        let remove_cached_future = defer({
+                            let uri = uri.clone();
+                            move || {
+                                images.lock().remove(uri.as_ref());
+                            }
+                        });
+
+                        let mut response = client.get(uri.as_ref(), ().into(), true).await?;
+                        let mut body = Vec::new();
+                        response.body_mut().read_to_end(&mut body).await?;
+
+                        if !response.status().is_success() {
+                            return Err(Error::BadStatus {
+                                status: response.status(),
+                                body: String::from_utf8_lossy(&body).into_owned(),
+                            });
+                        }
+
+                        let format = image::guess_format(&body)?;
+                        let image =
+                            image::load_from_memory_with_format(&body, format)?.into_bgra8();
+
+                        remove_cached_future.cancel();
+                        Ok(ImageData::new(image))
+                    }
+                }
+                .boxed()
+                .shared();
+                self.images.lock().insert(uri.clone(), future.clone());
+                future
+            }
+        }
+    }
+}
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 545ca508730f46ce1ea5073b24a47dc2a440568f..4ef05e0e8e15069c5107ec3ec2b97ee770baebb7 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -2,12 +2,12 @@ use crate::{
     element::{Element, IntoElement, Layout},
     layout_context::LayoutContext,
     paint_context::PaintContext,
-    ArcCow,
 };
 use anyhow::Result;
 use gpui::{geometry::Size, text_layout::LineLayout, LayoutId};
 use parking_lot::Mutex;
 use std::sync::Arc;
+use util::arc_cow::ArcCow;
 
 impl<V: 'static, S: Into<ArcCow<'static, str>>> IntoElement<V> for S {
     type Element = Text;
diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs
index e9cddb65c872d1e955f1f53fd922d0d00eff0517..c92d22ba61772e06a65e0c67a8a117495a1ece08 100644
--- a/crates/gpui2/src/gpui2.rs
+++ b/crates/gpui2/src/gpui2.rs
@@ -1,5 +1,4 @@
 pub mod adapter;
-mod arc_cow;
 pub mod color;
 pub mod element;
 pub mod elements;
@@ -9,7 +8,6 @@ pub mod paint_context;
 pub mod style;
 pub mod view;
 
-pub use arc_cow::ArcCow;
 pub use color::*;
 pub use element::{AnyElement, Element, IntoElement, Layout, ParentElement};
 pub use geometry::{
@@ -21,4 +19,5 @@ pub use gpui2_macros::{Element, *};
 pub use interactive::*;
 pub use layout_context::LayoutContext;
 pub use platform::{Platform, WindowBounds, WindowOptions};
+pub use util::arc_cow::ArcCow;
 pub use view::*;
diff --git a/crates/gpui2/src/arc_cow.rs b/crates/util/src/arc_cow.rs
similarity index 80%
rename from crates/gpui2/src/arc_cow.rs
rename to crates/util/src/arc_cow.rs
index 26c9870ee086db5dbf9a6868763401f603d82cce..c1176931667e1d69d3541b25fefe9aec0d55b0a6 100644
--- a/crates/gpui2/src/arc_cow.rs
+++ b/crates/util/src/arc_cow.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+#[derive(PartialEq, Eq, Hash)]
 pub enum ArcCow<'a, T: ?Sized> {
     Borrowed(&'a T),
     Owned(Arc<T>),
@@ -32,6 +33,15 @@ impl From<String> for ArcCow<'_, str> {
     }
 }
 
+impl<'a, T: ?Sized + ToOwned> std::borrow::Borrow<T> for ArcCow<'a, T> {
+    fn borrow(&self) -> &T {
+        match self {
+            ArcCow::Borrowed(borrowed) => borrowed,
+            ArcCow::Owned(owned) => owned.as_ref(),
+        }
+    }
+}
+
 impl<T: ?Sized> std::ops::Deref for ArcCow<'_, T> {
     type Target = T;
 
diff --git a/crates/util/src/http.rs b/crates/util/src/http.rs
index e29768a53e891e165dd859fd27be5325f35cdfa5..329d84996d908259ea6fe2a40d0ec536d9292f97 100644
--- a/crates/util/src/http.rs
+++ b/crates/util/src/http.rs
@@ -2,7 +2,7 @@ pub use anyhow::{anyhow, Result};
 use futures::future::BoxFuture;
 use isahc::config::{Configurable, RedirectPolicy};
 pub use isahc::{
-    http::{Method, Uri},
+    http::{Method, StatusCode, Uri},
     Error,
 };
 pub use isahc::{AsyncBody, Request, Response};
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index c8beb86aeff44a75482531d22a6e8b0c07155fa6..858f6074339d9ee9991f9bce3aaa2fdba97bba2f 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -1,3 +1,4 @@
+pub mod arc_cow;
 pub mod channel;
 pub mod fs;
 pub mod github;
@@ -246,9 +247,16 @@ where
     }
 }
 
-struct Defer<F: FnOnce()>(Option<F>);
+pub struct Deferred<F: FnOnce()>(Option<F>);
 
-impl<F: FnOnce()> Drop for Defer<F> {
+impl<F: FnOnce()> Deferred<F> {
+    /// Drop without running the deferred function.
+    pub fn cancel(mut self) {
+        self.0.take();
+    }
+}
+
+impl<F: FnOnce()> Drop for Deferred<F> {
     fn drop(&mut self) {
         if let Some(f) = self.0.take() {
             f()
@@ -256,8 +264,9 @@ impl<F: FnOnce()> Drop for Defer<F> {
     }
 }
 
-pub fn defer<F: FnOnce()>(f: F) -> impl Drop {
-    Defer(Some(f))
+/// Run the given function when the returned value is dropped (unless it's cancelled).
+pub fn defer<F: FnOnce()>(f: F) -> Deferred<F> {
+    Deferred(Some(f))
 }
 
 pub struct RandomCharIter<T: Rng>(T);

From 99ad60460a501428d896df37fecb17f600f160e5 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 6 Sep 2023 17:13:38 -0600
Subject: [PATCH 045/109] Add support for fetching/rendering images

---
 Cargo.lock                           |   1 +
 crates/gpui/src/image_cache.rs       |  32 +++-----
 crates/gpui2/Cargo.toml              |   1 +
 crates/gpui2/src/elements.rs         |   2 +
 crates/gpui2/src/elements/img.rs     | 105 +++++++++++++++++++++++++++
 crates/storybook/src/collab_panel.rs |  39 +++++++---
 crates/util/src/arc_cow.rs           |  13 +++-
 7 files changed, 161 insertions(+), 32 deletions(-)
 create mode 100644 crates/gpui2/src/elements/img.rs

diff --git a/Cargo.lock b/Cargo.lock
index cf14fcf989e0d75e805ae8db43f5d1b6eb4442a3..2a1236bda3d902291cc59112eee416e28584d6c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3177,6 +3177,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "derive_more",
+ "futures 0.3.28",
  "gpui",
  "gpui2_macros",
  "log",
diff --git a/crates/gpui/src/image_cache.rs b/crates/gpui/src/image_cache.rs
index 77195c493faa17075e71e1b5625c25e51bd0ba2d..d7682a43fd201935ae8683e1e73c166091f8efa7 100644
--- a/crates/gpui/src/image_cache.rs
+++ b/crates/gpui/src/image_cache.rs
@@ -11,7 +11,6 @@ use parking_lot::Mutex;
 use thiserror::Error;
 use util::{
     arc_cow::ArcCow,
-    defer,
     http::{self, HttpClient},
 };
 
@@ -44,16 +43,11 @@ impl From<ImageError> for Error {
 
 pub struct ImageCache {
     client: Arc<dyn HttpClient>,
-    images: Arc<
-        Mutex<
-            HashMap<
-                ArcCow<'static, str>,
-                Shared<BoxFuture<'static, Result<Arc<ImageData>, Error>>>,
-            >,
-        >,
-    >,
+    images: Arc<Mutex<HashMap<ArcCow<'static, str>, FetchImageFuture>>>,
 }
 
+type FetchImageFuture = Shared<BoxFuture<'static, Result<Arc<ImageData>, Error>>>;
+
 impl ImageCache {
     pub fn new(client: Arc<dyn HttpClient>) -> Self {
         ImageCache {
@@ -64,24 +58,18 @@ impl ImageCache {
 
     pub fn get(
         &self,
-        uri: ArcCow<'static, str>,
+        uri: impl Into<ArcCow<'static, str>>,
     ) -> Shared<BoxFuture<'static, Result<Arc<ImageData>, Error>>> {
-        match self.images.lock().get(uri.as_ref()) {
+        let uri = uri.into();
+        let mut images = self.images.lock();
+
+        match images.get(uri.as_ref()) {
             Some(future) => future.clone(),
             None => {
                 let client = self.client.clone();
-                let images = self.images.clone();
                 let future = {
                     let uri = uri.clone();
                     async move {
-                        // If we error, remove the cached future. Otherwise we cancel before returning.
-                        let remove_cached_future = defer({
-                            let uri = uri.clone();
-                            move || {
-                                images.lock().remove(uri.as_ref());
-                            }
-                        });
-
                         let mut response = client.get(uri.as_ref(), ().into(), true).await?;
                         let mut body = Vec::new();
                         response.body_mut().read_to_end(&mut body).await?;
@@ -97,13 +85,13 @@ impl ImageCache {
                         let image =
                             image::load_from_memory_with_format(&body, format)?.into_bgra8();
 
-                        remove_cached_future.cancel();
                         Ok(ImageData::new(image))
                     }
                 }
                 .boxed()
                 .shared();
-                self.images.lock().insert(uri.clone(), future.clone());
+
+                images.insert(uri, future.clone());
                 future
             }
         }
diff --git a/crates/gpui2/Cargo.toml b/crates/gpui2/Cargo.toml
index 7d95c1e76515958a6343e3d876f99bd8f877e342..093ab1e3470b313208645845118ef6cda6957941 100644
--- a/crates/gpui2/Cargo.toml
+++ b/crates/gpui2/Cargo.toml
@@ -16,6 +16,7 @@ anyhow.workspace = true
 derive_more.workspace = true
 gpui = { path = "../gpui" }
 log.workspace = true
+futures.workspace = true
 gpui2_macros = { path = "../gpui2_macros" }
 parking_lot.workspace = true
 refineable.workspace = true
diff --git a/crates/gpui2/src/elements.rs b/crates/gpui2/src/elements.rs
index 65b8c7119fbaeb06251f52817eb68cc7cdf483fa..5b4942fc467cadfcd46de2e472db80bc638047e0 100644
--- a/crates/gpui2/src/elements.rs
+++ b/crates/gpui2/src/elements.rs
@@ -1,8 +1,10 @@
 pub mod div;
 pub mod hoverable;
+mod img;
 pub mod pressable;
 pub mod svg;
 pub mod text;
 
 pub use div::div;
+pub use img::img;
 pub use svg::svg;
diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cf22f2986992e2e61c3e112619633fb231a299db
--- /dev/null
+++ b/crates/gpui2/src/elements/img.rs
@@ -0,0 +1,105 @@
+use crate as gpui2;
+use crate::style::{StyleHelpers, Styleable};
+use crate::{style::Style, Element};
+use futures::FutureExt;
+use gpui::scene;
+use gpui2_macros::IntoElement;
+use refineable::RefinementCascade;
+use util::arc_cow::ArcCow;
+use util::ResultExt;
+
+#[derive(IntoElement)]
+pub struct Img {
+    style: RefinementCascade<Style>,
+    uri: Option<ArcCow<'static, str>>,
+}
+
+pub fn img() -> Img {
+    Img {
+        style: RefinementCascade::default(),
+        uri: None,
+    }
+}
+
+impl Img {
+    pub fn uri(mut self, uri: impl Into<ArcCow<'static, str>>) -> Self {
+        self.uri = Some(uri.into());
+        self
+    }
+}
+
+impl<V: 'static> Element<V> for Img {
+    type PaintState = ();
+
+    fn layout(
+        &mut self,
+        _: &mut V,
+        cx: &mut crate::LayoutContext<V>,
+    ) -> anyhow::Result<(gpui::LayoutId, Self::PaintState)>
+    where
+        Self: Sized,
+    {
+        let style = self.computed_style();
+        let layout_id = cx.add_layout_node(style, [])?;
+        Ok((layout_id, ()))
+    }
+
+    fn paint(
+        &mut self,
+        _: &mut V,
+        layout: &gpui::Layout,
+        _: &mut Self::PaintState,
+        cx: &mut crate::paint_context::PaintContext<V>,
+    ) where
+        Self: Sized,
+    {
+        let style = self.computed_style();
+
+        style.paint_background(layout.bounds, cx);
+
+        if let Some(uri) = &self.uri {
+            let image_future = cx.image_cache.get(uri.clone());
+            if let Some(data) = image_future
+                .clone()
+                .now_or_never()
+                .and_then(ResultExt::log_err)
+            {
+                let rem_size = cx.rem_size();
+                cx.scene.push_image(scene::Image {
+                    bounds: layout.bounds,
+                    border: gpui::Border {
+                        color: style.border_color.unwrap_or_default().into(),
+                        top: style.border_widths.top.to_pixels(rem_size),
+                        right: style.border_widths.right.to_pixels(rem_size),
+                        bottom: style.border_widths.bottom.to_pixels(rem_size),
+                        left: style.border_widths.left.to_pixels(rem_size),
+                    },
+                    corner_radii: style.corner_radii.to_gpui(rem_size),
+                    grayscale: false,
+                    data,
+                })
+            } else {
+                cx.spawn(|this, mut cx| async move {
+                    if image_future.await.log_err().is_some() {
+                        this.update(&mut cx, |_, cx| cx.notify()).ok();
+                    }
+                })
+                .detach();
+            }
+        }
+    }
+}
+
+impl Styleable for Img {
+    type Style = Style;
+
+    fn style_cascade(&mut self) -> &mut RefinementCascade<Self::Style> {
+        &mut self.style
+    }
+
+    fn declared_style(&mut self) -> &mut <Self::Style as refineable::Refineable>::Refinement {
+        self.style.base()
+    }
+}
+
+impl StyleHelpers for Img {}
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 0b5f15cdbe9cf3d2ae27aa8db1b91f9034444016..fe222a4ee5697d613ddbf6abf74be7db86fd50d4 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -1,6 +1,6 @@
 use crate::theme::{theme, Theme};
 use gpui2::{
-    elements::{div, svg},
+    elements::{div, img, svg},
     style::{StyleHelpers, Styleable},
     ArcCow, Element, IntoElement, ParentElement, ViewContext,
 };
@@ -48,7 +48,11 @@ impl<V: 'static> CollabPanelElement<V> {
                             // List Section Header
                             .child(self.list_section_header("#CRDB", true, theme))
                             // List Item Large
-                            .child(self.list_item("maxbrunsfeld", theme)),
+                            .child(self.list_item(
+                                "http://github.com/maxbrunsfeld.png?s=50",
+                                "maxbrunsfeld",
+                                theme,
+                            )),
                     )
                     .child(
                         div()
@@ -63,9 +67,21 @@ impl<V: 'static> CollabPanelElement<V> {
                             .flex()
                             .flex_col()
                             .child(self.list_section_header("CONTACTS", true, theme))
-                            .child(self.list_item("as-cii", theme))
-                            .child(self.list_item("nathansobo", theme))
-                            .child(self.list_item("maxbrunsfeld", theme)),
+                            .child(self.list_item(
+                                "http://github.com/as-cii.png?s=50",
+                                "as-cii",
+                                theme,
+                            ))
+                            .child(self.list_item(
+                                "http://github.com/nathansobo.png?s=50",
+                                "nathansobo",
+                                theme,
+                            ))
+                            .child(self.list_item(
+                                "http://github.com/maxbrunsfeld.png?s=50",
+                                "maxbrunsfeld",
+                                theme,
+                            )),
                     ),
             )
             .child(
@@ -106,7 +122,12 @@ impl<V: 'static> CollabPanelElement<V> {
             )
     }
 
-    fn list_item(&self, label: impl Into<ArcCow<'static, str>>, theme: &Theme) -> impl Element<V> {
+    fn list_item(
+        &self,
+        avatar_uri: impl Into<ArcCow<'static, str>>,
+        label: impl Into<ArcCow<'static, str>>,
+        theme: &Theme,
+    ) -> impl Element<V> {
         div()
             .h_7()
             .px_2()
@@ -123,9 +144,9 @@ impl<V: 'static> CollabPanelElement<V> {
                     .gap_1()
                     .text_sm()
                     .child(
-                        div()
-                            .w_3p5()
-                            .h_3p5()
+                        img()
+                            .uri(avatar_uri)
+                            .size_3p5()
                             .fill(theme.middle.positive.default.foreground),
                     )
                     .child(label),
diff --git a/crates/util/src/arc_cow.rs b/crates/util/src/arc_cow.rs
index c1176931667e1d69d3541b25fefe9aec0d55b0a6..a54c6d5a40699dd841faafd311f5c70ed1afd86b 100644
--- a/crates/util/src/arc_cow.rs
+++ b/crates/util/src/arc_cow.rs
@@ -1,11 +1,22 @@
 use std::sync::Arc;
 
-#[derive(PartialEq, Eq, Hash)]
+#[derive(PartialEq, Eq)]
 pub enum ArcCow<'a, T: ?Sized> {
     Borrowed(&'a T),
     Owned(Arc<T>),
 }
 
+use std::hash::{Hash, Hasher};
+
+impl<'a, T: ?Sized + Hash> Hash for ArcCow<'a, T> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        match self {
+            Self::Borrowed(borrowed) => Hash::hash(borrowed, state),
+            Self::Owned(owned) => Hash::hash(&**owned, state),
+        }
+    }
+}
+
 impl<'a, T: ?Sized> Clone for ArcCow<'a, T> {
     fn clone(&self) -> Self {
         match self {

From a8d5d937579660ad48b94b952a7c6ba14d9a54af Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Wed, 6 Sep 2023 17:21:05 -0600
Subject: [PATCH 046/109] Max out corner radii to half the smaller dimension of
 the parent box

---
 crates/gpui2/src/elements/img.rs     |  2 +-
 crates/gpui2/src/style.rs            | 20 +++++++++++---------
 crates/storybook/src/collab_panel.rs |  1 +
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs
index cf22f2986992e2e61c3e112619633fb231a299db..1feb3cdf31eb9002bb8ba044ef6e26c1a578da9d 100644
--- a/crates/gpui2/src/elements/img.rs
+++ b/crates/gpui2/src/elements/img.rs
@@ -74,7 +74,7 @@ impl<V: 'static> Element<V> for Img {
                         bottom: style.border_widths.bottom.to_pixels(rem_size),
                         left: style.border_widths.left.to_pixels(rem_size),
                     },
-                    corner_radii: style.corner_radii.to_gpui(rem_size),
+                    corner_radii: style.corner_radii.to_gpui(layout.bounds.size(), rem_size),
                     grayscale: false,
                     data,
                 })
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 5ec08123929ac3d376ac6deb5ecdf8c7f013de6a..0b1e9b3442559d3fbb8a6c84a4f5f514ab12e995 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -13,8 +13,8 @@ pub use gpui::taffy::style::{
 use gpui::{
     fonts::{self, TextStyleRefinement},
     geometry::{
-        rect::RectF, relative, AbsoluteLength, DefiniteLength, Edges, EdgesRefinement, Length,
-        Point, PointRefinement, Size, SizeRefinement,
+        rect::RectF, relative, vector::Vector2F, AbsoluteLength, DefiniteLength, Edges,
+        EdgesRefinement, Length, Point, PointRefinement, Size, SizeRefinement,
     },
     scene, taffy, WindowContext,
 };
@@ -169,7 +169,7 @@ impl Style {
             cx.scene.push_quad(gpui::Quad {
                 bounds,
                 background: Some(color.into()),
-                corner_radii: self.corner_radii.to_gpui(rem_size),
+                corner_radii: self.corner_radii.to_gpui(bounds.size(), rem_size),
                 border: Default::default(),
             });
         }
@@ -185,7 +185,7 @@ impl Style {
                 cx.scene.push_quad(gpui::Quad {
                     bounds,
                     background: None,
-                    corner_radii: self.corner_radii.to_gpui(rem_size),
+                    corner_radii: self.corner_radii.to_gpui(bounds.size(), rem_size),
                     border: scene::Border {
                         color: color.into(),
                         top: border.top,
@@ -275,12 +275,14 @@ pub struct CornerRadii {
 }
 
 impl CornerRadii {
-    pub fn to_gpui(&self, rem_size: f32) -> gpui::scene::CornerRadii {
+    pub fn to_gpui(&self, box_size: Vector2F, rem_size: f32) -> gpui::scene::CornerRadii {
+        let max_radius = box_size.x().min(box_size.y()) / 2.;
+
         gpui::scene::CornerRadii {
-            top_left: self.top_left.to_pixels(rem_size),
-            top_right: self.top_right.to_pixels(rem_size),
-            bottom_left: self.bottom_left.to_pixels(rem_size),
-            bottom_right: self.bottom_right.to_pixels(rem_size),
+            top_left: self.top_left.to_pixels(rem_size).min(max_radius),
+            top_right: self.top_right.to_pixels(rem_size).min(max_radius),
+            bottom_left: self.bottom_left.to_pixels(rem_size).min(max_radius),
+            bottom_right: self.bottom_right.to_pixels(rem_size).min(max_radius),
         }
     }
 }
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index fe222a4ee5697d613ddbf6abf74be7db86fd50d4..9e510313816541a9aa2437c6a0c152eb947a7e98 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -147,6 +147,7 @@ impl<V: 'static> CollabPanelElement<V> {
                         img()
                             .uri(avatar_uri)
                             .size_3p5()
+                            .rounded_full()
                             .fill(theme.middle.positive.default.foreground),
                     )
                     .child(label),

From 1b1d7f22cce914c0dc1c17631680c41333101597 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 6 Sep 2023 16:31:52 -0600
Subject: [PATCH 047/109] Add visual area repeating

---
 assets/keymaps/vim.json                      |   6 +-
 crates/editor/src/editor.rs                  |   2 +-
 crates/vim/src/motion.rs                     |   8 +-
 crates/vim/src/normal.rs                     |  20 +-
 crates/vim/src/normal/case.rs                |  15 +-
 crates/vim/src/normal/paste.rs               |   2 +-
 crates/vim/src/normal/repeat.rs              | 268 ++++++++++++++++---
 crates/vim/src/normal/substitute.rs          |   2 +
 crates/vim/src/state.rs                      |  23 +-
 crates/vim/src/vim.rs                        |  53 +++-
 crates/vim/src/visual.rs                     |   2 +-
 crates/vim/test_data/test_change_case.json   |   5 +
 crates/vim/test_data/test_repeat_visual.json |  51 ++++
 13 files changed, 393 insertions(+), 64 deletions(-)
 create mode 100644 crates/vim/test_data/test_repeat_visual.json

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 582171d8a23a6532be654a387f4a45b33f2530db..2027943a0f3c09a7549f5c99ca5799d51f02f927 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -446,12 +446,10 @@
       ],
       "s": "vim::Substitute",
       "shift-s": "vim::SubstituteLine",
+      "shift-r": "vim::SubstituteLine",
       "c": "vim::Substitute",
       "~": "vim::ChangeCase",
-      "shift-i": [
-        "vim::SwitchMode",
-        "Insert"
-      ],
+      "shift-i": "vim::InsertBefore",
       "shift-a": "vim::InsertAfter",
       "r": [
         "vim::PushOperator",
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 1e6e5685b93165bbfad166ac0c86bd54b4656f68..50a382439a1d2fa824271d41476dad9f2944912d 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -572,7 +572,7 @@ pub struct Editor {
     project: Option<ModelHandle<Project>>,
     focused: bool,
     blink_manager: ModelHandle<BlinkManager>,
-    show_local_selections: bool,
+    pub show_local_selections: bool,
     mode: EditorMode,
     replica_id_mapping: Option<HashMap<ReplicaId, ReplicaId>>,
     show_gutter: bool,
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 16bccb696338e229e01cf39ec8ecc496bda62217..48f502639cb74841e6eed14121c51dfb1d030ab9 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -65,9 +65,9 @@ struct PreviousWordStart {
 
 #[derive(Clone, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
-struct Up {
+pub(crate) struct Up {
     #[serde(default)]
-    display_lines: bool,
+    pub(crate) display_lines: bool,
 }
 
 #[derive(Clone, Deserialize, PartialEq)]
@@ -93,9 +93,9 @@ struct EndOfLine {
 
 #[derive(Clone, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
-struct StartOfLine {
+pub struct StartOfLine {
     #[serde(default)]
-    display_lines: bool,
+    pub(crate) display_lines: bool,
 }
 
 #[derive(Clone, Deserialize, PartialEq)]
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 310883d1d69a8dac7f85eaa9908f89a6cb6379ac..25a5ba5131e39bb94966e9d87bb5b8b21f884cbb 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -66,21 +66,21 @@ pub fn init(cx: &mut AppContext) {
 
     cx.add_action(|_: &mut Workspace, _: &DeleteLeft, cx| {
         Vim::update(cx, |vim, cx| {
-            vim.record_current_action();
+            vim.record_current_action(cx);
             let times = vim.pop_number_operator(cx);
             delete_motion(vim, Motion::Left, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteRight, cx| {
         Vim::update(cx, |vim, cx| {
-            vim.record_current_action();
+            vim.record_current_action(cx);
             let times = vim.pop_number_operator(cx);
             delete_motion(vim, Motion::Right, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &ChangeToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
-            vim.start_recording();
+            vim.start_recording(cx);
             let times = vim.pop_number_operator(cx);
             change_motion(
                 vim,
@@ -94,7 +94,7 @@ pub fn init(cx: &mut AppContext) {
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
-            vim.record_current_action();
+            vim.record_current_action(cx);
             let times = vim.pop_number_operator(cx);
             delete_motion(
                 vim,
@@ -161,7 +161,7 @@ fn move_cursor(vim: &mut Vim, motion: Motion, times: Option<usize>, cx: &mut Win
 
 fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.start_recording();
+        vim.start_recording(cx);
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
@@ -175,7 +175,7 @@ fn insert_after(_: &mut Workspace, _: &InsertAfter, cx: &mut ViewContext<Workspa
 
 fn insert_before(_: &mut Workspace, _: &InsertBefore, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.start_recording();
+        vim.start_recording(cx);
         vim.switch_mode(Mode::Insert, false, cx);
     });
 }
@@ -186,7 +186,7 @@ fn insert_first_non_whitespace(
     cx: &mut ViewContext<Workspace>,
 ) {
     Vim::update(cx, |vim, cx| {
-        vim.start_recording();
+        vim.start_recording(cx);
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
@@ -203,7 +203,7 @@ fn insert_first_non_whitespace(
 
 fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.start_recording();
+        vim.start_recording(cx);
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
@@ -217,7 +217,7 @@ fn insert_end_of_line(_: &mut Workspace, _: &InsertEndOfLine, cx: &mut ViewConte
 
 fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.start_recording();
+        vim.start_recording(cx);
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
@@ -250,7 +250,7 @@ fn insert_line_above(_: &mut Workspace, _: &InsertLineAbove, cx: &mut ViewContex
 
 fn insert_line_below(_: &mut Workspace, _: &InsertLineBelow, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.start_recording();
+        vim.start_recording(cx);
         vim.switch_mode(Mode::Insert, false, cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs
index bca7af852db4b82958166f977c1b8d8816ae0f37..12fd8dbd2b66df8ef94ea61e9f80718769c6a28c 100644
--- a/crates/vim/src/normal/case.rs
+++ b/crates/vim/src/normal/case.rs
@@ -7,7 +7,7 @@ use crate::{normal::ChangeCase, state::Mode, Vim};
 
 pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.record_current_action();
+        vim.record_current_action(cx);
         let count = vim.pop_number_operator(cx).unwrap_or(1) as u32;
         vim.update_active_editor(cx, |editor, cx| {
             let mut ranges = Vec::new();
@@ -22,10 +22,16 @@ pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Works
                         ranges.push(start..end);
                         cursor_positions.push(start..start);
                     }
-                    Mode::Visual | Mode::VisualBlock => {
+                    Mode::Visual => {
                         ranges.push(selection.start..selection.end);
                         cursor_positions.push(selection.start..selection.start);
                     }
+                    Mode::VisualBlock => {
+                        ranges.push(selection.start..selection.end);
+                        if cursor_positions.len() == 0 {
+                            cursor_positions.push(selection.start..selection.start);
+                        }
+                    }
                     Mode::Insert | Mode::Normal => {
                         let start = selection.start;
                         let mut end = start;
@@ -97,6 +103,11 @@ mod test {
         cx.simulate_shared_keystrokes(["shift-v", "~"]).await;
         cx.assert_shared_state("ˇABc\n").await;
 
+        // works in visual block mode
+        cx.set_shared_state("ˇaa\nbb\ncc").await;
+        cx.simulate_shared_keystrokes(["ctrl-v", "j", "~"]).await;
+        cx.assert_shared_state("ˇAa\nBb\ncc").await;
+
         // works with multiple cursors (zed only)
         cx.set_state("aˇßcdˇe\n", Mode::Normal);
         cx.simulate_keystroke("~");
diff --git a/crates/vim/src/normal/paste.rs b/crates/vim/src/normal/paste.rs
index db451cec12343576d8c275a13ae0238aba081dbf..dda8dea1e480fcbf07a7df7f66b7846b27ee3d32 100644
--- a/crates/vim/src/normal/paste.rs
+++ b/crates/vim/src/normal/paste.rs
@@ -28,7 +28,7 @@ pub(crate) fn init(cx: &mut AppContext) {
 
 fn paste(_: &mut Workspace, action: &Paste, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.record_current_action();
+        vim.record_current_action(cx);
         vim.update_active_editor(cx, |editor, cx| {
             editor.transact(cx, |editor, cx| {
                 editor.set_clip_at_line_ends(false, cx);
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index 7f2b8c4434c7d2546eb9512b35154e0d1a89ee6a..a29141941358ae925bd32902721c2249c4f8f404 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -1,5 +1,7 @@
 use crate::{
-    state::{Mode, ReplayableAction},
+    motion::Motion,
+    state::{Mode, RecordedSelection, ReplayableAction},
+    visual::visual_motion,
     Vim,
 };
 use gpui::{actions, AppContext};
@@ -11,47 +13,127 @@ pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| {
         Vim::update(cx, |vim, cx| {
             vim.workspace_state.replaying = false;
+            vim.update_active_editor(cx, |editor, _| {
+                editor.show_local_selections = true;
+            });
             vim.switch_mode(Mode::Normal, false, cx)
         });
     });
 
     cx.add_action(|_: &mut Workspace, _: &Repeat, cx| {
-        Vim::update(cx, |vim, cx| {
-            let actions = vim.workspace_state.repeat_actions.clone();
+        let Some((actions, editor, selection)) = Vim::update(cx, |vim, cx| {
+            let actions = vim.workspace_state.recorded_actions.clone();
             let Some(editor) = vim.active_editor.clone() else {
-                return;
+                return None;
             };
-            if let Some(new_count) = vim.pop_number_operator(cx) {
-                vim.workspace_state.recorded_count = Some(new_count);
-            }
+            let count = vim.pop_number_operator(cx);
+
             vim.workspace_state.replaying = true;
 
-            let window = cx.window();
-            cx.app_context()
-                .spawn(move |mut cx| async move {
-                    for action in actions {
-                        match action {
-                            ReplayableAction::Action(action) => window
-                                .dispatch_action(editor.id(), action.as_ref(), &mut cx)
-                                .ok_or_else(|| anyhow::anyhow!("window was closed")),
-                            ReplayableAction::Insertion {
-                                text,
-                                utf16_range_to_replace,
-                            } => editor.update(&mut cx, |editor, cx| {
-                                editor.replay_insert_event(
-                                    &text,
-                                    utf16_range_to_replace.clone(),
-                                    cx,
-                                )
-                            }),
-                        }?
+            let selection = vim.workspace_state.recorded_selection.clone();
+            match selection {
+                RecordedSelection::SingleLine { .. } | RecordedSelection::Visual { .. } => {
+                    vim.workspace_state.recorded_count = None;
+                    vim.switch_mode(Mode::Visual, false, cx)
+                }
+                RecordedSelection::VisualLine { .. } => {
+                    vim.workspace_state.recorded_count = None;
+                    vim.switch_mode(Mode::VisualLine, false, cx)
+                }
+                RecordedSelection::VisualBlock { .. } => {
+                    vim.workspace_state.recorded_count = None;
+                    vim.switch_mode(Mode::VisualBlock, false, cx)
+                }
+                RecordedSelection::None => {
+                    if let Some(count) = count {
+                        vim.workspace_state.recorded_count = Some(count);
                     }
-                    window
-                        .dispatch_action(editor.id(), &EndRepeat, &mut cx)
-                        .ok_or_else(|| anyhow::anyhow!("window was closed"))
+                }
+            }
+
+            if let Some(editor) = editor.upgrade(cx) {
+                editor.update(cx, |editor, _| {
+                    editor.show_local_selections = false;
                 })
-                .detach_and_log_err(cx);
-        });
+            } else {
+                return None;
+            }
+
+            Some((actions, editor, selection))
+        }) else {
+            return;
+        };
+
+        match selection {
+            RecordedSelection::SingleLine { cols } => {
+                if cols > 1 {
+                    visual_motion(Motion::Right, Some(cols as usize - 1), cx)
+                }
+            }
+            RecordedSelection::Visual { rows, cols } => {
+                visual_motion(
+                    Motion::Down {
+                        display_lines: false,
+                    },
+                    Some(rows as usize),
+                    cx,
+                );
+                visual_motion(
+                    Motion::StartOfLine {
+                        display_lines: false,
+                    },
+                    None,
+                    cx,
+                );
+                if cols > 1 {
+                    visual_motion(Motion::Right, Some(cols as usize - 1), cx)
+                }
+            }
+            RecordedSelection::VisualBlock { rows, cols } => {
+                visual_motion(
+                    Motion::Down {
+                        display_lines: false,
+                    },
+                    Some(rows as usize),
+                    cx,
+                );
+                if cols > 1 {
+                    visual_motion(Motion::Right, Some(cols as usize - 1), cx);
+                }
+            }
+            RecordedSelection::VisualLine { rows } => {
+                visual_motion(
+                    Motion::Down {
+                        display_lines: false,
+                    },
+                    Some(rows as usize),
+                    cx,
+                );
+            }
+            RecordedSelection::None => {}
+        }
+
+        let window = cx.window();
+        cx.app_context()
+            .spawn(move |mut cx| async move {
+                for action in actions {
+                    match action {
+                        ReplayableAction::Action(action) => window
+                            .dispatch_action(editor.id(), action.as_ref(), &mut cx)
+                            .ok_or_else(|| anyhow::anyhow!("window was closed")),
+                        ReplayableAction::Insertion {
+                            text,
+                            utf16_range_to_replace,
+                        } => editor.update(&mut cx, |editor, cx| {
+                            editor.replay_insert_event(&text, utf16_range_to_replace.clone(), cx)
+                        }),
+                    }?
+                }
+                window
+                    .dispatch_action(editor.id(), &EndRepeat, &mut cx)
+                    .ok_or_else(|| anyhow::anyhow!("window was closed"))
+            })
+            .detach_and_log_err(cx);
     });
 }
 
@@ -204,4 +286,128 @@ mod test {
             Mode::Normal,
         );
     }
+
+    #[gpui::test]
+    async fn test_repeat_visual(deterministic: Arc<Deterministic>, cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        // single-line (3 columns)
+        cx.set_shared_state(indoc! {
+            "ˇthe quick brown
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["v", "i", "w", "s", "o", "escape"])
+            .await;
+        cx.assert_shared_state(indoc! {
+            "ˇo quick brown
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["j", "w", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            "o quick brown
+            fox ˇops over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["f", "r", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            "o quick brown
+            fox ops oveˇothe lazy dog"
+        })
+        .await;
+
+        // visual
+        cx.set_shared_state(indoc! {
+            "the ˇquick brown
+            fox jumps over
+            fox jumps over
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["v", "j", "x"]).await;
+        cx.assert_shared_state(indoc! {
+            "the ˇumps over
+            fox jumps over
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            "the ˇumps over
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["w", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            "the umps ˇumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["j", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            "the umps umps over
+            the ˇog"
+        })
+        .await;
+
+        // block mode (3 rows)
+        cx.set_shared_state(indoc! {
+            "ˇthe quick brown
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["ctrl-v", "j", "j", "shift-i", "o", "escape"])
+            .await;
+        cx.assert_shared_state(indoc! {
+            "ˇothe quick brown
+            ofox jumps over
+            othe lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["j", "4", "l", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            "othe quick brown
+            ofoxˇo jumps over
+            otheo lazy dog"
+        })
+        .await;
+
+        // line mode
+        cx.set_shared_state(indoc! {
+            "ˇthe quick brown
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["shift-v", "shift-r", "o", "escape"])
+            .await;
+        cx.assert_shared_state(indoc! {
+            "ˇo
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["j", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            "o
+            ˇo
+            the lazy dog"
+        })
+        .await;
+    }
 }
diff --git a/crates/vim/src/normal/substitute.rs b/crates/vim/src/normal/substitute.rs
index 23b545abd84f4435a92d10b107fbb8b4e09f20ed..d0dbb9e3068c9de28b2fe90258ef22112f9c8bb3 100644
--- a/crates/vim/src/normal/substitute.rs
+++ b/crates/vim/src/normal/substitute.rs
@@ -10,6 +10,7 @@ actions!(vim, [Substitute, SubstituteLine]);
 pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &Substitute, cx| {
         Vim::update(cx, |vim, cx| {
+            vim.start_recording(cx);
             let count = vim.pop_number_operator(cx);
             substitute(vim, count, vim.state().mode == Mode::VisualLine, cx);
         })
@@ -17,6 +18,7 @@ pub(crate) fn init(cx: &mut AppContext) {
 
     cx.add_action(|_: &mut Workspace, _: &SubstituteLine, cx| {
         Vim::update(cx, |vim, cx| {
+            vim.start_recording(cx);
             if matches!(vim.state().mode, Mode::VisualBlock | Mode::Visual) {
                 vim.switch_mode(Mode::VisualLine, false, cx)
             }
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 0b4f19fe134e938d487663d9ff711778ebb925d7..7359178f0eba91b06780301f4ddc6b00c03b97e5 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -50,6 +50,26 @@ pub struct EditorState {
     pub operator_stack: Vec<Operator>,
 }
 
+#[derive(Default, Clone, Debug)]
+pub enum RecordedSelection {
+    #[default]
+    None,
+    Visual {
+        rows: u32,
+        cols: u32,
+    },
+    SingleLine {
+        cols: u32,
+    },
+    VisualBlock {
+        rows: u32,
+        cols: u32,
+    },
+    VisualLine {
+        rows: u32,
+    },
+}
+
 #[derive(Default, Clone)]
 pub struct WorkspaceState {
     pub search: SearchState,
@@ -59,7 +79,8 @@ pub struct WorkspaceState {
     pub stop_recording_after_next_action: bool,
     pub replaying: bool,
     pub recorded_count: Option<usize>,
-    pub repeat_actions: Vec<ReplayableAction>,
+    pub recorded_actions: Vec<ReplayableAction>,
+    pub recorded_selection: RecordedSelection,
 }
 
 #[derive(Debug)]
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 48d34d70940de76d208e644802bc9e6ca2b69f3d..35abdaf834bc7af3172bbb745395cd820032fb2d 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -18,13 +18,13 @@ use gpui::{
     actions, impl_actions, keymap_matcher::KeymapContext, keymap_matcher::MatchResult, AppContext,
     Subscription, ViewContext, ViewHandle, WeakViewHandle, WindowContext,
 };
-use language::{CursorShape, Selection, SelectionGoal};
+use language::{CursorShape, Point, Selection, SelectionGoal};
 pub use mode_indicator::ModeIndicator;
 use motion::Motion;
 use normal::normal_replace;
 use serde::Deserialize;
 use settings::{Setting, SettingsStore};
-use state::{EditorState, Mode, Operator, WorkspaceState};
+use state::{EditorState, Mode, Operator, RecordedSelection, WorkspaceState};
 use std::{ops::Range, sync::Arc};
 use visual::{visual_block_motion, visual_replace};
 use workspace::{self, Workspace};
@@ -107,7 +107,7 @@ pub fn observe_keystrokes(cx: &mut WindowContext) {
             Vim::update(cx, |vim, _| {
                 if vim.workspace_state.recording {
                     vim.workspace_state
-                        .repeat_actions
+                        .recorded_actions
                         .push(ReplayableAction::Action(handled_by.boxed_clone()));
 
                     if vim.workspace_state.stop_recording_after_next_action {
@@ -204,7 +204,7 @@ impl Vim {
         Vim::update(cx, |vim, _| {
             if vim.workspace_state.recording {
                 vim.workspace_state
-                    .repeat_actions
+                    .recorded_actions
                     .push(ReplayableAction::Insertion {
                         text: text.clone(),
                         utf16_range_to_replace: range_to_replace,
@@ -232,16 +232,51 @@ impl Vim {
 
     // TODO: shift-j?
     //
-    pub fn start_recording(&mut self) {
+    pub fn start_recording(&mut self, cx: &mut WindowContext) {
         if !self.workspace_state.replaying {
             self.workspace_state.recording = true;
-            self.workspace_state.repeat_actions = Default::default();
+            self.workspace_state.recorded_actions = Default::default();
             self.workspace_state.recorded_count =
                 if let Some(Operator::Number(number)) = self.active_operator() {
                     Some(number)
                 } else {
                     None
+                };
+
+            let selections = self
+                .active_editor
+                .and_then(|editor| editor.upgrade(cx))
+                .map(|editor| {
+                    let editor = editor.read(cx);
+                    (
+                        editor.selections.oldest::<Point>(cx),
+                        editor.selections.newest::<Point>(cx),
+                    )
+                });
+
+            if let Some((oldest, newest)) = selections {
+                self.workspace_state.recorded_selection = match self.state().mode {
+                    Mode::Visual if newest.end.row == newest.start.row => {
+                        RecordedSelection::SingleLine {
+                            cols: newest.end.column - newest.start.column,
+                        }
+                    }
+                    Mode::Visual => RecordedSelection::Visual {
+                        rows: newest.end.row - newest.start.row,
+                        cols: newest.end.column,
+                    },
+                    Mode::VisualLine => RecordedSelection::VisualLine {
+                        rows: newest.end.row - newest.start.row,
+                    },
+                    Mode::VisualBlock => RecordedSelection::VisualBlock {
+                        rows: newest.end.row.abs_diff(oldest.start.row),
+                        cols: newest.end.column.abs_diff(oldest.start.column),
+                    },
+                    _ => RecordedSelection::None,
                 }
+            } else {
+                self.workspace_state.recorded_selection = RecordedSelection::None;
+            }
         }
     }
 
@@ -251,8 +286,8 @@ impl Vim {
         }
     }
 
-    pub fn record_current_action(&mut self) {
-        self.start_recording();
+    pub fn record_current_action(&mut self, cx: &mut WindowContext) {
+        self.start_recording(cx);
         self.stop_recording();
     }
 
@@ -322,7 +357,7 @@ impl Vim {
             operator,
             Operator::Change | Operator::Delete | Operator::Replace
         ) {
-            self.start_recording()
+            self.start_recording(cx)
         };
         self.update_state(|state| state.operator_stack.push(operator));
         self.sync_vim_settings(cx);
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rs
index b7ea0811f0a93ebec413e72bb5d088ab7ea8366f..acd55a0954ac9d4c9a5214237e7fd451f81be795 100644
--- a/crates/vim/src/visual.rs
+++ b/crates/vim/src/visual.rs
@@ -277,7 +277,7 @@ pub fn other_end(_: &mut Workspace, _: &OtherEnd, cx: &mut ViewContext<Workspace
 
 pub fn delete(_: &mut Workspace, _: &VisualDelete, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
-        vim.record_current_action();
+        vim.record_current_action(cx);
         vim.update_active_editor(cx, |editor, cx| {
             let mut original_columns: HashMap<_, _> = Default::default();
             let line_mode = editor.selections.line_mode;
diff --git a/crates/vim/test_data/test_change_case.json b/crates/vim/test_data/test_change_case.json
index 1c0cad0b935a91b31ad9e54f3548b9af117e929c..10eb93b2279339b5f032569878f479efa701b718 100644
--- a/crates/vim/test_data/test_change_case.json
+++ b/crates/vim/test_data/test_change_case.json
@@ -16,3 +16,8 @@
 {"Key":"shift-v"}
 {"Key":"~"}
 {"Get":{"state":"ˇABc\n","mode":"Normal"}}
+{"Put":{"state":"ˇaa\nbb\ncc"}}
+{"Key":"ctrl-v"}
+{"Key":"j"}
+{"Key":"~"}
+{"Get":{"state":"ˇAa\nBb\ncc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_visual.json b/crates/vim/test_data/test_repeat_visual.json
new file mode 100644
index 0000000000000000000000000000000000000000..cb83addcfb412e51c4477be189a95b7c72eee39c
--- /dev/null
+++ b/crates/vim/test_data/test_repeat_visual.json
@@ -0,0 +1,51 @@
+{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
+{"Key":"v"}
+{"Key":"i"}
+{"Key":"w"}
+{"Key":"s"}
+{"Key":"o"}
+{"Key":"escape"}
+{"Get":{"state":"ˇo quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"w"}
+{"Key":"."}
+{"Get":{"state":"o quick brown\nfox ˇops over\nthe lazy dog","mode":"Normal"}}
+{"Key":"f"}
+{"Key":"r"}
+{"Key":"."}
+{"Get":{"state":"o quick brown\nfox ops oveˇothe lazy dog","mode":"Normal"}}
+{"Put":{"state":"the ˇquick brown\nfox jumps over\nfox jumps over\nfox jumps over\nthe lazy dog"}}
+{"Key":"v"}
+{"Key":"j"}
+{"Key":"x"}
+{"Get":{"state":"the ˇumps over\nfox jumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}}
+{"Key":"."}
+{"Get":{"state":"the ˇumps over\nfox jumps over\nthe lazy dog","mode":"Normal"}}
+{"Key":"w"}
+{"Key":"."}
+{"Get":{"state":"the umps ˇumps over\nthe lazy dog","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"."}
+{"Get":{"state":"the umps umps over\nthe ˇog","mode":"Normal"}}
+{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
+{"Key":"ctrl-v"}
+{"Key":"j"}
+{"Key":"j"}
+{"Key":"shift-i"}
+{"Key":"o"}
+{"Key":"escape"}
+{"Get":{"state":"ˇothe quick brown\nofox jumps over\nothe lazy dog","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"4"}
+{"Key":"l"}
+{"Key":"."}
+{"Get":{"state":"othe quick brown\nofoxˇo jumps over\notheo lazy dog","mode":"Normal"}}
+{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
+{"Key":"shift-v"}
+{"Key":"shift-r"}
+{"Key":"o"}
+{"Key":"escape"}
+{"Get":{"state":"ˇo\nfox jumps over\nthe lazy dog","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"."}
+{"Get":{"state":"o\nˇo\nthe lazy dog","mode":"Normal"}}

From 48bb2a3321f5aeebc7f830760202b8ef317579f6 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 7 Sep 2023 10:51:18 -0600
Subject: [PATCH 048/109] TEMP

---
 assets/keymaps/vim.json  |  2 +-
 crates/vim/src/normal.rs | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 2027943a0f3c09a7549f5c99ca5799d51f02f927..f7fdb57d9dab3288b3dcadfbaa780250d598bd99 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -327,7 +327,7 @@
         "Delete"
       ],
       "shift-d": "vim::DeleteToEndOfLine",
-      "shift-j": "editor::JoinLines",
+      "shift-j": "vim::JoinLines",
       "y": [
         "vim::PushOperator",
         "Yank"
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 25a5ba5131e39bb94966e9d87bb5b8b21f884cbb..d328f663c556899ebe20717627986f8311ddef07 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -46,6 +46,7 @@ actions!(
         DeleteToEndOfLine,
         Yank,
         ChangeCase,
+        JoinLines,
     ]
 );
 
@@ -106,6 +107,19 @@ pub fn init(cx: &mut AppContext) {
             );
         })
     });
+    cx.add_action(|_: &mut Workspace, _: &JoinLines, cx| {
+        Vim::update(cx, |vim, cx| {
+            vim.record_current_action(cx);
+            let times = vim.pop_number_operator(cx).unwrap_or(1);
+            vim.update_active_editor(cx, |editor, cx| {
+                editor.transact(cx, |editor, cx| {
+                    for _ in 0..times {
+                        editor.join_lines(editor::JoinLines, cx)
+                    }
+                })
+            })
+        })
+    })
 }
 
 pub fn normal_motion(

From 23a8d8fba46f73f1bbf79edafcf46a7eafc4f6ee Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 7 Sep 2023 12:55:47 -0400
Subject: [PATCH 049/109] Merge workspace and collab panel demos

---
 crates/storybook/src/collab_panel.rs |  2 +-
 crates/storybook/src/workspace.rs    | 62 ++++++++++++++++------------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 9e510313816541a9aa2437c6a0c152eb947a7e98..60b0131528a048d192a21abb44796ca65a7350d3 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -23,7 +23,7 @@ impl<V: 'static> CollabPanelElement<V> {
 
         // Panel
         div()
-            .full()
+            .w_96()
             .flex()
             .flex_col()
             .font("Zed Sans Extended")
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index c2416976104de0950fd195149865d304ca45f185..6f7a9b712c6316d76e7bb0394da84a4e6aa390b9 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,4 +1,4 @@
-use crate::theme::theme;
+use crate::{collab_panel::collab_panel, theme::theme};
 use gpui2::{
     elements::{div, svg},
     geometry::pixels,
@@ -247,31 +247,38 @@ impl StatusBar {
             )
             // === Diagnostics === //
             .child(
-                div().flex().items_center().gap_2()
-                .child(
-                    div()
-                        .h_full()
-                        .flex()
-                        .items_center()
-                        .justify_center()
-                        .gap_0p5()
-                        .px_1()
-                        .text_color(theme.lowest.variant.default.foreground)
-                        .hover()
-                        .fill(theme.lowest.base.hovered.background)
-                        .active()
-                        .fill(theme.lowest.base.pressed.background)
-                        .child(
-                            svg()
-                                .path("icons/error.svg")
-                                .w_4()
-                                .h_4()
-                                .fill(theme.lowest.negative.default.foreground),
-                        )
-                        .child(div().text_sm().child("2")),
-                )
-                .child(div().text_sm().text_color(theme.lowest.variant.default.foreground).child("Something is wrong")),
-
+                div()
+                    .flex()
+                    .items_center()
+                    .gap_2()
+                    .child(
+                        div()
+                            .h_full()
+                            .flex()
+                            .items_center()
+                            .justify_center()
+                            .gap_0p5()
+                            .px_1()
+                            .text_color(theme.lowest.variant.default.foreground)
+                            .hover()
+                            .fill(theme.lowest.base.hovered.background)
+                            .active()
+                            .fill(theme.lowest.base.pressed.background)
+                            .child(
+                                svg()
+                                    .path("icons/error.svg")
+                                    .w_4()
+                                    .h_4()
+                                    .fill(theme.lowest.negative.default.foreground),
+                            )
+                            .child(div().text_sm().child("2")),
+                    )
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(theme.lowest.variant.default.foreground)
+                            .child("Something is wrong"),
+                    ),
             )
     }
 
@@ -340,11 +347,12 @@ impl WorkspaceElement {
             .w_full()
             .flex()
             .flex_col()
+            .gap_y_0()
             .font("Zed Sans Extended")
             .text_color(theme.lowest.base.default.foreground)
             .fill(theme.middle.base.default.background)
             .child(titlebar())
-            .child(div().child("panes"))
+            .child(collab_panel())
             .child(statusbar())
     }
 }

From 17c5bbfd96d9ab7de8cfae4869f797c2cc1517bc Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 7 Sep 2023 12:58:42 -0400
Subject: [PATCH 050/109] Update titlebar style

---
 crates/storybook/src/workspace.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index 6f7a9b712c6316d76e7bb0394da84a4e6aa390b9..869b3b395d18882946c747eb7560bf835a867a7e 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,7 +1,6 @@
 use crate::{collab_panel::collab_panel, theme::theme};
 use gpui2::{
     elements::{div, svg},
-    geometry::pixels,
     style::{StyleHelpers, Styleable},
     Element, IntoElement, ParentElement, ViewContext,
 };
@@ -45,21 +44,21 @@ impl TitleBar {
                         div()
                             .w_3()
                             .h_3()
-                            // .rounded_full()
+                            .rounded_full()
                             .fill(theme.lowest.positive.default.foreground),
                     )
                     .child(
                         div()
                             .w_3()
                             .h_3()
-                            // .rounded_full()
+                            .rounded_full()
                             .fill(theme.lowest.warning.default.foreground),
                     )
                     .child(
                         div()
                             .w_3()
                             .h_3()
-                            // .rounded_full()
+                            .rounded_full()
                             .fill(theme.lowest.negative.default.foreground),
                     ),
             )

From 8e2e00e00377600cd261bd1c43c9476991bd2a5f Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 7 Sep 2023 11:08:07 -0600
Subject: [PATCH 051/109] add vim-specific J (with repeatability)

---
 assets/keymaps/vim.json                   |  1 +
 crates/vim/src/normal.rs                  | 11 ++++-
 crates/vim/src/test.rs                    | 49 +++++++++++++++++++++++
 crates/vim/test_data/test_join_lines.json | 13 ++++++
 4 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 crates/vim/test_data/test_join_lines.json

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index f7fdb57d9dab3288b3dcadfbaa780250d598bd99..45891adee66385bc748439294bc51cd533eab2ef 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -451,6 +451,7 @@
       "~": "vim::ChangeCase",
       "shift-i": "vim::InsertBefore",
       "shift-a": "vim::InsertAfter",
+      "shift-j": "vim::JoinLines",
       "r": [
         "vim::PushOperator",
         "Replace"
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index d328f663c556899ebe20717627986f8311ddef07..63bfe9bd1ecb34e16a2ba365baccd22b1a7a23b6 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -110,11 +110,18 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &JoinLines, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let times = vim.pop_number_operator(cx).unwrap_or(1);
+            let mut times = vim.pop_number_operator(cx).unwrap_or(1);
+            if vim.state().mode.is_visual() {
+                times = 1;
+            } else if times > 1 {
+                // 2J joins two lines together (same as J or 1J)
+                times -= 1;
+            }
+
             vim.update_active_editor(cx, |editor, cx| {
                 editor.transact(cx, |editor, cx| {
                     for _ in 0..times {
-                        editor.join_lines(editor::JoinLines, cx)
+                        editor.join_lines(&Default::default(), cx)
                     }
                 })
             })
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index c6a212d77f1d91118defa0b3c8097f6c38f112ab..9d3a141a9e8abc0cf3abcb622cc4881a78fe0af5 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -286,6 +286,55 @@ async fn test_word_characters(cx: &mut gpui::TestAppContext) {
     )
 }
 
+#[gpui::test]
+async fn test_join_lines(cx: &mut gpui::TestAppContext) {
+    let mut cx = NeovimBackedTestContext::new(cx).await;
+
+    cx.set_shared_state(indoc! {"
+      ˇone
+      two
+      three
+      four
+      five
+      six
+      "})
+        .await;
+    cx.simulate_shared_keystrokes(["shift-j"]).await;
+    cx.assert_shared_state(indoc! {"
+          oneˇ two
+          three
+          four
+          five
+          six
+          "})
+        .await;
+    cx.simulate_shared_keystrokes(["3", "shift-j"]).await;
+    cx.assert_shared_state(indoc! {"
+          one two threeˇ four
+          five
+          six
+          "})
+        .await;
+
+    cx.set_shared_state(indoc! {"
+      ˇone
+      two
+      three
+      four
+      five
+      six
+      "})
+        .await;
+    cx.simulate_shared_keystrokes(["j", "v", "3", "j", "shift-j"])
+        .await;
+    cx.assert_shared_state(indoc! {"
+      one
+      two three fourˇ five
+      six
+      "})
+        .await;
+}
+
 #[gpui::test]
 async fn test_wrapped_lines(cx: &mut gpui::TestAppContext) {
     let mut cx = NeovimBackedTestContext::new(cx).await;
diff --git a/crates/vim/test_data/test_join_lines.json b/crates/vim/test_data/test_join_lines.json
new file mode 100644
index 0000000000000000000000000000000000000000..b4bc5c30e1ce7a96e2fa9ada59efa48e0aa83a0e
--- /dev/null
+++ b/crates/vim/test_data/test_join_lines.json
@@ -0,0 +1,13 @@
+{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}}
+{"Key":"shift-j"}
+{"Get":{"state":"oneˇ two\nthree\nfour\nfive\nsix\n","mode":"Normal"}}
+{"Key":"3"}
+{"Key":"shift-j"}
+{"Get":{"state":"one two threeˇ four\nfive\nsix\n","mode":"Normal"}}
+{"Put":{"state":"ˇone\ntwo\nthree\nfour\nfive\nsix\n"}}
+{"Key":"j"}
+{"Key":"v"}
+{"Key":"3"}
+{"Key":"j"}
+{"Key":"shift-j"}
+{"Get":{"state":"one\ntwo three fourˇ five\nsix\n","mode":"Normal"}}

From f7b2edb59a3ab411fcb2359c638bbc473df03ae6 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 7 Sep 2023 13:15:38 -0400
Subject: [PATCH 052/109] Checkpoint

---
 crates/storybook/src/collab_panel.rs | 21 ++++++++++++++-------
 crates/storybook/src/workspace.rs    | 20 +++++++++++++++-----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 60b0131528a048d192a21abb44796ca65a7350d3..8530f95f3ce2fe69b3ffe3b38642a03f772b581e 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -85,12 +85,19 @@ impl<V: 'static> CollabPanelElement<V> {
                     ),
             )
             .child(
-                div().h_7().px_2().flex().items_center().child(
-                    div()
-                        .text_sm()
-                        .text_color(theme.middle.variant.default.foreground)
-                        .child("Find..."),
-                ),
+                div()
+                    .h_7()
+                    .px_2()
+                    .border_t()
+                    .border_color(theme.middle.variant.default.border)
+                    .flex()
+                    .items_center()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(theme.middle.variant.default.foreground)
+                            .child("Find..."),
+                    ),
             )
     }
 
@@ -117,7 +124,7 @@ impl<V: 'static> CollabPanelElement<V> {
                         })
                         .w_3p5()
                         .h_3p5()
-                        .fill(theme.middle.positive.default.foreground),
+                        .fill(theme.middle.variant.default.foreground),
                 ),
             )
     }
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index 869b3b395d18882946c747eb7560bf835a867a7e..d125181f38a0b0ade26064ce6ca26023c5b697fc 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -74,7 +74,8 @@ impl TitleBar {
                             .flex()
                             .items_center()
                             .justify_center()
-                            .px_1()
+                            .px_2()
+                            .rounded_md()
                             .hover()
                             .fill(theme.lowest.base.hovered.background)
                             .active()
@@ -87,7 +88,8 @@ impl TitleBar {
                             .flex()
                             .items_center()
                             .justify_center()
-                            .px_1()
+                            .px_2()
+                            .rounded_md()
                             .text_color(theme.lowest.variant.default.foreground)
                             .hover()
                             .fill(theme.lowest.base.hovered.background)
@@ -342,16 +344,24 @@ impl WorkspaceElement {
     fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
         div()
-            .h_full()
-            .w_full()
+            .size_full()
             .flex()
             .flex_col()
             .gap_y_0()
             .font("Zed Sans Extended")
             .text_color(theme.lowest.base.default.foreground)
-            .fill(theme.middle.base.default.background)
+            .fill(theme.middle.warning.default.background)
             .child(titlebar())
             .child(collab_panel())
             .child(statusbar())
     }
 }
+
+// Hover over things
+// Paint its space... padding, margin, border, content
+
+/*
+* h_8, grow_0/flex_grow_0, shrink_0/flex_shrink_0
+* flex_grow
+* h_8, grow_0/flex_grow_0, shrink_0/flex_shrink_0
+*/

From 5fb9c6090502afd7a443800275eb2251f3a4a122 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 7 Sep 2023 15:33:50 -0400
Subject: [PATCH 053/109] Checkpoint

---
 assets/icons/Icons/exit.svg                  |   3 +
 assets/icons/stop_sharing.svg                |   5 +
 crates/gpui2_macros/src/styleable_helpers.rs |   5 +
 crates/storybook/src/workspace.rs            | 165 +++++++++++++------
 4 files changed, 127 insertions(+), 51 deletions(-)
 create mode 100644 assets/icons/Icons/exit.svg
 create mode 100644 assets/icons/stop_sharing.svg

diff --git a/assets/icons/Icons/exit.svg b/assets/icons/Icons/exit.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6d768492482d6c62e1ec10b5f10054796c89cbb7
--- /dev/null
+++ b/assets/icons/Icons/exit.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 1C2.44771 1 2 1.44772 2 2V13C2 13.5523 2.44772 14 3 14H10.5C10.7761 14 11 13.7761 11 13.5C11 13.2239 10.7761 13 10.5 13H3V2L10.5 2C10.7761 2 11 1.77614 11 1.5C11 1.22386 10.7761 1 10.5 1H3ZM12.6036 4.89645C12.4083 4.70118 12.0917 4.70118 11.8964 4.89645C11.7012 5.09171 11.7012 5.40829 11.8964 5.60355L13.2929 7H6.5C6.22386 7 6 7.22386 6 7.5C6 7.77614 6.22386 8 6.5 8H13.2929L11.8964 9.39645C11.7012 9.59171 11.7012 9.90829 11.8964 10.1036C12.0917 10.2988 12.4083 10.2988 12.6036 10.1036L14.8536 7.85355C15.0488 7.65829 15.0488 7.34171 14.8536 7.14645L12.6036 4.89645Z" fill="black"/>
+</svg>
diff --git a/assets/icons/stop_sharing.svg b/assets/icons/stop_sharing.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e9aa7eac5a481ed3f6ae9253fc8c9c8c3a0785e6
--- /dev/null
+++ b/assets/icons/stop_sharing.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.70312 4L7.26046 2.97338C7.10239 2.60678 6.74141 2.36933 6.34219 2.36933H2.5C2.22386 2.36933 2 2.59319 2 2.86933V4.375V8" stroke="#11181C" stroke-width="1.25" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.07812 4C7.07812 3.65482 7.35795 3.375 7.70312 3.375H7.71945H7.73568H7.75182H7.76787H7.78382H7.79968H7.81546H7.83114H7.84673H7.86223H7.87763H7.89295H7.90818H7.92333H7.93838H7.95334H7.96822H7.98301H7.99771H8.01232H8.02685H8.04129H8.05565H8.06992H8.08411H8.09821H8.11222H8.12615H8.14H8.15377H8.16745H8.18105H8.19456H8.208H8.22135H8.23462H8.24781H8.26092H8.27394H8.28689H8.29976H8.31255H8.32526H8.33789H8.35044H8.36292H8.37532H8.38764H8.39988H8.41204H8.42413H8.43615H8.44809H8.45995H8.47174H8.48345H8.49509H8.50666H8.51815H8.52957H8.54091H8.55219H8.56339H8.57452H8.58557H8.59656H8.60748H8.61832H8.6291H8.6398H8.65044H8.661H8.6715H8.68193H8.69229H8.70258H8.71281H8.72297H8.73306H8.74309H8.75305H8.76294H8.77277H8.78254H8.79223H8.80187H8.81144H8.82095H8.83039H8.83977H8.84909H8.85835H8.86754H8.87667H8.88575H8.89476H8.90371H8.9126H8.92143H8.9302H8.93891H8.94756H8.95615H8.96469H8.97317H8.98159H8.98995H8.99826H9.00651H9.0147H9.02284H9.03092H9.03895H9.04692H9.05484H9.06271H9.07052H9.07827H9.08598H9.09363H9.10123H9.10878H9.11627H9.12372H9.13111H9.13845H9.14575H9.15299H9.16018H9.16733H9.17442H9.18147H9.18846H9.19541H9.20232H9.20917H9.21598H9.22274H9.22946H9.23613H9.24275H9.24933H9.25587H9.26236H9.2688H9.27521H9.28157H9.28788H9.29415H9.30038H9.30657H9.31272H9.31883H9.32489H9.33091H9.3369H9.34284H9.34874H9.35461H9.36043H9.36622H9.37197H9.37768H9.38335H9.38899H9.39459H9.40015H9.40567H9.41116H9.41662H9.42204H9.42742H9.43277H9.43809H9.44337H9.44862H9.45383H9.45901H9.46416H9.46928H9.47437H9.47942H9.48445H9.48944H9.4944H9.49933H9.50424H9.50911H9.51395H9.51877H9.52355H9.52831H9.53304H9.53775H9.54243H9.54708H9.5517H9.5563H9.56087H9.56542H9.56994H9.57444H9.57891H9.58336H9.58778H9.59219H9.59657H9.60092H9.60526H9.60957H9.61386H9.61813H9.62238H9.62661H9.63082H9.63501H9.63918H9.64333H9.64746H9.65157H9.65567H9.65975H9.66381H9.66785H9.67188H9.67588H9.67988H9.68386H9.68782H9.69177H9.6957H9.69962H9.70352H9.70741H9.71129H9.71516H9.71901H9.72285H9.72668H9.73049H9.7343H9.73809H9.74188H9.74565H9.74941H9.75317H9.75691H9.76065H9.76438H9.7681H9.77181H9.77551H9.77921H9.7829H9.78658H9.79026H9.79393H9.7976H9.80126H9.80492H9.80857H9.81222H9.81586H9.8195H9.82314H9.82678H9.83041H9.83404H9.83767H9.8413H9.84493H9.84855H9.85218H9.85581H9.85943H9.86306H9.86669H9.87032H9.87395H9.87758H9.88122H9.88486H9.8885H9.89215H9.8958H9.89945H9.90311H9.90677H9.91044H9.91411H9.91779H9.92148H9.92517H9.92887H9.93258H9.93629H9.94001H9.94375H9.94748H9.95123H9.95499H9.95876H9.96253H9.96632H9.97012H9.97393H9.97775H9.98158H9.98542H9.98928H9.99315H9.99703H10.0009H10.0048H10.0088H10.0127H10.0167H10.0206H10.0246H10.0286H10.0326H10.0366H10.0407H10.0448H10.0488H10.0529H10.0571H10.0612H10.0654H10.0695H10.0737H10.078H10.0822H10.0864H10.0907H10.095H10.0993H10.1037H10.108H10.1124H10.1168H10.1213H10.1257H10.1302H10.1347H10.1393H10.1438H10.1484H10.153H10.1576H10.1623H10.167H10.1717H10.1764H10.1812H10.186H10.1908H10.1957H10.2006H10.2055H10.2104H10.2154H10.2204H10.2254H10.2305H10.2356H10.2407H10.2459H10.2511H10.2563H10.2615H10.2668H10.2722H10.2775H10.2829H10.2884H10.2938H10.2993H10.3049H10.3104H10.3161H10.3217H10.3274H10.3331H10.3389H10.3447H10.3505H10.3564H10.3623H10.3683H10.3743H10.3803H10.3864H10.3925H10.3987H10.4049H10.4111H10.4174H10.4237H10.4301H10.4365H10.443H10.4495H10.456H10.4626H10.4693H10.4759H10.4827H10.4895H10.4963H10.5032H10.5101H10.517H10.5241H10.5311H10.5382H10.5454H10.5526H10.5599H10.5672H10.5745H10.5819H10.5894H10.5969H10.6045H10.6121H10.6198H10.6275H10.6353H10.6431H10.651H10.6589H10.6669H10.6749H10.683H10.6912H10.6994H10.7077H10.716H10.7244H10.7328H10.7413H10.7499H10.7585H10.7672H10.7759H10.7847H10.7935H10.8025H10.8114H10.8205H10.8296H10.8387H10.8479H10.8572H10.8665H10.8759H10.8854H10.8949H10.9045H10.9142H10.9239H10.9337H10.9435H10.9535H10.9634H10.9735H10.9836H10.9938H11.004H11.0144H11.0247H11.0352H11.0457H11.0563H11.067H11.0777H11.0885H11.0994H11.1103H11.1213H11.1324H11.1435H11.1548H11.1661H11.1774H11.1889H11.2004H11.212H11.2237H11.2354H11.2472H11.2591H11.2711H11.2831H11.2952H11.3074H11.3197H11.332H11.3444H11.3569H11.3695H11.3822H11.3949H11.4077H11.4206H11.4336H11.4467H11.4598H11.473H11.4863H11.4997C12.1205 3.375 12.625 3.87818 12.625 4.5V4.92724L12.6065 4.9457L11.375 6.17606V4.625H11.3695H11.3569H11.3444H11.332H11.3197H11.3074H11.2952H11.2831H11.2711H11.2591H11.2472H11.2354H11.2237H11.212H11.2004H11.1889H11.1774H11.1661H11.1548H11.1435H11.1324H11.1213H11.1103H11.0994H11.0885H11.0777H11.067H11.0563H11.0457H11.0352H11.0247H11.0144H11.004H10.9938H10.9836H10.9735H10.9634H10.9535H10.9435H10.9337H10.9239H10.9142H10.9045H10.8949H10.8854H10.8759H10.8665H10.8572H10.8479H10.8387H10.8296H10.8205H10.8114H10.8025H10.7935H10.7847H10.7759H10.7672H10.7585H10.7499H10.7413H10.7328H10.7244H10.716H10.7077H10.6994H10.6912H10.683H10.6749H10.6669H10.6589H10.651H10.6431H10.6353H10.6275H10.6198H10.6121H10.6045H10.5969H10.5894H10.5819H10.5745H10.5672H10.5599H10.5526H10.5454H10.5382H10.5311H10.5241H10.517H10.5101H10.5032H10.4963H10.4895H10.4827H10.4759H10.4693H10.4626H10.456H10.4495H10.443H10.4365H10.4301H10.4237H10.4174H10.4111H10.4049H10.3987H10.3925H10.3864H10.3803H10.3743H10.3683H10.3623H10.3564H10.3505H10.3447H10.3389H10.3331H10.3274H10.3217H10.3161H10.3104H10.3049H10.2993H10.2938H10.2884H10.2829H10.2775H10.2722H10.2668H10.2615H10.2563H10.2511H10.2459H10.2407H10.2356H10.2305H10.2254H10.2204H10.2154H10.2104H10.2055H10.2006H10.1957H10.1908H10.186H10.1812H10.1764H10.1717H10.167H10.1623H10.1576H10.153H10.1484H10.1438H10.1393H10.1347H10.1302H10.1257H10.1213H10.1168H10.1124H10.108H10.1037H10.0993H10.095H10.0907H10.0864H10.0822H10.078H10.0737H10.0695H10.0654H10.0612H10.0571H10.0529H10.0488H10.0448H10.0407H10.0366H10.0326H10.0286H10.0246H10.0206H10.0167H10.0127H10.0088H10.0048H10.0009H9.99703H9.99315H9.98928H9.98542H9.98158H9.97775H9.97393H9.97012H9.96632H9.96253H9.95876H9.95499H9.95123H9.94748H9.94375H9.94001H9.93629H9.93258H9.92887H9.92517H9.92148H9.91779H9.91411H9.91044H9.90677H9.90311H9.89945H9.8958H9.89215H9.8885H9.88486H9.88122H9.87758H9.87395H9.87032H9.86669H9.86306H9.85943H9.85581H9.85218H9.84855H9.84493H9.8413H9.83767H9.83404H9.83041H9.82678H9.82314H9.8195H9.81586H9.81222H9.80857H9.80492H9.80126H9.7976H9.79393H9.79026H9.78658H9.7829H9.77921H9.77551H9.77181H9.7681H9.76438H9.76065H9.75691H9.75317H9.74941H9.74565H9.74188H9.73809H9.7343H9.73049H9.72668H9.72285H9.71901H9.71516H9.71129H9.70741H9.70352H9.69962H9.6957H9.69177H9.68782H9.68386H9.67988H9.67588H9.67188H9.66785H9.66381H9.65975H9.65567H9.65157H9.64746H9.64333H9.63918H9.63501H9.63082H9.62661H9.62238H9.61813H9.61386H9.60957H9.60526H9.60092H9.59657H9.59219H9.58778H9.58336H9.57891H9.57444H9.56994H9.56542H9.56087H9.5563H9.5517H9.54708H9.54243H9.53775H9.53304H9.52831H9.52355H9.51877H9.51395H9.50911H9.50424H9.49933H9.4944H9.48944H9.48445H9.47942H9.47437H9.46928H9.46416H9.45901H9.45383H9.44862H9.44337H9.43809H9.43277H9.42742H9.42204H9.41662H9.41116H9.40567H9.40015H9.39459H9.38899H9.38335H9.37768H9.37197H9.36622H9.36043H9.35461H9.34874H9.34284H9.3369H9.33091H9.32489H9.31883H9.31272H9.30657H9.30038H9.29415H9.28788H9.28157H9.27521H9.2688H9.26236H9.25587H9.24933H9.24275H9.23613H9.22946H9.22274H9.21598H9.20917H9.20232H9.19541H9.18846H9.18147H9.17442H9.16733H9.16018H9.15299H9.14575H9.13845H9.13111H9.12372H9.11627H9.10878H9.10123H9.09363H9.08598H9.07827H9.07052H9.06271H9.05484H9.04692H9.03895H9.03092H9.02284H9.0147H9.00651H8.99826H8.98995H8.98159H8.97317H8.96469H8.95615H8.94756H8.93891H8.9302H8.92143H8.9126H8.90371H8.89476H8.88575H8.87667H8.86754H8.85835H8.84909H8.83977H8.83039H8.82095H8.81144H8.80187H8.79223H8.78254H8.77277H8.76294H8.75305H8.74309H8.73306H8.72297H8.71281H8.70258H8.69229H8.68193H8.6715H8.661H8.65044H8.6398H8.6291H8.61832H8.60748H8.59656H8.58557H8.57452H8.56339H8.55219H8.54091H8.52957H8.51815H8.50666H8.49509H8.48345H8.47174H8.45995H8.44809H8.43615H8.42413H8.41204H8.39988H8.38764H8.37532H8.36292H8.35044H8.33789H8.32526H8.31255H8.29976H8.28689H8.27394H8.26092H8.24781H8.23462H8.22135H8.208H8.19456H8.18105H8.16745H8.15377H8.14H8.12615H8.11222H8.09821H8.08411H8.06992H8.05565H8.04129H8.02685H8.01232H7.99771H7.98301H7.96822H7.95334H7.93838H7.92333H7.90818H7.89295H7.87763H7.86223H7.84673H7.83114H7.81546H7.79968H7.78382H7.76787H7.75182H7.73568H7.71945H7.70312C7.35795 4.625 7.07812 4.34518 7.07812 4ZM6.5465 11H2.625V5H1.375V11.125C1.375 11.7463 1.87868 12.25 2.5 12.25H5.29532L5.94495 11.601L6.5465 11Z" fill="#11181C"/>
+<path d="M12 7.31372L7.31372 12M12 12L7.31372 7.31372" stroke="#11181C" stroke-width="1.25" stroke-linecap="round"/>
+</svg>
diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index 41a7008fc16efb3ed5b3f1176a9d1821ec15bf01..2c67653292f9b972915afb8e8d7af895e664cb41 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -105,6 +105,11 @@ fn box_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
         ),
         ("mt", true, vec![quote! { margin.top }]),
         ("mb", true, vec![quote! { margin.bottom }]),
+        (
+            "my",
+            true,
+            vec![quote! { margin.top }, quote! { margin.bottom }],
+        ),
         (
             "mx",
             true,
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index d125181f38a0b0ade26064ce6ca26023c5b697fc..0d463a45e716fce1e7e75b9c5f5eb96dbb9c2c2c 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,6 +1,6 @@
 use crate::{collab_panel::collab_panel, theme::theme};
 use gpui2::{
-    elements::{div, svg},
+    elements::{div, img, svg},
     style::{StyleHelpers, Styleable},
     Element, IntoElement, ParentElement, ViewContext,
 };
@@ -106,59 +106,122 @@ impl TitleBar {
             .flex()
             .items_center()
             .h_full()
-            .gap_4()
+            .gap_3()
             .px_2()
-            // === Comms === //
+            // === Actions === //
             .child(
-                div()
-                    .flex()
-                    .items_center()
-                    .gap_1()
-                    .child(
-                        div()
-                            .w_6()
-                            .h_full()
-                            .flex()
-                            .items_center()
-                            .justify_center()
-                            .child(
-                                svg()
-                                    .path("icons/microphone.svg")
-                                    .w_4()
-                                    .h_4()
-                                    .fill(theme.lowest.base.default.foreground),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .w_6()
-                            .h_full()
-                            .flex()
-                            .items_center()
-                            .justify_center()
-                            .child(
-                                svg()
-                                    .path("icons/screen.svg")
-                                    .w_4()
-                                    .h_4()
-                                    .fill(theme.lowest.base.default.foreground),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .w_6()
-                            .h_full()
-                            .flex()
-                            .items_center()
-                            .justify_center()
-                            .child(
-                                svg()
-                                    .path("icons/exit.svg")
-                                    .w_4()
-                                    .h_4()
-                                    .fill(theme.lowest.base.default.foreground),
-                            ),
+                div().child(
+                    div().flex().items_center().gap_1().child(
+                        div().size_4().flex().items_center().justify_center().child(
+                            svg()
+                                .path("icons/exit.svg")
+                                .size_4()
+                                .fill(theme.lowest.base.default.foreground),
+                        ),
                     ),
+                ),
+            )
+            .child(div().w_px().h_3().fill(theme.lowest.base.default.border))
+            // === Comms === //
+            .child(
+                div().child(
+                    div()
+                        .flex()
+                        .items_center()
+                        .gap_px()
+                        .child(
+                            div()
+                                .px_2()
+                                .py_1()
+                                .rounded_md()
+                                .h_full()
+                                .flex()
+                                .items_center()
+                                .justify_center()
+                                .hover()
+                                .fill(theme.lowest.base.hovered.background)
+                                .active()
+                                .fill(theme.lowest.base.pressed.background)
+                                .child(
+                                    svg()
+                                        .path("icons/microphone.svg")
+                                        .size_3p5()
+                                        .fill(theme.lowest.base.default.foreground),
+                                ),
+                        )
+                        .child(
+                            div()
+                                .px_2()
+                                .py_1()
+                                .rounded_md()
+                                .h_full()
+                                .flex()
+                                .items_center()
+                                .justify_center()
+                                .hover()
+                                .fill(theme.lowest.base.hovered.background)
+                                .active()
+                                .fill(theme.lowest.base.pressed.background)
+                                .child(
+                                    svg()
+                                        .path("icons/radix/speaker-loud.svg")
+                                        .size_3p5()
+                                        .fill(theme.lowest.base.default.foreground),
+                                ),
+                        )
+                        .child(
+                            div()
+                                .px_2()
+                                .py_1()
+                                .rounded_md()
+                                .h_full()
+                                .flex()
+                                .items_center()
+                                .justify_center()
+                                .hover()
+                                .fill(theme.lowest.base.hovered.background)
+                                .active()
+                                .fill(theme.lowest.base.pressed.background)
+                                .child(
+                                    svg()
+                                        .path("icons/radix/desktop.svg")
+                                        .size_3p5()
+                                        .fill(theme.lowest.base.default.foreground),
+                                ),
+                        ),
+                ),
+            )
+            .child(div().w_px().h_3().fill(theme.lowest.base.default.border))
+            // User Group
+            .child(
+                div().child(
+                    div()
+                        .px_1()
+                        .py_1()
+                        .flex()
+                        .items_center()
+                        .justify_center()
+                        .rounded_md()
+                        .gap_0p5()
+                        .hover()
+                        .fill(theme.lowest.base.hovered.background)
+                        .active()
+                        .fill(theme.lowest.base.pressed.background)
+                        .child(
+                            img()
+                                .uri("https://avatars.githubusercontent.com/u/1714999?v=4")
+                                .size_4()
+                                .rounded_md()
+                                .fill(theme.middle.on.default.foreground),
+                        )
+                        .child(
+                            svg()
+                                .path("icons/caret_down_8.svg")
+                                .w_2()
+                                .h_2()
+                                .fill(theme.lowest.variant.default.foreground),
+                        ),
+                ),
             )
     }
 }

From 14ea5a148542b702765a4da287a940a9451ba355 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 7 Sep 2023 16:01:32 -0400
Subject: [PATCH 054/109] Checkpoint

---
 crates/gpui2/src/style.rs                     |  33 ++-
 crates/gpui2_macros/src/styleable_helpers.rs  |  14 +-
 .../src/active_buffer_language.rs             |  94 +++++++++
 .../src/language_selector.rs                  | 196 ++++++++++++++++++
 crates/storybook/src/workspace.rs             |   4 +-
 5 files changed, 337 insertions(+), 4 deletions(-)
 create mode 100644 crates/language_tools/language_selector/src/active_buffer_language.rs
 create mode 100644 crates/language_tools/language_selector/src/language_selector.rs

diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 0b1e9b3442559d3fbb8a6c84a4f5f514ab12e995..591fb54576355e14a888ca23bf12fa4cb863bec9 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -398,11 +398,42 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
-    fn flex_grow(mut self) -> Self
+    fn flex_1(mut self) -> Self
     where
         Self: Sized,
     {
         self.declared_style().flex_grow = Some(1.);
+        self.declared_style().flex_shrink = Some(1.);
+        self.declared_style().flex_basis = Some(relative(0.));
+        self
+    }
+
+    fn flex_auto(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_grow = Some(1.);
+        self.declared_style().flex_shrink = Some(1.);
+        self.declared_style().flex_basis = Some(Length::Auto);
+        self
+    }
+
+    fn flex_initial(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_grow = Some(0.);
+        self.declared_style().flex_shrink = Some(1.);
+        self.declared_style().flex_basis = Some(Length::Auto);
+        self
+    }
+
+    fn flex_none(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_grow = Some(0.);
+        self.declared_style().flex_shrink = Some(0.);
         self
     }
 
diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index 2c67653292f9b972915afb8e8d7af895e664cb41..ae7b2d3b1b8dcc13eeaacadf00cbe2cfd0cd716c 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -101,7 +101,12 @@ fn box_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
         (
             "m",
             true,
-            vec![quote! { margin.top }, quote! { margin.bottom }],
+            vec![
+                quote! { margin.top },
+                quote! { margin.bottom },
+                quote! { margin.left },
+                quote! { margin.right },
+            ],
         ),
         ("mt", true, vec![quote! { margin.top }]),
         ("mb", true, vec![quote! { margin.bottom }]),
@@ -120,7 +125,12 @@ fn box_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
         (
             "p",
             false,
-            vec![quote! { padding.top }, quote! { padding.bottom }],
+            vec![
+                quote! { padding.top },
+                quote! { padding.bottom },
+                quote! { padding.left },
+                quote! { padding.right },
+            ],
         ),
         ("pt", false, vec![quote! { padding.top }]),
         ("pb", false, vec![quote! { padding.bottom }]),
diff --git a/crates/language_tools/language_selector/src/active_buffer_language.rs b/crates/language_tools/language_selector/src/active_buffer_language.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5ffcb13fbafa7be008346f97bcfb1b2041b4244b
--- /dev/null
+++ b/crates/language_tools/language_selector/src/active_buffer_language.rs
@@ -0,0 +1,94 @@
+use editor::Editor;
+use gpui::{
+    elements::*,
+    platform::{CursorStyle, MouseButton},
+    Entity, Subscription, View, ViewContext, ViewHandle, WeakViewHandle,
+};
+use std::sync::Arc;
+use workspace::{item::ItemHandle, StatusItemView, Workspace};
+
+pub struct ActiveBufferLanguage {
+    active_language: Option<Option<Arc<str>>>,
+    workspace: WeakViewHandle<Workspace>,
+    _observe_active_editor: Option<Subscription>,
+}
+
+impl ActiveBufferLanguage {
+    pub fn new(workspace: &Workspace) -> Self {
+        Self {
+            active_language: None,
+            workspace: workspace.weak_handle(),
+            _observe_active_editor: None,
+        }
+    }
+
+    fn update_language(&mut self, editor: ViewHandle<Editor>, cx: &mut ViewContext<Self>) {
+        self.active_language = Some(None);
+
+        let editor = editor.read(cx);
+        if let Some((_, buffer, _)) = editor.active_excerpt(cx) {
+            if let Some(language) = buffer.read(cx).language() {
+                self.active_language = Some(Some(language.name()));
+            }
+        }
+
+        cx.notify();
+    }
+}
+
+impl Entity for ActiveBufferLanguage {
+    type Event = ();
+}
+
+impl View for ActiveBufferLanguage {
+    fn ui_name() -> &'static str {
+        "ActiveBufferLanguage"
+    }
+
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
+        if let Some(active_language) = self.active_language.as_ref() {
+            let active_language_text = if let Some(active_language_text) = active_language {
+                active_language_text.to_string()
+            } else {
+                "Unknown".to_string()
+            };
+
+            MouseEventHandler::new::<Self, _>(0, cx, |state, cx| {
+                let theme = &theme::current(cx).workspace.status_bar;
+                let style = theme.active_language.style_for(state);
+                Label::new(active_language_text, style.text.clone())
+                    .contained()
+                    .with_style(style.container)
+            })
+            .with_cursor_style(CursorStyle::PointingHand)
+            .on_click(MouseButton::Left, |_, this, cx| {
+                if let Some(workspace) = this.workspace.upgrade(cx) {
+                    workspace.update(cx, |workspace, cx| {
+                        crate::toggle(workspace, &Default::default(), cx)
+                    });
+                }
+            })
+            .into_any()
+        } else {
+            Empty::new().into_any()
+        }
+    }
+}
+
+impl StatusItemView for ActiveBufferLanguage {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn ItemHandle>,
+        cx: &mut ViewContext<Self>,
+    ) {
+        if let Some(editor) = active_pane_item.and_then(|item| item.act_as::<Editor>(cx)) {
+            self._observe_active_editor = Some(cx.observe(&editor, Self::update_language));
+            self.update_language(editor, cx);
+        } else {
+            self.active_language = None;
+            self._observe_active_editor = None;
+        }
+
+        cx.notify();
+    }
+}
diff --git a/crates/language_tools/language_selector/src/language_selector.rs b/crates/language_tools/language_selector/src/language_selector.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b5336d5b3b7952b8c015fae7840ddd3320663424
--- /dev/null
+++ b/crates/language_tools/language_selector/src/language_selector.rs
@@ -0,0 +1,196 @@
+mod active_buffer_language;
+
+pub use active_buffer_language::ActiveBufferLanguage;
+use anyhow::anyhow;
+use editor::Editor;
+use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
+use gpui::{actions, elements::*, AppContext, ModelHandle, MouseState, ViewContext};
+use language::{Buffer, LanguageRegistry};
+use picker::{Picker, PickerDelegate, PickerEvent};
+use project::Project;
+use std::sync::Arc;
+use util::ResultExt;
+use workspace::Workspace;
+
+actions!(language_selector, [Toggle]);
+
+pub fn init(cx: &mut AppContext) {
+    Picker::<LanguageSelectorDelegate>::init(cx);
+    cx.add_action(toggle);
+}
+
+pub fn toggle(
+    workspace: &mut Workspace,
+    _: &Toggle,
+    cx: &mut ViewContext<Workspace>,
+) -> Option<()> {
+    let (_, buffer, _) = workspace
+        .active_item(cx)?
+        .act_as::<Editor>(cx)?
+        .read(cx)
+        .active_excerpt(cx)?;
+    workspace.toggle_modal(cx, |workspace, cx| {
+        let registry = workspace.app_state().languages.clone();
+        cx.add_view(|cx| {
+            Picker::new(
+                LanguageSelectorDelegate::new(buffer, workspace.project().clone(), registry),
+                cx,
+            )
+        })
+    });
+    Some(())
+}
+
+pub struct LanguageSelectorDelegate {
+    buffer: ModelHandle<Buffer>,
+    project: ModelHandle<Project>,
+    language_registry: Arc<LanguageRegistry>,
+    candidates: Vec<StringMatchCandidate>,
+    matches: Vec<StringMatch>,
+    selected_index: usize,
+}
+
+impl LanguageSelectorDelegate {
+    fn new(
+        buffer: ModelHandle<Buffer>,
+        project: ModelHandle<Project>,
+        language_registry: Arc<LanguageRegistry>,
+    ) -> Self {
+        let candidates = language_registry
+            .language_names()
+            .into_iter()
+            .enumerate()
+            .map(|(candidate_id, name)| StringMatchCandidate::new(candidate_id, name))
+            .collect::<Vec<_>>();
+        let mut matches = candidates
+            .iter()
+            .map(|candidate| StringMatch {
+                candidate_id: candidate.id,
+                score: 0.,
+                positions: Default::default(),
+                string: candidate.string.clone(),
+            })
+            .collect::<Vec<_>>();
+        matches.sort_unstable_by(|mat1, mat2| mat1.string.cmp(&mat2.string));
+
+        Self {
+            buffer,
+            project,
+            language_registry,
+            candidates,
+            matches,
+            selected_index: 0,
+        }
+    }
+}
+
+impl PickerDelegate for LanguageSelectorDelegate {
+    fn placeholder_text(&self) -> Arc<str> {
+        "Select a language...".into()
+    }
+
+    fn match_count(&self) -> usize {
+        self.matches.len()
+    }
+
+    fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<Self>>) {
+        if let Some(mat) = self.matches.get(self.selected_index) {
+            let language_name = &self.candidates[mat.candidate_id].string;
+            let language = self.language_registry.language_for_name(language_name);
+            let project = self.project.downgrade();
+            let buffer = self.buffer.downgrade();
+            cx.spawn(|_, mut cx| async move {
+                let language = language.await?;
+                let project = project
+                    .upgrade(&cx)
+                    .ok_or_else(|| anyhow!("project was dropped"))?;
+                let buffer = buffer
+                    .upgrade(&cx)
+                    .ok_or_else(|| anyhow!("buffer was dropped"))?;
+                project.update(&mut cx, |project, cx| {
+                    project.set_language_for_buffer(&buffer, language, cx);
+                });
+                anyhow::Ok(())
+            })
+            .detach_and_log_err(cx);
+        }
+
+        cx.emit(PickerEvent::Dismiss);
+    }
+
+    fn dismissed(&mut self, _cx: &mut ViewContext<Picker<Self>>) {}
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn set_selected_index(&mut self, ix: usize, _: &mut ViewContext<Picker<Self>>) {
+        self.selected_index = ix;
+    }
+
+    fn update_matches(
+        &mut self,
+        query: String,
+        cx: &mut ViewContext<Picker<Self>>,
+    ) -> gpui::Task<()> {
+        let background = cx.background().clone();
+        let candidates = self.candidates.clone();
+        cx.spawn(|this, mut cx| async move {
+            let matches = if query.is_empty() {
+                candidates
+                    .into_iter()
+                    .enumerate()
+                    .map(|(index, candidate)| StringMatch {
+                        candidate_id: index,
+                        string: candidate.string,
+                        positions: Vec::new(),
+                        score: 0.0,
+                    })
+                    .collect()
+            } else {
+                match_strings(
+                    &candidates,
+                    &query,
+                    false,
+                    100,
+                    &Default::default(),
+                    background,
+                )
+                .await
+            };
+
+            this.update(&mut cx, |this, cx| {
+                let delegate = this.delegate_mut();
+                delegate.matches = matches;
+                delegate.selected_index = delegate
+                    .selected_index
+                    .min(delegate.matches.len().saturating_sub(1));
+                cx.notify();
+            })
+            .log_err();
+        })
+    }
+
+    fn render_match(
+        &self,
+        ix: usize,
+        mouse_state: &mut MouseState,
+        selected: bool,
+        cx: &AppContext,
+    ) -> AnyElement<Picker<Self>> {
+        let theme = theme::current(cx);
+        let mat = &self.matches[ix];
+        let style = theme.picker.item.in_state(selected).style_for(mouse_state);
+        let buffer_language_name = self.buffer.read(cx).language().map(|l| l.name());
+        let mut label = mat.string.clone();
+        if buffer_language_name.as_deref() == Some(mat.string.as_str()) {
+            label.push_str(" (current)");
+        }
+
+        Label::new(label, style.label.clone())
+            .with_highlights(mat.positions.clone())
+            .contained()
+            .with_style(style.container)
+            .into_any()
+    }
+}
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index 0d463a45e716fce1e7e75b9c5f5eb96dbb9c2c2c..b3eb5b31143543b6f5aa83fb7b0159e9e6d38806 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -410,8 +410,10 @@ impl WorkspaceElement {
             .size_full()
             .flex()
             .flex_col()
-            .gap_y_0()
             .font("Zed Sans Extended")
+            .gap_0()
+            .justify_start()
+            .items_start()
             .text_color(theme.lowest.base.default.foreground)
             .fill(theme.middle.warning.default.background)
             .child(titlebar())

From 4307a06073b68126d07d829b601ade0f42073421 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Thu, 7 Sep 2023 14:16:44 -0600
Subject: [PATCH 055/109] WIP

---
 crates/storybook/src/workspace.rs | 47 +++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index b3eb5b31143543b6f5aa83fb7b0159e9e6d38806..17c0877339e2da53d3c0e4cbf4eecd093c7925de 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -416,9 +416,50 @@ impl WorkspaceElement {
             .items_start()
             .text_color(theme.lowest.base.default.foreground)
             .fill(theme.middle.warning.default.background)
-            .child(titlebar())
-            .child(collab_panel())
-            .child(statusbar())
+            .child(
+                div()
+                    .w_full()
+                    .h_8()
+                    .fill(theme.lowest.negative.default.background)
+                    .child(titlebar()),
+            )
+            .child(
+                div()
+                    .flex_1()
+                    .fill(theme.lowest.warning.default.background)
+                    .child(collab_panel()),
+            )
+            .child(
+                div()
+                    .w_full()
+                    .h_9()
+                    .fill(theme.lowest.positive.default.background)
+                    .child(statusbar())
+                    .child(
+                        div()
+                            .h_px()
+                            .w_full()
+                            .fill(theme.lowest.negative.default.background),
+                    )
+                    .child(
+                        div()
+                            .h_px()
+                            .w_full()
+                            .fill(theme.lowest.positive.default.background),
+                    )
+                    .child(
+                        div()
+                            .h_px()
+                            .w_full()
+                            .fill(theme.lowest.accent.default.background),
+                    )
+                    .child(
+                        div()
+                            .h_px()
+                            .w_full()
+                            .fill(theme.lowest.warning.default.background),
+                    ),
+            )
     }
 }
 

From ab8a9e912fbb73145d1ed703acb85fb77edd79a9 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 7 Sep 2023 16:19:06 -0400
Subject: [PATCH 056/109] Remove accidentally added files

---
 .../src/active_buffer_language.rs             |  94 ---------
 .../src/language_selector.rs                  | 196 ------------------
 2 files changed, 290 deletions(-)
 delete mode 100644 crates/language_tools/language_selector/src/active_buffer_language.rs
 delete mode 100644 crates/language_tools/language_selector/src/language_selector.rs

diff --git a/crates/language_tools/language_selector/src/active_buffer_language.rs b/crates/language_tools/language_selector/src/active_buffer_language.rs
deleted file mode 100644
index 5ffcb13fbafa7be008346f97bcfb1b2041b4244b..0000000000000000000000000000000000000000
--- a/crates/language_tools/language_selector/src/active_buffer_language.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use editor::Editor;
-use gpui::{
-    elements::*,
-    platform::{CursorStyle, MouseButton},
-    Entity, Subscription, View, ViewContext, ViewHandle, WeakViewHandle,
-};
-use std::sync::Arc;
-use workspace::{item::ItemHandle, StatusItemView, Workspace};
-
-pub struct ActiveBufferLanguage {
-    active_language: Option<Option<Arc<str>>>,
-    workspace: WeakViewHandle<Workspace>,
-    _observe_active_editor: Option<Subscription>,
-}
-
-impl ActiveBufferLanguage {
-    pub fn new(workspace: &Workspace) -> Self {
-        Self {
-            active_language: None,
-            workspace: workspace.weak_handle(),
-            _observe_active_editor: None,
-        }
-    }
-
-    fn update_language(&mut self, editor: ViewHandle<Editor>, cx: &mut ViewContext<Self>) {
-        self.active_language = Some(None);
-
-        let editor = editor.read(cx);
-        if let Some((_, buffer, _)) = editor.active_excerpt(cx) {
-            if let Some(language) = buffer.read(cx).language() {
-                self.active_language = Some(Some(language.name()));
-            }
-        }
-
-        cx.notify();
-    }
-}
-
-impl Entity for ActiveBufferLanguage {
-    type Event = ();
-}
-
-impl View for ActiveBufferLanguage {
-    fn ui_name() -> &'static str {
-        "ActiveBufferLanguage"
-    }
-
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
-        if let Some(active_language) = self.active_language.as_ref() {
-            let active_language_text = if let Some(active_language_text) = active_language {
-                active_language_text.to_string()
-            } else {
-                "Unknown".to_string()
-            };
-
-            MouseEventHandler::new::<Self, _>(0, cx, |state, cx| {
-                let theme = &theme::current(cx).workspace.status_bar;
-                let style = theme.active_language.style_for(state);
-                Label::new(active_language_text, style.text.clone())
-                    .contained()
-                    .with_style(style.container)
-            })
-            .with_cursor_style(CursorStyle::PointingHand)
-            .on_click(MouseButton::Left, |_, this, cx| {
-                if let Some(workspace) = this.workspace.upgrade(cx) {
-                    workspace.update(cx, |workspace, cx| {
-                        crate::toggle(workspace, &Default::default(), cx)
-                    });
-                }
-            })
-            .into_any()
-        } else {
-            Empty::new().into_any()
-        }
-    }
-}
-
-impl StatusItemView for ActiveBufferLanguage {
-    fn set_active_pane_item(
-        &mut self,
-        active_pane_item: Option<&dyn ItemHandle>,
-        cx: &mut ViewContext<Self>,
-    ) {
-        if let Some(editor) = active_pane_item.and_then(|item| item.act_as::<Editor>(cx)) {
-            self._observe_active_editor = Some(cx.observe(&editor, Self::update_language));
-            self.update_language(editor, cx);
-        } else {
-            self.active_language = None;
-            self._observe_active_editor = None;
-        }
-
-        cx.notify();
-    }
-}
diff --git a/crates/language_tools/language_selector/src/language_selector.rs b/crates/language_tools/language_selector/src/language_selector.rs
deleted file mode 100644
index b5336d5b3b7952b8c015fae7840ddd3320663424..0000000000000000000000000000000000000000
--- a/crates/language_tools/language_selector/src/language_selector.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-mod active_buffer_language;
-
-pub use active_buffer_language::ActiveBufferLanguage;
-use anyhow::anyhow;
-use editor::Editor;
-use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
-use gpui::{actions, elements::*, AppContext, ModelHandle, MouseState, ViewContext};
-use language::{Buffer, LanguageRegistry};
-use picker::{Picker, PickerDelegate, PickerEvent};
-use project::Project;
-use std::sync::Arc;
-use util::ResultExt;
-use workspace::Workspace;
-
-actions!(language_selector, [Toggle]);
-
-pub fn init(cx: &mut AppContext) {
-    Picker::<LanguageSelectorDelegate>::init(cx);
-    cx.add_action(toggle);
-}
-
-pub fn toggle(
-    workspace: &mut Workspace,
-    _: &Toggle,
-    cx: &mut ViewContext<Workspace>,
-) -> Option<()> {
-    let (_, buffer, _) = workspace
-        .active_item(cx)?
-        .act_as::<Editor>(cx)?
-        .read(cx)
-        .active_excerpt(cx)?;
-    workspace.toggle_modal(cx, |workspace, cx| {
-        let registry = workspace.app_state().languages.clone();
-        cx.add_view(|cx| {
-            Picker::new(
-                LanguageSelectorDelegate::new(buffer, workspace.project().clone(), registry),
-                cx,
-            )
-        })
-    });
-    Some(())
-}
-
-pub struct LanguageSelectorDelegate {
-    buffer: ModelHandle<Buffer>,
-    project: ModelHandle<Project>,
-    language_registry: Arc<LanguageRegistry>,
-    candidates: Vec<StringMatchCandidate>,
-    matches: Vec<StringMatch>,
-    selected_index: usize,
-}
-
-impl LanguageSelectorDelegate {
-    fn new(
-        buffer: ModelHandle<Buffer>,
-        project: ModelHandle<Project>,
-        language_registry: Arc<LanguageRegistry>,
-    ) -> Self {
-        let candidates = language_registry
-            .language_names()
-            .into_iter()
-            .enumerate()
-            .map(|(candidate_id, name)| StringMatchCandidate::new(candidate_id, name))
-            .collect::<Vec<_>>();
-        let mut matches = candidates
-            .iter()
-            .map(|candidate| StringMatch {
-                candidate_id: candidate.id,
-                score: 0.,
-                positions: Default::default(),
-                string: candidate.string.clone(),
-            })
-            .collect::<Vec<_>>();
-        matches.sort_unstable_by(|mat1, mat2| mat1.string.cmp(&mat2.string));
-
-        Self {
-            buffer,
-            project,
-            language_registry,
-            candidates,
-            matches,
-            selected_index: 0,
-        }
-    }
-}
-
-impl PickerDelegate for LanguageSelectorDelegate {
-    fn placeholder_text(&self) -> Arc<str> {
-        "Select a language...".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matches.len()
-    }
-
-    fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<Self>>) {
-        if let Some(mat) = self.matches.get(self.selected_index) {
-            let language_name = &self.candidates[mat.candidate_id].string;
-            let language = self.language_registry.language_for_name(language_name);
-            let project = self.project.downgrade();
-            let buffer = self.buffer.downgrade();
-            cx.spawn(|_, mut cx| async move {
-                let language = language.await?;
-                let project = project
-                    .upgrade(&cx)
-                    .ok_or_else(|| anyhow!("project was dropped"))?;
-                let buffer = buffer
-                    .upgrade(&cx)
-                    .ok_or_else(|| anyhow!("buffer was dropped"))?;
-                project.update(&mut cx, |project, cx| {
-                    project.set_language_for_buffer(&buffer, language, cx);
-                });
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
-        }
-
-        cx.emit(PickerEvent::Dismiss);
-    }
-
-    fn dismissed(&mut self, _cx: &mut ViewContext<Picker<Self>>) {}
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut ViewContext<Picker<Self>>) {
-        self.selected_index = ix;
-    }
-
-    fn update_matches(
-        &mut self,
-        query: String,
-        cx: &mut ViewContext<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let background = cx.background().clone();
-        let candidates = self.candidates.clone();
-        cx.spawn(|this, mut cx| async move {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    100,
-                    &Default::default(),
-                    background,
-                )
-                .await
-            };
-
-            this.update(&mut cx, |this, cx| {
-                let delegate = this.delegate_mut();
-                delegate.matches = matches;
-                delegate.selected_index = delegate
-                    .selected_index
-                    .min(delegate.matches.len().saturating_sub(1));
-                cx.notify();
-            })
-            .log_err();
-        })
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        mouse_state: &mut MouseState,
-        selected: bool,
-        cx: &AppContext,
-    ) -> AnyElement<Picker<Self>> {
-        let theme = theme::current(cx);
-        let mat = &self.matches[ix];
-        let style = theme.picker.item.in_state(selected).style_for(mouse_state);
-        let buffer_language_name = self.buffer.read(cx).language().map(|l| l.name());
-        let mut label = mat.string.clone();
-        if buffer_language_name.as_deref() == Some(mat.string.as_str()) {
-            label.push_str(" (current)");
-        }
-
-        Label::new(label, style.label.clone())
-            .with_highlights(mat.positions.clone())
-            .contained()
-            .with_style(style.container)
-            .into_any()
-    }
-}

From e7760e1a3ff38dfcbccdb8d49c71d4d47af00e61 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 7 Sep 2023 16:25:02 -0400
Subject: [PATCH 057/109] Outline workspace

---
 crates/storybook/src/collab_panel.rs | 2 +-
 crates/storybook/src/workspace.rs    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 8530f95f3ce2fe69b3ffe3b38642a03f772b581e..8fa84766449c56c320cb62914f1e1e7f3c02beb0 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -23,7 +23,7 @@ impl<V: 'static> CollabPanelElement<V> {
 
         // Panel
         div()
-            .w_96()
+            .w_64()
             .flex()
             .flex_col()
             .font("Zed Sans Extended")
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index 17c0877339e2da53d3c0e4cbf4eecd093c7925de..ecdfcd4def8632a4c92f49f895e00ac4e1eede5b 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -425,9 +425,11 @@ impl WorkspaceElement {
             )
             .child(
                 div()
+                    .flex()
                     .flex_1()
-                    .fill(theme.lowest.warning.default.background)
-                    .child(collab_panel()),
+                    .child(collab_panel())
+                    .child(div().flex_1().fill(theme.lowest.accent.default.background))
+                    .child(div().w_64().fill(theme.lowest.positive.default.background)),
             )
             .child(
                 div()

From d311bd04ffd0f469d4e9fbd5cdc0eab9f7c5c37d Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Thu, 7 Sep 2023 22:24:02 -0600
Subject: [PATCH 058/109] Add basic inspector

---
 crates/gpui/src/app/window.rs                 | 36 +++++++-
 crates/gpui/src/geometry.rs                   | 54 +++++++++---
 crates/gpui2/src/elements/div.rs              | 65 +++++++++++++-
 crates/gpui2/src/elements/hoverable.rs        |  1 +
 crates/gpui2/src/style.rs                     |  6 +-
 .../src/derive_refineable.rs                  | 56 +++++++++++-
 crates/storybook/src/storybook.rs             | 12 ++-
 crates/storybook/src/workspace.rs             | 85 +++++++------------
 8 files changed, 240 insertions(+), 75 deletions(-)

diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 2c4a758c7f45a433e6ff3d6366eae14ab5c7627e..e0f29fea51b414a50d792f915fd0e8934d53fe0f 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -51,6 +51,7 @@ pub struct Window {
     pub(crate) parents: HashMap<usize, usize>,
     pub(crate) is_active: bool,
     pub(crate) is_fullscreen: bool,
+    inspector_enabled: bool,
     pub(crate) invalidation: Option<WindowInvalidation>,
     pub(crate) platform_window: Box<dyn platform::Window>,
     pub(crate) rendered_views: HashMap<usize, Box<dyn AnyRootElement>>,
@@ -65,6 +66,7 @@ pub struct Window {
     event_handlers: Vec<EventHandler>,
     last_mouse_moved_event: Option<Event>,
     last_mouse_position: Vector2F,
+    pressed_buttons: HashSet<MouseButton>,
     pub(crate) hovered_region_ids: Vec<MouseRegionId>,
     pub(crate) clicked_region_ids: Vec<MouseRegionId>,
     pub(crate) clicked_region: Option<(MouseRegionId, MouseButton)>,
@@ -92,6 +94,7 @@ impl Window {
             is_active: false,
             invalidation: None,
             is_fullscreen: false,
+            inspector_enabled: false,
             platform_window,
             rendered_views: Default::default(),
             text_style_stack: Vec::new(),
@@ -104,6 +107,7 @@ impl Window {
             text_layout_cache: TextLayoutCache::new(cx.font_system.clone()),
             last_mouse_moved_event: None,
             last_mouse_position: Vector2F::zero(),
+            pressed_buttons: Default::default(),
             hovered_region_ids: Default::default(),
             clicked_region_ids: Default::default(),
             clicked_region: None,
@@ -235,6 +239,18 @@ impl<'a> WindowContext<'a> {
             .push_back(Effect::RepaintWindow { window });
     }
 
+    pub fn enable_inspector(&mut self) {
+        self.window.inspector_enabled = true;
+    }
+
+    pub fn is_inspector_enabled(&self) -> bool {
+        self.window.inspector_enabled
+    }
+
+    pub fn is_mouse_down(&self, button: MouseButton) -> bool {
+        self.window.pressed_buttons.contains(&button)
+    }
+
     pub fn rem_size(&self) -> f32 {
         16.
     }
@@ -521,7 +537,7 @@ impl<'a> WindowContext<'a> {
 
     pub(crate) fn dispatch_event(&mut self, event: Event, event_reused: bool) -> bool {
         if !event_reused {
-            self.dispatch_to_new_event_handlers(&event);
+            self.dispatch_event_2(&event);
         }
 
         let mut mouse_events = SmallVec::<[_; 2]>::new();
@@ -898,12 +914,24 @@ impl<'a> WindowContext<'a> {
         any_event_handled
     }
 
-    fn dispatch_to_new_event_handlers(&mut self, event: &Event) {
+    fn dispatch_event_2(&mut self, event: &Event) {
+        match event {
+            Event::MouseDown(event) => {
+                self.window.pressed_buttons.insert(event.button);
+            }
+            Event::MouseUp(event) => {
+                self.window.pressed_buttons.remove(&event.button);
+            }
+            _ => {}
+        }
+
         if let Some(mouse_event) = event.mouse_event() {
             let event_handlers = self.window.take_event_handlers();
             for event_handler in event_handlers.iter().rev() {
                 if event_handler.event_type == mouse_event.type_id() {
-                    (event_handler.handler)(mouse_event, self);
+                    if !(event_handler.handler)(mouse_event, self) {
+                        break;
+                    }
                 }
             }
             self.window.event_handlers = event_handlers;
@@ -1394,7 +1422,7 @@ pub struct MeasureParams {
     pub available_space: Size<AvailableSpace>,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub enum AvailableSpace {
     /// The amount of space available is the specified number of pixels
     Pixels(f32),
diff --git a/crates/gpui/src/geometry.rs b/crates/gpui/src/geometry.rs
index b05ec63f9714534c3b6bacc0c6b9421cc3e6cfac..c83ad73b5db16a457a94d0494743e7ee3f352f4a 100644
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -1,3 +1,5 @@
+use std::fmt::Debug;
+
 use super::scene::{Path, PathVertex};
 use crate::{color::Color, json::ToJson};
 pub use pathfinder_geometry::*;
@@ -133,13 +135,14 @@ impl ToJson for RectF {
     }
 }
 
-#[derive(Refineable)]
-pub struct Point<T: Clone + Default> {
+#[derive(Refineable, Debug)]
+#[refineable(debug)]
+pub struct Point<T: Clone + Default + Debug> {
     pub x: T,
     pub y: T,
 }
 
-impl<T: Clone + Default> Clone for Point<T> {
+impl<T: Clone + Default + Debug> Clone for Point<T> {
     fn clone(&self) -> Self {
         Self {
             x: self.x.clone(),
@@ -148,7 +151,7 @@ impl<T: Clone + Default> Clone for Point<T> {
     }
 }
 
-impl<T: Clone + Default> Into<taffy::geometry::Point<T>> for Point<T> {
+impl<T: Clone + Default + Debug> Into<taffy::geometry::Point<T>> for Point<T> {
     fn into(self) -> taffy::geometry::Point<T> {
         taffy::geometry::Point {
             x: self.x,
@@ -157,13 +160,14 @@ impl<T: Clone + Default> Into<taffy::geometry::Point<T>> for Point<T> {
     }
 }
 
-#[derive(Clone, Refineable, Debug)]
-pub struct Size<T: Clone + Default> {
+#[derive(Refineable, Clone, Debug)]
+#[refineable(debug)]
+pub struct Size<T: Clone + Default + Debug> {
     pub width: T,
     pub height: T,
 }
 
-impl<S, T: Clone + Default> From<taffy::geometry::Size<S>> for Size<T>
+impl<S, T: Clone + Default + Debug> From<taffy::geometry::Size<S>> for Size<T>
 where
     S: Into<T>,
 {
@@ -175,7 +179,7 @@ where
     }
 }
 
-impl<S, T: Clone + Default> Into<taffy::geometry::Size<S>> for Size<T>
+impl<S, T: Clone + Default + Debug> Into<taffy::geometry::Size<S>> for Size<T>
 where
     T: Into<S>,
 {
@@ -222,8 +226,9 @@ impl Size<Length> {
     }
 }
 
-#[derive(Clone, Default, Refineable)]
-pub struct Edges<T: Clone + Default> {
+#[derive(Clone, Default, Refineable, Debug)]
+#[refineable(debug)]
+pub struct Edges<T: Clone + Default + Debug> {
     pub top: T,
     pub right: T,
     pub bottom: T,
@@ -323,6 +328,15 @@ pub enum AbsoluteLength {
     Rems(f32),
 }
 
+impl std::fmt::Debug for AbsoluteLength {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            AbsoluteLength::Pixels(pixels) => write!(f, "{}px", pixels),
+            AbsoluteLength::Rems(rems) => write!(f, "{}rems", rems),
+        }
+    }
+}
+
 impl AbsoluteLength {
     pub fn to_pixels(&self, rem_size: f32) -> f32 {
         match self {
@@ -349,7 +363,7 @@ impl Default for AbsoluteLength {
 #[derive(Clone, Copy)]
 pub enum DefiniteLength {
     Absolute(AbsoluteLength),
-    Relative(f32), // Percent, from 0 to 100.
+    Relative(f32), // 0. to 1.
 }
 
 impl DefiniteLength {
@@ -368,6 +382,15 @@ impl DefiniteLength {
     }
 }
 
+impl std::fmt::Debug for DefiniteLength {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            DefiniteLength::Absolute(length) => std::fmt::Debug::fmt(length, f),
+            DefiniteLength::Relative(fract) => write!(f, "{}%", (fract * 100.0) as i32),
+        }
+    }
+}
+
 impl From<AbsoluteLength> for DefiniteLength {
     fn from(length: AbsoluteLength) -> Self {
         Self::Absolute(length)
@@ -387,6 +410,15 @@ pub enum Length {
     Auto,
 }
 
+impl std::fmt::Debug for Length {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Length::Definite(definite_length) => write!(f, "{:?}", definite_length),
+            Length::Auto => write!(f, "auto"),
+        }
+    }
+}
+
 pub fn relative<T: From<DefiniteLength>>(fraction: f32) -> T {
     DefiniteLength::Relative(fraction).into()
 }
diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index 081b4f65a3ae1f09e303877688eb66d898355ca1..06c40af11a2b5ceb5ccc7f648bf8a8484b12d094 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -1,12 +1,19 @@
+use std::cell::Cell;
+
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
+    hsla,
     layout_context::LayoutContext,
     paint_context::PaintContext,
-    style::{Style, StyleHelpers, Styleable},
+    style::{CornerRadii, Style, StyleHelpers, Styleable},
     InteractionHandlers, Interactive,
 };
 use anyhow::Result;
-use gpui::LayoutId;
+use gpui::{
+    platform::{MouseButton, MouseButtonEvent, MouseMovedEvent},
+    scene::{self},
+    LayoutId,
+};
 use refineable::{Refineable, RefinementCascade};
 use smallvec::SmallVec;
 use util::ResultExt;
@@ -63,7 +70,7 @@ impl<V: 'static> Element<V> for Div<V> {
     ) where
         Self: Sized,
     {
-        let style = &self.computed_style();
+        let style = self.computed_style();
         let pop_text_style = style.text_style(cx).map_or(false, |style| {
             cx.push_text_style(&style).log_err().is_some()
         });
@@ -77,6 +84,58 @@ impl<V: 'static> Element<V> for Div<V> {
         if pop_text_style {
             cx.pop_text_style();
         }
+
+        if cx.is_inspector_enabled() {
+            self.paint_inspector(layout, cx);
+        }
+    }
+}
+
+impl<V: 'static> Div<V> {
+    fn paint_inspector(&self, layout: &Layout, cx: &mut PaintContext<V>) {
+        let style = self.styles.merged();
+
+        let hovered = layout.bounds.contains_point(cx.mouse_position());
+        if hovered {
+            let rem_size = cx.rem_size();
+            cx.scene.push_quad(scene::Quad {
+                bounds: layout.bounds,
+                background: Some(hsla(0., 0., 1., 0.05).into()),
+                border: gpui::Border {
+                    color: hsla(0., 0., 1., 0.2).into(),
+                    top: 1.,
+                    right: 1.,
+                    bottom: 1.,
+                    left: 1.,
+                },
+                corner_radii: CornerRadii::default()
+                    .refined(&style.corner_radii)
+                    .to_gpui(layout.bounds.size(), rem_size),
+            })
+        }
+
+        let bounds = layout.bounds;
+        let pressed = Cell::new(hovered && cx.is_mouse_down(MouseButton::Left));
+        cx.on_event(layout.order, move |_, event: &MouseButtonEvent, _| {
+            if bounds.contains_point(event.position) {
+                if event.is_down {
+                    pressed.set(true);
+                } else if pressed.get() {
+                    pressed.set(false);
+                    eprintln!("clicked div {:?} {:#?}", bounds, style);
+                }
+            }
+        });
+
+        let hovered = Cell::new(hovered);
+        cx.on_event(layout.order, move |_, event: &MouseMovedEvent, cx| {
+            cx.bubble_event();
+            let hovered_now = bounds.contains_point(event.position);
+            if hovered.get() != hovered_now {
+                hovered.set(hovered_now);
+                cx.repaint();
+            }
+        });
     }
 }
 
diff --git a/crates/gpui2/src/elements/hoverable.rs b/crates/gpui2/src/elements/hoverable.rs
index e97c66113cf5688ea4fc440778b0f8cf8b124b15..d70b6f994d8cfeedcab67a307dacabc95dbabac6 100644
--- a/crates/gpui2/src/elements/hoverable.rs
+++ b/crates/gpui2/src/elements/hoverable.rs
@@ -72,6 +72,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
         let hovered = self.hovered.clone();
         let bounds = layout.bounds;
         cx.on_event(layout.order, move |_view, _: &MouseMovedEvent, cx| {
+            cx.bubble_event();
             if bounds.contains_point(cx.mouse_position()) != hovered.get() {
                 cx.repaint();
             }
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 591fb54576355e14a888ca23bf12fa4cb863bec9..42f91b102cc85f202e5d4c8a94aa6ae68ee0bc9d 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -22,7 +22,8 @@ use gpui2_macros::styleable_helpers;
 use refineable::{Refineable, RefinementCascade};
 use std::sync::Arc;
 
-#[derive(Clone, Refineable)]
+#[derive(Clone, Refineable, Debug)]
+#[refineable(debug)]
 pub struct Style {
     /// What layout strategy should be used?
     pub display: Display,
@@ -266,7 +267,8 @@ impl From<Hsla> for Fill {
     }
 }
 
-#[derive(Clone, Refineable, Default)]
+#[derive(Clone, Refineable, Default, Debug)]
+#[refineable(debug)]
 pub struct CornerRadii {
     top_left: AbsoluteLength,
     top_right: AbsoluteLength,
diff --git a/crates/refineable/derive_refineable/src/derive_refineable.rs b/crates/refineable/derive_refineable/src/derive_refineable.rs
index b5ba4124820c8a775974a427542b2d6e35f10914..547af0e757d0f3a7467ddfbc510f52750dbfb9a8 100644
--- a/crates/refineable/derive_refineable/src/derive_refineable.rs
+++ b/crates/refineable/derive_refineable/src/derive_refineable.rs
@@ -12,9 +12,14 @@ pub fn derive_refineable(input: TokenStream) -> TokenStream {
         ident,
         data,
         generics,
+        attrs,
         ..
     } = parse_macro_input!(input);
 
+    let impl_debug_on_refinement = attrs
+        .iter()
+        .any(|attr| attr.path.is_ident("refineable") && attr.tokens.to_string().contains("debug"));
+
     let refinement_ident = format_ident!("{}Refinement", ident);
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
@@ -120,6 +125,41 @@ pub fn derive_refineable(input: TokenStream) -> TokenStream {
         })
         .collect();
 
+    let debug_impl = if impl_debug_on_refinement {
+        let refinement_field_debugs: Vec<TokenStream2> = fields
+            .iter()
+            .map(|field| {
+                let name = &field.ident;
+                quote! {
+                    if self.#name.is_some() {
+                        debug_struct.field(stringify!(#name), &self.#name);
+                    } else {
+                        all_some = false;
+                    }
+                }
+            })
+            .collect();
+
+        quote! {
+            impl #impl_generics std::fmt::Debug for #refinement_ident #ty_generics
+                #where_clause
+            {
+                fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                    let mut debug_struct = f.debug_struct(stringify!(#refinement_ident));
+                    let mut all_some = true;
+                    #( #refinement_field_debugs )*
+                    if all_some {
+                        debug_struct.finish()
+                    } else {
+                        debug_struct.finish_non_exhaustive()
+                    }
+                }
+            }
+        }
+    } else {
+        quote! {}
+    };
+
     let gen = quote! {
         #[derive(Default, Clone)]
         pub struct #refinement_ident #impl_generics {
@@ -145,8 +185,22 @@ pub fn derive_refineable(input: TokenStream) -> TokenStream {
                 #( #refinement_field_assignments )*
             }
         }
-    };
 
+        impl #impl_generics #refinement_ident #ty_generics
+            #where_clause
+        {
+            pub fn is_some(&self) -> bool {
+                #(
+                    if self.#field_names.is_some() {
+                        return true;
+                    }
+                )*
+                false
+            }
+        }
+
+        #debug_impl
+    };
     gen.into()
 }
 
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index c13e5e0bc323c51c563018f886ea6b1e3b4358a5..cbfc9681f6e892f2ccdbf58b6c3a7e61c5e801d2 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -15,6 +15,11 @@ mod element_ext;
 mod theme;
 mod workspace;
 
+gpui2::actions! {
+    storybook,
+    [ToggleInspector]
+}
+
 fn main() {
     SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
 
@@ -33,7 +38,12 @@ fn main() {
                 center: true,
                 ..Default::default()
             },
-            |_| view(|cx| storybook(cx)),
+            |cx| {
+                view(|cx| {
+                    cx.enable_inspector();
+                    storybook(cx)
+                })
+            },
         );
         cx.platform().activate(true);
     });
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index ecdfcd4def8632a4c92f49f895e00ac4e1eede5b..f66b1ba14078393414668eb5be5c8bc481c5bb12 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -406,62 +406,41 @@ pub fn workspace<V: 'static>() -> impl Element<V> {
 impl WorkspaceElement {
     fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
+
         div()
             .size_full()
             .flex()
-            .flex_col()
-            .font("Zed Sans Extended")
-            .gap_0()
-            .justify_start()
-            .items_start()
-            .text_color(theme.lowest.base.default.foreground)
-            .fill(theme.middle.warning.default.background)
-            .child(
-                div()
-                    .w_full()
-                    .h_8()
-                    .fill(theme.lowest.negative.default.background)
-                    .child(titlebar()),
-            )
-            .child(
-                div()
-                    .flex()
-                    .flex_1()
-                    .child(collab_panel())
-                    .child(div().flex_1().fill(theme.lowest.accent.default.background))
-                    .child(div().w_64().fill(theme.lowest.positive.default.background)),
-            )
-            .child(
-                div()
-                    .w_full()
-                    .h_9()
-                    .fill(theme.lowest.positive.default.background)
-                    .child(statusbar())
-                    .child(
-                        div()
-                            .h_px()
-                            .w_full()
-                            .fill(theme.lowest.negative.default.background),
-                    )
-                    .child(
-                        div()
-                            .h_px()
-                            .w_full()
-                            .fill(theme.lowest.positive.default.background),
-                    )
-                    .child(
-                        div()
-                            .h_px()
-                            .w_full()
-                            .fill(theme.lowest.accent.default.background),
-                    )
-                    .child(
-                        div()
-                            .h_px()
-                            .w_full()
-                            .fill(theme.lowest.warning.default.background),
-                    ),
-            )
+            .flex_row()
+            .child(collab_panel())
+            .child(collab_panel())
+
+        // div()
+        //     .size_full()
+        //     .flex()
+        //     .flex_col()
+        //     .font("Zed Sans Extended")
+        //     .gap_0()
+        //     .justify_start()
+        //     .items_start()
+        //     .text_color(theme.lowest.base.default.foreground)
+        //     // .fill(theme.middle.warning.default.background)
+        //     .child(titlebar())
+        //     .child(
+        //         div()
+        //             .flex_1()
+        //             .w_full()
+        //             .flex()
+        //             .flex_row()
+        //             .child(collab_panel())
+        //             // .child(
+        //             //     div()
+        //             //         .h_full()
+        //             //         .flex_1()
+        //             //         .fill(theme.highest.accent.default.background),
+        //             // )
+        //             .child(collab_panel()),
+        //     )
+        //     .child(statusbar())
     }
 }
 

From 773886763969f34c93121b2006e886c9225d3fcd Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 06:32:20 -0600
Subject: [PATCH 059/109] Always pass parent origin when painting elements

---
 crates/gpui2/src/element.rs               | 10 +++--
 crates/gpui2/src/elements/div.rs          | 24 ++++++-----
 crates/gpui2/src/elements/hoverable.rs    |  6 ++-
 crates/gpui2/src/elements/img.rs          |  9 ++--
 crates/gpui2/src/elements/pressable.rs    |  6 ++-
 crates/gpui2/src/elements/svg.rs          |  4 +-
 crates/gpui2/src/elements/text.rs         | 20 +++++++--
 crates/gpui2_macros/src/derive_element.rs |  5 ++-
 crates/storybook/src/collab_panel.rs      |  2 +-
 crates/storybook/src/theme.rs             |  5 ++-
 crates/storybook/src/workspace.rs         | 50 +++++++++--------------
 11 files changed, 79 insertions(+), 62 deletions(-)

diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index 92a981fc5c2200257119d6d201d27f00179a6d84..3f376f978f21475e958c3dabb57a796ac67ff00d 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -19,6 +19,7 @@ pub trait Element<V: 'static>: 'static + IntoElement<V> {
     fn paint(
         &mut self,
         view: &mut V,
+        parent_origin: Vector2F,
         layout: &Layout,
         state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
@@ -110,9 +111,9 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
                 layout_id,
                 mut paint_state,
             } => match cx.computed_layout(layout_id) {
-                Ok(mut layout) => {
-                    layout.bounds = layout.bounds + parent_origin;
-                    self.element.paint(view, &layout, &mut paint_state, cx);
+                Ok(layout) => {
+                    self.element
+                        .paint(view, parent_origin, &layout, &mut paint_state, cx);
                     ElementPhase::PostPaint {
                         layout,
                         paint_state,
@@ -124,7 +125,8 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
                 layout,
                 mut paint_state,
             } => {
-                self.element.paint(view, &layout, &mut paint_state, cx);
+                self.element
+                    .paint(view, parent_origin, &layout, &mut paint_state, cx);
                 ElementPhase::PostPaint {
                     layout,
                     paint_state,
diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index 06c40af11a2b5ceb5ccc7f648bf8a8484b12d094..bc7497319aabb6cdbc94b72ecf50bd5728df491a 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -10,6 +10,7 @@ use crate::{
 };
 use anyhow::Result;
 use gpui::{
+    geometry::vector::Vector2F,
     platform::{MouseButton, MouseButtonEvent, MouseMovedEvent},
     scene::{self},
     LayoutId,
@@ -64,42 +65,45 @@ impl<V: 'static> Element<V> for Div<V> {
     fn paint(
         &mut self,
         view: &mut V,
+        parent_origin: Vector2F,
         layout: &Layout,
         _: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) where
         Self: Sized,
     {
+        let order = layout.order;
+        let bounds = layout.bounds + parent_origin;
         let style = self.computed_style();
         let pop_text_style = style.text_style(cx).map_or(false, |style| {
             cx.push_text_style(&style).log_err().is_some()
         });
-        style.paint_background(layout.bounds, cx);
-        self.interaction_handlers()
-            .paint(layout.order, layout.bounds, cx);
+        style.paint_background(bounds, cx);
+        self.interaction_handlers().paint(order, bounds, cx);
         for child in &mut self.children {
-            child.paint(view, layout.bounds.origin(), cx);
+            child.paint(view, bounds.origin(), cx);
         }
-        style.paint_foreground(layout.bounds, cx);
+        style.paint_foreground(bounds, cx);
         if pop_text_style {
             cx.pop_text_style();
         }
 
         if cx.is_inspector_enabled() {
-            self.paint_inspector(layout, cx);
+            self.paint_inspector(parent_origin, layout, cx);
         }
     }
 }
 
 impl<V: 'static> Div<V> {
-    fn paint_inspector(&self, layout: &Layout, cx: &mut PaintContext<V>) {
+    fn paint_inspector(&self, parent_origin: Vector2F, layout: &Layout, cx: &mut PaintContext<V>) {
         let style = self.styles.merged();
+        let bounds = layout.bounds + parent_origin;
 
-        let hovered = layout.bounds.contains_point(cx.mouse_position());
+        let hovered = bounds.contains_point(cx.mouse_position());
         if hovered {
             let rem_size = cx.rem_size();
             cx.scene.push_quad(scene::Quad {
-                bounds: layout.bounds,
+                bounds,
                 background: Some(hsla(0., 0., 1., 0.05).into()),
                 border: gpui::Border {
                     color: hsla(0., 0., 1., 0.2).into(),
@@ -110,7 +114,7 @@ impl<V: 'static> Div<V> {
                 },
                 corner_radii: CornerRadii::default()
                     .refined(&style.corner_radii)
-                    .to_gpui(layout.bounds.size(), rem_size),
+                    .to_gpui(bounds.size(), rem_size),
             })
         }
 
diff --git a/crates/gpui2/src/elements/hoverable.rs b/crates/gpui2/src/elements/hoverable.rs
index d70b6f994d8cfeedcab67a307dacabc95dbabac6..689df16daf171a724347f0f7a6d414dab9f3dab0 100644
--- a/crates/gpui2/src/elements/hoverable.rs
+++ b/crates/gpui2/src/elements/hoverable.rs
@@ -6,7 +6,7 @@ use crate::{
     style::{Style, StyleHelpers, Styleable},
 };
 use anyhow::Result;
-use gpui::{platform::MouseMovedEvent, LayoutId};
+use gpui::{geometry::vector::Vector2F, platform::MouseMovedEvent, LayoutId};
 use refineable::{CascadeSlot, Refineable, RefinementCascade};
 use smallvec::SmallVec;
 use std::{cell::Cell, rc::Rc};
@@ -56,6 +56,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
     fn paint(
         &mut self,
         view: &mut V,
+        parent_origin: Vector2F,
         layout: &Layout,
         paint_state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
@@ -78,7 +79,8 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
             }
         });
 
-        self.child.paint(view, layout, paint_state, cx);
+        self.child
+            .paint(view, parent_origin, layout, paint_state, cx);
     }
 }
 
diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs
index 1feb3cdf31eb9002bb8ba044ef6e26c1a578da9d..8f9620ce2a06788ed2d02430bcb41eb0831601f6 100644
--- a/crates/gpui2/src/elements/img.rs
+++ b/crates/gpui2/src/elements/img.rs
@@ -2,6 +2,7 @@ use crate as gpui2;
 use crate::style::{StyleHelpers, Styleable};
 use crate::{style::Style, Element};
 use futures::FutureExt;
+use gpui::geometry::vector::Vector2F;
 use gpui::scene;
 use gpui2_macros::IntoElement;
 use refineable::RefinementCascade;
@@ -47,6 +48,7 @@ impl<V: 'static> Element<V> for Img {
     fn paint(
         &mut self,
         _: &mut V,
+        parent_origin: Vector2F,
         layout: &gpui::Layout,
         _: &mut Self::PaintState,
         cx: &mut crate::paint_context::PaintContext<V>,
@@ -54,8 +56,9 @@ impl<V: 'static> Element<V> for Img {
         Self: Sized,
     {
         let style = self.computed_style();
+        let bounds = layout.bounds + parent_origin;
 
-        style.paint_background(layout.bounds, cx);
+        style.paint_background(bounds, cx);
 
         if let Some(uri) = &self.uri {
             let image_future = cx.image_cache.get(uri.clone());
@@ -66,7 +69,7 @@ impl<V: 'static> Element<V> for Img {
             {
                 let rem_size = cx.rem_size();
                 cx.scene.push_image(scene::Image {
-                    bounds: layout.bounds,
+                    bounds,
                     border: gpui::Border {
                         color: style.border_color.unwrap_or_default().into(),
                         top: style.border_widths.top.to_pixels(rem_size),
@@ -74,7 +77,7 @@ impl<V: 'static> Element<V> for Img {
                         bottom: style.border_widths.bottom.to_pixels(rem_size),
                         left: style.border_widths.left.to_pixels(rem_size),
                     },
-                    corner_radii: style.corner_radii.to_gpui(layout.bounds.size(), rem_size),
+                    corner_radii: style.corner_radii.to_gpui(bounds.size(), rem_size),
                     grayscale: false,
                     data,
                 })
diff --git a/crates/gpui2/src/elements/pressable.rs b/crates/gpui2/src/elements/pressable.rs
index ebe330c79b79b163d2d29ceff0af4836bdbf4786..a9d332e6c843c0e47ab51ff8acabffd983b9ef21 100644
--- a/crates/gpui2/src/elements/pressable.rs
+++ b/crates/gpui2/src/elements/pressable.rs
@@ -6,7 +6,7 @@ use crate::{
     style::{Style, StyleHelpers, Styleable},
 };
 use anyhow::Result;
-use gpui::{platform::MouseButtonEvent, LayoutId};
+use gpui::{geometry::vector::Vector2F, platform::MouseButtonEvent, LayoutId};
 use refineable::{CascadeSlot, Refineable, RefinementCascade};
 use smallvec::SmallVec;
 use std::{cell::Cell, rc::Rc};
@@ -56,6 +56,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
     fn paint(
         &mut self,
         view: &mut V,
+        parent_origin: Vector2F,
         layout: &Layout,
         paint_state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
@@ -80,7 +81,8 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
             }
         });
 
-        self.child.paint(view, layout, paint_state, cx);
+        self.child
+            .paint(view, parent_origin, layout, paint_state, cx);
     }
 }
 
diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs
index bbd45098e41ef9f0354e4cfe2407b2f8e756d423..216725b6d6c4b0a36bf40bef65177daace17fcd5 100644
--- a/crates/gpui2/src/elements/svg.rs
+++ b/crates/gpui2/src/elements/svg.rs
@@ -3,6 +3,7 @@ use crate::{
     style::{Style, StyleHelpers, Styleable},
     Element, IntoElement, Layout, LayoutId, Rgba,
 };
+use gpui::geometry::vector::Vector2F;
 use refineable::RefinementCascade;
 use std::borrow::Cow;
 use util::ResultExt;
@@ -45,6 +46,7 @@ impl<V: 'static> Element<V> for Svg {
     fn paint(
         &mut self,
         _: &mut V,
+        parent_origin: Vector2F,
         layout: &Layout,
         _: &mut Self::PaintState,
         cx: &mut crate::paint_context::PaintContext<V>,
@@ -55,7 +57,7 @@ impl<V: 'static> Element<V> for Svg {
         if let Some((path, fill_color)) = self.path.as_ref().zip(fill_color) {
             if let Some(svg_tree) = cx.asset_cache.svg(path).log_err() {
                 let icon = scene::Icon {
-                    bounds: layout.bounds,
+                    bounds: layout.bounds + parent_origin,
                     svg: svg_tree,
                     path: path.clone(),
                     color: Rgba::from(fill_color).into(),
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 4ef05e0e8e15069c5107ec3ec2b97ee770baebb7..c0e2996d16f62fe173550296577eca3098086ba9 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -4,7 +4,11 @@ use crate::{
     paint_context::PaintContext,
 };
 use anyhow::Result;
-use gpui::{geometry::Size, text_layout::LineLayout, LayoutId};
+use gpui::{
+    geometry::{vector::Vector2F, Size},
+    text_layout::LineLayout,
+    LayoutId,
+};
 use parking_lot::Mutex;
 use std::sync::Arc;
 use util::arc_cow::ArcCow;
@@ -64,10 +68,13 @@ impl<V: 'static> Element<V> for Text {
     fn paint<'a>(
         &mut self,
         _view: &mut V,
+        parent_origin: Vector2F,
         layout: &Layout,
         paint_state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
     ) {
+        let bounds = layout.bounds + parent_origin;
+
         let line_layout;
         let line_height;
         {
@@ -83,10 +90,15 @@ impl<V: 'static> Element<V> for Text {
         let line =
             gpui::text_layout::Line::new(line_layout, &[(self.text.len(), text_style.to_run())]);
 
-        let origin = layout.bounds.origin();
         // TODO: We haven't added visible bounds to the new element system yet, so this is a placeholder.
-        let visible_bounds = layout.bounds;
-        line.paint(cx.scene, origin, visible_bounds, line_height, cx.legacy_cx);
+        let visible_bounds = bounds;
+        line.paint(
+            cx.scene,
+            bounds.origin(),
+            visible_bounds,
+            line_height,
+            cx.legacy_cx,
+        );
     }
 }
 
diff --git a/crates/gpui2_macros/src/derive_element.rs b/crates/gpui2_macros/src/derive_element.rs
index 63d1ca62ee6e9b44f5302a331a1bb7c71da1e782..ca94112a020726324e0908e7c6b8f0375b68d750 100644
--- a/crates/gpui2_macros/src/derive_element.rs
+++ b/crates/gpui2_macros/src/derive_element.rs
@@ -77,11 +77,12 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
             fn paint(
                 &mut self,
                 view: &mut V,
-                layout: &gpui2::element::Layout,
+                parent_origin: gpui2::Vector2F,
+                _: &gpui2::element::Layout,
                 rendered_element: &mut Self::PaintState,
                 cx: &mut gpui2::element::PaintContext<V>,
             ) {
-                rendered_element.paint(view, layout.bounds.origin(), cx);
+                rendered_element.paint(view, parent_origin, cx);
             }
         }
 
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 8fa84766449c56c320cb62914f1e1e7f3c02beb0..3b42ac823799a01725d385ee037bd67e69d55461 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -33,7 +33,7 @@ impl<V: 'static> CollabPanelElement<V> {
             .fill(theme.middle.base.default.background)
             .child(
                 div()
-                    .full()
+                    .w_full()
                     .flex()
                     .flex_col()
                     // List Container
diff --git a/crates/storybook/src/theme.rs b/crates/storybook/src/theme.rs
index b17abd3138212d70e8bdc8b0a7fa30ed1be33b36..fbcb8e37a8cdad16d0e96ab6c46054f711a4debe 100644
--- a/crates/storybook/src/theme.rs
+++ b/crates/storybook/src/theme.rs
@@ -2,7 +2,7 @@ use gpui2::{
     color::Hsla,
     element::{Element, PaintContext},
     layout_context::LayoutContext,
-    serde_json, AppContext, IntoElement, WindowContext,
+    serde_json, AppContext, IntoElement, Vector2F, WindowContext,
 };
 use serde::{de::Visitor, Deserialize, Deserializer};
 use std::{collections::HashMap, fmt, marker::PhantomData};
@@ -160,6 +160,7 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
     fn paint(
         &mut self,
         view: &mut V,
+        parent_origin: Vector2F,
         layout: &gpui2::Layout,
         state: &mut Self::PaintState,
         cx: &mut PaintContext<V>,
@@ -167,7 +168,7 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
         Self: Sized,
     {
         cx.push_theme(self.theme.clone());
-        self.child.paint(view, layout, state, cx);
+        self.child.paint(view, parent_origin, layout, state, cx);
         cx.pop_theme();
     }
 }
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index f66b1ba14078393414668eb5be5c8bc481c5bb12..619b19c8b827c2cdcf0627147ab8d813f3e553bf 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -410,37 +410,25 @@ impl WorkspaceElement {
         div()
             .size_full()
             .flex()
-            .flex_row()
-            .child(collab_panel())
-            .child(collab_panel())
-
-        // div()
-        //     .size_full()
-        //     .flex()
-        //     .flex_col()
-        //     .font("Zed Sans Extended")
-        //     .gap_0()
-        //     .justify_start()
-        //     .items_start()
-        //     .text_color(theme.lowest.base.default.foreground)
-        //     // .fill(theme.middle.warning.default.background)
-        //     .child(titlebar())
-        //     .child(
-        //         div()
-        //             .flex_1()
-        //             .w_full()
-        //             .flex()
-        //             .flex_row()
-        //             .child(collab_panel())
-        //             // .child(
-        //             //     div()
-        //             //         .h_full()
-        //             //         .flex_1()
-        //             //         .fill(theme.highest.accent.default.background),
-        //             // )
-        //             .child(collab_panel()),
-        //     )
-        //     .child(statusbar())
+            .flex_col()
+            .font("Zed Sans Extended")
+            .gap_0()
+            .justify_start()
+            .items_start()
+            .text_color(theme.lowest.base.default.foreground)
+            // .fill(theme.middle.warning.default.background)
+            .child(titlebar())
+            .child(
+                div()
+                    .flex_1()
+                    .flex()
+                    .flex_row()
+                    .w_full()
+                    .child(collab_panel())
+                    .child(div().h_full().flex_1())
+                    .child(collab_panel()),
+            )
+            .child(statusbar())
     }
 }
 

From 713d72942d0acbfeada64fb822fc0570d18edfde Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 06:45:23 -0600
Subject: [PATCH 060/109] Fix bounds calculations

---
 crates/gpui2/src/elements/div.rs       | 1 -
 crates/gpui2/src/elements/hoverable.rs | 5 ++---
 crates/gpui2/src/elements/pressable.rs | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index bc7497319aabb6cdbc94b72ecf50bd5728df491a..acaf166fc000ca028154d936d48eff9a2fd5c2d8 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -118,7 +118,6 @@ impl<V: 'static> Div<V> {
             })
         }
 
-        let bounds = layout.bounds;
         let pressed = Cell::new(hovered && cx.is_mouse_down(MouseButton::Left));
         cx.on_event(layout.order, move |_, event: &MouseButtonEvent, _| {
             if bounds.contains_point(event.position) {
diff --git a/crates/gpui2/src/elements/hoverable.rs b/crates/gpui2/src/elements/hoverable.rs
index 689df16daf171a724347f0f7a6d414dab9f3dab0..89a8b663ee8bc112ab95a77e395da4b08790589c 100644
--- a/crates/gpui2/src/elements/hoverable.rs
+++ b/crates/gpui2/src/elements/hoverable.rs
@@ -63,15 +63,14 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
     ) where
         Self: Sized,
     {
-        self.hovered
-            .set(layout.bounds.contains_point(cx.mouse_position()));
+        let bounds = layout.bounds + parent_origin;
+        self.hovered.set(bounds.contains_point(cx.mouse_position()));
 
         let slot = self.cascade_slot;
         let style = self.hovered.get().then_some(self.hovered_style.clone());
         self.style_cascade().set(slot, style);
 
         let hovered = self.hovered.clone();
-        let bounds = layout.bounds;
         cx.on_event(layout.order, move |_view, _: &MouseMovedEvent, cx| {
             cx.bubble_event();
             if bounds.contains_point(cx.mouse_position()) != hovered.get() {
diff --git a/crates/gpui2/src/elements/pressable.rs b/crates/gpui2/src/elements/pressable.rs
index a9d332e6c843c0e47ab51ff8acabffd983b9ef21..db6652fad5e5dc3212c38b18394db212eee9d0ad 100644
--- a/crates/gpui2/src/elements/pressable.rs
+++ b/crates/gpui2/src/elements/pressable.rs
@@ -68,7 +68,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
         self.style_cascade().set(slot, style);
 
         let pressed = self.pressed.clone();
-        let bounds = layout.bounds;
+        let bounds = layout.bounds + parent_origin;
         cx.on_event(layout.order, move |_view, event: &MouseButtonEvent, cx| {
             if event.is_down {
                 if bounds.contains_point(event.position) {

From 74ccb3df637a7ba7228e2eb30266d97e40eae0c7 Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Fri, 8 Sep 2023 12:09:31 -0400
Subject: [PATCH 061/109] Fix Python's cached binary retrieval being borked

Co-Authored-By: Max Brunsfeld <max@zed.dev>
---
 crates/zed/src/languages/python.rs | 38 +++++++++---------------------
 crates/zed/src/languages/rust.rs   |  1 +
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/crates/zed/src/languages/python.rs b/crates/zed/src/languages/python.rs
index c1539e9590e112e6e54a61aece7a7169e6361c15..c10d605a38948710e04129c61a9e74e571dc646d 100644
--- a/crates/zed/src/languages/python.rs
+++ b/crates/zed/src/languages/python.rs
@@ -1,6 +1,5 @@
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use async_trait::async_trait;
-use futures::StreamExt;
 use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
 use lsp::LanguageServerBinary;
 use node_runtime::NodeRuntime;
@@ -164,31 +163,16 @@ async fn get_cached_server_binary(
     container_dir: PathBuf,
     node: &dyn NodeRuntime,
 ) -> Option<LanguageServerBinary> {
-    (|| async move {
-        let mut last_version_dir = None;
-        let mut entries = fs::read_dir(&container_dir).await?;
-        while let Some(entry) = entries.next().await {
-            let entry = entry?;
-            if entry.file_type().await?.is_dir() {
-                last_version_dir = Some(entry.path());
-            }
-        }
-        let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
-        let server_path = last_version_dir.join(SERVER_PATH);
-        if server_path.exists() {
-            Ok(LanguageServerBinary {
-                path: node.binary_path().await?,
-                arguments: server_binary_arguments(&server_path),
-            })
-        } else {
-            Err(anyhow!(
-                "missing executable in directory {:?}",
-                last_version_dir
-            ))
-        }
-    })()
-    .await
-    .log_err()
+    let server_path = container_dir.join(SERVER_PATH);
+    if server_path.exists() {
+        Some(LanguageServerBinary {
+            path: node.binary_path().await.log_err()?,
+            arguments: server_binary_arguments(&server_path),
+        })
+    } else {
+        log::error!("missing executable in directory {:?}", server_path);
+        None
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/zed/src/languages/rust.rs b/crates/zed/src/languages/rust.rs
index 854eeb7e085845b9bf212692bd9e546d067df0dc..62bdddab5bdd24b2925616b79750ac3d0c714347 100644
--- a/crates/zed/src/languages/rust.rs
+++ b/crates/zed/src/languages/rust.rs
@@ -262,6 +262,7 @@ impl LspAdapter for RustLspAdapter {
         })
     }
 }
+
 async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
     (|| async move {
         let mut last = None;

From 5f897f45a883b1fb4e0bf0840e74de56136e1505 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 7 Sep 2023 10:42:47 -0600
Subject: [PATCH 062/109] Fix f,t on soft-wrapped lines

Also remove the (dangerously confusing) display_map.find_while
---
 crates/editor/src/display_map.rs             | 89 +-----------------
 crates/vim/src/motion.rs                     | 95 +++++++++++---------
 crates/vim/src/normal.rs                     |  1 +
 crates/vim/src/test.rs                       |  7 ++
 crates/vim/src/vim.rs                        | 10 ++-
 crates/vim/test_data/test_wrapped_lines.json |  6 ++
 6 files changed, 76 insertions(+), 132 deletions(-)

diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index e8e15a927eaacabc37c88884094a97f105bf9bb7..f306692b5e420ac7101e95ec2a38cc5d8f00669c 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -555,67 +555,6 @@ impl DisplaySnapshot {
             })
     }
 
-    /// Returns an iterator of the start positions of the occurrences of `target` in the `self` after `from`
-    /// Stops if `condition` returns false for any of the character position pairs observed.
-    pub fn find_while<'a>(
-        &'a self,
-        from: DisplayPoint,
-        target: &str,
-        condition: impl FnMut(char, DisplayPoint) -> bool + 'a,
-    ) -> impl Iterator<Item = DisplayPoint> + 'a {
-        Self::find_internal(self.chars_at(from), target.chars().collect(), condition)
-    }
-
-    /// Returns an iterator of the end positions of the occurrences of `target` in the `self` before `from`
-    /// Stops if `condition` returns false for any of the character position pairs observed.
-    pub fn reverse_find_while<'a>(
-        &'a self,
-        from: DisplayPoint,
-        target: &str,
-        condition: impl FnMut(char, DisplayPoint) -> bool + 'a,
-    ) -> impl Iterator<Item = DisplayPoint> + 'a {
-        Self::find_internal(
-            self.reverse_chars_at(from),
-            target.chars().rev().collect(),
-            condition,
-        )
-    }
-
-    fn find_internal<'a>(
-        iterator: impl Iterator<Item = (char, DisplayPoint)> + 'a,
-        target: Vec<char>,
-        mut condition: impl FnMut(char, DisplayPoint) -> bool + 'a,
-    ) -> impl Iterator<Item = DisplayPoint> + 'a {
-        // List of partial matches with the index of the last seen character in target and the starting point of the match
-        let mut partial_matches: Vec<(usize, DisplayPoint)> = Vec::new();
-        iterator
-            .take_while(move |(ch, point)| condition(*ch, *point))
-            .filter_map(move |(ch, point)| {
-                if Some(&ch) == target.get(0) {
-                    partial_matches.push((0, point));
-                }
-
-                let mut found = None;
-                // Keep partial matches that have the correct next character
-                partial_matches.retain_mut(|(match_position, match_start)| {
-                    if target.get(*match_position) == Some(&ch) {
-                        *match_position += 1;
-                        if *match_position == target.len() {
-                            found = Some(match_start.clone());
-                            // This match is completed. No need to keep tracking it
-                            false
-                        } else {
-                            true
-                        }
-                    } else {
-                        false
-                    }
-                });
-
-                found
-            })
-    }
-
     pub fn column_to_chars(&self, display_row: u32, target: u32) -> u32 {
         let mut count = 0;
         let mut column = 0;
@@ -933,7 +872,7 @@ pub mod tests {
     use smol::stream::StreamExt;
     use std::{env, sync::Arc};
     use theme::SyntaxTheme;
-    use util::test::{marked_text_offsets, marked_text_ranges, sample_text};
+    use util::test::{marked_text_ranges, sample_text};
     use Bias::*;
 
     #[gpui::test(iterations = 100)]
@@ -1744,32 +1683,6 @@ pub mod tests {
         )
     }
 
-    #[test]
-    fn test_find_internal() {
-        assert("This is a ˇtest of find internal", "test");
-        assert("Some text ˇaˇaˇaa with repeated characters", "aa");
-
-        fn assert(marked_text: &str, target: &str) {
-            let (text, expected_offsets) = marked_text_offsets(marked_text);
-
-            let chars = text
-                .chars()
-                .enumerate()
-                .map(|(index, ch)| (ch, DisplayPoint::new(0, index as u32)));
-            let target = target.chars();
-
-            assert_eq!(
-                expected_offsets
-                    .into_iter()
-                    .map(|offset| offset as u32)
-                    .collect::<Vec<_>>(),
-                DisplaySnapshot::find_internal(chars, target.collect(), |_, _| true)
-                    .map(|point| point.column())
-                    .collect::<Vec<_>>()
-            )
-        }
-    }
-
     fn syntax_chunks<'a>(
         rows: Range<u32>,
         map: &ModelHandle<DisplayMap>,
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 16bccb696338e229e01cf39ec8ecc496bda62217..6d83642648b592f4b55035efd46c77c686568b89 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -1,9 +1,9 @@
-use std::{cmp, sync::Arc};
+use std::cmp;
 
 use editor::{
     char_kind,
     display_map::{DisplaySnapshot, FoldPoint, ToDisplayPoint},
-    movement::{self, FindRange},
+    movement::{self, find_boundary, find_preceding_boundary, FindRange},
     Bias, CharKind, DisplayPoint, ToOffset,
 };
 use gpui::{actions, impl_actions, AppContext, WindowContext};
@@ -37,8 +37,8 @@ pub enum Motion {
     StartOfDocument,
     EndOfDocument,
     Matching,
-    FindForward { before: bool, text: Arc<str> },
-    FindBackward { after: bool, text: Arc<str> },
+    FindForward { before: bool, char: char },
+    FindBackward { after: bool, char: char },
     NextLineStart,
 }
 
@@ -233,25 +233,25 @@ pub(crate) fn motion(motion: Motion, cx: &mut WindowContext) {
 
 fn repeat_motion(backwards: bool, cx: &mut WindowContext) {
     let find = match Vim::read(cx).workspace_state.last_find.clone() {
-        Some(Motion::FindForward { before, text }) => {
+        Some(Motion::FindForward { before, char }) => {
             if backwards {
                 Motion::FindBackward {
                     after: before,
-                    text,
+                    char,
                 }
             } else {
-                Motion::FindForward { before, text }
+                Motion::FindForward { before, char }
             }
         }
 
-        Some(Motion::FindBackward { after, text }) => {
+        Some(Motion::FindBackward { after, char }) => {
             if backwards {
                 Motion::FindForward {
                     before: after,
-                    text,
+                    char,
                 }
             } else {
-                Motion::FindBackward { after, text }
+                Motion::FindBackward { after, char }
             }
         }
         _ => return,
@@ -403,12 +403,12 @@ impl Motion {
                 SelectionGoal::None,
             ),
             Matching => (matching(map, point), SelectionGoal::None),
-            FindForward { before, text } => (
-                find_forward(map, point, *before, text.clone(), times),
+            FindForward { before, char } => (
+                find_forward(map, point, *before, *char, times),
                 SelectionGoal::None,
             ),
-            FindBackward { after, text } => (
-                find_backward(map, point, *after, text.clone(), times),
+            FindBackward { after, char } => (
+                find_backward(map, point, *after, *char, times),
                 SelectionGoal::None,
             ),
             NextLineStart => (next_line_start(map, point, times), SelectionGoal::None),
@@ -793,44 +793,55 @@ fn find_forward(
     map: &DisplaySnapshot,
     from: DisplayPoint,
     before: bool,
-    target: Arc<str>,
+    target: char,
     times: usize,
 ) -> DisplayPoint {
-    map.find_while(from, target.as_ref(), |ch, _| ch != '\n')
-        .skip_while(|found_at| found_at == &from)
-        .nth(times - 1)
-        .map(|mut found| {
-            if before {
-                *found.column_mut() -= 1;
-                found = map.clip_point(found, Bias::Right);
-                found
-            } else {
-                found
-            }
-        })
-        .unwrap_or(from)
+    let mut to = from;
+    let mut found = false;
+
+    for _ in 0..times {
+        found = false;
+        to = find_boundary(map, to, FindRange::SingleLine, |_, right| {
+            found = right == target;
+            found
+        });
+    }
+
+    if found {
+        if before && to.column() > 0 {
+            *to.column_mut() -= 1;
+            map.clip_point(to, Bias::Left)
+        } else {
+            to
+        }
+    } else {
+        from
+    }
 }
 
 fn find_backward(
     map: &DisplaySnapshot,
     from: DisplayPoint,
     after: bool,
-    target: Arc<str>,
+    target: char,
     times: usize,
 ) -> DisplayPoint {
-    map.reverse_find_while(from, target.as_ref(), |ch, _| ch != '\n')
-        .skip_while(|found_at| found_at == &from)
-        .nth(times - 1)
-        .map(|mut found| {
-            if after {
-                *found.column_mut() += 1;
-                found = map.clip_point(found, Bias::Left);
-                found
-            } else {
-                found
-            }
-        })
-        .unwrap_or(from)
+    let mut to = from;
+
+    for _ in 0..times {
+        to = find_preceding_boundary(map, to, FindRange::SingleLine, |_, right| right == target);
+    }
+
+    if map.buffer_snapshot.chars_at(to.to_point(map)).next() == Some(target) {
+        if after {
+            *to.column_mut() += 1;
+            map.clip_point(to, Bias::Right)
+        } else {
+            to
+        }
+    } else {
+        from
+    }
 }
 
 fn next_line_start(map: &DisplaySnapshot, point: DisplayPoint, times: usize) -> DisplayPoint {
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index ce1e4c3d6d50dfddda933be1fd3fe2f6bd448bbf..e452fb65ae554461f1ead3a152f8b846a2630f61 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -780,6 +780,7 @@ mod test {
     #[gpui::test]
     async fn test_f_and_t(cx: &mut gpui::TestAppContext) {
         let mut cx = NeovimBackedTestContext::new(cx).await;
+
         for count in 1..=3 {
             let test_case = indoc! {"
                 ˇaaaˇbˇ ˇbˇ   ˇbˇbˇ aˇaaˇbaaa
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index c6a212d77f1d91118defa0b3c8097f6c38f112ab..54bbe6c56ea468932e08899bfcad8ed602c545b9 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -449,6 +449,13 @@ async fn test_wrapped_lines(cx: &mut gpui::TestAppContext) {
         fourteen char
     "})
         .await;
+    cx.simulate_shared_keystrokes(["j", "shift-f", "e", "f", "r"])
+        .await;
+    cx.assert_shared_state(indoc! {"
+        fourteen•
+        fourteen chaˇr
+    "})
+        .await;
 }
 
 #[gpui::test]
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index da1c634682f1511c197cb32687502422606cf387..be3d04d3ee0c28d3238c4627f793103d8f62a0c2 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -295,14 +295,20 @@ impl Vim {
 
         match Vim::read(cx).active_operator() {
             Some(Operator::FindForward { before }) => {
-                let find = Motion::FindForward { before, text };
+                let find = Motion::FindForward {
+                    before,
+                    char: text.chars().next().unwrap(),
+                };
                 Vim::update(cx, |vim, _| {
                     vim.workspace_state.last_find = Some(find.clone())
                 });
                 motion::motion(find, cx)
             }
             Some(Operator::FindBackward { after }) => {
-                let find = Motion::FindBackward { after, text };
+                let find = Motion::FindBackward {
+                    after,
+                    char: text.chars().next().unwrap(),
+                };
                 Vim::update(cx, |vim, _| {
                     vim.workspace_state.last_find = Some(find.clone())
                 });
diff --git a/crates/vim/test_data/test_wrapped_lines.json b/crates/vim/test_data/test_wrapped_lines.json
index 1fbfc935d93824b376c06e5fa2eaa980e530df6f..e5b5d0eac0b21ace460f2c09cfeb0b5861dcd951 100644
--- a/crates/vim/test_data/test_wrapped_lines.json
+++ b/crates/vim/test_data/test_wrapped_lines.json
@@ -53,3 +53,9 @@
 {"Key":"i"}
 {"Key":"w"}
 {"Get":{"state":"fourteenˇ \nfourteen char\n","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"shift-f"}
+{"Key":"e"}
+{"Key":"f"}
+{"Key":"r"}
+{"Get":{"state":"fourteen \nfourteen chaˇr\n","mode":"Normal"}}

From 21d390fa4a8a97f9d425a9903ca75e5cbb8e98e2 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 10:20:45 -0600
Subject: [PATCH 063/109] Support overflow scroll

---
 crates/gpui2/src/elements/div.rs     | 161 +++++++++++++++++++++++++--
 crates/gpui2/src/layout_context.rs   |   5 +-
 crates/gpui2/src/style.rs            |   8 ++
 crates/storybook/src/collab_panel.rs |  48 +++++---
 crates/storybook/src/workspace.rs    |  89 +++++++--------
 5 files changed, 236 insertions(+), 75 deletions(-)

diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index acaf166fc000ca028154d936d48eff9a2fd5c2d8..162383642a865f719fa32719fce587f377dcc59a 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -1,17 +1,17 @@
-use std::cell::Cell;
+use std::{cell::Cell, rc::Rc};
 
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     hsla,
     layout_context::LayoutContext,
     paint_context::PaintContext,
-    style::{CornerRadii, Style, StyleHelpers, Styleable},
+    style::{CornerRadii, Overflow, Style, StyleHelpers, Styleable},
     InteractionHandlers, Interactive,
 };
 use anyhow::Result;
 use gpui::{
-    geometry::vector::Vector2F,
-    platform::{MouseButton, MouseButtonEvent, MouseMovedEvent},
+    geometry::{rect::RectF, vector::Vector2F, Point},
+    platform::{MouseButton, MouseButtonEvent, MouseMovedEvent, ScrollWheelEvent},
     scene::{self},
     LayoutId,
 };
@@ -23,6 +23,7 @@ pub struct Div<V: 'static> {
     styles: RefinementCascade<Style>,
     handlers: InteractionHandlers<V>,
     children: SmallVec<[AnyElement<V>; 2]>,
+    scroll_state: Option<ScrollState>,
 }
 
 pub fn div<V>() -> Div<V> {
@@ -30,11 +31,12 @@ pub fn div<V>() -> Div<V> {
         styles: Default::default(),
         handlers: Default::default(),
         children: Default::default(),
+        scroll_state: None,
     }
 }
 
 impl<V: 'static> Element<V> for Div<V> {
-    type PaintState = ();
+    type PaintState = Vec<LayoutId>;
 
     fn layout(
         &mut self,
@@ -59,7 +61,7 @@ impl<V: 'static> Element<V> for Div<V> {
             cx.pop_text_style();
         }
 
-        Ok((cx.add_layout_node(style, children)?, ()))
+        Ok((cx.add_layout_node(style, children.clone())?, children))
     }
 
     fn paint(
@@ -67,27 +69,45 @@ impl<V: 'static> Element<V> for Div<V> {
         view: &mut V,
         parent_origin: Vector2F,
         layout: &Layout,
-        _: &mut Self::PaintState,
+        child_layouts: &mut Vec<LayoutId>,
         cx: &mut PaintContext<V>,
     ) where
         Self: Sized,
     {
         let order = layout.order;
         let bounds = layout.bounds + parent_origin;
+
         let style = self.computed_style();
         let pop_text_style = style.text_style(cx).map_or(false, |style| {
             cx.push_text_style(&style).log_err().is_some()
         });
         style.paint_background(bounds, cx);
         self.interaction_handlers().paint(order, bounds, cx);
+
+        let scrolled_origin = bounds.origin() - self.scroll_offset(&style.overflow);
+
+        // TODO: Support only one dimension being hidden
+        let mut pop_layer = false;
+        if style.overflow.y != Overflow::Visible || style.overflow.x != Overflow::Visible {
+            cx.scene.push_layer(Some(bounds));
+            pop_layer = true;
+        }
+
         for child in &mut self.children {
-            child.paint(view, bounds.origin(), cx);
+            child.paint(view, scrolled_origin, cx);
+        }
+
+        if pop_layer {
+            cx.scene.pop_layer();
         }
+
         style.paint_foreground(bounds, cx);
         if pop_text_style {
             cx.pop_text_style();
         }
 
+        self.handle_scroll(order, bounds, style.overflow.clone(), child_layouts, cx);
+
         if cx.is_inspector_enabled() {
             self.paint_inspector(parent_origin, layout, cx);
         }
@@ -95,6 +115,106 @@ impl<V: 'static> Element<V> for Div<V> {
 }
 
 impl<V: 'static> Div<V> {
+    pub fn overflow_hidden(mut self) -> Self {
+        self.declared_style().overflow.x = Some(Overflow::Hidden);
+        self.declared_style().overflow.y = Some(Overflow::Hidden);
+        self
+    }
+
+    pub fn overflow_hidden_x(mut self) -> Self {
+        self.declared_style().overflow.x = Some(Overflow::Hidden);
+        self
+    }
+
+    pub fn overflow_hidden_y(mut self) -> Self {
+        self.declared_style().overflow.y = Some(Overflow::Hidden);
+        self
+    }
+
+    pub fn overflow_scroll(mut self, scroll_state: ScrollState) -> Self {
+        self.scroll_state = Some(scroll_state);
+        self.declared_style().overflow.x = Some(Overflow::Scroll);
+        self.declared_style().overflow.y = Some(Overflow::Scroll);
+        self
+    }
+
+    pub fn overflow_x_scroll(mut self, scroll_state: ScrollState) -> Self {
+        self.scroll_state = Some(scroll_state);
+        self.declared_style().overflow.x = Some(Overflow::Scroll);
+        self
+    }
+
+    pub fn overflow_y_scroll(mut self, scroll_state: ScrollState) -> Self {
+        self.scroll_state = Some(scroll_state);
+        self.declared_style().overflow.y = Some(Overflow::Scroll);
+        self
+    }
+
+    fn scroll_offset(&self, overflow: &Point<Overflow>) -> Vector2F {
+        let mut offset = Vector2F::zero();
+        if overflow.y == Overflow::Scroll {
+            offset.set_y(self.scroll_state.as_ref().unwrap().y());
+        }
+        if overflow.x == Overflow::Scroll {
+            offset.set_x(self.scroll_state.as_ref().unwrap().x());
+        }
+
+        offset
+    }
+
+    fn handle_scroll(
+        &mut self,
+        order: u32,
+        bounds: RectF,
+        overflow: Point<Overflow>,
+        child_layout_ids: &[LayoutId],
+        cx: &mut PaintContext<V>,
+    ) {
+        if overflow.y == Overflow::Scroll || overflow.x == Overflow::Scroll {
+            let mut scroll_max = Vector2F::zero();
+            for child_layout_id in child_layout_ids {
+                if let Some(child_layout) = cx
+                    .layout_engine()
+                    .unwrap()
+                    .computed_layout(*child_layout_id)
+                    .log_err()
+                {
+                    scroll_max = scroll_max.max(child_layout.bounds.lower_right());
+                }
+            }
+            scroll_max -= bounds.size();
+
+            let scroll_state = self.scroll_state.as_ref().unwrap().clone();
+            cx.on_event(order, move |_, event: &ScrollWheelEvent, cx| {
+                if bounds.contains_point(event.position) {
+                    let scroll_delta = match event.delta {
+                        gpui::platform::ScrollDelta::Pixels(delta) => delta,
+                        gpui::platform::ScrollDelta::Lines(delta) => {
+                            delta * cx.text_style().font_size
+                        }
+                    };
+                    if overflow.x == Overflow::Scroll {
+                        scroll_state.set_x(
+                            (scroll_state.x() - scroll_delta.x())
+                                .max(0.)
+                                .min(scroll_max.x()),
+                        );
+                    }
+                    if overflow.y == Overflow::Scroll {
+                        scroll_state.set_y(
+                            (scroll_state.y() - scroll_delta.y())
+                                .max(0.)
+                                .min(scroll_max.y()),
+                        );
+                    }
+                    cx.repaint();
+                } else {
+                    cx.bubble_event();
+                }
+            })
+        }
+    }
+
     fn paint_inspector(&self, parent_origin: Vector2F, layout: &Layout, cx: &mut PaintContext<V>) {
         let style = self.styles.merged();
         let bounds = layout.bounds + parent_origin;
@@ -175,3 +295,28 @@ impl<V: 'static> IntoElement<V> for Div<V> {
         self
     }
 }
+
+#[derive(Default, Clone)]
+pub struct ScrollState(Rc<Cell<Vector2F>>);
+
+impl ScrollState {
+    pub fn x(&self) -> f32 {
+        self.0.get().x()
+    }
+
+    pub fn set_x(&self, value: f32) {
+        let mut current_value = self.0.get();
+        current_value.set_x(value);
+        self.0.set(current_value);
+    }
+
+    pub fn y(&self) -> f32 {
+        self.0.get().y()
+    }
+
+    pub fn set_y(&self, value: f32) {
+        let mut current_value = self.0.get();
+        current_value.set_y(value);
+        self.0.set(current_value);
+    }
+}
diff --git a/crates/gpui2/src/layout_context.rs b/crates/gpui2/src/layout_context.rs
index bba39d4b0db40be59d53c0f8b69bcef6f466287a..c82a6f89b88454642e363000be851bfe130fbe0d 100644
--- a/crates/gpui2/src/layout_context.rs
+++ b/crates/gpui2/src/layout_context.rs
@@ -1,7 +1,7 @@
 use crate::{element::LayoutId, style::Style};
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
-use gpui::{geometry::Size, MeasureParams};
+use gpui::{geometry::Size, taffy::style::Overflow, MeasureParams};
 pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
 
 #[derive(Deref, DerefMut)]
@@ -22,11 +22,12 @@ impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
         children: impl IntoIterator<Item = NodeId>,
     ) -> Result<LayoutId> {
         let rem_size = self.rem_size();
+        let style = style.to_taffy(rem_size);
         let id = self
             .legacy_cx
             .layout_engine()
             .ok_or_else(|| anyhow!("no layout engine"))?
-            .add_node(style.to_taffy(rem_size), children)?;
+            .add_node(style, children)?;
 
         Ok(id)
     }
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 42f91b102cc85f202e5d4c8a94aa6ae68ee0bc9d..790cea6614caf9878060f6d8de60b26451f6df87 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -439,6 +439,14 @@ pub trait StyleHelpers: Styleable<Style = Style> {
         self
     }
 
+    fn grow(mut self) -> Self
+    where
+        Self: Sized,
+    {
+        self.declared_style().flex_grow = Some(1.);
+        self
+    }
+
     fn items_start(mut self) -> Self
     where
         Self: Sized,
diff --git a/crates/storybook/src/collab_panel.rs b/crates/storybook/src/collab_panel.rs
index 3b42ac823799a01725d385ee037bd67e69d55461..7bf08febe3a5980b27d5a8446dc0dab3405a652b 100644
--- a/crates/storybook/src/collab_panel.rs
+++ b/crates/storybook/src/collab_panel.rs
@@ -1,6 +1,6 @@
 use crate::theme::{theme, Theme};
 use gpui2::{
-    elements::{div, img, svg},
+    elements::{div, div::ScrollState, img, svg},
     style::{StyleHelpers, Styleable},
     ArcCow, Element, IntoElement, ParentElement, ViewContext,
 };
@@ -9,11 +9,15 @@ use std::marker::PhantomData;
 #[derive(Element)]
 pub struct CollabPanelElement<V: 'static> {
     view_type: PhantomData<V>,
+    scroll_state: ScrollState,
 }
 
-pub fn collab_panel<V: 'static>() -> CollabPanelElement<V> {
+// When I improve child view rendering, I'd like to have V implement a trait  that
+// provides the scroll state, among other things.
+pub fn collab_panel<V: 'static>(scroll_state: ScrollState) -> CollabPanelElement<V> {
     CollabPanelElement {
         view_type: PhantomData,
+        scroll_state,
     }
 }
 
@@ -24,6 +28,7 @@ impl<V: 'static> CollabPanelElement<V> {
         // Panel
         div()
             .w_64()
+            .h_full()
             .flex()
             .flex_col()
             .font("Zed Sans Extended")
@@ -36,6 +41,7 @@ impl<V: 'static> CollabPanelElement<V> {
                     .w_full()
                     .flex()
                     .flex_col()
+                    .overflow_y_scroll(self.scroll_state.clone())
                     // List Container
                     .child(
                         div()
@@ -67,21 +73,29 @@ impl<V: 'static> CollabPanelElement<V> {
                             .flex()
                             .flex_col()
                             .child(self.list_section_header("CONTACTS", true, theme))
-                            .child(self.list_item(
-                                "http://github.com/as-cii.png?s=50",
-                                "as-cii",
-                                theme,
-                            ))
-                            .child(self.list_item(
-                                "http://github.com/nathansobo.png?s=50",
-                                "nathansobo",
-                                theme,
-                            ))
-                            .child(self.list_item(
-                                "http://github.com/maxbrunsfeld.png?s=50",
-                                "maxbrunsfeld",
-                                theme,
-                            )),
+                            .children(
+                                std::iter::repeat_with(|| {
+                                    vec![
+                                        self.list_item(
+                                            "http://github.com/as-cii.png?s=50",
+                                            "as-cii",
+                                            theme,
+                                        ),
+                                        self.list_item(
+                                            "http://github.com/nathansobo.png?s=50",
+                                            "nathansobo",
+                                            theme,
+                                        ),
+                                        self.list_item(
+                                            "http://github.com/maxbrunsfeld.png?s=50",
+                                            "maxbrunsfeld",
+                                            theme,
+                                        ),
+                                    ]
+                                })
+                                .take(10)
+                                .flatten(),
+                            ),
                     ),
             )
             .child(
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index 619b19c8b827c2cdcf0627147ab8d813f3e553bf..d9f9c22fcb41f73856c8ebb6be9b0d0024d48780 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,10 +1,50 @@
 use crate::{collab_panel::collab_panel, theme::theme};
 use gpui2::{
-    elements::{div, img, svg},
+    elements::{div, div::ScrollState, img, svg},
     style::{StyleHelpers, Styleable},
     Element, IntoElement, ParentElement, ViewContext,
 };
 
+#[derive(Element, Default)]
+struct WorkspaceElement {
+    left_scroll_state: ScrollState,
+    right_scroll_state: ScrollState,
+}
+
+pub fn workspace<V: 'static>() -> impl Element<V> {
+    WorkspaceElement::default()
+}
+
+impl WorkspaceElement {
+    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+
+        div()
+            .size_full()
+            .flex()
+            .flex_col()
+            .font("Zed Sans Extended")
+            .gap_0()
+            .justify_start()
+            .items_start()
+            .text_color(theme.lowest.base.default.foreground)
+            .fill(theme.middle.base.default.background)
+            .child(titlebar())
+            .child(
+                div()
+                    .flex_1()
+                    .w_full()
+                    .flex()
+                    .flex_row()
+                    .overflow_hidden()
+                    .child(collab_panel(self.left_scroll_state.clone()))
+                    .child(div().h_full().flex_1())
+                    .child(collab_panel(self.right_scroll_state.clone())),
+            )
+            .child(statusbar())
+    }
+}
+
 #[derive(Element)]
 struct TitleBar;
 
@@ -393,50 +433,3 @@ impl StatusBar {
             )
     }
 }
-
-// ================================================================================ //
-
-#[derive(Element)]
-struct WorkspaceElement;
-
-pub fn workspace<V: 'static>() -> impl Element<V> {
-    WorkspaceElement
-}
-
-impl WorkspaceElement {
-    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
-        let theme = theme(cx);
-
-        div()
-            .size_full()
-            .flex()
-            .flex_col()
-            .font("Zed Sans Extended")
-            .gap_0()
-            .justify_start()
-            .items_start()
-            .text_color(theme.lowest.base.default.foreground)
-            // .fill(theme.middle.warning.default.background)
-            .child(titlebar())
-            .child(
-                div()
-                    .flex_1()
-                    .flex()
-                    .flex_row()
-                    .w_full()
-                    .child(collab_panel())
-                    .child(div().h_full().flex_1())
-                    .child(collab_panel()),
-            )
-            .child(statusbar())
-    }
-}
-
-// Hover over things
-// Paint its space... padding, margin, border, content
-
-/*
-* h_8, grow_0/flex_grow_0, shrink_0/flex_shrink_0
-* flex_grow
-* h_8, grow_0/flex_grow_0, shrink_0/flex_shrink_0
-*/

From a5ee8fc805382f0385a14c33c238687333e5dcfb Mon Sep 17 00:00:00 2001
From: KCaverly <kyle@zed.dev>
Date: Fri, 8 Sep 2023 12:35:15 -0400
Subject: [PATCH 064/109] initial outline for rate limiting status updates

---
 crates/search/src/project_search.rs           | 16 +++-
 crates/semantic_index/src/embedding.rs        | 75 +++++++++++++++++++
 crates/semantic_index/src/semantic_index.rs   | 17 +++--
 .../src/semantic_index_tests.rs               |  6 +-
 4 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index c52be6414188673701804e84b8f6c678e6bf7246..977ead8c9eed365a24bf2bee25356a3cc9d243db 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -34,6 +34,7 @@ use std::{
     ops::{Not, Range},
     path::PathBuf,
     sync::Arc,
+    time::Duration,
 };
 use util::ResultExt as _;
 use workspace::{
@@ -319,11 +320,22 @@ impl View for ProjectSearchView {
                 let status = semantic.index_status;
                 match status {
                     SemanticIndexStatus::Indexed => Some("Indexing complete".to_string()),
-                    SemanticIndexStatus::Indexing { remaining_files } => {
+                    SemanticIndexStatus::Indexing {
+                        remaining_files,
+                        rate_limiting,
+                    } => {
                         if remaining_files == 0 {
                             Some(format!("Indexing..."))
                         } else {
-                            Some(format!("Remaining files to index: {}", remaining_files))
+                            if rate_limiting > Duration::ZERO {
+                                Some(format!(
+                                    "Remaining files to index (rate limit resets in {}s): {}",
+                                    rate_limiting.as_secs(),
+                                    remaining_files
+                                ))
+                            } else {
+                                Some(format!("Remaining files to index: {}", remaining_files))
+                            }
                         }
                     }
                     SemanticIndexStatus::NotIndexed => None,
diff --git a/crates/semantic_index/src/embedding.rs b/crates/semantic_index/src/embedding.rs
index 7228738525c993b949b66124d698a509b4ed6257..6affac2556544067ff1eb3362aa33839c61233a7 100644
--- a/crates/semantic_index/src/embedding.rs
+++ b/crates/semantic_index/src/embedding.rs
@@ -7,7 +7,9 @@ use isahc::http::StatusCode;
 use isahc::prelude::Configurable;
 use isahc::{AsyncBody, Response};
 use lazy_static::lazy_static;
+use parking_lot::Mutex;
 use parse_duration::parse;
+use postage::watch;
 use rusqlite::types::{FromSql, FromSqlResult, ToSqlOutput, ValueRef};
 use rusqlite::ToSql;
 use serde::{Deserialize, Serialize};
@@ -82,6 +84,8 @@ impl ToSql for Embedding {
 pub struct OpenAIEmbeddings {
     pub client: Arc<dyn HttpClient>,
     pub executor: Arc<Background>,
+    rate_limit_count_rx: watch::Receiver<(Duration, usize)>,
+    rate_limit_count_tx: Arc<Mutex<watch::Sender<(Duration, usize)>>>,
 }
 
 #[derive(Serialize)]
@@ -114,12 +118,16 @@ pub trait EmbeddingProvider: Sync + Send {
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>>;
     fn max_tokens_per_batch(&self) -> usize;
     fn truncate(&self, span: &str) -> (String, usize);
+    fn rate_limit_expiration(&self) -> Duration;
 }
 
 pub struct DummyEmbeddings {}
 
 #[async_trait]
 impl EmbeddingProvider for DummyEmbeddings {
+    fn rate_limit_expiration(&self) -> Duration {
+        Duration::ZERO
+    }
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>> {
         // 1024 is the OpenAI Embeddings size for ada models.
         // the model we will likely be starting with.
@@ -149,6 +157,53 @@ impl EmbeddingProvider for DummyEmbeddings {
 const OPENAI_INPUT_LIMIT: usize = 8190;
 
 impl OpenAIEmbeddings {
+    pub fn new(client: Arc<dyn HttpClient>, executor: Arc<Background>) -> Self {
+        let (rate_limit_count_tx, rate_limit_count_rx) = watch::channel_with((Duration::ZERO, 0));
+        let rate_limit_count_tx = Arc::new(Mutex::new(rate_limit_count_tx));
+
+        OpenAIEmbeddings {
+            client,
+            executor,
+            rate_limit_count_rx,
+            rate_limit_count_tx,
+        }
+    }
+
+    fn resolve_rate_limit(&self) {
+        let (current_delay, delay_count) = *self.rate_limit_count_tx.lock().borrow();
+        let updated_count = delay_count - 1;
+        let updated_duration = if updated_count == 0 {
+            Duration::ZERO
+        } else {
+            current_delay
+        };
+
+        log::trace!(
+            "resolving rate limit: Count: {:?} Duration: {:?}",
+            updated_count,
+            updated_duration
+        );
+
+        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_duration, updated_count);
+    }
+
+    fn update_rate_limit(&self, delay_duration: Duration, count_increase: usize) {
+        let (current_delay, delay_count) = *self.rate_limit_count_tx.lock().borrow();
+        let updated_count = delay_count + count_increase;
+        let updated_duration = if current_delay < delay_duration {
+            delay_duration
+        } else {
+            current_delay
+        };
+
+        log::trace!(
+            "updating rate limit: Count: {:?} Duration: {:?}",
+            updated_count,
+            updated_duration
+        );
+
+        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_duration, updated_count);
+    }
     async fn send_request(
         &self,
         api_key: &str,
@@ -179,6 +234,10 @@ impl EmbeddingProvider for OpenAIEmbeddings {
         50000
     }
 
+    fn rate_limit_expiration(&self) -> Duration {
+        let (duration, _) = *self.rate_limit_count_rx.borrow();
+        duration
+    }
     fn truncate(&self, span: &str) -> (String, usize) {
         let mut tokens = OPENAI_BPE_TOKENIZER.encode_with_special_tokens(span);
         let output = if tokens.len() > OPENAI_INPUT_LIMIT {
@@ -203,6 +262,7 @@ impl EmbeddingProvider for OpenAIEmbeddings {
             .ok_or_else(|| anyhow!("no api key"))?;
 
         let mut request_number = 0;
+        let mut rate_limiting = false;
         let mut request_timeout: u64 = 15;
         let mut response: Response<AsyncBody>;
         while request_number < MAX_RETRIES {
@@ -229,6 +289,12 @@ impl EmbeddingProvider for OpenAIEmbeddings {
                         response.usage.total_tokens
                     );
 
+                    // If we complete a request successfully that was previously rate_limited
+                    // resolve the rate limit
+                    if rate_limiting {
+                        self.resolve_rate_limit()
+                    }
+
                     return Ok(response
                         .data
                         .into_iter()
@@ -254,6 +320,15 @@ impl EmbeddingProvider for OpenAIEmbeddings {
                         }
                     };
 
+                    // If we've previously rate limited, increment the duration but not the count
+                    if rate_limiting {
+                        self.update_rate_limit(delay_duration, 0);
+                    } else {
+                        self.update_rate_limit(delay_duration, 1);
+                    }
+
+                    rate_limiting = true;
+
                     log::trace!(
                         "openai rate limiting: waiting {:?} until lifted",
                         &delay_duration
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index 0e18c420491837a3fe3b9fbaec79539696cf4170..8fba7de0f05624e399193ef010624bcd5192e65f 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -91,10 +91,7 @@ pub fn init(
         let semantic_index = SemanticIndex::new(
             fs,
             db_file_path,
-            Arc::new(OpenAIEmbeddings {
-                client: http_client,
-                executor: cx.background(),
-            }),
+            Arc::new(OpenAIEmbeddings::new(http_client, cx.background())),
             language_registry,
             cx.clone(),
         )
@@ -113,7 +110,10 @@ pub fn init(
 pub enum SemanticIndexStatus {
     NotIndexed,
     Indexed,
-    Indexing { remaining_files: usize },
+    Indexing {
+        remaining_files: usize,
+        rate_limiting: Duration,
+    },
 }
 
 pub struct SemanticIndex {
@@ -132,6 +132,8 @@ struct ProjectState {
     pending_file_count_rx: watch::Receiver<usize>,
     pending_file_count_tx: Arc<Mutex<watch::Sender<usize>>>,
     pending_index: usize,
+    rate_limiting_count_rx: watch::Receiver<usize>,
+    rate_limiting_count_tx: Arc<Mutex<watch::Sender<usize>>>,
     _subscription: gpui::Subscription,
     _observe_pending_file_count: Task<()>,
 }
@@ -223,11 +225,15 @@ impl ProjectState {
     fn new(subscription: gpui::Subscription, cx: &mut ModelContext<SemanticIndex>) -> Self {
         let (pending_file_count_tx, pending_file_count_rx) = watch::channel_with(0);
         let pending_file_count_tx = Arc::new(Mutex::new(pending_file_count_tx));
+        let (rate_limiting_count_tx, rate_limiting_count_rx) = watch::channel_with(0);
+        let rate_limiting_count_tx = Arc::new(Mutex::new(rate_limiting_count_tx));
         Self {
             worktrees: Default::default(),
             pending_file_count_rx: pending_file_count_rx.clone(),
             pending_file_count_tx,
             pending_index: 0,
+            rate_limiting_count_rx: rate_limiting_count_rx.clone(),
+            rate_limiting_count_tx,
             _subscription: subscription,
             _observe_pending_file_count: cx.spawn_weak({
                 let mut pending_file_count_rx = pending_file_count_rx.clone();
@@ -293,6 +299,7 @@ impl SemanticIndex {
             } else {
                 SemanticIndexStatus::Indexing {
                     remaining_files: project_state.pending_file_count_rx.borrow().clone(),
+                    rate_limiting: self.embedding_provider.rate_limit_expiration(),
                 }
             }
         } else {
diff --git a/crates/semantic_index/src/semantic_index_tests.rs b/crates/semantic_index/src/semantic_index_tests.rs
index ffd8db87814cacb09143381891b993ca86e173e7..09c94b9a94a279623f812b3d1451cda72d586911 100644
--- a/crates/semantic_index/src/semantic_index_tests.rs
+++ b/crates/semantic_index/src/semantic_index_tests.rs
@@ -21,7 +21,7 @@ use std::{
         atomic::{self, AtomicUsize},
         Arc,
     },
-    time::SystemTime,
+    time::{Duration, SystemTime},
 };
 use unindent::Unindent;
 use util::RandomCharIter;
@@ -1275,6 +1275,10 @@ impl EmbeddingProvider for FakeEmbeddingProvider {
         200
     }
 
+    fn rate_limit_expiration(&self) -> Duration {
+        Duration::ZERO
+    }
+
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>> {
         self.embedding_count
             .fetch_add(spans.len(), atomic::Ordering::SeqCst);

From f4a9d3f26979335cb65710f2340a9e554f2a4622 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 8 Sep 2023 12:41:32 -0400
Subject: [PATCH 065/109] Add tooltip to language selector

---
 crates/language_selector/src/active_buffer_language.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/language_selector/src/active_buffer_language.rs b/crates/language_selector/src/active_buffer_language.rs
index 5ffcb13fbafa7be008346f97bcfb1b2041b4244b..01333c1ffb8310302159b1f1306deaefc34bb157 100644
--- a/crates/language_selector/src/active_buffer_language.rs
+++ b/crates/language_selector/src/active_buffer_language.rs
@@ -52,6 +52,7 @@ impl View for ActiveBufferLanguage {
             } else {
                 "Unknown".to_string()
             };
+            let theme = theme::current(cx).clone();
 
             MouseEventHandler::new::<Self, _>(0, cx, |state, cx| {
                 let theme = &theme::current(cx).workspace.status_bar;
@@ -68,6 +69,7 @@ impl View for ActiveBufferLanguage {
                     });
                 }
             })
+            .with_tooltip::<Self>(0, "Select Language", None, theme.tooltip.clone(), cx)
             .into_any()
         } else {
             Empty::new().into_any()

From a0701777d5b2d8762c5f84ff29d6a19e0f16e3b3 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 8 Sep 2023 12:44:49 -0400
Subject: [PATCH 066/109] Make tooltip title case to match other tooltips

---
 crates/collab_ui/src/collab_titlebar_item.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 95b98689374250c824b3c7e84d16aac45d7f6a11..6c34b7021ee37b51843015642f6f5f05166868ed 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -771,7 +771,7 @@ impl CollabTitlebarItem {
                 })
                 .with_tooltip::<ToggleUserMenu>(
                     0,
-                    "Toggle user menu".to_owned(),
+                    "Toggle User Menu".to_owned(),
                     Some(Box::new(ToggleUserMenu)),
                     tooltip,
                     cx,

From 88dae22e3eedbc1b6c42209b5a985705345cfbed Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 8 Sep 2023 10:56:26 -0600
Subject: [PATCH 067/109] Don't replay ShowCharacterPalette

---
 crates/vim/src/normal/repeat.rs | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index a29141941358ae925bd32902721c2249c4f8f404..1a7c789aad9a680eddef208eed182b5b237ca286 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -4,11 +4,19 @@ use crate::{
     visual::visual_motion,
     Vim,
 };
-use gpui::{actions, AppContext};
+use gpui::{actions, Action, AppContext};
 use workspace::Workspace;
 
 actions!(vim, [Repeat, EndRepeat,]);
 
+fn should_replay(action: &Box<dyn Action>) -> bool {
+    // skip so that we don't leave the character palette open
+    if editor::ShowCharacterPalette.id() == action.id() {
+        return false;
+    }
+    true
+}
+
 pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| {
         Vim::update(cx, |vim, cx| {
@@ -118,9 +126,15 @@ pub(crate) fn init(cx: &mut AppContext) {
             .spawn(move |mut cx| async move {
                 for action in actions {
                     match action {
-                        ReplayableAction::Action(action) => window
-                            .dispatch_action(editor.id(), action.as_ref(), &mut cx)
-                            .ok_or_else(|| anyhow::anyhow!("window was closed")),
+                        ReplayableAction::Action(action) => {
+                            if should_replay(&action) {
+                                window
+                                    .dispatch_action(editor.id(), action.as_ref(), &mut cx)
+                                    .ok_or_else(|| anyhow::anyhow!("window was closed"))
+                            } else {
+                                Ok(())
+                            }
+                        }
                         ReplayableAction::Insertion {
                             text,
                             utf16_range_to_replace,

From bf43f93197e9149ef7625ed7b61f368edca79e82 Mon Sep 17 00:00:00 2001
From: KCaverly <kyle@zed.dev>
Date: Fri, 8 Sep 2023 15:04:50 -0400
Subject: [PATCH 068/109] updated semantic_index reset status to leverage
 target reset system time as opposed to duration

---
 crates/search/src/project_search.rs           | 22 +++---
 crates/semantic_index/src/embedding.rs        | 67 +++++++++----------
 crates/semantic_index/src/semantic_index.rs   | 10 +--
 .../src/semantic_index_tests.rs               |  6 +-
 4 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 977ead8c9eed365a24bf2bee25356a3cc9d243db..6b5ebd56d40a292184e1dd19b026eab90b7516f2 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -34,7 +34,7 @@ use std::{
     ops::{Not, Range},
     path::PathBuf,
     sync::Arc,
-    time::Duration,
+    time::SystemTime,
 };
 use util::ResultExt as _;
 use workspace::{
@@ -322,17 +322,23 @@ impl View for ProjectSearchView {
                     SemanticIndexStatus::Indexed => Some("Indexing complete".to_string()),
                     SemanticIndexStatus::Indexing {
                         remaining_files,
-                        rate_limiting,
+                        rate_limit_expiration_time,
                     } => {
                         if remaining_files == 0 {
                             Some(format!("Indexing..."))
                         } else {
-                            if rate_limiting > Duration::ZERO {
-                                Some(format!(
-                                    "Remaining files to index (rate limit resets in {}s): {}",
-                                    rate_limiting.as_secs(),
-                                    remaining_files
-                                ))
+                            if let Some(rate_limit_expiration_time) = rate_limit_expiration_time {
+                                if let Ok(remaining_seconds) =
+                                    rate_limit_expiration_time.duration_since(SystemTime::now())
+                                {
+                                    Some(format!(
+                                        "Remaining files to index(rate limit resets in {}s): {}",
+                                        remaining_seconds.as_secs(),
+                                        remaining_files
+                                    ))
+                                } else {
+                                    Some(format!("Remaining files to index: {}", remaining_files))
+                                }
                             } else {
                                 Some(format!("Remaining files to index: {}", remaining_files))
                             }
diff --git a/crates/semantic_index/src/embedding.rs b/crates/semantic_index/src/embedding.rs
index 6affac2556544067ff1eb3362aa33839c61233a7..148b354794a5b002ee984c506f8cc4f0c334a4bf 100644
--- a/crates/semantic_index/src/embedding.rs
+++ b/crates/semantic_index/src/embedding.rs
@@ -14,8 +14,9 @@ use rusqlite::types::{FromSql, FromSqlResult, ToSqlOutput, ValueRef};
 use rusqlite::ToSql;
 use serde::{Deserialize, Serialize};
 use std::env;
+use std::ops::Add;
 use std::sync::Arc;
-use std::time::Duration;
+use std::time::{Duration, SystemTime};
 use tiktoken_rs::{cl100k_base, CoreBPE};
 use util::http::{HttpClient, Request};
 
@@ -84,8 +85,8 @@ impl ToSql for Embedding {
 pub struct OpenAIEmbeddings {
     pub client: Arc<dyn HttpClient>,
     pub executor: Arc<Background>,
-    rate_limit_count_rx: watch::Receiver<(Duration, usize)>,
-    rate_limit_count_tx: Arc<Mutex<watch::Sender<(Duration, usize)>>>,
+    rate_limit_count_rx: watch::Receiver<(Option<SystemTime>, usize)>,
+    rate_limit_count_tx: Arc<Mutex<watch::Sender<(Option<SystemTime>, usize)>>>,
 }
 
 #[derive(Serialize)]
@@ -118,15 +119,15 @@ pub trait EmbeddingProvider: Sync + Send {
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>>;
     fn max_tokens_per_batch(&self) -> usize;
     fn truncate(&self, span: &str) -> (String, usize);
-    fn rate_limit_expiration(&self) -> Duration;
+    fn rate_limit_expiration(&self) -> Option<SystemTime>;
 }
 
 pub struct DummyEmbeddings {}
 
 #[async_trait]
 impl EmbeddingProvider for DummyEmbeddings {
-    fn rate_limit_expiration(&self) -> Duration {
-        Duration::ZERO
+    fn rate_limit_expiration(&self) -> Option<SystemTime> {
+        None
     }
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>> {
         // 1024 is the OpenAI Embeddings size for ada models.
@@ -158,7 +159,7 @@ const OPENAI_INPUT_LIMIT: usize = 8190;
 
 impl OpenAIEmbeddings {
     pub fn new(client: Arc<dyn HttpClient>, executor: Arc<Background>) -> Self {
-        let (rate_limit_count_tx, rate_limit_count_rx) = watch::channel_with((Duration::ZERO, 0));
+        let (rate_limit_count_tx, rate_limit_count_rx) = watch::channel_with((None, 0));
         let rate_limit_count_tx = Arc::new(Mutex::new(rate_limit_count_tx));
 
         OpenAIEmbeddings {
@@ -170,39 +171,32 @@ impl OpenAIEmbeddings {
     }
 
     fn resolve_rate_limit(&self) {
-        let (current_delay, delay_count) = *self.rate_limit_count_tx.lock().borrow();
+        let (reset_time, delay_count) = *self.rate_limit_count_tx.lock().borrow();
         let updated_count = delay_count - 1;
-        let updated_duration = if updated_count == 0 {
-            Duration::ZERO
-        } else {
-            current_delay
-        };
+        let updated_time = if updated_count == 0 { None } else { reset_time };
 
-        log::trace!(
-            "resolving rate limit: Count: {:?} Duration: {:?}",
-            updated_count,
-            updated_duration
-        );
+        log::trace!("resolving rate limit: Count: {:?}", updated_count);
 
-        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_duration, updated_count);
+        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_time, updated_count);
     }
 
-    fn update_rate_limit(&self, delay_duration: Duration, count_increase: usize) {
-        let (current_delay, delay_count) = *self.rate_limit_count_tx.lock().borrow();
-        let updated_count = delay_count + count_increase;
-        let updated_duration = if current_delay < delay_duration {
-            delay_duration
+    fn update_rate_limit(&self, reset_time: SystemTime, count_increase: usize) {
+        let (original_time, original_count) = *self.rate_limit_count_tx.lock().borrow();
+        let updated_count = original_count + count_increase;
+
+        let updated_time = if let Some(original_time) = original_time {
+            if reset_time < original_time {
+                Some(reset_time)
+            } else {
+                Some(original_time)
+            }
         } else {
-            current_delay
+            Some(reset_time)
         };
 
-        log::trace!(
-            "updating rate limit: Count: {:?} Duration: {:?}",
-            updated_count,
-            updated_duration
-        );
+        log::trace!("updating rate limit: Count: {:?}", updated_count);
 
-        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_duration, updated_count);
+        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_time, updated_count);
     }
     async fn send_request(
         &self,
@@ -234,9 +228,9 @@ impl EmbeddingProvider for OpenAIEmbeddings {
         50000
     }
 
-    fn rate_limit_expiration(&self) -> Duration {
-        let (duration, _) = *self.rate_limit_count_rx.borrow();
-        duration
+    fn rate_limit_expiration(&self) -> Option<SystemTime> {
+        let (expiration_time, _) = *self.rate_limit_count_rx.borrow();
+        expiration_time
     }
     fn truncate(&self, span: &str) -> (String, usize) {
         let mut tokens = OPENAI_BPE_TOKENIZER.encode_with_special_tokens(span);
@@ -321,10 +315,11 @@ impl EmbeddingProvider for OpenAIEmbeddings {
                     };
 
                     // If we've previously rate limited, increment the duration but not the count
+                    let reset_time = SystemTime::now().add(delay_duration);
                     if rate_limiting {
-                        self.update_rate_limit(delay_duration, 0);
+                        self.update_rate_limit(reset_time, 0);
                     } else {
-                        self.update_rate_limit(delay_duration, 1);
+                        self.update_rate_limit(reset_time, 1);
                     }
 
                     rate_limiting = true;
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index 8fba7de0f05624e399193ef010624bcd5192e65f..b60d697b43d3a4ad98ddfcafdfd1df66a626cdcb 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -112,7 +112,7 @@ pub enum SemanticIndexStatus {
     Indexed,
     Indexing {
         remaining_files: usize,
-        rate_limiting: Duration,
+        rate_limit_expiration_time: Option<SystemTime>,
     },
 }
 
@@ -132,8 +132,6 @@ struct ProjectState {
     pending_file_count_rx: watch::Receiver<usize>,
     pending_file_count_tx: Arc<Mutex<watch::Sender<usize>>>,
     pending_index: usize,
-    rate_limiting_count_rx: watch::Receiver<usize>,
-    rate_limiting_count_tx: Arc<Mutex<watch::Sender<usize>>>,
     _subscription: gpui::Subscription,
     _observe_pending_file_count: Task<()>,
 }
@@ -225,15 +223,11 @@ impl ProjectState {
     fn new(subscription: gpui::Subscription, cx: &mut ModelContext<SemanticIndex>) -> Self {
         let (pending_file_count_tx, pending_file_count_rx) = watch::channel_with(0);
         let pending_file_count_tx = Arc::new(Mutex::new(pending_file_count_tx));
-        let (rate_limiting_count_tx, rate_limiting_count_rx) = watch::channel_with(0);
-        let rate_limiting_count_tx = Arc::new(Mutex::new(rate_limiting_count_tx));
         Self {
             worktrees: Default::default(),
             pending_file_count_rx: pending_file_count_rx.clone(),
             pending_file_count_tx,
             pending_index: 0,
-            rate_limiting_count_rx: rate_limiting_count_rx.clone(),
-            rate_limiting_count_tx,
             _subscription: subscription,
             _observe_pending_file_count: cx.spawn_weak({
                 let mut pending_file_count_rx = pending_file_count_rx.clone();
@@ -299,7 +293,7 @@ impl SemanticIndex {
             } else {
                 SemanticIndexStatus::Indexing {
                     remaining_files: project_state.pending_file_count_rx.borrow().clone(),
-                    rate_limiting: self.embedding_provider.rate_limit_expiration(),
+                    rate_limit_expiration_time: self.embedding_provider.rate_limit_expiration(),
                 }
             }
         } else {
diff --git a/crates/semantic_index/src/semantic_index_tests.rs b/crates/semantic_index/src/semantic_index_tests.rs
index 09c94b9a94a279623f812b3d1451cda72d586911..4bc95bec62e7980744dca209dec28f0213d12526 100644
--- a/crates/semantic_index/src/semantic_index_tests.rs
+++ b/crates/semantic_index/src/semantic_index_tests.rs
@@ -21,7 +21,7 @@ use std::{
         atomic::{self, AtomicUsize},
         Arc,
     },
-    time::{Duration, SystemTime},
+    time::SystemTime,
 };
 use unindent::Unindent;
 use util::RandomCharIter;
@@ -1275,8 +1275,8 @@ impl EmbeddingProvider for FakeEmbeddingProvider {
         200
     }
 
-    fn rate_limit_expiration(&self) -> Duration {
-        Duration::ZERO
+    fn rate_limit_expiration(&self) -> Option<SystemTime> {
+        None
     }
 
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>> {

From 53a50b8df45ad778f04120ea580b17710669049f Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 13:27:29 -0600
Subject: [PATCH 069/109] Move refreshing to window

---
 crates/editor/src/element.rs       |  8 ++++----
 crates/gpui/src/app.rs             | 10 +++-------
 crates/gpui/src/app/window.rs      | 12 ++++++++++--
 crates/gpui/src/elements.rs        | 16 +++-------------
 crates/gpui/src/elements/list.rs   | 10 +++++-----
 crates/gpui/src/elements/text.rs   |  2 +-
 crates/gpui2/src/layout_context.rs |  2 +-
 7 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 9a6eb1116c1bcec556a35f875a9e0f046dbed54b..2d157761bfacee8ea1e94ded56b4009d1323fc50 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -3204,7 +3204,7 @@ mod tests {
                     Point::new(5, 6)..Point::new(6, 0),
                 ]);
             });
-            let mut layout_cx = LayoutContext::new(cx, false);
+            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3289,7 +3289,7 @@ mod tests {
                     DisplayPoint::new(10, 0)..DisplayPoint::new(13, 0),
                 ]);
             });
-            let mut layout_cx = LayoutContext::new(cx, false);
+            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3349,7 +3349,7 @@ mod tests {
 
         let mut element = EditorElement::new(editor.read_with(cx, |editor, cx| editor.style(cx)));
         let (size, mut state) = editor.update(cx, |editor, cx| {
-            let mut layout_cx = LayoutContext::new(cx, false);
+            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
@@ -3546,7 +3546,7 @@ mod tests {
             editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
             editor.set_wrap_width(Some(editor_width), cx);
 
-            let mut layout_cx = LayoutContext::new(cx, false);
+            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(editor_width, 500.), vec2f(editor_width, 500.)),
                 editor,
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 68b42f6e6e4ecd2fb870aaf87c93a20915323acc..b3f5ab1ff972eab104f7772925a967498418d414 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3454,15 +3454,11 @@ impl<V> BorrowWindowContext for ViewContext<'_, '_, V> {
 pub struct LayoutContext<'a, 'b, 'c, V> {
     // Nathan: Making this is public while I work on gpui2.
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
-    pub refreshing: bool,
 }
 
 impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
-    pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>, refreshing: bool) -> Self {
-        Self {
-            view_context,
-            refreshing,
-        }
+    pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>) -> Self {
+        Self { view_context }
     }
 
     pub fn view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
@@ -6482,7 +6478,7 @@ mod tests {
         view_1.update(cx, |_, cx| {
             view_2.update(cx, |_, cx| {
                 // Sanity check
-                let mut layout_cx = LayoutContext::new(cx, false);
+                let mut layout_cx = LayoutContext::new(cx);
                 assert_eq!(
                     layout_cx
                         .keystrokes_for_action(view_1_id, &Action1)
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index e0f29fea51b414a50d792f915fd0e8934d53fe0f..c1304f10cd586bcffe9014febc5d0f467a67452e 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -71,6 +71,7 @@ pub struct Window {
     pub(crate) clicked_region_ids: Vec<MouseRegionId>,
     pub(crate) clicked_region: Option<(MouseRegionId, MouseButton)>,
     text_layout_cache: TextLayoutCache,
+    refreshing: bool,
 }
 
 impl Window {
@@ -113,6 +114,7 @@ impl Window {
             clicked_region: None,
             titlebar_height,
             appearance,
+            refreshing: false,
         };
 
         let mut window_context = WindowContext::mutable(cx, &mut window, handle);
@@ -291,6 +293,10 @@ impl<'a> WindowContext<'a> {
         self.window.platform_window.mouse_position()
     }
 
+    pub fn refreshing(&self) -> bool {
+        self.window.refreshing
+    }
+
     pub fn text_layout_cache(&self) -> &TextLayoutCache {
         &self.window.text_layout_cache
     }
@@ -1034,7 +1040,9 @@ impl<'a> WindowContext<'a> {
 
         let mut rendered_root = self.window.rendered_views.remove(&root_view_id).unwrap();
 
-        rendered_root.layout(SizeConstraint::strict(window_size), refreshing, self)?;
+        self.window.refreshing = refreshing;
+        rendered_root.layout(SizeConstraint::strict(window_size), self)?;
+        self.window.refreshing = false;
 
         let views_to_notify_if_ancestors_change =
             mem::take(&mut self.window.views_to_notify_if_ancestors_change);
@@ -1671,7 +1679,7 @@ impl<V: 'static> Element<V> for ChildView {
             let parent_id = cx.view_id();
             cx.window.new_parents.insert(self.view_id, parent_id);
             let size = rendered_view
-                .layout(constraint, cx.refreshing, cx.view_context)
+                .layout(constraint, cx.view_context)
                 .log_err()
                 .unwrap_or(Vector2F::zero());
             cx.window.rendered_views.insert(self.view_id, rendered_view);
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index da714907c359e6ab4b2b17e3056fb3ab378bf144..790581eb9f4af667618db984e51836c37e064bca 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -644,12 +644,7 @@ impl<V> RootElement<V> {
 }
 
 pub trait AnyRootElement {
-    fn layout(
-        &mut self,
-        constraint: SizeConstraint,
-        refreshing: bool,
-        cx: &mut WindowContext,
-    ) -> Result<Vector2F>;
+    fn layout(&mut self, constraint: SizeConstraint, cx: &mut WindowContext) -> Result<Vector2F>;
     fn paint(
         &mut self,
         scene: &mut SceneBuilder,
@@ -667,18 +662,13 @@ pub trait AnyRootElement {
 }
 
 impl<V: View> AnyRootElement for RootElement<V> {
-    fn layout(
-        &mut self,
-        constraint: SizeConstraint,
-        refreshing: bool,
-        cx: &mut WindowContext,
-    ) -> Result<Vector2F> {
+    fn layout(&mut self, constraint: SizeConstraint, cx: &mut WindowContext) -> Result<Vector2F> {
         let view = self
             .view
             .upgrade(cx)
             .ok_or_else(|| anyhow!("layout called on a root element for a dropped view"))?;
         view.update(cx, |view, cx| {
-            let mut cx = LayoutContext::new(cx, refreshing);
+            let mut cx = LayoutContext::new(cx);
             Ok(self.element.layout(constraint, view, &mut cx))
         })
     }
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 1f1b2b9fb4f0db55be2e58f640c88d9bd4322f36..bcb80d8c7ecc60335045e36e664eaccadd5a9c32 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -108,7 +108,7 @@ impl<V: 'static> Element<V> for List<V> {
         item_constraint.min.set_y(0.);
         item_constraint.max.set_y(f32::INFINITY);
 
-        if cx.refreshing || state.last_layout_width != Some(size.x()) {
+        if cx.refreshing() || state.last_layout_width != Some(size.x()) {
             state.rendered_range = 0..0;
             state.items = SumTree::from_iter(
                 (0..state.items.summary().count).map(|_| ListItem::Unrendered),
@@ -666,7 +666,7 @@ mod tests {
             });
 
             let mut list = List::new(state.clone());
-            let mut layout_cx = LayoutContext::new(cx, false);
+            let mut layout_cx = LayoutContext::new(cx);
             let (size, _) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
@@ -691,7 +691,7 @@ mod tests {
                 cx,
             );
 
-            let mut layout_cx = LayoutContext::new(cx, false);
+            let mut layout_cx = LayoutContext::new(cx);
             let (_, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(
                 logical_scroll_top,
@@ -716,7 +716,7 @@ mod tests {
                 }
             );
 
-            let mut layout_cx = LayoutContext::new(cx, false);
+            let mut layout_cx = LayoutContext::new(cx);
             let (size, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
@@ -835,7 +835,7 @@ mod tests {
 
                 let mut list = List::new(state.clone());
                 let window_size = vec2f(width, height);
-                let mut layout_cx = LayoutContext::new(cx, false);
+                let mut layout_cx = LayoutContext::new(cx);
                 let (size, logical_scroll_top) = list.layout(
                     SizeConstraint::new(vec2f(0., 0.), window_size),
                     &mut view,
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 3e9214f12c92b36a8947e72318147b5e8dc025da..3f5888345604a32138a60c4969e853472d502330 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -411,7 +411,7 @@ mod tests {
             let mut view = TestView;
             fonts::with_font_cache(cx.font_cache().clone(), || {
                 let mut text = Text::new("Hello\r\n", Default::default()).with_soft_wrap(true);
-                let mut layout_cx = LayoutContext::new(cx, false);
+                let mut layout_cx = LayoutContext::new(cx);
                 let (_, state) = text.layout(
                     SizeConstraint::new(Default::default(), vec2f(f32::INFINITY, f32::INFINITY)),
                     &mut view,
diff --git a/crates/gpui2/src/layout_context.rs b/crates/gpui2/src/layout_context.rs
index c82a6f89b88454642e363000be851bfe130fbe0d..0249246514e015ab14a515963c10035c1742f2b6 100644
--- a/crates/gpui2/src/layout_context.rs
+++ b/crates/gpui2/src/layout_context.rs
@@ -1,7 +1,7 @@
 use crate::{element::LayoutId, style::Style};
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
-use gpui::{geometry::Size, taffy::style::Overflow, MeasureParams};
+use gpui::{geometry::Size, MeasureParams};
 pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
 
 #[derive(Deref, DerefMut)]

From 14fc386dc898a8980f741dc0bb45f57292778117 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 13:54:15 -0600
Subject: [PATCH 070/109] Checkpoint

---
 crates/gpui/src/app.rs | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index b3f5ab1ff972eab104f7772925a967498418d414..de96a223407355ee200d77d26c49236455bbd6d1 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3360,6 +3360,51 @@ impl<'a, 'b, V: 'static> ViewContext<'a, 'b, V> {
     ) -> ElementStateHandle<T> {
         self.element_state_dynamic::<T>(tag, element_id, T::default())
     }
+
+    /// Return keystrokes that would dispatch the given action on the given view.
+    pub(crate) fn keystrokes_for_action(
+        &mut self,
+        view_id: usize,
+        action: &dyn Action,
+    ) -> Option<SmallVec<[Keystroke; 2]>> {
+        self.notify_if_view_ancestors_change(view_id);
+
+        let window = self.window_handle;
+        let mut contexts = Vec::new();
+        let mut handler_depth = None;
+        for (i, view_id) in self.ancestors(view_id).enumerate() {
+            if let Some(view_metadata) = self.views_metadata.get(&(window, view_id)) {
+                if let Some(actions) = self.actions.get(&view_metadata.type_id) {
+                    if actions.contains_key(&action.id()) {
+                        handler_depth = Some(i);
+                    }
+                }
+                contexts.push(view_metadata.keymap_context.clone());
+            }
+        }
+
+        if self.global_actions.contains_key(&action.id()) {
+            handler_depth = Some(contexts.len())
+        }
+
+        let action_contexts = if let Some(depth) = handler_depth {
+            &contexts[depth..]
+        } else {
+            &contexts
+        };
+
+        self.keystroke_matcher
+            .keystrokes_for_action(action, action_contexts)
+    }
+
+    fn notify_if_view_ancestors_change(&mut self, view_id: usize) {
+        let self_view_id = self.view_id;
+        self.window
+            .views_to_notify_if_ancestors_change
+            .entry(view_id)
+            .or_default()
+            .push(self_view_id);
+    }
 }
 
 impl<V: View> ViewContext<'_, '_, V> {
@@ -3464,51 +3509,6 @@ impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
     pub fn view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
         self.view_context
     }
-
-    /// Return keystrokes that would dispatch the given action on the given view.
-    pub(crate) fn keystrokes_for_action(
-        &mut self,
-        view_id: usize,
-        action: &dyn Action,
-    ) -> Option<SmallVec<[Keystroke; 2]>> {
-        self.notify_if_view_ancestors_change(view_id);
-
-        let window = self.window_handle;
-        let mut contexts = Vec::new();
-        let mut handler_depth = None;
-        for (i, view_id) in self.ancestors(view_id).enumerate() {
-            if let Some(view_metadata) = self.views_metadata.get(&(window, view_id)) {
-                if let Some(actions) = self.actions.get(&view_metadata.type_id) {
-                    if actions.contains_key(&action.id()) {
-                        handler_depth = Some(i);
-                    }
-                }
-                contexts.push(view_metadata.keymap_context.clone());
-            }
-        }
-
-        if self.global_actions.contains_key(&action.id()) {
-            handler_depth = Some(contexts.len())
-        }
-
-        let action_contexts = if let Some(depth) = handler_depth {
-            &contexts[depth..]
-        } else {
-            &contexts
-        };
-
-        self.keystroke_matcher
-            .keystrokes_for_action(action, action_contexts)
-    }
-
-    fn notify_if_view_ancestors_change(&mut self, view_id: usize) {
-        let self_view_id = self.view_id;
-        self.window
-            .views_to_notify_if_ancestors_change
-            .entry(view_id)
-            .or_default()
-            .push(self_view_id);
-    }
 }
 
 impl<'a, 'b, 'c, V> Deref for LayoutContext<'a, 'b, 'c, V> {

From c3b1264c05feec23a25cd3012181dc9158fe68eb Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 14:09:25 -0600
Subject: [PATCH 071/109] Checkpoint

---
 crates/gpui2/src/adapter.rs                            |  4 ++--
 crates/gpui2/src/element.rs                            | 10 +++++-----
 crates/gpui2/src/elements/div.rs                       |  5 ++---
 crates/gpui2/src/elements/hoverable.rs                 |  4 ++--
 crates/gpui2/src/elements/img.rs                       |  8 +++++---
 crates/gpui2/src/elements/pressable.rs                 |  4 ++--
 crates/gpui2/src/elements/svg.rs                       |  2 +-
 crates/gpui2/src/elements/text.rs                      |  4 ++--
 crates/gpui2/src/gpui2.rs                              |  4 ++--
 .../gpui2/src/{layout_context.rs => view_context.rs}   | 10 +++++-----
 crates/gpui2_macros/src/derive_element.rs              |  2 +-
 crates/storybook/src/components.rs                     |  9 ++++++---
 crates/storybook/src/storybook.rs                      |  2 +-
 crates/storybook/src/theme.rs                          |  5 ++---
 14 files changed, 38 insertions(+), 35 deletions(-)
 rename crates/gpui2/src/{layout_context.rs => view_context.rs} (76%)

diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
index 6aa89385af4e9f22297264080ab3761e3365acef..d1bc7ac290e3b9ac44eb3e54e8951cbf4a0aba29 100644
--- a/crates/gpui2/src/adapter.rs
+++ b/crates/gpui2/src/adapter.rs
@@ -1,4 +1,4 @@
-use crate::{layout_context::LayoutContext, paint_context::PaintContext};
+use crate::{paint_context::PaintContext, ViewContext};
 use gpui::{geometry::rect::RectF, LayoutEngine, LayoutId};
 use util::ResultExt;
 
@@ -17,7 +17,7 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
     ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
         cx.push_layout_engine(LayoutEngine::new());
 
-        let mut cx = LayoutContext::new(cx);
+        let mut cx = ViewContext::new(cx);
         let layout_id = self.0.layout(view, &mut cx).log_err();
         if let Some(layout_id) = layout_id {
             cx.layout_engine()
diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index 3f376f978f21475e958c3dabb57a796ac67ff00d..d2a8efee830518aa695ca2c6bc8bb8e6a886de4b 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -1,5 +1,5 @@
-pub use crate::layout_context::LayoutContext;
 pub use crate::paint_context::PaintContext;
+pub use crate::ViewContext;
 use anyhow::Result;
 use gpui::geometry::vector::Vector2F;
 pub use gpui::{Layout, LayoutId};
@@ -11,7 +11,7 @@ pub trait Element<V: 'static>: 'static + IntoElement<V> {
     fn layout(
         &mut self,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized;
@@ -39,7 +39,7 @@ pub trait Element<V: 'static>: 'static + IntoElement<V> {
 
 /// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
 trait AnyStatefulElement<V> {
-    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId>;
+    fn layout(&mut self, view: &mut V, cx: &mut ViewContext<V>) -> Result<LayoutId>;
     fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>);
 }
 
@@ -86,7 +86,7 @@ impl<V: 'static, E: Element<V>> Default for ElementPhase<V, E> {
 
 /// We blanket-implement the object-safe ElementStateObject interface to make ElementStates into trait objects
 impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
-    fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
+    fn layout(&mut self, view: &mut V, cx: &mut ViewContext<V>) -> Result<LayoutId> {
         let result;
         self.phase = match self.element.layout(view, cx) {
             Ok((layout_id, paint_state)) => {
@@ -145,7 +145,7 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
 pub struct AnyElement<V>(Box<dyn AnyStatefulElement<V>>);
 
 impl<V> AnyElement<V> {
-    pub fn layout(&mut self, view: &mut V, cx: &mut LayoutContext<V>) -> Result<LayoutId> {
+    pub fn layout(&mut self, view: &mut V, cx: &mut ViewContext<V>) -> Result<LayoutId> {
         self.0.layout(view, cx)
     }
 
diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index 162383642a865f719fa32719fce587f377dcc59a..f32b22434a87a2db3601af0477d4ae07ab15c379 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -3,10 +3,9 @@ use std::{cell::Cell, rc::Rc};
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     hsla,
-    layout_context::LayoutContext,
     paint_context::PaintContext,
     style::{CornerRadii, Overflow, Style, StyleHelpers, Styleable},
-    InteractionHandlers, Interactive,
+    InteractionHandlers, Interactive, ViewContext,
 };
 use anyhow::Result;
 use gpui::{
@@ -41,7 +40,7 @@ impl<V: 'static> Element<V> for Div<V> {
     fn layout(
         &mut self,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized,
diff --git a/crates/gpui2/src/elements/hoverable.rs b/crates/gpui2/src/elements/hoverable.rs
index 89a8b663ee8bc112ab95a77e395da4b08790589c..ba8109038fdaa05bfb05467c7b9009b280b4c87b 100644
--- a/crates/gpui2/src/elements/hoverable.rs
+++ b/crates/gpui2/src/elements/hoverable.rs
@@ -1,9 +1,9 @@
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     interactive::{InteractionHandlers, Interactive},
-    layout_context::LayoutContext,
     paint_context::PaintContext,
     style::{Style, StyleHelpers, Styleable},
+    ViewContext,
 };
 use anyhow::Result;
 use gpui::{geometry::vector::Vector2F, platform::MouseMovedEvent, LayoutId};
@@ -45,7 +45,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
     fn layout(
         &mut self,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized,
diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs
index 8f9620ce2a06788ed2d02430bcb41eb0831601f6..a4934c54155eb649c4b975980b90289832add82e 100644
--- a/crates/gpui2/src/elements/img.rs
+++ b/crates/gpui2/src/elements/img.rs
@@ -1,6 +1,8 @@
 use crate as gpui2;
-use crate::style::{StyleHelpers, Styleable};
-use crate::{style::Style, Element};
+use crate::{
+    style::{Style, StyleHelpers, Styleable},
+    Element,
+};
 use futures::FutureExt;
 use gpui::geometry::vector::Vector2F;
 use gpui::scene;
@@ -35,7 +37,7 @@ impl<V: 'static> Element<V> for Img {
     fn layout(
         &mut self,
         _: &mut V,
-        cx: &mut crate::LayoutContext<V>,
+        cx: &mut crate::ViewContext<V>,
     ) -> anyhow::Result<(gpui::LayoutId, Self::PaintState)>
     where
         Self: Sized,
diff --git a/crates/gpui2/src/elements/pressable.rs b/crates/gpui2/src/elements/pressable.rs
index db6652fad5e5dc3212c38b18394db212eee9d0ad..1b696e7ef6030c78337f56fcd3657b4c1e14bcaf 100644
--- a/crates/gpui2/src/elements/pressable.rs
+++ b/crates/gpui2/src/elements/pressable.rs
@@ -1,9 +1,9 @@
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     interactive::{InteractionHandlers, Interactive},
-    layout_context::LayoutContext,
     paint_context::PaintContext,
     style::{Style, StyleHelpers, Styleable},
+    ViewContext,
 };
 use anyhow::Result;
 use gpui::{geometry::vector::Vector2F, platform::MouseButtonEvent, LayoutId};
@@ -45,7 +45,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
     fn layout(
         &mut self,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized,
diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs
index 216725b6d6c4b0a36bf40bef65177daace17fcd5..ebf06178aa8c174c63fc65c7adc6e7c694f7ac0e 100644
--- a/crates/gpui2/src/elements/svg.rs
+++ b/crates/gpui2/src/elements/svg.rs
@@ -34,7 +34,7 @@ impl<V: 'static> Element<V> for Svg {
     fn layout(
         &mut self,
         _: &mut V,
-        cx: &mut crate::LayoutContext<V>,
+        cx: &mut crate::ViewContext<V>,
     ) -> anyhow::Result<(LayoutId, Self::PaintState)>
     where
         Self: Sized,
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index c0e2996d16f62fe173550296577eca3098086ba9..97b911201acd4897d5e4c92594de23eb6564f354 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -1,7 +1,7 @@
 use crate::{
     element::{Element, IntoElement, Layout},
-    layout_context::LayoutContext,
     paint_context::PaintContext,
+    ViewContext,
 };
 use anyhow::Result;
 use gpui::{
@@ -31,7 +31,7 @@ impl<V: 'static> Element<V> for Text {
     fn layout(
         &mut self,
         _view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Result<(LayoutId, Self::PaintState)> {
         let fonts = cx.platform().fonts();
         let text_style = cx.text_style();
diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs
index c92d22ba61772e06a65e0c67a8a117495a1ece08..11d5279ec134336751d8b91eb466fb17548c560c 100644
--- a/crates/gpui2/src/gpui2.rs
+++ b/crates/gpui2/src/gpui2.rs
@@ -3,10 +3,10 @@ pub mod color;
 pub mod element;
 pub mod elements;
 pub mod interactive;
-pub mod layout_context;
 pub mod paint_context;
 pub mod style;
 pub mod view;
+pub mod view_context;
 
 pub use color::*;
 pub use element::{AnyElement, Element, IntoElement, Layout, ParentElement};
@@ -17,7 +17,7 @@ pub use geometry::{
 pub use gpui::*;
 pub use gpui2_macros::{Element, *};
 pub use interactive::*;
-pub use layout_context::LayoutContext;
 pub use platform::{Platform, WindowBounds, WindowOptions};
 pub use util::arc_cow::ArcCow;
 pub use view::*;
+pub use view_context::ViewContext;
diff --git a/crates/gpui2/src/layout_context.rs b/crates/gpui2/src/view_context.rs
similarity index 76%
rename from crates/gpui2/src/layout_context.rs
rename to crates/gpui2/src/view_context.rs
index 0249246514e015ab14a515963c10035c1742f2b6..43d8093240d6cecfa6d8616d25701f23e15e6f57 100644
--- a/crates/gpui2/src/layout_context.rs
+++ b/crates/gpui2/src/view_context.rs
@@ -2,17 +2,17 @@ use crate::{element::LayoutId, style::Style};
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
 use gpui::{geometry::Size, MeasureParams};
-pub use gpui::{taffy::tree::NodeId, LayoutContext as LegacyLayoutContext};
+pub use gpui::{taffy::tree::NodeId, ViewContext as LegacyViewContext};
 
 #[derive(Deref, DerefMut)]
-pub struct LayoutContext<'a, 'b, 'c, 'd, V> {
+pub struct ViewContext<'a, 'b, 'c, V> {
     #[deref]
     #[deref_mut]
-    pub(crate) legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>,
+    pub(crate) legacy_cx: &'c mut LegacyViewContext<'a, 'b, V>,
 }
 
-impl<'a, 'b, 'c, 'd, V: 'static> LayoutContext<'a, 'b, 'c, 'd, V> {
-    pub fn new(legacy_cx: &'d mut LegacyLayoutContext<'a, 'b, 'c, V>) -> Self {
+impl<'a, 'b, 'c, V: 'static> ViewContext<'a, 'b, 'c, V> {
+    pub fn new(legacy_cx: &'c mut LegacyViewContext<'a, 'b, V>) -> Self {
         Self { legacy_cx }
     }
 
diff --git a/crates/gpui2_macros/src/derive_element.rs b/crates/gpui2_macros/src/derive_element.rs
index ca94112a020726324e0908e7c6b8f0375b68d750..a769437676e5cd93957852ba62887518d773d17f 100644
--- a/crates/gpui2_macros/src/derive_element.rs
+++ b/crates/gpui2_macros/src/derive_element.rs
@@ -67,7 +67,7 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
             fn layout(
                 &mut self,
                 view: &mut V,
-                cx: &mut gpui2::element::LayoutContext<V>,
+                cx: &mut gpui2::ViewContext<V>,
             ) -> anyhow::Result<(gpui2::element::LayoutId, Self::PaintState)> {
                 let mut rendered_element = self.render(view, cx).into_element().into_any();
                 let layout_id = rendered_element.layout(view, cx)?;
diff --git a/crates/storybook/src/components.rs b/crates/storybook/src/components.rs
index c24f9d672b88fb59773096bc30502da64d3cfd91..1aafefc1a6a0a89728f64b6c6299e8c68ef1cc20 100644
--- a/crates/storybook/src/components.rs
+++ b/crates/storybook/src/components.rs
@@ -1,11 +1,11 @@
 use gpui2::{
     elements::div, interactive::Interactive, platform::MouseButton, style::StyleHelpers, ArcCow,
-    Element, IntoElement, ParentElement, ViewContext,
+    Element, EventContext, IntoElement, ParentElement, ViewContext,
 };
 use std::{marker::PhantomData, rc::Rc};
 
 struct ButtonHandlers<V, D> {
-    click: Option<Rc<dyn Fn(&mut V, &D, &mut ViewContext<V>)>>,
+    click: Option<Rc<dyn Fn(&mut V, &D, &mut EventContext<V>)>>,
 }
 
 impl<V, D> Default for ButtonHandlers<V, D> {
@@ -59,7 +59,10 @@ impl<V: 'static, D: 'static> Button<V, D> {
         self
     }
 
-    pub fn on_click(mut self, handler: impl Fn(&mut V, &D, &mut ViewContext<V>) + 'static) -> Self {
+    pub fn on_click(
+        mut self,
+        handler: impl Fn(&mut V, &D, &mut EventContext<V>) + 'static,
+    ) -> Self {
         self.handlers.click = Some(Rc::new(handler));
         self
     }
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index cbfc9681f6e892f2ccdbf58b6c3a7e61c5e801d2..04e1038988fc640d54a2d1d289319af7c832d7c2 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -41,7 +41,7 @@ fn main() {
             |cx| {
                 view(|cx| {
                     cx.enable_inspector();
-                    storybook(cx)
+                    storybook(&mut ViewContext::new(cx))
                 })
             },
         );
diff --git a/crates/storybook/src/theme.rs b/crates/storybook/src/theme.rs
index fbcb8e37a8cdad16d0e96ab6c46054f711a4debe..45327e1ffcf6ca781413590ab652e3525909320b 100644
--- a/crates/storybook/src/theme.rs
+++ b/crates/storybook/src/theme.rs
@@ -1,8 +1,7 @@
 use gpui2::{
     color::Hsla,
     element::{Element, PaintContext},
-    layout_context::LayoutContext,
-    serde_json, AppContext, IntoElement, Vector2F, WindowContext,
+    serde_json, AppContext, IntoElement, Vector2F, ViewContext, WindowContext,
 };
 use serde::{de::Visitor, Deserialize, Deserializer};
 use std::{collections::HashMap, fmt, marker::PhantomData};
@@ -146,7 +145,7 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
     fn layout(
         &mut self,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> anyhow::Result<(gpui2::LayoutId, Self::PaintState)>
     where
         Self: Sized,

From 37915ec4f2f5d03eedc5accd979c37f4c3da0121 Mon Sep 17 00:00:00 2001
From: KCaverly <kyle@zed.dev>
Date: Fri, 8 Sep 2023 16:53:16 -0400
Subject: [PATCH 072/109] updated notify to accomodate for updated countdown

---
 crates/search/src/project_search.rs         |  2 +-
 crates/semantic_index/src/embedding.rs      | 42 ++++++++++-----------
 crates/semantic_index/src/semantic_index.rs | 17 +++++++--
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 6b5ebd56d40a292184e1dd19b026eab90b7516f2..5a1d5992a662ae4ce8f11831276a9c80e049c9d8 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -332,7 +332,7 @@ impl View for ProjectSearchView {
                                     rate_limit_expiration_time.duration_since(SystemTime::now())
                                 {
                                     Some(format!(
-                                        "Remaining files to index(rate limit resets in {}s): {}",
+                                        "Remaining files to index (rate limit resets in {}s): {}",
                                         remaining_seconds.as_secs(),
                                         remaining_files
                                     ))
diff --git a/crates/semantic_index/src/embedding.rs b/crates/semantic_index/src/embedding.rs
index 148b354794a5b002ee984c506f8cc4f0c334a4bf..7bac809c9720c39c2d861bde58884a0badbc4fb1 100644
--- a/crates/semantic_index/src/embedding.rs
+++ b/crates/semantic_index/src/embedding.rs
@@ -85,8 +85,8 @@ impl ToSql for Embedding {
 pub struct OpenAIEmbeddings {
     pub client: Arc<dyn HttpClient>,
     pub executor: Arc<Background>,
-    rate_limit_count_rx: watch::Receiver<(Option<SystemTime>, usize)>,
-    rate_limit_count_tx: Arc<Mutex<watch::Sender<(Option<SystemTime>, usize)>>>,
+    rate_limit_count_rx: watch::Receiver<Option<SystemTime>>,
+    rate_limit_count_tx: Arc<Mutex<watch::Sender<Option<SystemTime>>>>,
 }
 
 #[derive(Serialize)]
@@ -159,7 +159,7 @@ const OPENAI_INPUT_LIMIT: usize = 8190;
 
 impl OpenAIEmbeddings {
     pub fn new(client: Arc<dyn HttpClient>, executor: Arc<Background>) -> Self {
-        let (rate_limit_count_tx, rate_limit_count_rx) = watch::channel_with((None, 0));
+        let (rate_limit_count_tx, rate_limit_count_rx) = watch::channel_with(None);
         let rate_limit_count_tx = Arc::new(Mutex::new(rate_limit_count_tx));
 
         OpenAIEmbeddings {
@@ -171,18 +171,22 @@ impl OpenAIEmbeddings {
     }
 
     fn resolve_rate_limit(&self) {
-        let (reset_time, delay_count) = *self.rate_limit_count_tx.lock().borrow();
-        let updated_count = delay_count - 1;
-        let updated_time = if updated_count == 0 { None } else { reset_time };
+        let reset_time = *self.rate_limit_count_tx.lock().borrow();
 
-        log::trace!("resolving rate limit: Count: {:?}", updated_count);
+        if let Some(reset_time) = reset_time {
+            if SystemTime::now() >= reset_time {
+                *self.rate_limit_count_tx.lock().borrow_mut() = None
+            }
+        }
 
-        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_time, updated_count);
+        log::trace!(
+            "resolving reset time: {:?}",
+            *self.rate_limit_count_tx.lock().borrow()
+        );
     }
 
-    fn update_rate_limit(&self, reset_time: SystemTime, count_increase: usize) {
-        let (original_time, original_count) = *self.rate_limit_count_tx.lock().borrow();
-        let updated_count = original_count + count_increase;
+    fn update_reset_time(&self, reset_time: SystemTime) {
+        let original_time = *self.rate_limit_count_tx.lock().borrow();
 
         let updated_time = if let Some(original_time) = original_time {
             if reset_time < original_time {
@@ -194,9 +198,9 @@ impl OpenAIEmbeddings {
             Some(reset_time)
         };
 
-        log::trace!("updating rate limit: Count: {:?}", updated_count);
+        log::trace!("updating rate limit time: {:?}", updated_time);
 
-        *self.rate_limit_count_tx.lock().borrow_mut() = (updated_time, updated_count);
+        *self.rate_limit_count_tx.lock().borrow_mut() = updated_time;
     }
     async fn send_request(
         &self,
@@ -229,8 +233,7 @@ impl EmbeddingProvider for OpenAIEmbeddings {
     }
 
     fn rate_limit_expiration(&self) -> Option<SystemTime> {
-        let (expiration_time, _) = *self.rate_limit_count_rx.borrow();
-        expiration_time
+        *self.rate_limit_count_rx.borrow()
     }
     fn truncate(&self, span: &str) -> (String, usize) {
         let mut tokens = OPENAI_BPE_TOKENIZER.encode_with_special_tokens(span);
@@ -296,6 +299,7 @@ impl EmbeddingProvider for OpenAIEmbeddings {
                         .collect());
                 }
                 StatusCode::TOO_MANY_REQUESTS => {
+                    rate_limiting = true;
                     let mut body = String::new();
                     response.body_mut().read_to_string(&mut body).await?;
 
@@ -316,13 +320,7 @@ impl EmbeddingProvider for OpenAIEmbeddings {
 
                     // If we've previously rate limited, increment the duration but not the count
                     let reset_time = SystemTime::now().add(delay_duration);
-                    if rate_limiting {
-                        self.update_rate_limit(reset_time, 0);
-                    } else {
-                        self.update_rate_limit(reset_time, 1);
-                    }
-
-                    rate_limiting = true;
+                    self.update_reset_time(reset_time);
 
                     log::trace!(
                         "openai rate limiting: waiting {:?} until lifted",
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index b60d697b43d3a4ad98ddfcafdfd1df66a626cdcb..92b11f00d10cc0084c158370488dcee282186606 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -232,9 +232,20 @@ impl ProjectState {
             _observe_pending_file_count: cx.spawn_weak({
                 let mut pending_file_count_rx = pending_file_count_rx.clone();
                 |this, mut cx| async move {
-                    while let Some(_) = pending_file_count_rx.next().await {
-                        if let Some(this) = this.upgrade(&cx) {
-                            this.update(&mut cx, |_, cx| cx.notify());
+                    loop {
+                        let mut timer = cx.background().timer(Duration::from_millis(350)).fuse();
+                        let mut pending_file_count = pending_file_count_rx.next().fuse();
+                        futures::select_biased! {
+                            _ = pending_file_count => {
+                                if let Some(this) = this.upgrade(&cx) {
+                                    this.update(&mut cx, |_, cx| cx.notify());
+                                }
+                            },
+                            _ = timer => {
+                                if let Some(this) = this.upgrade(&cx) {
+                                    this.update(&mut cx, |_, cx| cx.notify());
+                                }
+                            }
                         }
                     }
                 }

From 6b23f7463667d1e95bb60024c2f9543655c26ef2 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 16:08:31 -0600
Subject: [PATCH 073/109] Checkpoint

---
 crates/collab_ui/src/collab_panel.rs          |   8 +-
 crates/collab_ui/src/collab_titlebar_item.rs  |   9 +-
 crates/collab_ui/src/face_pile.rs             |  10 +-
 crates/editor/src/element.rs                  | 365 ++++++++----------
 crates/editor/src/hover_popover.rs            |   8 +-
 crates/gpui/examples/corner_radii.rs          |  25 +-
 crates/gpui/examples/text.rs                  |   6 +-
 crates/gpui/src/app.rs                        |  11 +
 crates/gpui/src/app/window.rs                 |  13 +-
 crates/gpui/src/elements.rs                   |  20 +-
 crates/gpui/src/elements/align.rs             |   5 +-
 crates/gpui/src/elements/canvas.rs            |   9 +-
 crates/gpui/src/elements/clipped.rs           |  14 +-
 crates/gpui/src/elements/component.rs         |   7 +-
 crates/gpui/src/elements/constrained_box.rs   |  11 +-
 crates/gpui/src/elements/container.rs         |  29 +-
 crates/gpui/src/elements/empty.rs             |   3 +-
 crates/gpui/src/elements/expanded.rs          |   7 +-
 crates/gpui/src/elements/flex.rs              |  23 +-
 crates/gpui/src/elements/hook.rs              |   6 +-
 crates/gpui/src/elements/image.rs             |   8 +-
 crates/gpui/src/elements/keystroke_label.rs   |   3 +-
 crates/gpui/src/elements/label.rs             |  11 +-
 crates/gpui/src/elements/list.rs              |  30 +-
 .../gpui/src/elements/mouse_event_handler.rs  |  33 +-
 crates/gpui/src/elements/overlay.rs           |  39 +-
 crates/gpui/src/elements/resizable.rs         | 111 +++---
 crates/gpui/src/elements/stack.rs             |   9 +-
 crates/gpui/src/elements/svg.rs               |   7 +-
 crates/gpui/src/elements/text.rs              |  20 +-
 crates/gpui/src/elements/tooltip.rs           |  10 +-
 crates/gpui/src/elements/uniform_list.rs      |  11 +-
 crates/gpui/src/scene.rs                      |  63 ++-
 crates/gpui/src/text_layout.rs                |  21 +-
 crates/gpui2/src/adapter.rs                   |   3 +-
 crates/gpui2/src/elements/div.rs              |   6 +-
 crates/gpui2/src/elements/img.rs              |   2 +-
 crates/gpui2/src/elements/svg.rs              |   2 +-
 crates/gpui2/src/elements/text.rs             |   8 +-
 crates/gpui2/src/paint_context.rs             |  10 +-
 crates/gpui2/src/style.rs                     |   4 +-
 crates/gpui_macros/src/gpui_macros.rs         |   3 +-
 crates/terminal_view/src/terminal_element.rs  |  44 +--
 crates/workspace/src/pane.rs                  |  16 +-
 .../src/pane/dragged_item_receiver.rs         |  17 +-
 crates/workspace/src/pane_group.rs            |  17 +-
 crates/workspace/src/shared_screen.rs         |   4 +-
 crates/workspace/src/status_bar.rs            |  11 +-
 crates/workspace/src/workspace.rs             |   4 +-
 49 files changed, 489 insertions(+), 627 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index fba10c61bad9b31b145e3b515423891bedae6972..8e0252ec608a6e113db5b39fefb86b99e95ed07c 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2434,14 +2434,14 @@ fn render_tree_branch(
     let cap_height = row_style.cap_height(font_cache);
     let baseline_offset = row_style.baseline_offset(font_cache) + (size.y() - line_height) / 2.;
 
-    Canvas::new(move |scene, bounds, _, _, _| {
-        scene.paint_layer(None, |scene| {
+    Canvas::new(move |bounds, _, _, cx| {
+        cx.paint_layer(None, |cx| {
             let start_x = bounds.min_x() + (bounds.width() / 2.) - (branch_style.width / 2.);
             let end_x = bounds.max_x();
             let start_y = bounds.min_y();
             let end_y = bounds.min_y() + baseline_offset - (cap_height / 2.);
 
-            scene.push_quad(gpui::Quad {
+            cx.scene().push_quad(gpui::Quad {
                 bounds: RectF::from_points(
                     vec2f(start_x, start_y),
                     vec2f(
@@ -2453,7 +2453,7 @@ fn render_tree_branch(
                 border: gpui::Border::default(),
                 corner_radii: (0.).into(),
             });
-            scene.push_quad(gpui::Quad {
+            cx.scene().push_quad(gpui::Quad {
                 bounds: RectF::from_points(
                     vec2f(start_x, end_y),
                     vec2f(end_x, end_y + branch_style.width),
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 6c34b7021ee37b51843015642f6f5f05166868ed..8f3a434a830a3adc254302ae38e60357c8d3d4a1 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -13,8 +13,8 @@ use gpui::{
     geometry::{rect::RectF, vector::vec2f, PathBuilder},
     json::{self, ToJson},
     platform::{CursorStyle, MouseButton},
-    AppContext, Entity, ImageData, LayoutContext, ModelHandle, PaintContext, SceneBuilder,
-    Subscription, View, ViewContext, ViewHandle, WeakViewHandle,
+    AppContext, Entity, ImageData, LayoutContext, ModelHandle, PaintContext, Subscription, View,
+    ViewContext, ViewHandle, WeakViewHandle,
 };
 use picker::PickerEvent;
 use project::{Project, RepositoryEntry};
@@ -1172,12 +1172,11 @@ impl Element<CollabTitlebarItem> for AvatarRibbon {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _: RectF,
         _: &mut Self::LayoutState,
         _: &mut CollabTitlebarItem,
-        _: &mut PaintContext<CollabTitlebarItem>,
+        cx: &mut PaintContext<CollabTitlebarItem>,
     ) -> Self::PaintState {
         let mut path = PathBuilder::new();
         path.reset(bounds.lower_left());
@@ -1188,7 +1187,7 @@ impl Element<CollabTitlebarItem> for AvatarRibbon {
         path.line_to(bounds.upper_right() - vec2f(bounds.height(), 0.));
         path.curve_to(bounds.lower_right(), bounds.upper_right());
         path.line_to(bounds.lower_left());
-        scene.push_path(path.build(self.color, None));
+        cx.scene().push_path(path.build(self.color, None));
     }
 
     fn rect_for_text_range(
diff --git a/crates/collab_ui/src/face_pile.rs b/crates/collab_ui/src/face_pile.rs
index a86b2576869b5d2e3b695ae41d073bf6fa631812..835d730d95ab7471714e04b3ab5ca58d2a5b6800 100644
--- a/crates/collab_ui/src/face_pile.rs
+++ b/crates/collab_ui/src/face_pile.rs
@@ -7,7 +7,7 @@ use gpui::{
     },
     json::ToJson,
     serde_json::{self, json},
-    AnyElement, Axis, Element, LayoutContext, PaintContext, SceneBuilder, View, ViewContext,
+    AnyElement, Axis, Element, LayoutContext, PaintContext, View, ViewContext,
 };
 
 pub(crate) struct FacePile<V: View> {
@@ -53,7 +53,6 @@ impl<V: View> Element<V> for FacePile<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _layout: &mut Self::LayoutState,
@@ -69,9 +68,10 @@ impl<V: View> Element<V> for FacePile<V> {
             let size = face.size();
             origin_x -= size.x();
             let origin_y = origin_y + (bounds.height() - size.y()) / 2.0;
-            scene.paint_layer(None, |scene| {
-                face.paint(scene, vec2f(origin_x, origin_y), visible_bounds, view, cx);
-            });
+
+            cx.scene().push_layer(None);
+            face.paint(vec2f(origin_x, origin_y), visible_bounds, view, cx);
+            cx.scene().pop_layer();
             origin_x += self.overlap;
         }
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 2d157761bfacee8ea1e94ded56b4009d1323fc50..942b4550bcd52417bb431fd1bb62e1628446f258 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -33,7 +33,7 @@ use gpui::{
     platform::{CursorStyle, Modifiers, MouseButton, MouseButtonEvent, MouseMovedEvent},
     text_layout::{self, Line, RunStyle, TextLayoutCache},
     AnyElement, Axis, CursorRegion, Element, EventContext, FontCache, LayoutContext, MouseRegion,
-    PaintContext, Quad, SceneBuilder, SizeConstraint, ViewContext, WindowContext,
+    PaintContext, Quad, SizeConstraint, ViewContext, WindowContext,
 };
 use itertools::Itertools;
 use json::json;
@@ -131,7 +131,6 @@ impl EditorElement {
     }
 
     fn attach_mouse_handlers(
-        scene: &mut SceneBuilder,
         position_map: &Arc<PositionMap>,
         has_popovers: bool,
         visible_bounds: RectF,
@@ -141,124 +140,124 @@ impl EditorElement {
         cx: &mut ViewContext<Editor>,
     ) {
         enum EditorElementMouseHandlers {}
-        scene.push_mouse_region(
-            MouseRegion::new::<EditorElementMouseHandlers>(
-                cx.view_id(),
-                cx.view_id(),
-                visible_bounds,
-            )
-            .on_down(MouseButton::Left, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_down(
-                        editor,
-                        event.platform_event,
-                        position_map.as_ref(),
-                        text_bounds,
-                        gutter_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event();
-                    }
-                }
-            })
-            .on_down(MouseButton::Right, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_right_down(
-                        editor,
-                        event.position,
-                        position_map.as_ref(),
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event();
+        let view_id = cx.view_id();
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<EditorElementMouseHandlers>(view_id, view_id, visible_bounds)
+                .on_down(MouseButton::Left, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_down(
+                            editor,
+                            event.platform_event,
+                            position_map.as_ref(),
+                            text_bounds,
+                            gutter_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event();
+                        }
                     }
-                }
-            })
-            .on_up(MouseButton::Left, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_up(
-                        editor,
-                        event.position,
-                        event.cmd,
-                        event.shift,
-                        event.alt,
-                        position_map.as_ref(),
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                })
+                .on_down(MouseButton::Right, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_right_down(
+                            editor,
+                            event.position,
+                            position_map.as_ref(),
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event();
+                        }
                     }
-                }
-            })
-            .on_drag(MouseButton::Left, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if event.end {
-                        return;
+                })
+                .on_up(MouseButton::Left, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_up(
+                            editor,
+                            event.position,
+                            event.cmd,
+                            event.shift,
+                            event.alt,
+                            position_map.as_ref(),
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
                     }
+                })
+                .on_drag(MouseButton::Left, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if event.end {
+                            return;
+                        }
 
-                    if !Self::mouse_dragged(
-                        editor,
-                        event.platform_event,
-                        position_map.as_ref(),
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                        if !Self::mouse_dragged(
+                            editor,
+                            event.platform_event,
+                            position_map.as_ref(),
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
                     }
-                }
-            })
-            .on_move({
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_moved(
-                        editor,
-                        event.platform_event,
-                        &position_map,
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                })
+                .on_move({
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_moved(
+                            editor,
+                            event.platform_event,
+                            &position_map,
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
                     }
-                }
-            })
-            .on_move_out(move |_, editor: &mut Editor, cx| {
-                if has_popovers {
-                    hide_hover(editor, cx);
-                }
-            })
-            .on_scroll({
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::scroll(
-                        editor,
-                        event.position,
-                        *event.delta.raw(),
-                        event.delta.precise(),
-                        &position_map,
-                        bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                })
+                .on_move_out(move |_, editor: &mut Editor, cx| {
+                    if has_popovers {
+                        hide_hover(editor, cx);
                     }
-                }
-            }),
+                })
+                .on_scroll({
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::scroll(
+                            editor,
+                            event.position,
+                            *event.delta.raw(),
+                            event.delta.precise(),
+                            &position_map,
+                            bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
+                    }
+                }),
         );
 
         enum GutterHandlers {}
-        scene.push_mouse_region(
-            MouseRegion::new::<GutterHandlers>(cx.view_id(), cx.view_id() + 1, gutter_bounds)
-                .on_hover(|hover, editor: &mut Editor, cx| {
+        let view_id = cx.view_id();
+        let region_id = cx.view_id() + 1;
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<GutterHandlers>(view_id, region_id, gutter_bounds).on_hover(
+                |hover, editor: &mut Editor, cx| {
                     editor.gutter_hover(
                         &GutterHover {
                             hovered: hover.started,
                         },
                         cx,
                     );
-                }),
+                },
+            ),
         )
     }
 
@@ -528,21 +527,21 @@ impl EditorElement {
 
     fn paint_background(
         &self,
-        scene: &mut SceneBuilder,
         gutter_bounds: RectF,
         text_bounds: RectF,
         layout: &LayoutState,
+        cx: &mut ViewContext<Editor>,
     ) {
         let bounds = gutter_bounds.union_rect(text_bounds);
         let scroll_top =
             layout.position_map.snapshot.scroll_position().y() * layout.position_map.line_height;
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: gutter_bounds,
             background: Some(self.style.gutter_background),
             border: Border::new(0., Color::transparent_black()).into(),
             corner_radii: Default::default(),
         });
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: text_bounds,
             background: Some(self.style.background),
             border: Border::new(0., Color::transparent_black()).into(),
@@ -570,7 +569,7 @@ impl EditorElement {
                         bounds.width(),
                         layout.position_map.line_height * (end_row - start_row + 1) as f32,
                     );
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: RectF::new(origin, size),
                         background: Some(self.style.active_line_background),
                         border: Border::default().into(),
@@ -590,7 +589,7 @@ impl EditorElement {
                     bounds.width(),
                     layout.position_map.line_height * highlighted_rows.len() as f32,
                 );
-                scene.push_quad(Quad {
+                cx.scene().push_quad(Quad {
                     bounds: RectF::new(origin, size),
                     background: Some(self.style.highlighted_line_background),
                     border: Border::default().into(),
@@ -617,7 +616,7 @@ impl EditorElement {
                 } else {
                     self.style.wrap_guide
                 };
-                scene.push_quad(Quad {
+                cx.scene().push_quad(Quad {
                     bounds: RectF::new(
                         vec2f(x, text_bounds.origin_y()),
                         vec2f(1., text_bounds.height()),
@@ -632,7 +631,6 @@ impl EditorElement {
 
     fn paint_gutter(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut LayoutState,
@@ -650,7 +648,7 @@ impl EditorElement {
         );
 
         if show_gutter {
-            Self::paint_diff_hunks(scene, bounds, layout, cx);
+            Self::paint_diff_hunks(bounds, layout, cx);
         }
 
         for (ix, line) in layout.line_number_layouts.iter().enumerate() {
@@ -661,7 +659,7 @@ impl EditorElement {
                         ix as f32 * line_height - (scroll_top % line_height),
                     );
 
-                line.paint(scene, line_origin, visible_bounds, line_height, cx);
+                line.paint(line_origin, visible_bounds, line_height, cx);
             }
         }
 
@@ -678,7 +676,7 @@ impl EditorElement {
 
                 let indicator_origin = bounds.origin() + position + centering_offset;
 
-                indicator.paint(scene, indicator_origin, visible_bounds, editor, cx);
+                indicator.paint(indicator_origin, visible_bounds, editor, cx);
             }
         }
 
@@ -687,22 +685,11 @@ impl EditorElement {
             let mut y = *row as f32 * line_height - scroll_top;
             x += ((layout.gutter_padding + layout.gutter_margin) - indicator.size().x()) / 2.;
             y += (line_height - indicator.size().y()) / 2.;
-            indicator.paint(
-                scene,
-                bounds.origin() + vec2f(x, y),
-                visible_bounds,
-                editor,
-                cx,
-            );
+            indicator.paint(bounds.origin() + vec2f(x, y), visible_bounds, editor, cx);
         }
     }
 
-    fn paint_diff_hunks(
-        scene: &mut SceneBuilder,
-        bounds: RectF,
-        layout: &mut LayoutState,
-        cx: &mut ViewContext<Editor>,
-    ) {
+    fn paint_diff_hunks(bounds: RectF, layout: &mut LayoutState, cx: &mut ViewContext<Editor>) {
         let diff_style = &theme::current(cx).editor.diff.clone();
         let line_height = layout.position_map.line_height;
 
@@ -721,7 +708,7 @@ impl EditorElement {
                     let highlight_size = vec2f(width * 2., end_y - start_y);
                     let highlight_bounds = RectF::new(highlight_origin, highlight_size);
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: highlight_bounds,
                         background: Some(diff_style.modified),
                         border: Border::new(0., Color::transparent_black()).into(),
@@ -754,7 +741,7 @@ impl EditorElement {
                     let highlight_size = vec2f(width * 2., end_y - start_y);
                     let highlight_bounds = RectF::new(highlight_origin, highlight_size);
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: highlight_bounds,
                         background: Some(diff_style.deleted),
                         border: Border::new(0., Color::transparent_black()).into(),
@@ -776,7 +763,7 @@ impl EditorElement {
             let highlight_size = vec2f(width * 2., end_y - start_y);
             let highlight_bounds = RectF::new(highlight_origin, highlight_size);
 
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: highlight_bounds,
                 background: Some(color),
                 border: Border::new(0., Color::transparent_black()).into(),
@@ -787,7 +774,6 @@ impl EditorElement {
 
     fn paint_text(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut LayoutState,
@@ -804,9 +790,9 @@ impl EditorElement {
         let line_end_overshoot = 0.15 * layout.position_map.line_height;
         let whitespace_setting = editor.buffer.read(cx).settings_at(0, cx).show_whitespaces;
 
-        scene.push_layer(Some(bounds));
+        cx.scene().push_layer(Some(bounds));
 
-        scene.push_cursor_region(CursorRegion {
+        cx.scene().push_cursor_region(CursorRegion {
             bounds,
             style: if !editor.link_go_to_definition_state.definitions.is_empty() {
                 CursorStyle::PointingHand
@@ -819,7 +805,6 @@ impl EditorElement {
             self.style.folds.ellipses.corner_radius_factor * layout.position_map.line_height;
         for (id, range, color) in layout.fold_ranges.iter() {
             self.paint_highlighted_range(
-                scene,
                 range.clone(),
                 *color,
                 fold_corner_radius,
@@ -829,6 +814,7 @@ impl EditorElement {
                 scroll_top,
                 scroll_left,
                 bounds,
+                cx,
             );
 
             for bound in range_to_bounds(
@@ -840,7 +826,7 @@ impl EditorElement {
                 line_end_overshoot,
                 &layout.position_map,
             ) {
-                scene.push_cursor_region(CursorRegion {
+                cx.scene().push_cursor_region(CursorRegion {
                     bounds: bound,
                     style: CursorStyle::PointingHand,
                 });
@@ -851,8 +837,9 @@ impl EditorElement {
                     .to_point(&layout.position_map.snapshot.display_snapshot)
                     .row;
 
-                scene.push_mouse_region(
-                    MouseRegion::new::<FoldMarkers>(cx.view_id(), *id as usize, bound)
+                let view_id = cx.view_id();
+                cx.scene().push_mouse_region(
+                    MouseRegion::new::<FoldMarkers>(view_id, *id as usize, bound)
                         .on_click(MouseButton::Left, move |_, editor: &mut Editor, cx| {
                             editor.unfold_at(&UnfoldAt { buffer_row }, cx)
                         })
@@ -864,7 +851,6 @@ impl EditorElement {
 
         for (range, color) in &layout.highlighted_ranges {
             self.paint_highlighted_range(
-                scene,
                 range.clone(),
                 *color,
                 0.,
@@ -874,6 +860,7 @@ impl EditorElement {
                 scroll_top,
                 scroll_left,
                 bounds,
+                cx,
             );
         }
 
@@ -891,7 +878,6 @@ impl EditorElement {
 
             for selection in selections {
                 self.paint_highlighted_range(
-                    scene,
                     selection.range.clone(),
                     selection_style.selection,
                     corner_radius,
@@ -901,6 +887,7 @@ impl EditorElement {
                     scroll_top,
                     scroll_left,
                     bounds,
+                    cx,
                 );
 
                 if selection.is_local && !selection.range.is_empty() {
@@ -980,7 +967,6 @@ impl EditorElement {
                     layout,
                     row,
                     scroll_top,
-                    scene,
                     content_origin,
                     scroll_left,
                     visible_text_bounds,
@@ -992,14 +978,14 @@ impl EditorElement {
             }
         }
 
-        scene.paint_layer(Some(bounds), |scene| {
-            for cursor in cursors {
-                cursor.paint(scene, content_origin, cx);
-            }
-        });
+        cx.scene().push_layer(Some(bounds));
+        for cursor in cursors {
+            cursor.paint(content_origin, cx);
+        }
+        cx.scene().pop_layer();
 
         if let Some((position, context_menu)) = layout.context_menu.as_mut() {
-            scene.push_stacking_context(None, None);
+            cx.scene().push_stacking_context(None, None);
             let cursor_row_layout =
                 &layout.position_map.line_layouts[(position.row() - start_row) as usize].line;
             let x = cursor_row_layout.x_for_index(position.column() as usize) - scroll_left;
@@ -1019,18 +1005,17 @@ impl EditorElement {
             }
 
             context_menu.paint(
-                scene,
                 list_origin,
                 RectF::from_points(Vector2F::zero(), vec2f(f32::MAX, f32::MAX)), // Let content bleed outside of editor
                 editor,
                 cx,
             );
 
-            scene.pop_stacking_context();
+            cx.scene().pop_stacking_context();
         }
 
         if let Some((position, hover_popovers)) = layout.hover_popovers.as_mut() {
-            scene.push_stacking_context(None, None);
+            cx.scene().push_stacking_context(None, None);
 
             // This is safe because we check on layout whether the required row is available
             let hovered_row_layout =
@@ -1061,7 +1046,6 @@ impl EditorElement {
                     }
 
                     hover_popover.paint(
-                        scene,
                         popover_origin,
                         RectF::from_points(Vector2F::zero(), vec2f(f32::MAX, f32::MAX)), // Let content bleed outside of editor
                         editor,
@@ -1083,7 +1067,6 @@ impl EditorElement {
                     }
 
                     hover_popover.paint(
-                        scene,
                         popover_origin,
                         RectF::from_points(Vector2F::zero(), vec2f(f32::MAX, f32::MAX)), // Let content bleed outside of editor
                         editor,
@@ -1094,10 +1077,10 @@ impl EditorElement {
                 }
             }
 
-            scene.pop_stacking_context();
+            cx.scene().pop_stacking_context();
         }
 
-        scene.pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn scrollbar_left(&self, bounds: &RectF) -> f32 {
@@ -1106,11 +1089,10 @@ impl EditorElement {
 
     fn paint_scrollbar(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         layout: &mut LayoutState,
-        cx: &mut ViewContext<Editor>,
         editor: &Editor,
+        cx: &mut ViewContext<Editor>,
     ) {
         enum ScrollbarMouseHandlers {}
         if layout.mode != EditorMode::Full {
@@ -1147,7 +1129,7 @@ impl EditorElement {
         let thumb_bounds = RectF::from_points(vec2f(left, thumb_top), vec2f(right, thumb_bottom));
 
         if layout.show_scrollbars {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: track_bounds,
                 border: style.track.border.into(),
                 background: style.track.background_color,
@@ -1177,7 +1159,7 @@ impl EditorElement {
                     }
                     let bounds = RectF::from_points(vec2f(left, start_y), vec2f(right, end_y));
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds,
                         background: Some(color),
                         border: border.into(),
@@ -1237,7 +1219,7 @@ impl EditorElement {
                         left: true,
                     };
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds,
                         background: Some(color),
                         border: border.into(),
@@ -1246,7 +1228,7 @@ impl EditorElement {
                 }
             }
 
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: thumb_bounds,
                 border: style.thumb.border.into(),
                 background: style.thumb.background_color,
@@ -1254,12 +1236,13 @@ impl EditorElement {
             });
         }
 
-        scene.push_cursor_region(CursorRegion {
+        cx.scene().push_cursor_region(CursorRegion {
             bounds: track_bounds,
             style: CursorStyle::Arrow,
         });
-        scene.push_mouse_region(
-            MouseRegion::new::<ScrollbarMouseHandlers>(cx.view_id(), cx.view_id(), track_bounds)
+        let region_id = cx.view_id();
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<ScrollbarMouseHandlers>(region_id, region_id, track_bounds)
                 .on_move(move |event, editor: &mut Editor, cx| {
                     if event.pressed_button.is_none() {
                         editor.scroll_manager.show_scrollbar(cx);
@@ -1305,7 +1288,6 @@ impl EditorElement {
     #[allow(clippy::too_many_arguments)]
     fn paint_highlighted_range(
         &self,
-        scene: &mut SceneBuilder,
         range: Range<DisplayPoint>,
         color: Color,
         corner_radius: f32,
@@ -1315,6 +1297,7 @@ impl EditorElement {
         scroll_top: f32,
         scroll_left: f32,
         bounds: RectF,
+        cx: &mut ViewContext<Editor>,
     ) {
         let start_row = layout.visible_display_row_range.start;
         let end_row = layout.visible_display_row_range.end;
@@ -1358,13 +1341,12 @@ impl EditorElement {
                     .collect(),
             };
 
-            highlighted_range.paint(bounds, scene);
+            highlighted_range.paint(bounds, cx);
         }
     }
 
     fn paint_blocks(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut LayoutState,
@@ -1384,9 +1366,7 @@ impl EditorElement {
             if !matches!(block.style, BlockStyle::Sticky) {
                 origin += vec2f(-scroll_left, 0.);
             }
-            block
-                .element
-                .paint(scene, origin, visible_bounds, editor, cx);
+            block.element.paint(origin, visible_bounds, editor, cx);
         }
     }
 
@@ -2022,7 +2002,6 @@ impl LineWithInvisibles {
         layout: &LayoutState,
         row: u32,
         scroll_top: f32,
-        scene: &mut SceneBuilder,
         content_origin: Vector2F,
         scroll_left: f32,
         visible_text_bounds: RectF,
@@ -2035,7 +2014,6 @@ impl LineWithInvisibles {
         let line_y = row as f32 * line_height - scroll_top;
 
         self.line.paint(
-            scene,
             content_origin + vec2f(-scroll_left, line_y),
             visible_text_bounds,
             line_height,
@@ -2049,7 +2027,6 @@ impl LineWithInvisibles {
             scroll_left,
             line_y,
             row,
-            scene,
             visible_bounds,
             line_height,
             whitespace_setting,
@@ -2065,7 +2042,6 @@ impl LineWithInvisibles {
         scroll_left: f32,
         line_y: f32,
         row: u32,
-        scene: &mut SceneBuilder,
         visible_bounds: RectF,
         line_height: f32,
         whitespace_setting: ShowWhitespaceSetting,
@@ -2097,7 +2073,7 @@ impl LineWithInvisibles {
                     continue;
                 }
             }
-            invisible_symbol.paint(scene, origin, visible_bounds, line_height, cx);
+            invisible_symbol.paint(origin, visible_bounds, line_height, cx);
         }
     }
 }
@@ -2590,7 +2566,6 @@ impl Element<Editor> for EditorElement {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -2598,7 +2573,7 @@ impl Element<Editor> for EditorElement {
         cx: &mut PaintContext<Editor>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
-        scene.push_layer(Some(visible_bounds));
+        cx.scene().push_layer(Some(visible_bounds));
 
         let gutter_bounds = RectF::new(bounds.origin(), layout.gutter_size);
         let text_bounds = RectF::new(
@@ -2607,7 +2582,6 @@ impl Element<Editor> for EditorElement {
         );
 
         Self::attach_mouse_handlers(
-            scene,
             &layout.position_map,
             layout.hover_popovers.is_some(),
             visible_bounds,
@@ -2617,20 +2591,19 @@ impl Element<Editor> for EditorElement {
             cx,
         );
 
-        self.paint_background(scene, gutter_bounds, text_bounds, layout);
+        self.paint_background(gutter_bounds, text_bounds, layout, cx);
         if layout.gutter_size.x() > 0. {
-            self.paint_gutter(scene, gutter_bounds, visible_bounds, layout, editor, cx);
+            self.paint_gutter(gutter_bounds, visible_bounds, layout, editor, cx);
         }
-        self.paint_text(scene, text_bounds, visible_bounds, layout, editor, cx);
+        self.paint_text(text_bounds, visible_bounds, layout, editor, cx);
 
-        scene.push_layer(Some(bounds));
+        cx.scene().push_layer(Some(bounds));
         if !layout.blocks.is_empty() {
-            self.paint_blocks(scene, bounds, visible_bounds, layout, editor, cx);
+            self.paint_blocks(bounds, visible_bounds, layout, editor, cx);
         }
-        self.paint_scrollbar(scene, bounds, layout, cx, &editor);
-        scene.pop_layer();
-
-        scene.pop_layer();
+        self.paint_scrollbar(bounds, layout, &editor, cx);
+        cx.scene().pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
@@ -2873,7 +2846,7 @@ impl Cursor {
         )
     }
 
-    pub fn paint(&self, scene: &mut SceneBuilder, origin: Vector2F, cx: &mut WindowContext) {
+    pub fn paint(&self, origin: Vector2F, cx: &mut WindowContext) {
         let bounds = match self.shape {
             CursorShape::Bar => RectF::new(self.origin + origin, vec2f(2.0, self.line_height)),
             CursorShape::Block | CursorShape::Hollow => RectF::new(
@@ -2888,14 +2861,14 @@ impl Cursor {
 
         //Draw background or border quad
         if matches!(self.shape, CursorShape::Hollow) {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds,
                 background: None,
                 border: Border::all(1., self.color).into(),
                 corner_radii: Default::default(),
             });
         } else {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds,
                 background: Some(self.color),
                 border: Default::default(),
@@ -2904,7 +2877,7 @@ impl Cursor {
         }
 
         if let Some(block_text) = &self.block_text {
-            block_text.paint(scene, self.origin + origin, bounds, self.line_height, cx);
+            block_text.paint(self.origin + origin, bounds, self.line_height, cx);
         }
     }
 
@@ -2929,17 +2902,17 @@ pub struct HighlightedRangeLine {
 }
 
 impl HighlightedRange {
-    pub fn paint(&self, bounds: RectF, scene: &mut SceneBuilder) {
+    pub fn paint(&self, bounds: RectF, cx: &mut WindowContext) {
         if self.lines.len() >= 2 && self.lines[0].start_x > self.lines[1].end_x {
-            self.paint_lines(self.start_y, &self.lines[0..1], bounds, scene);
+            self.paint_lines(self.start_y, &self.lines[0..1], bounds, cx);
             self.paint_lines(
                 self.start_y + self.line_height,
                 &self.lines[1..],
                 bounds,
-                scene,
+                cx,
             );
         } else {
-            self.paint_lines(self.start_y, &self.lines, bounds, scene);
+            self.paint_lines(self.start_y, &self.lines, bounds, cx);
         }
     }
 
@@ -2948,7 +2921,7 @@ impl HighlightedRange {
         start_y: f32,
         lines: &[HighlightedRangeLine],
         bounds: RectF,
-        scene: &mut SceneBuilder,
+        cx: &mut WindowContext,
     ) {
         if lines.is_empty() {
             return;
@@ -3046,7 +3019,7 @@ impl HighlightedRange {
         }
         path.line_to(first_top_right - top_curve_width);
 
-        scene.push_path(path.build(self.color, Some(bounds)));
+        cx.scene().push_path(path.build(self.color, Some(bounds)));
     }
 }
 
@@ -3368,11 +3341,9 @@ mod tests {
         );
 
         // Don't panic.
-        let mut scene = SceneBuilder::new(1.0);
         let bounds = RectF::new(Default::default(), size);
         editor.update(cx, |editor, cx| {
             element.paint(
-                &mut scene,
                 bounds,
                 bounds,
                 &mut state,
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 2f278ce262f6dd3e0910b022e6956f26c9bdfa6b..3d5b1d21134c90554cbb273f7d058e3db621ad07 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -691,15 +691,15 @@ impl InfoPopover {
                         .with_highlights(rendered_content.highlights.clone())
                         .with_custom_runs(
                             rendered_content.region_ranges.clone(),
-                            move |ix, bounds, scene, _| {
+                            move |ix, bounds, cx| {
                                 region_id += 1;
                                 let region = regions[ix].clone();
                                 if let Some(url) = region.link_url {
-                                    scene.push_cursor_region(CursorRegion {
+                                    cx.scene().push_cursor_region(CursorRegion {
                                         bounds,
                                         style: CursorStyle::PointingHand,
                                     });
-                                    scene.push_mouse_region(
+                                    cx.scene().push_mouse_region(
                                         MouseRegion::new::<Self>(view_id, region_id, bounds)
                                             .on_click::<Editor, _>(
                                                 MouseButton::Left,
@@ -708,7 +708,7 @@ impl InfoPopover {
                                     );
                                 }
                                 if region.code {
-                                    scene.push_quad(gpui::Quad {
+                                    cx.scene().push_quad(gpui::Quad {
                                         bounds,
                                         background: Some(code_span_background_color),
                                         border: Default::default(),
diff --git a/crates/gpui/examples/corner_radii.rs b/crates/gpui/examples/corner_radii.rs
index 1f33917529e55545a2d290699b255b1587cf32c5..8e5393e31a1428e0cc79d27f1f9e21d4cf0307c6 100644
--- a/crates/gpui/examples/corner_radii.rs
+++ b/crates/gpui/examples/corner_radii.rs
@@ -49,22 +49,21 @@ impl<V: View> gpui::Element<V> for CornersElement {
 
     fn paint(
         &mut self,
-        scene: &mut gpui::SceneBuilder,
         bounds: pathfinder_geometry::rect::RectF,
         _: pathfinder_geometry::rect::RectF,
         _: &mut Self::LayoutState,
         _: &mut V,
-        _: &mut gpui::PaintContext<V>,
+        cx: &mut gpui::PaintContext<V>,
     ) -> Self::PaintState {
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds,
             background: Some(Color::white()),
             ..Default::default()
         });
 
-        scene.push_layer(None);
+        cx.scene().push_layer(None);
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(100., 100.), vec2f(100., 100.)),
             background: Some(Color::red()),
             border: Default::default(),
@@ -74,7 +73,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(200., 100.), vec2f(100., 100.)),
             background: Some(Color::green()),
             border: Default::default(),
@@ -84,7 +83,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(100., 200.), vec2f(100., 100.)),
             background: Some(Color::blue()),
             border: Default::default(),
@@ -94,7 +93,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(200., 200.), vec2f(100., 100.)),
             background: Some(Color::yellow()),
             border: Default::default(),
@@ -104,7 +103,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_shadow(Shadow {
+        cx.scene().push_shadow(Shadow {
             bounds: RectF::new(vec2f(400., 100.), vec2f(100., 100.)),
             corner_radii: gpui::scene::CornerRadii {
                 bottom_right: 20.,
@@ -114,8 +113,8 @@ impl<V: View> gpui::Element<V> for CornersElement {
             color: Color::black(),
         });
 
-        scene.push_layer(None);
-        scene.push_quad(Quad {
+        cx.scene().push_layer(None);
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(400., 100.), vec2f(100., 100.)),
             background: Some(Color::red()),
             border: Default::default(),
@@ -125,8 +124,8 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.pop_layer();
-        scene.pop_layer();
+        cx.scene().pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/examples/text.rs b/crates/gpui/examples/text.rs
index bda70a49dc00954c5872d580c4dbadb58ce86e42..bc62d75ec26e4a4f8a1b6a95fa60dddf28298dd8 100644
--- a/crates/gpui/examples/text.rs
+++ b/crates/gpui/examples/text.rs
@@ -62,12 +62,12 @@ impl gpui::View for TextView {
             },
         )
         .with_highlights(vec![(17..26, underline), (34..40, underline)])
-        .with_custom_runs(vec![(17..26), (34..40)], move |ix, bounds, scene, _| {
-            scene.push_cursor_region(CursorRegion {
+        .with_custom_runs(vec![(17..26), (34..40)], move |ix, bounds, cx| {
+            cx.scene().push_cursor_region(CursorRegion {
                 bounds,
                 style: CursorStyle::PointingHand,
             });
-            scene.push_mouse_region(
+            cx.scene().push_mouse_region(
                 MouseRegion::new::<Self>(view_id, ix, bounds).on_click::<Self, _>(
                     MouseButton::Left,
                     move |_, _, _| {
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 34af24030768df600a735ac9fdb02dcb6d7cb14c..7f2af36a90f1872f7b4b3017984663160cf7185e 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -28,6 +28,7 @@ use collections::{hash_map::Entry, BTreeMap, HashMap, HashSet, VecDeque};
 use derive_more::Deref;
 pub use menu::*;
 use parking_lot::Mutex;
+use pathfinder_geometry::rect::RectF;
 use platform::Event;
 use postage::oneshot;
 #[cfg(any(test, feature = "test-support"))]
@@ -3571,6 +3572,16 @@ impl<'a, 'b, 'c, V> PaintContext<'a, 'b, 'c, V> {
     pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>) -> Self {
         Self { view_context }
     }
+
+    pub fn paint_layer<F, R>(&mut self, clip_bounds: Option<RectF>, f: F) -> R
+    where
+        F: FnOnce(&mut Self) -> R,
+    {
+        self.scene().push_layer(clip_bounds);
+        let result = f(self);
+        self.scene().pop_layer();
+        result
+    }
 }
 
 impl<'a, 'b, 'c, V> Deref for PaintContext<'a, 'b, 'c, V> {
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 27ccbdcf7a29a9add172eb7d5c0f55ac10f0f481..63462abad991dd6d4f7a3abb72c494cfd86cedec 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -55,6 +55,7 @@ pub struct Window {
     pub(crate) invalidation: Option<WindowInvalidation>,
     pub(crate) platform_window: Box<dyn platform::Window>,
     pub(crate) rendered_views: HashMap<usize, Box<dyn AnyRootElement>>,
+    scene: SceneBuilder,
     pub(crate) text_style_stack: Vec<TextStyle>,
     pub(crate) theme_stack: Vec<Box<dyn Any>>,
     pub(crate) new_parents: HashMap<usize, usize>,
@@ -98,6 +99,7 @@ impl Window {
             inspector_enabled: false,
             platform_window,
             rendered_views: Default::default(),
+            scene: SceneBuilder::new(),
             text_style_stack: Vec::new(),
             theme_stack: Vec::new(),
             new_parents: HashMap::default(),
@@ -241,6 +243,10 @@ impl<'a> WindowContext<'a> {
             .push_back(Effect::RepaintWindow { window });
     }
 
+    pub fn scene(&mut self) -> &mut SceneBuilder {
+        &mut self.window.scene
+    }
+
     pub fn enable_inspector(&mut self) {
         self.window.inspector_enabled = true;
     }
@@ -1080,9 +1086,7 @@ impl<'a> WindowContext<'a> {
         let root_view_id = self.window.root_view().id();
         let mut rendered_root = self.window.rendered_views.remove(&root_view_id).unwrap();
 
-        let mut scene_builder = SceneBuilder::new(scale_factor);
         rendered_root.paint(
-            &mut scene_builder,
             Vector2F::zero(),
             RectF::from_points(Vector2F::zero(), window_size),
             self,
@@ -1092,7 +1096,7 @@ impl<'a> WindowContext<'a> {
             .insert(root_view_id, rendered_root);
 
         self.window.text_layout_cache.finish_frame();
-        let mut scene = scene_builder.build();
+        let mut scene = self.window.scene.build(scale_factor);
         self.window.cursor_regions = scene.cursor_regions();
         self.window.mouse_regions = scene.mouse_regions();
         self.window.event_handlers = scene.take_event_handlers();
@@ -1696,7 +1700,6 @@ impl<V: 'static> Element<V> for ChildView {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -1705,7 +1708,7 @@ impl<V: 'static> Element<V> for ChildView {
     ) {
         if let Some(mut rendered_view) = cx.window.rendered_views.remove(&self.view_id) {
             rendered_view
-                .paint(scene, bounds.origin(), visible_bounds, cx)
+                .paint(bounds.origin(), visible_bounds, cx)
                 .log_err();
             cx.window.rendered_views.insert(self.view_id, rendered_view);
         } else {
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index 790581eb9f4af667618db984e51836c37e064bca..9924db0f1a9657e0fe3108ae351c7fc223731759 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -34,8 +34,8 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    json, Action, Entity, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, TypeTag, View,
-    ViewContext, WeakViewHandle, WindowContext,
+    json, Action, Entity, LayoutContext, PaintContext, SizeConstraint, TypeTag, View, ViewContext,
+    WeakViewHandle, WindowContext,
 };
 use anyhow::{anyhow, Result};
 use core::panic;
@@ -64,7 +64,6 @@ pub trait Element<V: 'static>: 'static {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -265,7 +264,6 @@ trait AnyElementState<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
@@ -346,7 +344,6 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
@@ -361,7 +358,6 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
             } => {
                 let bounds = RectF::new(origin, size);
                 let paint = element.paint(
-                    scene,
                     bounds,
                     visible_bounds,
                     &mut layout,
@@ -386,7 +382,6 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
             } => {
                 let bounds = RectF::new(origin, bounds.size());
                 let paint = element.paint(
-                    scene,
                     bounds,
                     visible_bounds,
                     &mut layout,
@@ -522,13 +517,12 @@ impl<V> AnyElement<V> {
 
     pub fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        self.state.paint(scene, origin, visible_bounds, view, cx);
+        self.state.paint(origin, visible_bounds, view, cx);
     }
 
     pub fn rect_for_text_range(
@@ -584,14 +578,13 @@ impl<V: 'static> Element<V> for AnyElement<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
@@ -647,7 +640,6 @@ pub trait AnyRootElement {
     fn layout(&mut self, constraint: SizeConstraint, cx: &mut WindowContext) -> Result<Vector2F>;
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         cx: &mut WindowContext,
@@ -675,7 +667,6 @@ impl<V: View> AnyRootElement for RootElement<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         cx: &mut WindowContext,
@@ -687,8 +678,7 @@ impl<V: View> AnyRootElement for RootElement<V> {
 
         view.update(cx, |view, cx| {
             let mut cx = PaintContext::new(cx);
-            self.element
-                .paint(scene, origin, visible_bounds, view, &mut cx);
+            self.element.paint(origin, visible_bounds, view, &mut cx);
             Ok(())
         })
     }
diff --git a/crates/gpui/src/elements/align.rs b/crates/gpui/src/elements/align.rs
index 1312c336fb352751e06be7310648dffae62c7e27..e79b37299d3380232cdfda11109b65f8ed1a5451 100644
--- a/crates/gpui/src/elements/align.rs
+++ b/crates/gpui/src/elements/align.rs
@@ -1,7 +1,6 @@
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use json::ToJson;
 
@@ -65,7 +64,6 @@ impl<V: 'static> Element<V> for Align<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -79,7 +77,6 @@ impl<V: 'static> Element<V> for Align<V> {
         let child_target = child_center + child_center * self.alignment;
 
         self.child.paint(
-            scene,
             bounds.origin() - (child_target - my_target),
             visible_bounds,
             view,
diff --git a/crates/gpui/src/elements/canvas.rs b/crates/gpui/src/elements/canvas.rs
index d169efb3d967705c40bcaca8b0de1222b5c6cad5..93cc0bdfdbb03fbc779dbb4c05cadb8b705819e9 100644
--- a/crates/gpui/src/elements/canvas.rs
+++ b/crates/gpui/src/elements/canvas.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use super::Element;
 use crate::{
     json::{self, json},
-    PaintContext, SceneBuilder, ViewContext,
+    PaintContext, ViewContext,
 };
 use json::ToJson;
 use pathfinder_geometry::{
@@ -15,7 +15,7 @@ pub struct Canvas<V, F>(F, PhantomData<V>);
 
 impl<V, F> Canvas<V, F>
 where
-    F: FnMut(&mut SceneBuilder, RectF, RectF, &mut V, &mut ViewContext<V>),
+    F: FnMut(RectF, RectF, &mut V, &mut PaintContext<V>),
 {
     pub fn new(f: F) -> Self {
         Self(f, PhantomData)
@@ -24,7 +24,7 @@ where
 
 impl<V: 'static, F> Element<V> for Canvas<V, F>
 where
-    F: 'static + FnMut(&mut SceneBuilder, RectF, RectF, &mut V, &mut ViewContext<V>),
+    F: 'static + FnMut(RectF, RectF, &mut V, &mut PaintContext<V>),
 {
     type LayoutState = ();
     type PaintState = ();
@@ -50,14 +50,13 @@ where
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.0(scene, bounds, visible_bounds, view, cx)
+        self.0(bounds, visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/clipped.rs b/crates/gpui/src/elements/clipped.rs
index 64f22515b3f19a7e779b1322d92bec24451705ab..e521794f3c49a82a124eed3a3d28cef3431b9a64 100644
--- a/crates/gpui/src/elements/clipped.rs
+++ b/crates/gpui/src/elements/clipped.rs
@@ -3,10 +3,7 @@ use std::ops::Range;
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 use serde_json::json;
 
-use crate::{
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
-};
+use crate::{json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext};
 
 pub struct Clipped<V> {
     child: AnyElement<V>,
@@ -33,17 +30,16 @@ impl<V: 'static> Element<V> for Clipped<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        scene.paint_layer(Some(bounds), |scene| {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx)
-        })
+        cx.scene().push_layer(Some(bounds));
+        let state = self.child.paint(bounds.origin(), visible_bounds, view, cx);
+        cx.scene().pop_layer();
+        state
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/component.rs b/crates/gpui/src/elements/component.rs
index c8800d18a16aafde2a8841bbd60a640f907f981e..48f139e7935feab9b1da4f47aa963a232097b92b 100644
--- a/crates/gpui/src/elements/component.rs
+++ b/crates/gpui/src/elements/component.rs
@@ -2,9 +2,7 @@ use std::{any::Any, marker::PhantomData};
 
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 
-use crate::{
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
-};
+use crate::{AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext};
 
 use super::Empty;
 
@@ -300,7 +298,6 @@ impl<V: 'static, C: StatefulComponent<V> + 'static> Element<V> for ComponentAdap
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -310,7 +307,7 @@ impl<V: 'static, C: StatefulComponent<V> + 'static> Element<V> for ComponentAdap
         self.element
             .as_mut()
             .expect("Layout should always be called before paint")
-            .paint(scene, bounds.origin(), visible_bounds, view, cx)
+            .paint(bounds.origin(), visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/constrained_box.rs b/crates/gpui/src/elements/constrained_box.rs
index 495b6c69dc40f80520be12afcb7d412a3015e8d3..fe49bd091987983faba0f3953cd274ac583cc334 100644
--- a/crates/gpui/src/elements/constrained_box.rs
+++ b/crates/gpui/src/elements/constrained_box.rs
@@ -5,8 +5,7 @@ use serde_json::json;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 
 pub struct ConstrainedBox<V> {
@@ -152,17 +151,15 @@ impl<V: 'static> Element<V> for ConstrainedBox<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        scene.paint_layer(Some(visible_bounds), |scene| {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx);
-        })
+        cx.scene().push_layer(Some(visible_bounds));
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/container.rs b/crates/gpui/src/elements/container.rs
index 82bf260fe15dfb8e29c7799a87f8a76d6f1ef6d3..6a0f860594d01099dd709e86388d74cf65c7c5b2 100644
--- a/crates/gpui/src/elements/container.rs
+++ b/crates/gpui/src/elements/container.rs
@@ -10,7 +10,7 @@ use crate::{
     json::ToJson,
     platform::CursorStyle,
     scene::{self, CornerRadii, CursorRegion, Quad},
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -387,7 +387,6 @@ impl<V: 'static> Element<V> for Container<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -400,7 +399,7 @@ impl<V: 'static> Element<V> for Container<V> {
         );
 
         if let Some(shadow) = self.style.shadow.as_ref() {
-            scene.push_shadow(scene::Shadow {
+            cx.scene().push_shadow(scene::Shadow {
                 bounds: quad_bounds + shadow.offset,
                 corner_radii: self.style.corner_radii,
                 sigma: shadow.blur,
@@ -410,7 +409,7 @@ impl<V: 'static> Element<V> for Container<V> {
 
         if let Some(hit_bounds) = quad_bounds.intersection(visible_bounds) {
             if let Some(style) = self.style.cursor {
-                scene.push_cursor_region(CursorRegion {
+                cx.scene().push_cursor_region(CursorRegion {
                     bounds: hit_bounds,
                     style,
                 });
@@ -421,26 +420,25 @@ impl<V: 'static> Element<V> for Container<V> {
             quad_bounds.origin() + vec2f(self.style.padding.left, self.style.padding.top);
 
         if self.style.border.overlay {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.background_color,
                 border: Default::default(),
                 corner_radii: self.style.corner_radii.into(),
             });
 
-            self.child
-                .paint(scene, child_origin, visible_bounds, view, cx);
+            self.child.paint(child_origin, visible_bounds, view, cx);
 
-            scene.push_layer(None);
-            scene.push_quad(Quad {
+            cx.scene().push_layer(None);
+            cx.scene().push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.overlay_color,
                 border: self.style.border.into(),
                 corner_radii: self.style.corner_radii.into(),
             });
-            scene.pop_layer();
+            cx.scene().pop_layer();
         } else {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.background_color,
                 border: self.style.border.into(),
@@ -452,18 +450,17 @@ impl<V: 'static> Element<V> for Container<V> {
                     self.style.border.left_width(),
                     self.style.border.top_width(),
                 );
-            self.child
-                .paint(scene, child_origin, visible_bounds, view, cx);
+            self.child.paint(child_origin, visible_bounds, view, cx);
 
             if self.style.overlay_color.is_some() {
-                scene.push_layer(None);
-                scene.push_quad(Quad {
+                cx.scene().push_layer(None);
+                cx.scene().push_quad(Quad {
                     bounds: quad_bounds,
                     background: self.style.overlay_color,
                     border: Default::default(),
                     corner_radii: self.style.corner_radii.into(),
                 });
-                scene.pop_layer();
+                cx.scene().pop_layer();
             }
         }
     }
diff --git a/crates/gpui/src/elements/empty.rs b/crates/gpui/src/elements/empty.rs
index 04b1c70213489cf0acd3b7b1d8151d45d905441f..021c58ecba61eb5561dc032602387ee58e4bab29 100644
--- a/crates/gpui/src/elements/empty.rs
+++ b/crates/gpui/src/elements/empty.rs
@@ -6,7 +6,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    LayoutContext, PaintContext, SceneBuilder, ViewContext,
+    LayoutContext, PaintContext, ViewContext,
 };
 use crate::{Element, SizeConstraint};
 
@@ -52,7 +52,6 @@ impl<V: 'static> Element<V> for Empty {
 
     fn paint(
         &mut self,
-        _: &mut SceneBuilder,
         _: RectF,
         _: RectF,
         _: &mut Self::LayoutState,
diff --git a/crates/gpui/src/elements/expanded.rs b/crates/gpui/src/elements/expanded.rs
index ad6682d2a9a2ff2ed9b40df489c2d4100c8191a8..0baab03ed875ee6f0ae024a0d9a9224da66d8a61 100644
--- a/crates/gpui/src/elements/expanded.rs
+++ b/crates/gpui/src/elements/expanded.rs
@@ -2,8 +2,7 @@ use std::ops::Range;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use serde_json::json;
 
@@ -57,15 +56,13 @@ impl<V: 'static> Element<V> for Expanded<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/flex.rs b/crates/gpui/src/elements/flex.rs
index 80dfb0625cd581407801148a5df7ee2046eae596..37cb512bd36ba93a9a9c53901013140dbfa9e750 100644
--- a/crates/gpui/src/elements/flex.rs
+++ b/crates/gpui/src/elements/flex.rs
@@ -2,8 +2,8 @@ use std::{any::Any, cell::Cell, f32::INFINITY, ops::Range, rc::Rc};
 
 use crate::{
     json::{self, ToJson, Value},
-    AnyElement, Axis, Element, ElementStateHandle, LayoutContext, PaintContext, SceneBuilder,
-    SizeConstraint, Vector2FExt, ViewContext,
+    AnyElement, Axis, Element, ElementStateHandle, LayoutContext, PaintContext, SizeConstraint,
+    Vector2FExt, ViewContext,
 };
 use pathfinder_geometry::{
     rect::RectF,
@@ -260,7 +260,6 @@ impl<V: 'static> Element<V> for Flex<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         remaining_space: &mut Self::LayoutState,
@@ -272,14 +271,14 @@ impl<V: 'static> Element<V> for Flex<V> {
         let mut remaining_space = *remaining_space;
         let overflowing = remaining_space < 0.;
         if overflowing {
-            scene.push_layer(Some(visible_bounds));
+            cx.scene().push_layer(Some(visible_bounds));
         }
 
-        if let Some(scroll_state) = &self.scroll_state {
-            scene.push_mouse_region(
-                crate::MouseRegion::new::<Self>(scroll_state.1, 0, bounds)
+        if let Some((scroll_state, id)) = &self.scroll_state {
+            let scroll_state = scroll_state.read(cx).clone();
+            cx.scene().push_mouse_region(
+                crate::MouseRegion::new::<Self>(*id, 0, bounds)
                     .on_scroll({
-                        let scroll_state = scroll_state.0.read(cx).clone();
                         let axis = self.axis;
                         move |e, _: &mut V, cx| {
                             if remaining_space < 0. {
@@ -358,7 +357,7 @@ impl<V: 'static> Element<V> for Flex<V> {
                 aligned_child_origin
             };
 
-            child.paint(scene, aligned_child_origin, visible_bounds, view, cx);
+            child.paint(aligned_child_origin, visible_bounds, view, cx);
 
             match self.axis {
                 Axis::Horizontal => child_origin += vec2f(child.size().x() + self.spacing, 0.0),
@@ -367,7 +366,7 @@ impl<V: 'static> Element<V> for Flex<V> {
         }
 
         if overflowing {
-            scene.pop_layer();
+            cx.scene().pop_layer();
         }
     }
 
@@ -451,15 +450,13 @@ impl<V: 'static> Element<V> for FlexItem<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx)
+        self.child.paint(bounds.origin(), visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/hook.rs b/crates/gpui/src/elements/hook.rs
index 579c2b682f41f37b19b5e587f8acdf3ea30012c4..c3fa0946f39f4c59b7a3977914d316c8669b6a96 100644
--- a/crates/gpui/src/elements/hook.rs
+++ b/crates/gpui/src/elements/hook.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 
 pub struct Hook<V> {
@@ -47,15 +47,13 @@ impl<V: 'static> Element<V> for Hook<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/image.rs b/crates/gpui/src/elements/image.rs
index aabf5469371ba17f9e34784cfbff5c3c92eb8d96..c1dbe33e68880645251273777143ff522590bfae 100644
--- a/crates/gpui/src/elements/image.rs
+++ b/crates/gpui/src/elements/image.rs
@@ -5,8 +5,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    scene, Element, ImageData, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    scene, Element, ImageData, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -92,15 +91,14 @@ impl<V: 'static> Element<V> for Image {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _: RectF,
         layout: &mut Self::LayoutState,
         _: &mut V,
-        _: &mut PaintContext<V>,
+        cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         if let Some(data) = layout {
-            scene.push_image(scene::Image {
+            cx.scene().push_image(scene::Image {
                 bounds,
                 border: self.style.border.into(),
                 corner_radii: self.style.corner_radius.into(),
diff --git a/crates/gpui/src/elements/keystroke_label.rs b/crates/gpui/src/elements/keystroke_label.rs
index 48a3971658d4ea4ca4d7c866b49d62dd228d92a6..cb473eeb087a239fdaa54176ad65aa46a21995e1 100644
--- a/crates/gpui/src/elements/keystroke_label.rs
+++ b/crates/gpui/src/elements/keystroke_label.rs
@@ -61,14 +61,13 @@ impl<V: 'static> Element<V> for KeystrokeLabel {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         element: &mut AnyElement<V>,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        element.paint(scene, bounds.origin(), visible_bounds, view, cx);
+        element.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/label.rs b/crates/gpui/src/elements/label.rs
index 281c2ce9b8de7736722cdc338e1558b45ef1146d..54d89bdaecedfedbaf1a2aa862867f7ab1af5208 100644
--- a/crates/gpui/src/elements/label.rs
+++ b/crates/gpui/src/elements/label.rs
@@ -8,7 +8,7 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle},
-    Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -158,7 +158,6 @@ impl<V: 'static> Element<V> for Label {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         line: &mut Self::LayoutState,
@@ -166,13 +165,7 @@ impl<V: 'static> Element<V> for Label {
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
-        line.paint(
-            scene,
-            bounds.origin(),
-            visible_bounds,
-            bounds.size().y(),
-            cx,
-        )
+        line.paint(bounds.origin(), visible_bounds, bounds.size().y(), cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index bcb80d8c7ecc60335045e36e664eaccadd5a9c32..e1052e9f8c3daeb7a16263d8cda85550d7442180 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -4,8 +4,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::json,
-    AnyElement, Element, LayoutContext, MouseRegion, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    AnyElement, Element, LayoutContext, MouseRegion, PaintContext, SizeConstraint, ViewContext,
 };
 use std::{cell::RefCell, collections::VecDeque, fmt::Debug, ops::Range, rc::Rc};
 use sum_tree::{Bias, SumTree};
@@ -250,7 +249,6 @@ impl<V: 'static> Element<V> for List<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         scroll_top: &mut ListOffset,
@@ -258,9 +256,10 @@ impl<V: 'static> Element<V> for List<V> {
         cx: &mut PaintContext<V>,
     ) {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
-        scene.push_layer(Some(visible_bounds));
-        scene.push_mouse_region(
-            MouseRegion::new::<Self>(cx.view_id(), 0, bounds).on_scroll({
+        cx.scene().push_layer(Some(visible_bounds));
+        let view_id = cx.view_id();
+        cx.scene()
+            .push_mouse_region(MouseRegion::new::<Self>(view_id, 0, bounds).on_scroll({
                 let state = self.state.clone();
                 let height = bounds.height();
                 let scroll_top = scroll_top.clone();
@@ -274,17 +273,14 @@ impl<V: 'static> Element<V> for List<V> {
                         cx,
                     )
                 }
-            }),
-        );
+            }));
 
         let state = &mut *self.state.0.borrow_mut();
         for (element, origin) in state.visible_elements(bounds, scroll_top) {
-            element
-                .borrow_mut()
-                .paint(scene, origin, visible_bounds, view, cx);
+            element.borrow_mut().paint(origin, visible_bounds, view, cx);
         }
 
-        scene.pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
@@ -957,15 +953,7 @@ mod tests {
             (self.size, ())
         }
 
-        fn paint(
-            &mut self,
-            _: &mut SceneBuilder,
-            _: RectF,
-            _: RectF,
-            _: &mut (),
-            _: &mut V,
-            _: &mut PaintContext<V>,
-        ) {
+        fn paint(&mut self, _: RectF, _: RectF, _: &mut (), _: &mut V, _: &mut PaintContext<V>) {
             unimplemented!()
         }
 
diff --git a/crates/gpui/src/elements/mouse_event_handler.rs b/crates/gpui/src/elements/mouse_event_handler.rs
index b1140a696045705a01af7f9f6cba89fc28401394..0b073f4f0f059441504b41408d05abe517293959 100644
--- a/crates/gpui/src/elements/mouse_event_handler.rs
+++ b/crates/gpui/src/elements/mouse_event_handler.rs
@@ -11,7 +11,7 @@ use crate::{
         MouseHover, MouseMove, MouseMoveOut, MouseScrollWheel, MouseUp, MouseUpOut,
     },
     AnyElement, Element, EventContext, LayoutContext, MouseRegion, MouseState, PaintContext,
-    SceneBuilder, SizeConstraint, TypeTag, ViewContext,
+    SizeConstraint, TypeTag, ViewContext,
 };
 use serde_json::json;
 use std::ops::Range;
@@ -236,26 +236,21 @@ impl<V: 'static> MouseEventHandler<V> {
         .round_out()
     }
 
-    fn paint_regions(
-        &self,
-        scene: &mut SceneBuilder,
-        bounds: RectF,
-        visible_bounds: RectF,
-        cx: &mut ViewContext<V>,
-    ) {
+    fn paint_regions(&self, bounds: RectF, visible_bounds: RectF, cx: &mut ViewContext<V>) {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
         let hit_bounds = self.hit_bounds(visible_bounds);
 
         if let Some(style) = self.cursor_style {
-            scene.push_cursor_region(CursorRegion {
+            cx.scene().push_cursor_region(CursorRegion {
                 bounds: hit_bounds,
                 style,
             });
         }
-        scene.push_mouse_region(
+        let view_id = cx.view_id();
+        cx.scene().push_mouse_region(
             MouseRegion::from_handlers(
                 self.tag,
-                cx.view_id(),
+                view_id,
                 self.region_id,
                 hit_bounds,
                 self.handlers.clone(),
@@ -282,7 +277,6 @@ impl<V: 'static> Element<V> for MouseEventHandler<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -290,16 +284,13 @@ impl<V: 'static> Element<V> for MouseEventHandler<V> {
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         if self.above {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx);
-
-            scene.paint_layer(None, |scene| {
-                self.paint_regions(scene, bounds, visible_bounds, cx);
-            });
+            self.child.paint(bounds.origin(), visible_bounds, view, cx);
+            cx.scene().push_layer(None);
+            self.paint_regions(bounds, visible_bounds, cx);
+            cx.scene().pop_layer();
         } else {
-            self.paint_regions(scene, bounds, visible_bounds, cx);
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx);
+            self.paint_regions(bounds, visible_bounds, cx);
+            self.child.paint(bounds.origin(), visible_bounds, view, cx);
         }
     }
 
diff --git a/crates/gpui/src/elements/overlay.rs b/crates/gpui/src/elements/overlay.rs
index 14d19e802c0ea15b314f209418fdaa4f25af5644..f8d4708623c2ffdaf0f54128cced0da6a52bb362 100644
--- a/crates/gpui/src/elements/overlay.rs
+++ b/crates/gpui/src/elements/overlay.rs
@@ -3,8 +3,8 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::ToJson,
-    AnyElement, Axis, Element, LayoutContext, MouseRegion, PaintContext, SceneBuilder,
-    SizeConstraint, ViewContext,
+    AnyElement, Axis, Element, LayoutContext, MouseRegion, PaintContext, SizeConstraint,
+    ViewContext,
 };
 use serde_json::json;
 
@@ -138,7 +138,6 @@ impl<V: 'static> Element<V> for Overlay<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _: RectF,
         size: &mut Self::LayoutState,
@@ -213,25 +212,23 @@ impl<V: 'static> Element<V> for Overlay<V> {
             OverlayFitMode::None => {}
         }
 
-        scene.paint_stacking_context(None, self.z_index, |scene| {
-            if self.hoverable {
-                enum OverlayHoverCapture {}
-                // Block hovers in lower stacking contexts
-                scene.push_mouse_region(MouseRegion::new::<OverlayHoverCapture>(
-                    cx.view_id(),
-                    cx.view_id(),
-                    bounds,
+        cx.scene().push_stacking_context(None, self.z_index);
+        if self.hoverable {
+            enum OverlayHoverCapture {}
+            // Block hovers in lower stacking contexts
+            let view_id = cx.view_id();
+            cx.scene()
+                .push_mouse_region(MouseRegion::new::<OverlayHoverCapture>(
+                    view_id, view_id, bounds,
                 ));
-            }
-
-            self.child.paint(
-                scene,
-                bounds.origin(),
-                RectF::new(Vector2F::zero(), cx.window_size()),
-                view,
-                cx,
-            );
-        });
+        }
+        self.child.paint(
+            bounds.origin(),
+            RectF::new(Vector2F::zero(), cx.window_size()),
+            view,
+            cx,
+        );
+        cx.scene().pop_stacking_context();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/resizable.rs b/crates/gpui/src/elements/resizable.rs
index 3c2febcce34572b2e50ae5ea0077ac339c072fd7..e67ad70304140eea1e7590a1b1bfac1f672fdb85 100644
--- a/crates/gpui/src/elements/resizable.rs
+++ b/crates/gpui/src/elements/resizable.rs
@@ -7,7 +7,7 @@ use serde_json::json;
 use crate::{
     geometry::rect::RectF,
     platform::{CursorStyle, MouseButton},
-    AnyElement, AppContext, Axis, Element, LayoutContext, MouseRegion, PaintContext, SceneBuilder,
+    AnyElement, AppContext, Axis, Element, LayoutContext, MouseRegion, PaintContext,
     SizeConstraint, TypeTag, View, ViewContext,
 };
 
@@ -112,70 +112,70 @@ impl<V: 'static> Element<V> for Resizable<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: pathfinder_geometry::rect::RectF,
         visible_bounds: pathfinder_geometry::rect::RectF,
         constraint: &mut SizeConstraint,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        scene.push_stacking_context(None, None);
+        cx.scene().push_stacking_context(None, None);
 
         let handle_region = self.handle_side.of_rect(bounds, self.handle_size);
 
         enum ResizeHandle {}
-        scene.push_mouse_region(
-            MouseRegion::new::<ResizeHandle>(
-                cx.view_id(),
-                self.handle_side as usize,
-                handle_region,
-            )
-            .on_down(MouseButton::Left, |_, _: &mut V, _| {}) // This prevents the mouse down event from being propagated elsewhere
-            .on_click(MouseButton::Left, {
-                let on_resize = self.on_resize.clone();
-                move |click, v, cx| {
-                    if click.click_count == 2 {
-                        on_resize.borrow_mut()(v, None, cx);
+        let view_id = cx.view_id();
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<ResizeHandle>(view_id, self.handle_side as usize, handle_region)
+                .on_down(MouseButton::Left, |_, _: &mut V, _| {}) // This prevents the mouse down event from being propagated elsewhere
+                .on_click(MouseButton::Left, {
+                    let on_resize = self.on_resize.clone();
+                    move |click, v, cx| {
+                        if click.click_count == 2 {
+                            on_resize.borrow_mut()(v, None, cx);
+                        }
                     }
-                }
-            })
-            .on_drag(MouseButton::Left, {
-                let bounds = bounds.clone();
-                let side = self.handle_side;
-                let prev_size = side.relevant_component(bounds.size());
-                let min_size = side.relevant_component(constraint.min);
-                let max_size = side.relevant_component(constraint.max);
-                let on_resize = self.on_resize.clone();
-                let tag = self.tag;
-                move |event, view: &mut V, cx| {
-                    if event.end {
-                        return;
+                })
+                .on_drag(MouseButton::Left, {
+                    let bounds = bounds.clone();
+                    let side = self.handle_side;
+                    let prev_size = side.relevant_component(bounds.size());
+                    let min_size = side.relevant_component(constraint.min);
+                    let max_size = side.relevant_component(constraint.max);
+                    let on_resize = self.on_resize.clone();
+                    let tag = self.tag;
+                    move |event, view: &mut V, cx| {
+                        if event.end {
+                            return;
+                        }
+
+                        let Some((bounds, _)) = get_bounds(tag, cx) else {
+                            return;
+                        };
+
+                        let new_size_raw = match side {
+                            // Handle on top side of element => Element is on bottom
+                            HandleSide::Top => {
+                                bounds.height() + bounds.origin_y() - event.position.y()
+                            }
+                            // Handle on right side of element => Element is on left
+                            HandleSide::Right => event.position.x() - bounds.lower_left().x(),
+                            // Handle on left side of element => Element is on the right
+                            HandleSide::Left => {
+                                bounds.width() + bounds.origin_x() - event.position.x()
+                            }
+                            // Handle on bottom side of element => Element is on the top
+                            HandleSide::Bottom => event.position.y() - bounds.lower_left().y(),
+                        };
+
+                        let new_size = min_size.max(new_size_raw).min(max_size).round();
+                        if new_size != prev_size {
+                            on_resize.borrow_mut()(view, Some(new_size), cx);
+                        }
                     }
-
-                    let Some((bounds, _)) = get_bounds(tag, cx) else {
-                        return;
-                    };
-
-                    let new_size_raw = match side {
-                        // Handle on top side of element => Element is on bottom
-                        HandleSide::Top => bounds.height() + bounds.origin_y() - event.position.y(),
-                        // Handle on right side of element => Element is on left
-                        HandleSide::Right => event.position.x() - bounds.lower_left().x(),
-                        // Handle on left side of element => Element is on the right
-                        HandleSide::Left => bounds.width() + bounds.origin_x() - event.position.x(),
-                        // Handle on bottom side of element => Element is on the top
-                        HandleSide::Bottom => event.position.y() - bounds.lower_left().y(),
-                    };
-
-                    let new_size = min_size.max(new_size_raw).min(max_size).round();
-                    if new_size != prev_size {
-                        on_resize.borrow_mut()(view, Some(new_size), cx);
-                    }
-                }
-            }),
+                }),
         );
 
-        scene.push_cursor_region(crate::CursorRegion {
+        cx.scene().push_cursor_region(crate::CursorRegion {
             bounds: handle_region,
             style: match self.handle_side.axis() {
                 Axis::Horizontal => CursorStyle::ResizeLeftRight,
@@ -183,10 +183,9 @@ impl<V: 'static> Element<V> for Resizable<V> {
             },
         });
 
-        scene.pop_stacking_context();
+        cx.scene().pop_stacking_context();
 
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
@@ -249,7 +248,6 @@ impl<V: View, P: 'static> Element<V> for BoundsProvider<V, P> {
 
     fn paint(
         &mut self,
-        scene: &mut crate::SceneBuilder,
         bounds: pathfinder_geometry::rect::RectF,
         visible_bounds: pathfinder_geometry::rect::RectF,
         _: &mut Self::LayoutState,
@@ -260,8 +258,7 @@ impl<V: View, P: 'static> Element<V> for BoundsProvider<V, P> {
             map.0.insert(TypeTag::new::<P>(), (bounds, visible_bounds));
         });
 
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx)
+        self.child.paint(bounds.origin(), visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/stack.rs b/crates/gpui/src/elements/stack.rs
index e73e2f0b4024c42a0bc583856009fa30c36c5517..72f129b1da3646eb212e98888b6d6e27d61a0a58 100644
--- a/crates/gpui/src/elements/stack.rs
+++ b/crates/gpui/src/elements/stack.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::{self, json, ToJson},
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 
 /// Element which renders it's children in a stack on top of each other.
@@ -52,7 +52,6 @@ impl<V: 'static> Element<V> for Stack<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -60,9 +59,9 @@ impl<V: 'static> Element<V> for Stack<V> {
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         for child in &mut self.children {
-            scene.paint_layer(None, |scene| {
-                child.paint(scene, bounds.origin(), visible_bounds, view, cx);
-            });
+            cx.scene().push_layer(None);
+            child.paint(bounds.origin(), visible_bounds, view, cx);
+            cx.scene().pop_layer();
         }
     }
 
diff --git a/crates/gpui/src/elements/svg.rs b/crates/gpui/src/elements/svg.rs
index 0d5bcd59e4a74545f23dd79aa1bd536df505967a..c81e5a2892f43582129c2858411a713e25a3e49b 100644
--- a/crates/gpui/src/elements/svg.rs
+++ b/crates/gpui/src/elements/svg.rs
@@ -7,7 +7,7 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    scene, Element, LayoutContext, SceneBuilder, SizeConstraint, ViewContext,
+    scene, Element, LayoutContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde_derive::Deserialize;
@@ -69,15 +69,14 @@ impl<V: 'static> Element<V> for Svg {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _visible_bounds: RectF,
         svg: &mut Self::LayoutState,
         _: &mut V,
-        _: &mut PaintContext<V>,
+        cx: &mut PaintContext<V>,
     ) {
         if let Some(svg) = svg.clone() {
-            scene.push_icon(scene::Icon {
+            cx.scene().push_icon(scene::Icon {
                 bounds,
                 svg,
                 path: self.path.clone(),
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 3f5888345604a32138a60c4969e853472d502330..224397d067f2adabd3ff0fa96634f0f2f11152c3 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -7,8 +7,8 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle, ShapedBoundary},
-    AppContext, Element, FontCache, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    TextLayoutCache, ViewContext,
+    Element, FontCache, LayoutContext, PaintContext, SizeConstraint, TextLayoutCache, ViewContext,
+    WindowContext,
 };
 use log::warn;
 use serde_json::json;
@@ -21,7 +21,7 @@ pub struct Text {
     highlights: Option<Box<[(Range<usize>, HighlightStyle)]>>,
     custom_runs: Option<(
         Box<[Range<usize>]>,
-        Box<dyn FnMut(usize, RectF, &mut SceneBuilder, &mut AppContext)>,
+        Box<dyn FnMut(usize, RectF, &mut WindowContext)>,
     )>,
 }
 
@@ -58,7 +58,7 @@ impl Text {
     pub fn with_custom_runs(
         mut self,
         runs: impl Into<Box<[Range<usize>]>>,
-        callback: impl 'static + FnMut(usize, RectF, &mut SceneBuilder, &mut AppContext),
+        callback: impl 'static + FnMut(usize, RectF, &mut WindowContext),
     ) -> Self {
         self.custom_runs = Some((runs.into(), Box::new(callback)));
         self
@@ -166,7 +166,6 @@ impl<V: 'static> Element<V> for Text {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -175,7 +174,7 @@ impl<V: 'static> Element<V> for Text {
     ) -> Self::PaintState {
         let mut origin = bounds.origin();
         let empty = Vec::new();
-        let mut callback = |_, _, _: &mut SceneBuilder, _: &mut AppContext| {};
+        let mut callback = |_, _, _: &mut WindowContext| {};
 
         let mouse_runs;
         let custom_run_callback;
@@ -202,7 +201,6 @@ impl<V: 'static> Element<V> for Text {
             if boundaries.intersects(visible_bounds) {
                 if self.soft_wrap {
                     line.paint_wrapped(
-                        scene,
                         origin,
                         visible_bounds,
                         layout.line_height,
@@ -210,7 +208,7 @@ impl<V: 'static> Element<V> for Text {
                         cx,
                     );
                 } else {
-                    line.paint(scene, origin, visible_bounds, layout.line_height, cx);
+                    line.paint(origin, visible_bounds, layout.line_height, cx);
                 }
             }
 
@@ -248,7 +246,7 @@ impl<V: 'static> Element<V> for Text {
                                     *run_origin,
                                     glyph_origin + vec2f(0., layout.line_height),
                                 );
-                                custom_run_callback(*run_ix, bounds, scene, cx);
+                                custom_run_callback(*run_ix, bounds, cx);
                                 *run_origin =
                                     vec2f(origin.x(), glyph_origin.y() + layout.line_height);
                             }
@@ -264,7 +262,7 @@ impl<V: 'static> Element<V> for Text {
                                     run_origin,
                                     glyph_origin + vec2f(0., layout.line_height),
                                 );
-                                custom_run_callback(run_ix, bounds, scene, cx);
+                                custom_run_callback(run_ix, bounds, cx);
                                 custom_runs.next();
                             }
 
@@ -294,7 +292,7 @@ impl<V: 'static> Element<V> for Text {
                             run_origin,
                             line_end + vec2f(0., layout.line_height),
                         );
-                        custom_run_callback(run_ix, bounds, scene, cx);
+                        custom_run_callback(run_ix, bounds, cx);
                         if end_offset == run_end_offset {
                             custom_runs.next();
                         }
diff --git a/crates/gpui/src/elements/tooltip.rs b/crates/gpui/src/elements/tooltip.rs
index d3a1db713e6af4570cf9754e5ccd58cb7d3fe96a..1c521751f9c5db0b3bebb0788d260deb1851ea2f 100644
--- a/crates/gpui/src/elements/tooltip.rs
+++ b/crates/gpui/src/elements/tooltip.rs
@@ -6,8 +6,8 @@ use crate::{
     fonts::TextStyle,
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    Action, Axis, ElementStateHandle, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    Task, TypeTag, ViewContext,
+    Action, Axis, ElementStateHandle, LayoutContext, PaintContext, SizeConstraint, Task, TypeTag,
+    ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -204,17 +204,15 @@ impl<V: 'static> Element<V> for Tooltip<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
         if let Some(tooltip) = self.tooltip.as_mut() {
-            tooltip.paint(scene, bounds.origin(), visible_bounds, view, cx);
+            tooltip.paint(bounds.origin(), visible_bounds, view, cx);
         }
     }
 
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index c7279d6389623c9b801f09961977e9759b94595b..e75e13438695169a226679ee50cfeaeece782830 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -6,7 +6,7 @@ use crate::{
     },
     json::{self, json},
     platform::ScrollWheelEvent,
-    AnyElement, LayoutContext, MouseRegion, PaintContext, SceneBuilder, ViewContext,
+    AnyElement, LayoutContext, MouseRegion, PaintContext, ViewContext,
 };
 use json::ToJson;
 use std::{cell::RefCell, cmp, ops::Range, rc::Rc};
@@ -272,7 +272,6 @@ impl<V: 'static> Element<V> for UniformList<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -281,9 +280,9 @@ impl<V: 'static> Element<V> for UniformList<V> {
     ) -> Self::PaintState {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
 
-        scene.push_layer(Some(visible_bounds));
+        cx.scene().push_layer(Some(visible_bounds));
 
-        scene.push_mouse_region(
+        cx.scene().push_mouse_region(
             MouseRegion::new::<Self>(self.view_id, 0, visible_bounds).on_scroll({
                 let scroll_max = layout.scroll_max;
                 let state = self.state.clone();
@@ -312,11 +311,11 @@ impl<V: 'static> Element<V> for UniformList<V> {
             );
 
         for item in &mut layout.items {
-            item.paint(scene, item_origin, visible_bounds, view, cx);
+            item.paint(item_origin, visible_bounds, view, cx);
             item_origin += vec2f(0.0, layout.item_height);
         }
 
-        scene.pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index e8b9936d8109c6c3acf22d156e8f360034218f16..9557c6fe910953eacf5d6f7cb6a7113fb43fe239 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -26,7 +26,6 @@ pub use mouse_event::*;
 pub use mouse_region::*;
 
 pub struct SceneBuilder {
-    scale_factor: f32,
     stacking_contexts: Vec<StackingContext>,
     active_stacking_context_stack: Vec<usize>,
     /// Used by the gpui2 crate.
@@ -245,43 +244,36 @@ impl Scene {
 }
 
 impl SceneBuilder {
-    pub fn new(scale_factor: f32) -> Self {
-        let stacking_context = StackingContext::new(None, 0);
-        SceneBuilder {
-            scale_factor,
-            stacking_contexts: vec![stacking_context],
-            active_stacking_context_stack: vec![0],
+    pub fn new() -> Self {
+        let mut this = SceneBuilder {
+            stacking_contexts: Vec::new(),
+            active_stacking_context_stack: Vec::new(),
             #[cfg(debug_assertions)]
-            mouse_region_ids: Default::default(),
+            mouse_region_ids: HashSet::default(),
             event_handlers: Vec::new(),
-        }
+        };
+        this.clear();
+        this
     }
 
-    pub fn build(mut self) -> Scene {
-        self.stacking_contexts
-            .sort_by_key(|context| context.z_index);
-        Scene {
-            scale_factor: self.scale_factor,
-            stacking_contexts: self.stacking_contexts,
-            event_handlers: self.event_handlers,
-        }
+    pub fn clear(&mut self) {
+        self.stacking_contexts.clear();
+        self.stacking_contexts.push(StackingContext::new(None, 0));
+        self.active_stacking_context_stack.clear();
+        self.active_stacking_context_stack.push(0);
     }
 
-    pub fn scale_factor(&self) -> f32 {
-        self.scale_factor
-    }
+    pub fn build(&mut self, scale_factor: f32) -> Scene {
+        let mut stacking_contexts = std::mem::take(&mut self.stacking_contexts);
+        stacking_contexts.sort_by_key(|context| context.z_index);
+        let event_handlers = std::mem::take(&mut self.event_handlers);
+        self.clear();
 
-    pub fn paint_stacking_context<F>(
-        &mut self,
-        clip_bounds: Option<RectF>,
-        z_index: Option<usize>,
-        f: F,
-    ) where
-        F: FnOnce(&mut Self),
-    {
-        self.push_stacking_context(clip_bounds, z_index);
-        f(self);
-        self.pop_stacking_context();
+        Scene {
+            scale_factor,
+            stacking_contexts,
+            event_handlers,
+        }
     }
 
     pub fn push_stacking_context(&mut self, clip_bounds: Option<RectF>, z_index: Option<usize>) {
@@ -297,15 +289,6 @@ impl SceneBuilder {
         assert!(!self.active_stacking_context_stack.is_empty());
     }
 
-    pub fn paint_layer<F>(&mut self, clip_bounds: Option<RectF>, f: F)
-    where
-        F: FnOnce(&mut Self),
-    {
-        self.push_layer(clip_bounds);
-        f(self);
-        self.pop_layer();
-    }
-
     pub fn push_layer(&mut self, clip_bounds: Option<RectF>) {
         self.active_stacking_context().push_layer(clip_bounds);
     }
diff --git a/crates/gpui/src/text_layout.rs b/crates/gpui/src/text_layout.rs
index d287d639abfb27e31c75d23afcf1604f5eb5ab40..97f4b7a12d7a2aa95159dc049e57c6b5a4eb2e21 100644
--- a/crates/gpui/src/text_layout.rs
+++ b/crates/gpui/src/text_layout.rs
@@ -9,7 +9,6 @@ use crate::{
     platform::FontSystem,
     scene,
     window::WindowContext,
-    SceneBuilder,
 };
 use ordered_float::OrderedFloat;
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
@@ -284,7 +283,6 @@ impl Line {
 
     pub fn paint(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         line_height: f32,
@@ -347,7 +345,7 @@ impl Line {
                 }
 
                 if let Some((underline_origin, underline_style)) = finished_underline {
-                    scene.push_underline(scene::Underline {
+                    cx.scene().push_underline(scene::Underline {
                         origin: underline_origin,
                         width: glyph_origin.x() - underline_origin.x(),
                         thickness: underline_style.thickness.into(),
@@ -357,14 +355,14 @@ impl Line {
                 }
 
                 if glyph.is_emoji {
-                    scene.push_image_glyph(scene::ImageGlyph {
+                    cx.scene().push_image_glyph(scene::ImageGlyph {
                         font_id: run.font_id,
                         font_size: self.layout.font_size,
                         id: glyph.id,
                         origin: glyph_origin,
                     });
                 } else {
-                    scene.push_glyph(scene::Glyph {
+                    cx.scene().push_glyph(scene::Glyph {
                         font_id: run.font_id,
                         font_size: self.layout.font_size,
                         id: glyph.id,
@@ -377,7 +375,7 @@ impl Line {
 
         if let Some((underline_start, underline_style)) = underline.take() {
             let line_end_x = origin.x() + self.layout.width;
-            scene.push_underline(scene::Underline {
+            cx.scene().push_underline(scene::Underline {
                 origin: underline_start,
                 width: line_end_x - underline_start.x(),
                 color: underline_style.color.unwrap(),
@@ -389,7 +387,6 @@ impl Line {
 
     pub fn paint_wrapped(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         line_height: f32,
@@ -417,7 +414,7 @@ impl Line {
                 {
                     boundaries.next();
                     if let Some((underline_origin, underline_style)) = underline {
-                        scene.push_underline(scene::Underline {
+                        cx.scene().push_underline(scene::Underline {
                             origin: underline_origin,
                             width: glyph_origin.x() - underline_origin.x(),
                             thickness: underline_style.thickness.into(),
@@ -461,7 +458,7 @@ impl Line {
                 }
 
                 if let Some((underline_origin, underline_style)) = finished_underline {
-                    scene.push_underline(scene::Underline {
+                    cx.scene().push_underline(scene::Underline {
                         origin: underline_origin,
                         width: glyph_origin.x() - underline_origin.x(),
                         thickness: underline_style.thickness.into(),
@@ -477,14 +474,14 @@ impl Line {
                 );
                 if glyph_bounds.intersects(visible_bounds) {
                     if glyph.is_emoji {
-                        scene.push_image_glyph(scene::ImageGlyph {
+                        cx.scene().push_image_glyph(scene::ImageGlyph {
                             font_id: run.font_id,
                             font_size: self.layout.font_size,
                             id: glyph.id,
                             origin: glyph_bounds.origin() + baseline_offset,
                         });
                     } else {
-                        scene.push_glyph(scene::Glyph {
+                        cx.scene().push_glyph(scene::Glyph {
                             font_id: run.font_id,
                             font_size: self.layout.font_size,
                             id: glyph.id,
@@ -498,7 +495,7 @@ impl Line {
 
         if let Some((underline_origin, underline_style)) = underline.take() {
             let line_end_x = glyph_origin.x() + self.layout.width - prev_position;
-            scene.push_underline(scene::Underline {
+            cx.scene().push_underline(scene::Underline {
                 origin: underline_origin,
                 width: line_end_x - underline_origin.x(),
                 thickness: underline_style.thickness.into(),
diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
index d1bc7ac290e3b9ac44eb3e54e8951cbf4a0aba29..e0b5483d06634cee5addd851769dc0ddd2b11281 100644
--- a/crates/gpui2/src/adapter.rs
+++ b/crates/gpui2/src/adapter.rs
@@ -36,7 +36,6 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
 
     fn paint(
         &mut self,
-        scene: &mut gpui::SceneBuilder,
         bounds: RectF,
         _visible_bounds: RectF,
         layout_data: &mut Option<(LayoutEngine, LayoutId)>,
@@ -45,7 +44,7 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
     ) -> Self::PaintState {
         let (layout_engine, layout_id) = layout_data.take().unwrap();
         legacy_cx.push_layout_engine(layout_engine);
-        let mut cx = PaintContext::new(legacy_cx, scene);
+        let mut cx = PaintContext::new(legacy_cx);
         self.0.paint(view, bounds.origin(), &mut cx);
         *layout_data = legacy_cx.pop_layout_engine().zip(Some(layout_id));
         debug_assert!(layout_data.is_some());
diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index f32b22434a87a2db3601af0477d4ae07ab15c379..598b564ab1704e219aa91f519a98b53ef1ae17c7 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -88,7 +88,7 @@ impl<V: 'static> Element<V> for Div<V> {
         // TODO: Support only one dimension being hidden
         let mut pop_layer = false;
         if style.overflow.y != Overflow::Visible || style.overflow.x != Overflow::Visible {
-            cx.scene.push_layer(Some(bounds));
+            cx.scene().push_layer(Some(bounds));
             pop_layer = true;
         }
 
@@ -97,7 +97,7 @@ impl<V: 'static> Element<V> for Div<V> {
         }
 
         if pop_layer {
-            cx.scene.pop_layer();
+            cx.scene().pop_layer();
         }
 
         style.paint_foreground(bounds, cx);
@@ -221,7 +221,7 @@ impl<V: 'static> Div<V> {
         let hovered = bounds.contains_point(cx.mouse_position());
         if hovered {
             let rem_size = cx.rem_size();
-            cx.scene.push_quad(scene::Quad {
+            cx.scene().push_quad(scene::Quad {
                 bounds,
                 background: Some(hsla(0., 0., 1., 0.05).into()),
                 border: gpui::Border {
diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs
index a4934c54155eb649c4b975980b90289832add82e..829a6d111655480b270a3a7d75a86ee579d1b0fb 100644
--- a/crates/gpui2/src/elements/img.rs
+++ b/crates/gpui2/src/elements/img.rs
@@ -70,7 +70,7 @@ impl<V: 'static> Element<V> for Img {
                 .and_then(ResultExt::log_err)
             {
                 let rem_size = cx.rem_size();
-                cx.scene.push_image(scene::Image {
+                cx.scene().push_image(scene::Image {
                     bounds,
                     border: gpui::Border {
                         color: style.border_color.unwrap_or_default().into(),
diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs
index ebf06178aa8c174c63fc65c7adc6e7c694f7ac0e..c17cdbe3c6675c0992a9c9e66d4de47736123620 100644
--- a/crates/gpui2/src/elements/svg.rs
+++ b/crates/gpui2/src/elements/svg.rs
@@ -63,7 +63,7 @@ impl<V: 'static> Element<V> for Svg {
                     color: Rgba::from(fill_color).into(),
                 };
 
-                cx.scene.push_icon(icon);
+                cx.scene().push_icon(icon);
             }
         }
     }
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 97b911201acd4897d5e4c92594de23eb6564f354..3b3acb45231e1ef0678735c51fd0b3aa198da38c 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -92,13 +92,7 @@ impl<V: 'static> Element<V> for Text {
 
         // TODO: We haven't added visible bounds to the new element system yet, so this is a placeholder.
         let visible_bounds = bounds;
-        line.paint(
-            cx.scene,
-            bounds.origin(),
-            visible_bounds,
-            line_height,
-            cx.legacy_cx,
-        );
+        line.paint(bounds.origin(), visible_bounds, line_height, cx.legacy_cx);
     }
 }
 
diff --git a/crates/gpui2/src/paint_context.rs b/crates/gpui2/src/paint_context.rs
index 0760b13cd33396b3d8c14e907c7ea8dc46eca1ae..9f8548d51927b07b80a6dcc6ca8775c8e5c78ba3 100644
--- a/crates/gpui2/src/paint_context.rs
+++ b/crates/gpui2/src/paint_context.rs
@@ -11,15 +11,11 @@ pub struct PaintContext<'a, 'b, 'c, 'd, V> {
     #[deref]
     #[deref_mut]
     pub(crate) legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
-    pub(crate) scene: &'d mut gpui::SceneBuilder,
 }
 
 impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
-    pub fn new(
-        legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
-        scene: &'d mut gpui::SceneBuilder,
-    ) -> Self {
-        Self { legacy_cx, scene }
+    pub fn new(legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>) -> Self {
+        Self { legacy_cx }
     }
 
     pub fn on_event<E: 'static>(
@@ -29,7 +25,7 @@ impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
     ) {
         let view = self.weak_handle();
 
-        self.scene.event_handlers.push(EventHandler {
+        self.scene().event_handlers.push(EventHandler {
             order,
             handler: Rc::new(move |event, window_cx| {
                 if let Some(view) = view.upgrade(window_cx) {
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 790cea6614caf9878060f6d8de60b26451f6df87..8a02dda5d76afd62ee9ae4e0d7262bfefcd190e3 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -167,7 +167,7 @@ impl Style {
     pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
         let rem_size = cx.rem_size();
         if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
-            cx.scene.push_quad(gpui::Quad {
+            cx.scene().push_quad(gpui::Quad {
                 bounds,
                 background: Some(color.into()),
                 corner_radii: self.corner_radii.to_gpui(bounds.size(), rem_size),
@@ -183,7 +183,7 @@ impl Style {
         if let Some(color) = self.border_color {
             let border = self.border_widths.to_pixels(rem_size);
             if !border.is_empty() {
-                cx.scene.push_quad(gpui::Quad {
+                cx.scene().push_quad(gpui::Quad {
                     bounds,
                     background: None,
                     corner_radii: self.corner_radii.to_gpui(bounds.size(), rem_size),
diff --git a/crates/gpui_macros/src/gpui_macros.rs b/crates/gpui_macros/src/gpui_macros.rs
index 16f293afbe286bcf2529125909e317ea5811fa82..b712aace69f493a537ae06bba098e580e87b7c36 100644
--- a/crates/gpui_macros/src/gpui_macros.rs
+++ b/crates/gpui_macros/src/gpui_macros.rs
@@ -338,14 +338,13 @@ pub fn element_derive(input: TokenStream) -> TokenStream {
 
             fn paint(
                 &mut self,
-                scene: &mut gpui::SceneBuilder,
                 bounds: gpui::geometry::rect::RectF,
                 visible_bounds: gpui::geometry::rect::RectF,
                 element: &mut gpui::elements::AnyElement<V>,
                 view: &mut V,
                 cx: &mut gpui::PaintContext<V>,
             ) {
-                element.paint(scene, bounds.origin(), visible_bounds, view, cx);
+                element.paint(bounds.origin(), visible_bounds, view, cx);
             }
 
             fn rect_for_text_range(
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index b3d87f531ad5794b86f4b56dbe307e3078a5ffd3..7892dfe70e64f791db9a28254121e4ea63d96514 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -11,8 +11,8 @@ use gpui::{
     serde_json::json,
     text_layout::{Line, RunStyle},
     AnyElement, Element, EventContext, FontCache, LayoutContext, ModelContext, MouseRegion,
-    PaintContext, Quad, SceneBuilder, SizeConstraint, TextLayoutCache, ViewContext,
-    WeakModelHandle,
+    PaintContext, Quad, SizeConstraint, TextLayoutCache, ViewContext, WeakModelHandle,
+    WindowContext,
 };
 use itertools::Itertools;
 use language::CursorShape;
@@ -86,12 +86,11 @@ impl LayoutCell {
 
     fn paint(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         layout: &LayoutState,
         visible_bounds: RectF,
         _view: &mut TerminalView,
-        cx: &mut ViewContext<TerminalView>,
+        cx: &mut WindowContext,
     ) {
         let pos = {
             let point = self.point;
@@ -102,7 +101,7 @@ impl LayoutCell {
         };
 
         self.text
-            .paint(scene, pos, visible_bounds, layout.size.line_height, cx);
+            .paint(pos, visible_bounds, layout.size.line_height, cx);
     }
 }
 
@@ -132,11 +131,10 @@ impl LayoutRect {
 
     fn paint(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         layout: &LayoutState,
         _view: &mut TerminalView,
-        _cx: &mut ViewContext<TerminalView>,
+        cx: &mut ViewContext<TerminalView>,
     ) {
         let position = {
             let point = self.point;
@@ -150,7 +148,7 @@ impl LayoutRect {
             layout.size.line_height,
         );
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(position, size),
             background: Some(self.color),
             border: Default::default(),
@@ -387,7 +385,6 @@ impl TerminalElement {
 
     fn attach_mouse_handlers(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         mode: TermMode,
@@ -518,7 +515,7 @@ impl TerminalElement {
                 )
         }
 
-        scene.push_mouse_region(region);
+        cx.scene().push_mouse_region(region);
     }
 }
 
@@ -733,7 +730,6 @@ impl Element<TerminalView> for TerminalElement {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -745,13 +741,13 @@ impl Element<TerminalView> for TerminalElement {
         //Setup element stuff
         let clip_bounds = Some(visible_bounds);
 
-        scene.paint_layer(clip_bounds, |scene| {
+        cx.paint_layer(clip_bounds, |cx| {
             let origin = bounds.origin() + vec2f(layout.gutter, 0.);
 
             // Elements are ephemeral, only at paint time do we know what could be clicked by a mouse
-            self.attach_mouse_handlers(scene, origin, visible_bounds, layout.mode, cx);
+            self.attach_mouse_handlers(origin, visible_bounds, layout.mode, cx);
 
-            scene.push_cursor_region(gpui::CursorRegion {
+            cx.scene().push_cursor_region(gpui::CursorRegion {
                 bounds,
                 style: if layout.hyperlink_tooltip.is_some() {
                     CursorStyle::PointingHand
@@ -760,9 +756,9 @@ impl Element<TerminalView> for TerminalElement {
                 },
             });
 
-            scene.paint_layer(clip_bounds, |scene| {
+            cx.paint_layer(clip_bounds, |cx| {
                 //Start with a background color
-                scene.push_quad(Quad {
+                cx.scene().push_quad(Quad {
                     bounds: RectF::new(bounds.origin(), bounds.size()),
                     background: Some(layout.background_color),
                     border: Default::default(),
@@ -770,12 +766,12 @@ impl Element<TerminalView> for TerminalElement {
                 });
 
                 for rect in &layout.rects {
-                    rect.paint(scene, origin, layout, view, cx)
+                    rect.paint(origin, layout, view, cx);
                 }
             });
 
             //Draw Highlighted Backgrounds
-            scene.paint_layer(clip_bounds, |scene| {
+            cx.paint_layer(clip_bounds, |cx| {
                 for (relative_highlighted_range, color) in layout.relative_highlighted_ranges.iter()
                 {
                     if let Some((start_y, highlighted_range_lines)) =
@@ -789,29 +785,29 @@ impl Element<TerminalView> for TerminalElement {
                             //Copied from editor. TODO: move to theme or something
                             corner_radius: 0.15 * layout.size.line_height,
                         };
-                        hr.paint(bounds, scene);
+                        hr.paint(bounds, cx);
                     }
                 }
             });
 
             //Draw the text cells
-            scene.paint_layer(clip_bounds, |scene| {
+            cx.paint_layer(clip_bounds, |cx| {
                 for cell in &layout.cells {
-                    cell.paint(scene, origin, layout, visible_bounds, view, cx);
+                    cell.paint(origin, layout, visible_bounds, view, cx);
                 }
             });
 
             //Draw cursor
             if self.cursor_visible {
                 if let Some(cursor) = &layout.cursor {
-                    scene.paint_layer(clip_bounds, |scene| {
-                        cursor.paint(scene, origin, cx);
+                    cx.paint_layer(clip_bounds, |cx| {
+                        cursor.paint(origin, cx);
                     })
                 }
             }
 
             if let Some(element) = &mut layout.hyperlink_tooltip {
-                element.paint(scene, origin, visible_bounds, view, cx)
+                element.paint(origin, visible_bounds, view, cx)
             }
         });
     }
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index fe3173ac9b92dbe27a4b4c3d36987c8c6b0ab634..d31f0d9749b3af4ac0d36d00803232607d92b842 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -1440,10 +1440,10 @@ impl Pane {
                 None
             };
 
-            Canvas::new(move |scene, bounds, _, _, _| {
+            Canvas::new(move |bounds, _, _, cx| {
                 if let Some(color) = icon_color {
                     let square = RectF::new(bounds.origin(), vec2f(diameter, diameter));
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: square,
                         background: Some(color),
                         border: Default::default(),
@@ -2007,7 +2007,6 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
 
     fn paint(
         &mut self,
-        scene: &mut gpui::SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -2018,14 +2017,14 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
 
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
 
-        scene.push_quad(gpui::Quad {
+        cx.scene().push_quad(gpui::Quad {
             bounds: RectF::new(bounds.origin(), bounds.size()),
             background: Some(background),
             ..Default::default()
         });
 
         let child_view_id = self.child_view;
-        scene.push_mouse_region(
+        cx.scene().push_mouse_region(
             MouseRegion::new::<Self>(child_view_id, 0, visible_bounds).on_down(
                 gpui::platform::MouseButton::Left,
                 move |_, _: &mut V, cx| {
@@ -2035,10 +2034,9 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
             ),
         );
 
-        scene.paint_layer(Some(bounds), |scene| {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx)
-        })
+        cx.scene().push_layer(Some(bounds));
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/workspace/src/pane/dragged_item_receiver.rs b/crates/workspace/src/pane/dragged_item_receiver.rs
index bbe391b5b543dbc698385c10d34f4f6f8e946505..e4d0a636b825b1c8016bf9f013c6ba40e20d71f0 100644
--- a/crates/workspace/src/pane/dragged_item_receiver.rs
+++ b/crates/workspace/src/pane/dragged_item_receiver.rs
@@ -50,7 +50,7 @@ where
         Stack::new()
             .with_child(render_child(state, cx))
             .with_children(drag_position.map(|drag_position| {
-                Canvas::new(move |scene, bounds, _, _, cx| {
+                Canvas::new(move |bounds, _, _, cx| {
                     if bounds.contains_point(drag_position) {
                         let overlay_region = split_margin
                             .and_then(|split_margin| {
@@ -60,14 +60,15 @@ where
                             .map(|(dir, margin)| dir.along_edge(bounds, margin))
                             .unwrap_or(bounds);
 
-                        scene.paint_stacking_context(None, None, |scene| {
-                            scene.push_quad(Quad {
-                                bounds: overlay_region,
-                                background: Some(overlay_color(cx)),
-                                border: Default::default(),
-                                corner_radii: Default::default(),
-                            });
+                        cx.scene().push_stacking_context(None, None);
+                        let background = overlay_color(cx);
+                        cx.scene().push_quad(Quad {
+                            bounds: overlay_region,
+                            background: Some(background),
+                            border: Default::default(),
+                            corner_radii: Default::default(),
                         });
+                        cx.scene().pop_stacking_context();
                     }
                 })
             }))
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index aa6ca143dfc4b982f8d458e19112edfe47c13387..9747bda2d5fe93c39c8bc55c83746f6a1c7e42e3 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -595,7 +595,7 @@ mod element {
         platform::{CursorStyle, MouseButton},
         scene::MouseDrag,
         AnyElement, Axis, CursorRegion, Element, EventContext, LayoutContext, MouseRegion,
-        PaintContext, RectFExt, SceneBuilder, SizeConstraint, Vector2FExt, ViewContext,
+        PaintContext, RectFExt, SizeConstraint, Vector2FExt, ViewContext,
     };
 
     use crate::{
@@ -851,7 +851,6 @@ mod element {
 
         fn paint(
             &mut self,
-            scene: &mut SceneBuilder,
             bounds: RectF,
             visible_bounds: RectF,
             remaining_space: &mut Self::LayoutState,
@@ -863,7 +862,7 @@ mod element {
 
             let overflowing = *remaining_space < 0.;
             if overflowing {
-                scene.push_layer(Some(visible_bounds));
+                cx.scene().push_layer(Some(visible_bounds));
             }
 
             let mut child_origin = bounds.origin();
@@ -874,7 +873,7 @@ mod element {
             let mut children_iter = self.children.iter_mut().enumerate().peekable();
             while let Some((ix, child)) = children_iter.next() {
                 let child_start = child_origin.clone();
-                child.paint(scene, child_origin, visible_bounds, view, cx);
+                child.paint(child_origin, visible_bounds, view, cx);
 
                 bounding_boxes.push(Some(RectF::new(child_origin, child.size())));
 
@@ -884,7 +883,7 @@ mod element {
                 }
 
                 if can_resize && children_iter.peek().is_some() {
-                    scene.push_stacking_context(None, None);
+                    cx.scene().push_stacking_context(None, None);
 
                     let handle_origin = match self.axis {
                         Axis::Horizontal => child_origin - vec2f(HANDLE_HITBOX_SIZE / 2., 0.0),
@@ -907,7 +906,7 @@ mod element {
                         Axis::Vertical => CursorStyle::ResizeUpDown,
                     };
 
-                    scene.push_cursor_region(CursorRegion {
+                    cx.scene().push_cursor_region(CursorRegion {
                         bounds: handle_bounds,
                         style,
                     });
@@ -940,14 +939,14 @@ mod element {
                                 }
                             }
                         });
-                    scene.push_mouse_region(mouse_region);
+                    cx.scene().push_mouse_region(mouse_region);
 
-                    scene.pop_stacking_context();
+                    cx.scene().pop_stacking_context();
                 }
             }
 
             if overflowing {
-                scene.pop_layer();
+                cx.scene().pop_layer();
             }
         }
 
diff --git a/crates/workspace/src/shared_screen.rs b/crates/workspace/src/shared_screen.rs
index 10a466cb61b92fdb98c1114126bc12cc43df0252..7b97174dfee71eb2ea43514f2fea4b26e7a308f0 100644
--- a/crates/workspace/src/shared_screen.rs
+++ b/crates/workspace/src/shared_screen.rs
@@ -73,14 +73,14 @@ impl View for SharedScreen {
 
         let frame = self.frame.clone();
         MouseEventHandler::new::<Focus, _>(0, cx, |_, cx| {
-            Canvas::new(move |scene, bounds, _, _, _| {
+            Canvas::new(move |bounds, _, _, cx| {
                 if let Some(frame) = frame.clone() {
                     let size = constrain_size_preserving_aspect_ratio(
                         bounds.size(),
                         vec2f(frame.width() as f32, frame.height() as f32),
                     );
                     let origin = bounds.origin() + (bounds.size() / 2.) - size / 2.;
-                    scene.push_surface(gpui::platform::mac::Surface {
+                    cx.scene().push_surface(gpui::platform::mac::Surface {
                         bounds: RectF::new(origin, size),
                         image_buffer: frame.image(),
                     });
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
index 81925f309030a6217c2ce0fa2796fd0f249bbbcc..c05b93ff9559bcd98714f4660e1e4e8f9b227393 100644
--- a/crates/workspace/src/status_bar.rs
+++ b/crates/workspace/src/status_bar.rs
@@ -8,8 +8,8 @@ use gpui::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    AnyElement, AnyViewHandle, Entity, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    Subscription, View, ViewContext, ViewHandle, WindowContext,
+    AnyElement, AnyViewHandle, Entity, LayoutContext, PaintContext, SizeConstraint, Subscription,
+    View, ViewContext, ViewHandle, WindowContext,
 };
 
 pub trait StatusItemView: View {
@@ -226,7 +226,6 @@ impl Element<StatusBar> for StatusBarElement {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -237,12 +236,10 @@ impl Element<StatusBar> for StatusBarElement {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
 
         let left_origin = vec2f(bounds.lower_left().x(), origin_y);
-        self.left
-            .paint(scene, left_origin, visible_bounds, view, cx);
+        self.left.paint(left_origin, visible_bounds, view, cx);
 
         let right_origin = vec2f(bounds.upper_right().x() - self.right.size().x(), origin_y);
-        self.right
-            .paint(scene, right_origin, visible_bounds, view, cx);
+        self.right.paint(right_origin, visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index be8148256d0b0f294bbeeafbcfb59e47ec4862d7..953a52928173601c962307074746fd8717755215 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3626,13 +3626,13 @@ fn notify_of_new_dock(workspace: &WeakViewHandle<Workspace>, cx: &mut AsyncAppCo
                             "Looking for the dock? Try ctrl-`!\nshift-escape now zooms your pane.",
                             text,
                         )
-                        .with_custom_runs(vec![26..32, 34..46], |_, bounds, scene, cx| {
+                        .with_custom_runs(vec![26..32, 34..46], |_, bounds, cx| {
                             let code_span_background_color = settings::get::<ThemeSettings>(cx)
                                 .theme
                                 .editor
                                 .document_highlight_read_background;
 
-                            scene.push_quad(gpui::Quad {
+                            cx.scene().push_quad(gpui::Quad {
                                 bounds,
                                 background: Some(code_span_background_color),
                                 border: Default::default(),

From ebf8b32811e0481257c508d2cec7a439fa0cb3aa Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Fri, 8 Sep 2023 16:08:31 -0600
Subject: [PATCH 074/109] Checkpoint

---
 crates/collab_ui/src/collab_panel.rs          |   8 +-
 crates/collab_ui/src/collab_titlebar_item.rs  |   9 +-
 crates/collab_ui/src/face_pile.rs             |  10 +-
 crates/editor/src/element.rs                  | 365 ++++++++----------
 crates/editor/src/hover_popover.rs            |   8 +-
 crates/gpui/examples/corner_radii.rs          |  25 +-
 crates/gpui/examples/text.rs                  |   6 +-
 crates/gpui/src/app.rs                        |  11 +
 crates/gpui/src/app/window.rs                 |  13 +-
 crates/gpui/src/elements.rs                   |  20 +-
 crates/gpui/src/elements/align.rs             |   5 +-
 crates/gpui/src/elements/canvas.rs            |   9 +-
 crates/gpui/src/elements/clipped.rs           |  14 +-
 crates/gpui/src/elements/component.rs         |   7 +-
 crates/gpui/src/elements/constrained_box.rs   |  11 +-
 crates/gpui/src/elements/container.rs         |  29 +-
 crates/gpui/src/elements/empty.rs             |   3 +-
 crates/gpui/src/elements/expanded.rs          |   7 +-
 crates/gpui/src/elements/flex.rs              |  23 +-
 crates/gpui/src/elements/hook.rs              |   6 +-
 crates/gpui/src/elements/image.rs             |   8 +-
 crates/gpui/src/elements/keystroke_label.rs   |   3 +-
 crates/gpui/src/elements/label.rs             |  11 +-
 crates/gpui/src/elements/list.rs              |  30 +-
 .../gpui/src/elements/mouse_event_handler.rs  |  31 +-
 crates/gpui/src/elements/overlay.rs           |  39 +-
 crates/gpui/src/elements/resizable.rs         | 111 +++---
 crates/gpui/src/elements/stack.rs             |   9 +-
 crates/gpui/src/elements/svg.rs               |   7 +-
 crates/gpui/src/elements/text.rs              |  20 +-
 crates/gpui/src/elements/tooltip.rs           |  10 +-
 crates/gpui/src/elements/uniform_list.rs      |  11 +-
 crates/gpui/src/scene.rs                      |  65 ++--
 crates/gpui/src/text_layout.rs                |  21 +-
 crates/gpui2/src/adapter.rs                   |   3 +-
 crates/gpui2/src/elements/div.rs              |   6 +-
 crates/gpui2/src/elements/img.rs              |   2 +-
 crates/gpui2/src/elements/svg.rs              |   2 +-
 crates/gpui2/src/elements/text.rs             |   8 +-
 crates/gpui2/src/paint_context.rs             |  10 +-
 crates/gpui2/src/style.rs                     |   4 +-
 crates/gpui_macros/src/gpui_macros.rs         |   3 +-
 crates/terminal_view/src/terminal_element.rs  |  44 +--
 crates/workspace/src/pane.rs                  |  16 +-
 .../src/pane/dragged_item_receiver.rs         |  17 +-
 crates/workspace/src/pane_group.rs            |  17 +-
 crates/workspace/src/shared_screen.rs         |   4 +-
 crates/workspace/src/status_bar.rs            |  11 +-
 crates/workspace/src/workspace.rs             |   4 +-
 49 files changed, 490 insertions(+), 626 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index fba10c61bad9b31b145e3b515423891bedae6972..8e0252ec608a6e113db5b39fefb86b99e95ed07c 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2434,14 +2434,14 @@ fn render_tree_branch(
     let cap_height = row_style.cap_height(font_cache);
     let baseline_offset = row_style.baseline_offset(font_cache) + (size.y() - line_height) / 2.;
 
-    Canvas::new(move |scene, bounds, _, _, _| {
-        scene.paint_layer(None, |scene| {
+    Canvas::new(move |bounds, _, _, cx| {
+        cx.paint_layer(None, |cx| {
             let start_x = bounds.min_x() + (bounds.width() / 2.) - (branch_style.width / 2.);
             let end_x = bounds.max_x();
             let start_y = bounds.min_y();
             let end_y = bounds.min_y() + baseline_offset - (cap_height / 2.);
 
-            scene.push_quad(gpui::Quad {
+            cx.scene().push_quad(gpui::Quad {
                 bounds: RectF::from_points(
                     vec2f(start_x, start_y),
                     vec2f(
@@ -2453,7 +2453,7 @@ fn render_tree_branch(
                 border: gpui::Border::default(),
                 corner_radii: (0.).into(),
             });
-            scene.push_quad(gpui::Quad {
+            cx.scene().push_quad(gpui::Quad {
                 bounds: RectF::from_points(
                     vec2f(start_x, end_y),
                     vec2f(end_x, end_y + branch_style.width),
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 6c34b7021ee37b51843015642f6f5f05166868ed..8f3a434a830a3adc254302ae38e60357c8d3d4a1 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -13,8 +13,8 @@ use gpui::{
     geometry::{rect::RectF, vector::vec2f, PathBuilder},
     json::{self, ToJson},
     platform::{CursorStyle, MouseButton},
-    AppContext, Entity, ImageData, LayoutContext, ModelHandle, PaintContext, SceneBuilder,
-    Subscription, View, ViewContext, ViewHandle, WeakViewHandle,
+    AppContext, Entity, ImageData, LayoutContext, ModelHandle, PaintContext, Subscription, View,
+    ViewContext, ViewHandle, WeakViewHandle,
 };
 use picker::PickerEvent;
 use project::{Project, RepositoryEntry};
@@ -1172,12 +1172,11 @@ impl Element<CollabTitlebarItem> for AvatarRibbon {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _: RectF,
         _: &mut Self::LayoutState,
         _: &mut CollabTitlebarItem,
-        _: &mut PaintContext<CollabTitlebarItem>,
+        cx: &mut PaintContext<CollabTitlebarItem>,
     ) -> Self::PaintState {
         let mut path = PathBuilder::new();
         path.reset(bounds.lower_left());
@@ -1188,7 +1187,7 @@ impl Element<CollabTitlebarItem> for AvatarRibbon {
         path.line_to(bounds.upper_right() - vec2f(bounds.height(), 0.));
         path.curve_to(bounds.lower_right(), bounds.upper_right());
         path.line_to(bounds.lower_left());
-        scene.push_path(path.build(self.color, None));
+        cx.scene().push_path(path.build(self.color, None));
     }
 
     fn rect_for_text_range(
diff --git a/crates/collab_ui/src/face_pile.rs b/crates/collab_ui/src/face_pile.rs
index a86b2576869b5d2e3b695ae41d073bf6fa631812..835d730d95ab7471714e04b3ab5ca58d2a5b6800 100644
--- a/crates/collab_ui/src/face_pile.rs
+++ b/crates/collab_ui/src/face_pile.rs
@@ -7,7 +7,7 @@ use gpui::{
     },
     json::ToJson,
     serde_json::{self, json},
-    AnyElement, Axis, Element, LayoutContext, PaintContext, SceneBuilder, View, ViewContext,
+    AnyElement, Axis, Element, LayoutContext, PaintContext, View, ViewContext,
 };
 
 pub(crate) struct FacePile<V: View> {
@@ -53,7 +53,6 @@ impl<V: View> Element<V> for FacePile<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _layout: &mut Self::LayoutState,
@@ -69,9 +68,10 @@ impl<V: View> Element<V> for FacePile<V> {
             let size = face.size();
             origin_x -= size.x();
             let origin_y = origin_y + (bounds.height() - size.y()) / 2.0;
-            scene.paint_layer(None, |scene| {
-                face.paint(scene, vec2f(origin_x, origin_y), visible_bounds, view, cx);
-            });
+
+            cx.scene().push_layer(None);
+            face.paint(vec2f(origin_x, origin_y), visible_bounds, view, cx);
+            cx.scene().pop_layer();
             origin_x += self.overlap;
         }
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 2d157761bfacee8ea1e94ded56b4009d1323fc50..942b4550bcd52417bb431fd1bb62e1628446f258 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -33,7 +33,7 @@ use gpui::{
     platform::{CursorStyle, Modifiers, MouseButton, MouseButtonEvent, MouseMovedEvent},
     text_layout::{self, Line, RunStyle, TextLayoutCache},
     AnyElement, Axis, CursorRegion, Element, EventContext, FontCache, LayoutContext, MouseRegion,
-    PaintContext, Quad, SceneBuilder, SizeConstraint, ViewContext, WindowContext,
+    PaintContext, Quad, SizeConstraint, ViewContext, WindowContext,
 };
 use itertools::Itertools;
 use json::json;
@@ -131,7 +131,6 @@ impl EditorElement {
     }
 
     fn attach_mouse_handlers(
-        scene: &mut SceneBuilder,
         position_map: &Arc<PositionMap>,
         has_popovers: bool,
         visible_bounds: RectF,
@@ -141,124 +140,124 @@ impl EditorElement {
         cx: &mut ViewContext<Editor>,
     ) {
         enum EditorElementMouseHandlers {}
-        scene.push_mouse_region(
-            MouseRegion::new::<EditorElementMouseHandlers>(
-                cx.view_id(),
-                cx.view_id(),
-                visible_bounds,
-            )
-            .on_down(MouseButton::Left, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_down(
-                        editor,
-                        event.platform_event,
-                        position_map.as_ref(),
-                        text_bounds,
-                        gutter_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event();
-                    }
-                }
-            })
-            .on_down(MouseButton::Right, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_right_down(
-                        editor,
-                        event.position,
-                        position_map.as_ref(),
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event();
+        let view_id = cx.view_id();
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<EditorElementMouseHandlers>(view_id, view_id, visible_bounds)
+                .on_down(MouseButton::Left, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_down(
+                            editor,
+                            event.platform_event,
+                            position_map.as_ref(),
+                            text_bounds,
+                            gutter_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event();
+                        }
                     }
-                }
-            })
-            .on_up(MouseButton::Left, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_up(
-                        editor,
-                        event.position,
-                        event.cmd,
-                        event.shift,
-                        event.alt,
-                        position_map.as_ref(),
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                })
+                .on_down(MouseButton::Right, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_right_down(
+                            editor,
+                            event.position,
+                            position_map.as_ref(),
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event();
+                        }
                     }
-                }
-            })
-            .on_drag(MouseButton::Left, {
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if event.end {
-                        return;
+                })
+                .on_up(MouseButton::Left, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_up(
+                            editor,
+                            event.position,
+                            event.cmd,
+                            event.shift,
+                            event.alt,
+                            position_map.as_ref(),
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
                     }
+                })
+                .on_drag(MouseButton::Left, {
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if event.end {
+                            return;
+                        }
 
-                    if !Self::mouse_dragged(
-                        editor,
-                        event.platform_event,
-                        position_map.as_ref(),
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                        if !Self::mouse_dragged(
+                            editor,
+                            event.platform_event,
+                            position_map.as_ref(),
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
                     }
-                }
-            })
-            .on_move({
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::mouse_moved(
-                        editor,
-                        event.platform_event,
-                        &position_map,
-                        text_bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                })
+                .on_move({
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::mouse_moved(
+                            editor,
+                            event.platform_event,
+                            &position_map,
+                            text_bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
                     }
-                }
-            })
-            .on_move_out(move |_, editor: &mut Editor, cx| {
-                if has_popovers {
-                    hide_hover(editor, cx);
-                }
-            })
-            .on_scroll({
-                let position_map = position_map.clone();
-                move |event, editor, cx| {
-                    if !Self::scroll(
-                        editor,
-                        event.position,
-                        *event.delta.raw(),
-                        event.delta.precise(),
-                        &position_map,
-                        bounds,
-                        cx,
-                    ) {
-                        cx.propagate_event()
+                })
+                .on_move_out(move |_, editor: &mut Editor, cx| {
+                    if has_popovers {
+                        hide_hover(editor, cx);
                     }
-                }
-            }),
+                })
+                .on_scroll({
+                    let position_map = position_map.clone();
+                    move |event, editor, cx| {
+                        if !Self::scroll(
+                            editor,
+                            event.position,
+                            *event.delta.raw(),
+                            event.delta.precise(),
+                            &position_map,
+                            bounds,
+                            cx,
+                        ) {
+                            cx.propagate_event()
+                        }
+                    }
+                }),
         );
 
         enum GutterHandlers {}
-        scene.push_mouse_region(
-            MouseRegion::new::<GutterHandlers>(cx.view_id(), cx.view_id() + 1, gutter_bounds)
-                .on_hover(|hover, editor: &mut Editor, cx| {
+        let view_id = cx.view_id();
+        let region_id = cx.view_id() + 1;
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<GutterHandlers>(view_id, region_id, gutter_bounds).on_hover(
+                |hover, editor: &mut Editor, cx| {
                     editor.gutter_hover(
                         &GutterHover {
                             hovered: hover.started,
                         },
                         cx,
                     );
-                }),
+                },
+            ),
         )
     }
 
@@ -528,21 +527,21 @@ impl EditorElement {
 
     fn paint_background(
         &self,
-        scene: &mut SceneBuilder,
         gutter_bounds: RectF,
         text_bounds: RectF,
         layout: &LayoutState,
+        cx: &mut ViewContext<Editor>,
     ) {
         let bounds = gutter_bounds.union_rect(text_bounds);
         let scroll_top =
             layout.position_map.snapshot.scroll_position().y() * layout.position_map.line_height;
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: gutter_bounds,
             background: Some(self.style.gutter_background),
             border: Border::new(0., Color::transparent_black()).into(),
             corner_radii: Default::default(),
         });
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: text_bounds,
             background: Some(self.style.background),
             border: Border::new(0., Color::transparent_black()).into(),
@@ -570,7 +569,7 @@ impl EditorElement {
                         bounds.width(),
                         layout.position_map.line_height * (end_row - start_row + 1) as f32,
                     );
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: RectF::new(origin, size),
                         background: Some(self.style.active_line_background),
                         border: Border::default().into(),
@@ -590,7 +589,7 @@ impl EditorElement {
                     bounds.width(),
                     layout.position_map.line_height * highlighted_rows.len() as f32,
                 );
-                scene.push_quad(Quad {
+                cx.scene().push_quad(Quad {
                     bounds: RectF::new(origin, size),
                     background: Some(self.style.highlighted_line_background),
                     border: Border::default().into(),
@@ -617,7 +616,7 @@ impl EditorElement {
                 } else {
                     self.style.wrap_guide
                 };
-                scene.push_quad(Quad {
+                cx.scene().push_quad(Quad {
                     bounds: RectF::new(
                         vec2f(x, text_bounds.origin_y()),
                         vec2f(1., text_bounds.height()),
@@ -632,7 +631,6 @@ impl EditorElement {
 
     fn paint_gutter(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut LayoutState,
@@ -650,7 +648,7 @@ impl EditorElement {
         );
 
         if show_gutter {
-            Self::paint_diff_hunks(scene, bounds, layout, cx);
+            Self::paint_diff_hunks(bounds, layout, cx);
         }
 
         for (ix, line) in layout.line_number_layouts.iter().enumerate() {
@@ -661,7 +659,7 @@ impl EditorElement {
                         ix as f32 * line_height - (scroll_top % line_height),
                     );
 
-                line.paint(scene, line_origin, visible_bounds, line_height, cx);
+                line.paint(line_origin, visible_bounds, line_height, cx);
             }
         }
 
@@ -678,7 +676,7 @@ impl EditorElement {
 
                 let indicator_origin = bounds.origin() + position + centering_offset;
 
-                indicator.paint(scene, indicator_origin, visible_bounds, editor, cx);
+                indicator.paint(indicator_origin, visible_bounds, editor, cx);
             }
         }
 
@@ -687,22 +685,11 @@ impl EditorElement {
             let mut y = *row as f32 * line_height - scroll_top;
             x += ((layout.gutter_padding + layout.gutter_margin) - indicator.size().x()) / 2.;
             y += (line_height - indicator.size().y()) / 2.;
-            indicator.paint(
-                scene,
-                bounds.origin() + vec2f(x, y),
-                visible_bounds,
-                editor,
-                cx,
-            );
+            indicator.paint(bounds.origin() + vec2f(x, y), visible_bounds, editor, cx);
         }
     }
 
-    fn paint_diff_hunks(
-        scene: &mut SceneBuilder,
-        bounds: RectF,
-        layout: &mut LayoutState,
-        cx: &mut ViewContext<Editor>,
-    ) {
+    fn paint_diff_hunks(bounds: RectF, layout: &mut LayoutState, cx: &mut ViewContext<Editor>) {
         let diff_style = &theme::current(cx).editor.diff.clone();
         let line_height = layout.position_map.line_height;
 
@@ -721,7 +708,7 @@ impl EditorElement {
                     let highlight_size = vec2f(width * 2., end_y - start_y);
                     let highlight_bounds = RectF::new(highlight_origin, highlight_size);
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: highlight_bounds,
                         background: Some(diff_style.modified),
                         border: Border::new(0., Color::transparent_black()).into(),
@@ -754,7 +741,7 @@ impl EditorElement {
                     let highlight_size = vec2f(width * 2., end_y - start_y);
                     let highlight_bounds = RectF::new(highlight_origin, highlight_size);
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: highlight_bounds,
                         background: Some(diff_style.deleted),
                         border: Border::new(0., Color::transparent_black()).into(),
@@ -776,7 +763,7 @@ impl EditorElement {
             let highlight_size = vec2f(width * 2., end_y - start_y);
             let highlight_bounds = RectF::new(highlight_origin, highlight_size);
 
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: highlight_bounds,
                 background: Some(color),
                 border: Border::new(0., Color::transparent_black()).into(),
@@ -787,7 +774,6 @@ impl EditorElement {
 
     fn paint_text(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut LayoutState,
@@ -804,9 +790,9 @@ impl EditorElement {
         let line_end_overshoot = 0.15 * layout.position_map.line_height;
         let whitespace_setting = editor.buffer.read(cx).settings_at(0, cx).show_whitespaces;
 
-        scene.push_layer(Some(bounds));
+        cx.scene().push_layer(Some(bounds));
 
-        scene.push_cursor_region(CursorRegion {
+        cx.scene().push_cursor_region(CursorRegion {
             bounds,
             style: if !editor.link_go_to_definition_state.definitions.is_empty() {
                 CursorStyle::PointingHand
@@ -819,7 +805,6 @@ impl EditorElement {
             self.style.folds.ellipses.corner_radius_factor * layout.position_map.line_height;
         for (id, range, color) in layout.fold_ranges.iter() {
             self.paint_highlighted_range(
-                scene,
                 range.clone(),
                 *color,
                 fold_corner_radius,
@@ -829,6 +814,7 @@ impl EditorElement {
                 scroll_top,
                 scroll_left,
                 bounds,
+                cx,
             );
 
             for bound in range_to_bounds(
@@ -840,7 +826,7 @@ impl EditorElement {
                 line_end_overshoot,
                 &layout.position_map,
             ) {
-                scene.push_cursor_region(CursorRegion {
+                cx.scene().push_cursor_region(CursorRegion {
                     bounds: bound,
                     style: CursorStyle::PointingHand,
                 });
@@ -851,8 +837,9 @@ impl EditorElement {
                     .to_point(&layout.position_map.snapshot.display_snapshot)
                     .row;
 
-                scene.push_mouse_region(
-                    MouseRegion::new::<FoldMarkers>(cx.view_id(), *id as usize, bound)
+                let view_id = cx.view_id();
+                cx.scene().push_mouse_region(
+                    MouseRegion::new::<FoldMarkers>(view_id, *id as usize, bound)
                         .on_click(MouseButton::Left, move |_, editor: &mut Editor, cx| {
                             editor.unfold_at(&UnfoldAt { buffer_row }, cx)
                         })
@@ -864,7 +851,6 @@ impl EditorElement {
 
         for (range, color) in &layout.highlighted_ranges {
             self.paint_highlighted_range(
-                scene,
                 range.clone(),
                 *color,
                 0.,
@@ -874,6 +860,7 @@ impl EditorElement {
                 scroll_top,
                 scroll_left,
                 bounds,
+                cx,
             );
         }
 
@@ -891,7 +878,6 @@ impl EditorElement {
 
             for selection in selections {
                 self.paint_highlighted_range(
-                    scene,
                     selection.range.clone(),
                     selection_style.selection,
                     corner_radius,
@@ -901,6 +887,7 @@ impl EditorElement {
                     scroll_top,
                     scroll_left,
                     bounds,
+                    cx,
                 );
 
                 if selection.is_local && !selection.range.is_empty() {
@@ -980,7 +967,6 @@ impl EditorElement {
                     layout,
                     row,
                     scroll_top,
-                    scene,
                     content_origin,
                     scroll_left,
                     visible_text_bounds,
@@ -992,14 +978,14 @@ impl EditorElement {
             }
         }
 
-        scene.paint_layer(Some(bounds), |scene| {
-            for cursor in cursors {
-                cursor.paint(scene, content_origin, cx);
-            }
-        });
+        cx.scene().push_layer(Some(bounds));
+        for cursor in cursors {
+            cursor.paint(content_origin, cx);
+        }
+        cx.scene().pop_layer();
 
         if let Some((position, context_menu)) = layout.context_menu.as_mut() {
-            scene.push_stacking_context(None, None);
+            cx.scene().push_stacking_context(None, None);
             let cursor_row_layout =
                 &layout.position_map.line_layouts[(position.row() - start_row) as usize].line;
             let x = cursor_row_layout.x_for_index(position.column() as usize) - scroll_left;
@@ -1019,18 +1005,17 @@ impl EditorElement {
             }
 
             context_menu.paint(
-                scene,
                 list_origin,
                 RectF::from_points(Vector2F::zero(), vec2f(f32::MAX, f32::MAX)), // Let content bleed outside of editor
                 editor,
                 cx,
             );
 
-            scene.pop_stacking_context();
+            cx.scene().pop_stacking_context();
         }
 
         if let Some((position, hover_popovers)) = layout.hover_popovers.as_mut() {
-            scene.push_stacking_context(None, None);
+            cx.scene().push_stacking_context(None, None);
 
             // This is safe because we check on layout whether the required row is available
             let hovered_row_layout =
@@ -1061,7 +1046,6 @@ impl EditorElement {
                     }
 
                     hover_popover.paint(
-                        scene,
                         popover_origin,
                         RectF::from_points(Vector2F::zero(), vec2f(f32::MAX, f32::MAX)), // Let content bleed outside of editor
                         editor,
@@ -1083,7 +1067,6 @@ impl EditorElement {
                     }
 
                     hover_popover.paint(
-                        scene,
                         popover_origin,
                         RectF::from_points(Vector2F::zero(), vec2f(f32::MAX, f32::MAX)), // Let content bleed outside of editor
                         editor,
@@ -1094,10 +1077,10 @@ impl EditorElement {
                 }
             }
 
-            scene.pop_stacking_context();
+            cx.scene().pop_stacking_context();
         }
 
-        scene.pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn scrollbar_left(&self, bounds: &RectF) -> f32 {
@@ -1106,11 +1089,10 @@ impl EditorElement {
 
     fn paint_scrollbar(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         layout: &mut LayoutState,
-        cx: &mut ViewContext<Editor>,
         editor: &Editor,
+        cx: &mut ViewContext<Editor>,
     ) {
         enum ScrollbarMouseHandlers {}
         if layout.mode != EditorMode::Full {
@@ -1147,7 +1129,7 @@ impl EditorElement {
         let thumb_bounds = RectF::from_points(vec2f(left, thumb_top), vec2f(right, thumb_bottom));
 
         if layout.show_scrollbars {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: track_bounds,
                 border: style.track.border.into(),
                 background: style.track.background_color,
@@ -1177,7 +1159,7 @@ impl EditorElement {
                     }
                     let bounds = RectF::from_points(vec2f(left, start_y), vec2f(right, end_y));
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds,
                         background: Some(color),
                         border: border.into(),
@@ -1237,7 +1219,7 @@ impl EditorElement {
                         left: true,
                     };
 
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds,
                         background: Some(color),
                         border: border.into(),
@@ -1246,7 +1228,7 @@ impl EditorElement {
                 }
             }
 
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: thumb_bounds,
                 border: style.thumb.border.into(),
                 background: style.thumb.background_color,
@@ -1254,12 +1236,13 @@ impl EditorElement {
             });
         }
 
-        scene.push_cursor_region(CursorRegion {
+        cx.scene().push_cursor_region(CursorRegion {
             bounds: track_bounds,
             style: CursorStyle::Arrow,
         });
-        scene.push_mouse_region(
-            MouseRegion::new::<ScrollbarMouseHandlers>(cx.view_id(), cx.view_id(), track_bounds)
+        let region_id = cx.view_id();
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<ScrollbarMouseHandlers>(region_id, region_id, track_bounds)
                 .on_move(move |event, editor: &mut Editor, cx| {
                     if event.pressed_button.is_none() {
                         editor.scroll_manager.show_scrollbar(cx);
@@ -1305,7 +1288,6 @@ impl EditorElement {
     #[allow(clippy::too_many_arguments)]
     fn paint_highlighted_range(
         &self,
-        scene: &mut SceneBuilder,
         range: Range<DisplayPoint>,
         color: Color,
         corner_radius: f32,
@@ -1315,6 +1297,7 @@ impl EditorElement {
         scroll_top: f32,
         scroll_left: f32,
         bounds: RectF,
+        cx: &mut ViewContext<Editor>,
     ) {
         let start_row = layout.visible_display_row_range.start;
         let end_row = layout.visible_display_row_range.end;
@@ -1358,13 +1341,12 @@ impl EditorElement {
                     .collect(),
             };
 
-            highlighted_range.paint(bounds, scene);
+            highlighted_range.paint(bounds, cx);
         }
     }
 
     fn paint_blocks(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut LayoutState,
@@ -1384,9 +1366,7 @@ impl EditorElement {
             if !matches!(block.style, BlockStyle::Sticky) {
                 origin += vec2f(-scroll_left, 0.);
             }
-            block
-                .element
-                .paint(scene, origin, visible_bounds, editor, cx);
+            block.element.paint(origin, visible_bounds, editor, cx);
         }
     }
 
@@ -2022,7 +2002,6 @@ impl LineWithInvisibles {
         layout: &LayoutState,
         row: u32,
         scroll_top: f32,
-        scene: &mut SceneBuilder,
         content_origin: Vector2F,
         scroll_left: f32,
         visible_text_bounds: RectF,
@@ -2035,7 +2014,6 @@ impl LineWithInvisibles {
         let line_y = row as f32 * line_height - scroll_top;
 
         self.line.paint(
-            scene,
             content_origin + vec2f(-scroll_left, line_y),
             visible_text_bounds,
             line_height,
@@ -2049,7 +2027,6 @@ impl LineWithInvisibles {
             scroll_left,
             line_y,
             row,
-            scene,
             visible_bounds,
             line_height,
             whitespace_setting,
@@ -2065,7 +2042,6 @@ impl LineWithInvisibles {
         scroll_left: f32,
         line_y: f32,
         row: u32,
-        scene: &mut SceneBuilder,
         visible_bounds: RectF,
         line_height: f32,
         whitespace_setting: ShowWhitespaceSetting,
@@ -2097,7 +2073,7 @@ impl LineWithInvisibles {
                     continue;
                 }
             }
-            invisible_symbol.paint(scene, origin, visible_bounds, line_height, cx);
+            invisible_symbol.paint(origin, visible_bounds, line_height, cx);
         }
     }
 }
@@ -2590,7 +2566,6 @@ impl Element<Editor> for EditorElement {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -2598,7 +2573,7 @@ impl Element<Editor> for EditorElement {
         cx: &mut PaintContext<Editor>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
-        scene.push_layer(Some(visible_bounds));
+        cx.scene().push_layer(Some(visible_bounds));
 
         let gutter_bounds = RectF::new(bounds.origin(), layout.gutter_size);
         let text_bounds = RectF::new(
@@ -2607,7 +2582,6 @@ impl Element<Editor> for EditorElement {
         );
 
         Self::attach_mouse_handlers(
-            scene,
             &layout.position_map,
             layout.hover_popovers.is_some(),
             visible_bounds,
@@ -2617,20 +2591,19 @@ impl Element<Editor> for EditorElement {
             cx,
         );
 
-        self.paint_background(scene, gutter_bounds, text_bounds, layout);
+        self.paint_background(gutter_bounds, text_bounds, layout, cx);
         if layout.gutter_size.x() > 0. {
-            self.paint_gutter(scene, gutter_bounds, visible_bounds, layout, editor, cx);
+            self.paint_gutter(gutter_bounds, visible_bounds, layout, editor, cx);
         }
-        self.paint_text(scene, text_bounds, visible_bounds, layout, editor, cx);
+        self.paint_text(text_bounds, visible_bounds, layout, editor, cx);
 
-        scene.push_layer(Some(bounds));
+        cx.scene().push_layer(Some(bounds));
         if !layout.blocks.is_empty() {
-            self.paint_blocks(scene, bounds, visible_bounds, layout, editor, cx);
+            self.paint_blocks(bounds, visible_bounds, layout, editor, cx);
         }
-        self.paint_scrollbar(scene, bounds, layout, cx, &editor);
-        scene.pop_layer();
-
-        scene.pop_layer();
+        self.paint_scrollbar(bounds, layout, &editor, cx);
+        cx.scene().pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
@@ -2873,7 +2846,7 @@ impl Cursor {
         )
     }
 
-    pub fn paint(&self, scene: &mut SceneBuilder, origin: Vector2F, cx: &mut WindowContext) {
+    pub fn paint(&self, origin: Vector2F, cx: &mut WindowContext) {
         let bounds = match self.shape {
             CursorShape::Bar => RectF::new(self.origin + origin, vec2f(2.0, self.line_height)),
             CursorShape::Block | CursorShape::Hollow => RectF::new(
@@ -2888,14 +2861,14 @@ impl Cursor {
 
         //Draw background or border quad
         if matches!(self.shape, CursorShape::Hollow) {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds,
                 background: None,
                 border: Border::all(1., self.color).into(),
                 corner_radii: Default::default(),
             });
         } else {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds,
                 background: Some(self.color),
                 border: Default::default(),
@@ -2904,7 +2877,7 @@ impl Cursor {
         }
 
         if let Some(block_text) = &self.block_text {
-            block_text.paint(scene, self.origin + origin, bounds, self.line_height, cx);
+            block_text.paint(self.origin + origin, bounds, self.line_height, cx);
         }
     }
 
@@ -2929,17 +2902,17 @@ pub struct HighlightedRangeLine {
 }
 
 impl HighlightedRange {
-    pub fn paint(&self, bounds: RectF, scene: &mut SceneBuilder) {
+    pub fn paint(&self, bounds: RectF, cx: &mut WindowContext) {
         if self.lines.len() >= 2 && self.lines[0].start_x > self.lines[1].end_x {
-            self.paint_lines(self.start_y, &self.lines[0..1], bounds, scene);
+            self.paint_lines(self.start_y, &self.lines[0..1], bounds, cx);
             self.paint_lines(
                 self.start_y + self.line_height,
                 &self.lines[1..],
                 bounds,
-                scene,
+                cx,
             );
         } else {
-            self.paint_lines(self.start_y, &self.lines, bounds, scene);
+            self.paint_lines(self.start_y, &self.lines, bounds, cx);
         }
     }
 
@@ -2948,7 +2921,7 @@ impl HighlightedRange {
         start_y: f32,
         lines: &[HighlightedRangeLine],
         bounds: RectF,
-        scene: &mut SceneBuilder,
+        cx: &mut WindowContext,
     ) {
         if lines.is_empty() {
             return;
@@ -3046,7 +3019,7 @@ impl HighlightedRange {
         }
         path.line_to(first_top_right - top_curve_width);
 
-        scene.push_path(path.build(self.color, Some(bounds)));
+        cx.scene().push_path(path.build(self.color, Some(bounds)));
     }
 }
 
@@ -3368,11 +3341,9 @@ mod tests {
         );
 
         // Don't panic.
-        let mut scene = SceneBuilder::new(1.0);
         let bounds = RectF::new(Default::default(), size);
         editor.update(cx, |editor, cx| {
             element.paint(
-                &mut scene,
                 bounds,
                 bounds,
                 &mut state,
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 2f278ce262f6dd3e0910b022e6956f26c9bdfa6b..3d5b1d21134c90554cbb273f7d058e3db621ad07 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -691,15 +691,15 @@ impl InfoPopover {
                         .with_highlights(rendered_content.highlights.clone())
                         .with_custom_runs(
                             rendered_content.region_ranges.clone(),
-                            move |ix, bounds, scene, _| {
+                            move |ix, bounds, cx| {
                                 region_id += 1;
                                 let region = regions[ix].clone();
                                 if let Some(url) = region.link_url {
-                                    scene.push_cursor_region(CursorRegion {
+                                    cx.scene().push_cursor_region(CursorRegion {
                                         bounds,
                                         style: CursorStyle::PointingHand,
                                     });
-                                    scene.push_mouse_region(
+                                    cx.scene().push_mouse_region(
                                         MouseRegion::new::<Self>(view_id, region_id, bounds)
                                             .on_click::<Editor, _>(
                                                 MouseButton::Left,
@@ -708,7 +708,7 @@ impl InfoPopover {
                                     );
                                 }
                                 if region.code {
-                                    scene.push_quad(gpui::Quad {
+                                    cx.scene().push_quad(gpui::Quad {
                                         bounds,
                                         background: Some(code_span_background_color),
                                         border: Default::default(),
diff --git a/crates/gpui/examples/corner_radii.rs b/crates/gpui/examples/corner_radii.rs
index 1f33917529e55545a2d290699b255b1587cf32c5..8e5393e31a1428e0cc79d27f1f9e21d4cf0307c6 100644
--- a/crates/gpui/examples/corner_radii.rs
+++ b/crates/gpui/examples/corner_radii.rs
@@ -49,22 +49,21 @@ impl<V: View> gpui::Element<V> for CornersElement {
 
     fn paint(
         &mut self,
-        scene: &mut gpui::SceneBuilder,
         bounds: pathfinder_geometry::rect::RectF,
         _: pathfinder_geometry::rect::RectF,
         _: &mut Self::LayoutState,
         _: &mut V,
-        _: &mut gpui::PaintContext<V>,
+        cx: &mut gpui::PaintContext<V>,
     ) -> Self::PaintState {
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds,
             background: Some(Color::white()),
             ..Default::default()
         });
 
-        scene.push_layer(None);
+        cx.scene().push_layer(None);
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(100., 100.), vec2f(100., 100.)),
             background: Some(Color::red()),
             border: Default::default(),
@@ -74,7 +73,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(200., 100.), vec2f(100., 100.)),
             background: Some(Color::green()),
             border: Default::default(),
@@ -84,7 +83,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(100., 200.), vec2f(100., 100.)),
             background: Some(Color::blue()),
             border: Default::default(),
@@ -94,7 +93,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(200., 200.), vec2f(100., 100.)),
             background: Some(Color::yellow()),
             border: Default::default(),
@@ -104,7 +103,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.push_shadow(Shadow {
+        cx.scene().push_shadow(Shadow {
             bounds: RectF::new(vec2f(400., 100.), vec2f(100., 100.)),
             corner_radii: gpui::scene::CornerRadii {
                 bottom_right: 20.,
@@ -114,8 +113,8 @@ impl<V: View> gpui::Element<V> for CornersElement {
             color: Color::black(),
         });
 
-        scene.push_layer(None);
-        scene.push_quad(Quad {
+        cx.scene().push_layer(None);
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(vec2f(400., 100.), vec2f(100., 100.)),
             background: Some(Color::red()),
             border: Default::default(),
@@ -125,8 +124,8 @@ impl<V: View> gpui::Element<V> for CornersElement {
             },
         });
 
-        scene.pop_layer();
-        scene.pop_layer();
+        cx.scene().pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/examples/text.rs b/crates/gpui/examples/text.rs
index bda70a49dc00954c5872d580c4dbadb58ce86e42..bc62d75ec26e4a4f8a1b6a95fa60dddf28298dd8 100644
--- a/crates/gpui/examples/text.rs
+++ b/crates/gpui/examples/text.rs
@@ -62,12 +62,12 @@ impl gpui::View for TextView {
             },
         )
         .with_highlights(vec![(17..26, underline), (34..40, underline)])
-        .with_custom_runs(vec![(17..26), (34..40)], move |ix, bounds, scene, _| {
-            scene.push_cursor_region(CursorRegion {
+        .with_custom_runs(vec![(17..26), (34..40)], move |ix, bounds, cx| {
+            cx.scene().push_cursor_region(CursorRegion {
                 bounds,
                 style: CursorStyle::PointingHand,
             });
-            scene.push_mouse_region(
+            cx.scene().push_mouse_region(
                 MouseRegion::new::<Self>(view_id, ix, bounds).on_click::<Self, _>(
                     MouseButton::Left,
                     move |_, _, _| {
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 34af24030768df600a735ac9fdb02dcb6d7cb14c..7f2af36a90f1872f7b4b3017984663160cf7185e 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -28,6 +28,7 @@ use collections::{hash_map::Entry, BTreeMap, HashMap, HashSet, VecDeque};
 use derive_more::Deref;
 pub use menu::*;
 use parking_lot::Mutex;
+use pathfinder_geometry::rect::RectF;
 use platform::Event;
 use postage::oneshot;
 #[cfg(any(test, feature = "test-support"))]
@@ -3571,6 +3572,16 @@ impl<'a, 'b, 'c, V> PaintContext<'a, 'b, 'c, V> {
     pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>) -> Self {
         Self { view_context }
     }
+
+    pub fn paint_layer<F, R>(&mut self, clip_bounds: Option<RectF>, f: F) -> R
+    where
+        F: FnOnce(&mut Self) -> R,
+    {
+        self.scene().push_layer(clip_bounds);
+        let result = f(self);
+        self.scene().pop_layer();
+        result
+    }
 }
 
 impl<'a, 'b, 'c, V> Deref for PaintContext<'a, 'b, 'c, V> {
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 27ccbdcf7a29a9add172eb7d5c0f55ac10f0f481..63462abad991dd6d4f7a3abb72c494cfd86cedec 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -55,6 +55,7 @@ pub struct Window {
     pub(crate) invalidation: Option<WindowInvalidation>,
     pub(crate) platform_window: Box<dyn platform::Window>,
     pub(crate) rendered_views: HashMap<usize, Box<dyn AnyRootElement>>,
+    scene: SceneBuilder,
     pub(crate) text_style_stack: Vec<TextStyle>,
     pub(crate) theme_stack: Vec<Box<dyn Any>>,
     pub(crate) new_parents: HashMap<usize, usize>,
@@ -98,6 +99,7 @@ impl Window {
             inspector_enabled: false,
             platform_window,
             rendered_views: Default::default(),
+            scene: SceneBuilder::new(),
             text_style_stack: Vec::new(),
             theme_stack: Vec::new(),
             new_parents: HashMap::default(),
@@ -241,6 +243,10 @@ impl<'a> WindowContext<'a> {
             .push_back(Effect::RepaintWindow { window });
     }
 
+    pub fn scene(&mut self) -> &mut SceneBuilder {
+        &mut self.window.scene
+    }
+
     pub fn enable_inspector(&mut self) {
         self.window.inspector_enabled = true;
     }
@@ -1080,9 +1086,7 @@ impl<'a> WindowContext<'a> {
         let root_view_id = self.window.root_view().id();
         let mut rendered_root = self.window.rendered_views.remove(&root_view_id).unwrap();
 
-        let mut scene_builder = SceneBuilder::new(scale_factor);
         rendered_root.paint(
-            &mut scene_builder,
             Vector2F::zero(),
             RectF::from_points(Vector2F::zero(), window_size),
             self,
@@ -1092,7 +1096,7 @@ impl<'a> WindowContext<'a> {
             .insert(root_view_id, rendered_root);
 
         self.window.text_layout_cache.finish_frame();
-        let mut scene = scene_builder.build();
+        let mut scene = self.window.scene.build(scale_factor);
         self.window.cursor_regions = scene.cursor_regions();
         self.window.mouse_regions = scene.mouse_regions();
         self.window.event_handlers = scene.take_event_handlers();
@@ -1696,7 +1700,6 @@ impl<V: 'static> Element<V> for ChildView {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -1705,7 +1708,7 @@ impl<V: 'static> Element<V> for ChildView {
     ) {
         if let Some(mut rendered_view) = cx.window.rendered_views.remove(&self.view_id) {
             rendered_view
-                .paint(scene, bounds.origin(), visible_bounds, cx)
+                .paint(bounds.origin(), visible_bounds, cx)
                 .log_err();
             cx.window.rendered_views.insert(self.view_id, rendered_view);
         } else {
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index 790581eb9f4af667618db984e51836c37e064bca..9924db0f1a9657e0fe3108ae351c7fc223731759 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -34,8 +34,8 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    json, Action, Entity, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, TypeTag, View,
-    ViewContext, WeakViewHandle, WindowContext,
+    json, Action, Entity, LayoutContext, PaintContext, SizeConstraint, TypeTag, View, ViewContext,
+    WeakViewHandle, WindowContext,
 };
 use anyhow::{anyhow, Result};
 use core::panic;
@@ -64,7 +64,6 @@ pub trait Element<V: 'static>: 'static {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -265,7 +264,6 @@ trait AnyElementState<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
@@ -346,7 +344,6 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
@@ -361,7 +358,6 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
             } => {
                 let bounds = RectF::new(origin, size);
                 let paint = element.paint(
-                    scene,
                     bounds,
                     visible_bounds,
                     &mut layout,
@@ -386,7 +382,6 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
             } => {
                 let bounds = RectF::new(origin, bounds.size());
                 let paint = element.paint(
-                    scene,
                     bounds,
                     visible_bounds,
                     &mut layout,
@@ -522,13 +517,12 @@ impl<V> AnyElement<V> {
 
     pub fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        self.state.paint(scene, origin, visible_bounds, view, cx);
+        self.state.paint(origin, visible_bounds, view, cx);
     }
 
     pub fn rect_for_text_range(
@@ -584,14 +578,13 @@ impl<V: 'static> Element<V> for AnyElement<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
@@ -647,7 +640,6 @@ pub trait AnyRootElement {
     fn layout(&mut self, constraint: SizeConstraint, cx: &mut WindowContext) -> Result<Vector2F>;
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         cx: &mut WindowContext,
@@ -675,7 +667,6 @@ impl<V: View> AnyRootElement for RootElement<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         cx: &mut WindowContext,
@@ -687,8 +678,7 @@ impl<V: View> AnyRootElement for RootElement<V> {
 
         view.update(cx, |view, cx| {
             let mut cx = PaintContext::new(cx);
-            self.element
-                .paint(scene, origin, visible_bounds, view, &mut cx);
+            self.element.paint(origin, visible_bounds, view, &mut cx);
             Ok(())
         })
     }
diff --git a/crates/gpui/src/elements/align.rs b/crates/gpui/src/elements/align.rs
index 1312c336fb352751e06be7310648dffae62c7e27..e79b37299d3380232cdfda11109b65f8ed1a5451 100644
--- a/crates/gpui/src/elements/align.rs
+++ b/crates/gpui/src/elements/align.rs
@@ -1,7 +1,6 @@
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use json::ToJson;
 
@@ -65,7 +64,6 @@ impl<V: 'static> Element<V> for Align<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -79,7 +77,6 @@ impl<V: 'static> Element<V> for Align<V> {
         let child_target = child_center + child_center * self.alignment;
 
         self.child.paint(
-            scene,
             bounds.origin() - (child_target - my_target),
             visible_bounds,
             view,
diff --git a/crates/gpui/src/elements/canvas.rs b/crates/gpui/src/elements/canvas.rs
index d169efb3d967705c40bcaca8b0de1222b5c6cad5..93cc0bdfdbb03fbc779dbb4c05cadb8b705819e9 100644
--- a/crates/gpui/src/elements/canvas.rs
+++ b/crates/gpui/src/elements/canvas.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use super::Element;
 use crate::{
     json::{self, json},
-    PaintContext, SceneBuilder, ViewContext,
+    PaintContext, ViewContext,
 };
 use json::ToJson;
 use pathfinder_geometry::{
@@ -15,7 +15,7 @@ pub struct Canvas<V, F>(F, PhantomData<V>);
 
 impl<V, F> Canvas<V, F>
 where
-    F: FnMut(&mut SceneBuilder, RectF, RectF, &mut V, &mut ViewContext<V>),
+    F: FnMut(RectF, RectF, &mut V, &mut PaintContext<V>),
 {
     pub fn new(f: F) -> Self {
         Self(f, PhantomData)
@@ -24,7 +24,7 @@ where
 
 impl<V: 'static, F> Element<V> for Canvas<V, F>
 where
-    F: 'static + FnMut(&mut SceneBuilder, RectF, RectF, &mut V, &mut ViewContext<V>),
+    F: 'static + FnMut(RectF, RectF, &mut V, &mut PaintContext<V>),
 {
     type LayoutState = ();
     type PaintState = ();
@@ -50,14 +50,13 @@ where
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.0(scene, bounds, visible_bounds, view, cx)
+        self.0(bounds, visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/clipped.rs b/crates/gpui/src/elements/clipped.rs
index 64f22515b3f19a7e779b1322d92bec24451705ab..e521794f3c49a82a124eed3a3d28cef3431b9a64 100644
--- a/crates/gpui/src/elements/clipped.rs
+++ b/crates/gpui/src/elements/clipped.rs
@@ -3,10 +3,7 @@ use std::ops::Range;
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 use serde_json::json;
 
-use crate::{
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
-};
+use crate::{json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext};
 
 pub struct Clipped<V> {
     child: AnyElement<V>,
@@ -33,17 +30,16 @@ impl<V: 'static> Element<V> for Clipped<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        scene.paint_layer(Some(bounds), |scene| {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx)
-        })
+        cx.scene().push_layer(Some(bounds));
+        let state = self.child.paint(bounds.origin(), visible_bounds, view, cx);
+        cx.scene().pop_layer();
+        state
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/component.rs b/crates/gpui/src/elements/component.rs
index c8800d18a16aafde2a8841bbd60a640f907f981e..48f139e7935feab9b1da4f47aa963a232097b92b 100644
--- a/crates/gpui/src/elements/component.rs
+++ b/crates/gpui/src/elements/component.rs
@@ -2,9 +2,7 @@ use std::{any::Any, marker::PhantomData};
 
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 
-use crate::{
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
-};
+use crate::{AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext};
 
 use super::Empty;
 
@@ -300,7 +298,6 @@ impl<V: 'static, C: StatefulComponent<V> + 'static> Element<V> for ComponentAdap
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -310,7 +307,7 @@ impl<V: 'static, C: StatefulComponent<V> + 'static> Element<V> for ComponentAdap
         self.element
             .as_mut()
             .expect("Layout should always be called before paint")
-            .paint(scene, bounds.origin(), visible_bounds, view, cx)
+            .paint(bounds.origin(), visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/constrained_box.rs b/crates/gpui/src/elements/constrained_box.rs
index 495b6c69dc40f80520be12afcb7d412a3015e8d3..fe49bd091987983faba0f3953cd274ac583cc334 100644
--- a/crates/gpui/src/elements/constrained_box.rs
+++ b/crates/gpui/src/elements/constrained_box.rs
@@ -5,8 +5,7 @@ use serde_json::json;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 
 pub struct ConstrainedBox<V> {
@@ -152,17 +151,15 @@ impl<V: 'static> Element<V> for ConstrainedBox<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        scene.paint_layer(Some(visible_bounds), |scene| {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx);
-        })
+        cx.scene().push_layer(Some(visible_bounds));
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/container.rs b/crates/gpui/src/elements/container.rs
index 82bf260fe15dfb8e29c7799a87f8a76d6f1ef6d3..6a0f860594d01099dd709e86388d74cf65c7c5b2 100644
--- a/crates/gpui/src/elements/container.rs
+++ b/crates/gpui/src/elements/container.rs
@@ -10,7 +10,7 @@ use crate::{
     json::ToJson,
     platform::CursorStyle,
     scene::{self, CornerRadii, CursorRegion, Quad},
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -387,7 +387,6 @@ impl<V: 'static> Element<V> for Container<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -400,7 +399,7 @@ impl<V: 'static> Element<V> for Container<V> {
         );
 
         if let Some(shadow) = self.style.shadow.as_ref() {
-            scene.push_shadow(scene::Shadow {
+            cx.scene().push_shadow(scene::Shadow {
                 bounds: quad_bounds + shadow.offset,
                 corner_radii: self.style.corner_radii,
                 sigma: shadow.blur,
@@ -410,7 +409,7 @@ impl<V: 'static> Element<V> for Container<V> {
 
         if let Some(hit_bounds) = quad_bounds.intersection(visible_bounds) {
             if let Some(style) = self.style.cursor {
-                scene.push_cursor_region(CursorRegion {
+                cx.scene().push_cursor_region(CursorRegion {
                     bounds: hit_bounds,
                     style,
                 });
@@ -421,26 +420,25 @@ impl<V: 'static> Element<V> for Container<V> {
             quad_bounds.origin() + vec2f(self.style.padding.left, self.style.padding.top);
 
         if self.style.border.overlay {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.background_color,
                 border: Default::default(),
                 corner_radii: self.style.corner_radii.into(),
             });
 
-            self.child
-                .paint(scene, child_origin, visible_bounds, view, cx);
+            self.child.paint(child_origin, visible_bounds, view, cx);
 
-            scene.push_layer(None);
-            scene.push_quad(Quad {
+            cx.scene().push_layer(None);
+            cx.scene().push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.overlay_color,
                 border: self.style.border.into(),
                 corner_radii: self.style.corner_radii.into(),
             });
-            scene.pop_layer();
+            cx.scene().pop_layer();
         } else {
-            scene.push_quad(Quad {
+            cx.scene().push_quad(Quad {
                 bounds: quad_bounds,
                 background: self.style.background_color,
                 border: self.style.border.into(),
@@ -452,18 +450,17 @@ impl<V: 'static> Element<V> for Container<V> {
                     self.style.border.left_width(),
                     self.style.border.top_width(),
                 );
-            self.child
-                .paint(scene, child_origin, visible_bounds, view, cx);
+            self.child.paint(child_origin, visible_bounds, view, cx);
 
             if self.style.overlay_color.is_some() {
-                scene.push_layer(None);
-                scene.push_quad(Quad {
+                cx.scene().push_layer(None);
+                cx.scene().push_quad(Quad {
                     bounds: quad_bounds,
                     background: self.style.overlay_color,
                     border: Default::default(),
                     corner_radii: self.style.corner_radii.into(),
                 });
-                scene.pop_layer();
+                cx.scene().pop_layer();
             }
         }
     }
diff --git a/crates/gpui/src/elements/empty.rs b/crates/gpui/src/elements/empty.rs
index 04b1c70213489cf0acd3b7b1d8151d45d905441f..021c58ecba61eb5561dc032602387ee58e4bab29 100644
--- a/crates/gpui/src/elements/empty.rs
+++ b/crates/gpui/src/elements/empty.rs
@@ -6,7 +6,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    LayoutContext, PaintContext, SceneBuilder, ViewContext,
+    LayoutContext, PaintContext, ViewContext,
 };
 use crate::{Element, SizeConstraint};
 
@@ -52,7 +52,6 @@ impl<V: 'static> Element<V> for Empty {
 
     fn paint(
         &mut self,
-        _: &mut SceneBuilder,
         _: RectF,
         _: RectF,
         _: &mut Self::LayoutState,
diff --git a/crates/gpui/src/elements/expanded.rs b/crates/gpui/src/elements/expanded.rs
index ad6682d2a9a2ff2ed9b40df489c2d4100c8191a8..0baab03ed875ee6f0ae024a0d9a9224da66d8a61 100644
--- a/crates/gpui/src/elements/expanded.rs
+++ b/crates/gpui/src/elements/expanded.rs
@@ -2,8 +2,7 @@ use std::ops::Range;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use serde_json::json;
 
@@ -57,15 +56,13 @@ impl<V: 'static> Element<V> for Expanded<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/flex.rs b/crates/gpui/src/elements/flex.rs
index 80dfb0625cd581407801148a5df7ee2046eae596..37cb512bd36ba93a9a9c53901013140dbfa9e750 100644
--- a/crates/gpui/src/elements/flex.rs
+++ b/crates/gpui/src/elements/flex.rs
@@ -2,8 +2,8 @@ use std::{any::Any, cell::Cell, f32::INFINITY, ops::Range, rc::Rc};
 
 use crate::{
     json::{self, ToJson, Value},
-    AnyElement, Axis, Element, ElementStateHandle, LayoutContext, PaintContext, SceneBuilder,
-    SizeConstraint, Vector2FExt, ViewContext,
+    AnyElement, Axis, Element, ElementStateHandle, LayoutContext, PaintContext, SizeConstraint,
+    Vector2FExt, ViewContext,
 };
 use pathfinder_geometry::{
     rect::RectF,
@@ -260,7 +260,6 @@ impl<V: 'static> Element<V> for Flex<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         remaining_space: &mut Self::LayoutState,
@@ -272,14 +271,14 @@ impl<V: 'static> Element<V> for Flex<V> {
         let mut remaining_space = *remaining_space;
         let overflowing = remaining_space < 0.;
         if overflowing {
-            scene.push_layer(Some(visible_bounds));
+            cx.scene().push_layer(Some(visible_bounds));
         }
 
-        if let Some(scroll_state) = &self.scroll_state {
-            scene.push_mouse_region(
-                crate::MouseRegion::new::<Self>(scroll_state.1, 0, bounds)
+        if let Some((scroll_state, id)) = &self.scroll_state {
+            let scroll_state = scroll_state.read(cx).clone();
+            cx.scene().push_mouse_region(
+                crate::MouseRegion::new::<Self>(*id, 0, bounds)
                     .on_scroll({
-                        let scroll_state = scroll_state.0.read(cx).clone();
                         let axis = self.axis;
                         move |e, _: &mut V, cx| {
                             if remaining_space < 0. {
@@ -358,7 +357,7 @@ impl<V: 'static> Element<V> for Flex<V> {
                 aligned_child_origin
             };
 
-            child.paint(scene, aligned_child_origin, visible_bounds, view, cx);
+            child.paint(aligned_child_origin, visible_bounds, view, cx);
 
             match self.axis {
                 Axis::Horizontal => child_origin += vec2f(child.size().x() + self.spacing, 0.0),
@@ -367,7 +366,7 @@ impl<V: 'static> Element<V> for Flex<V> {
         }
 
         if overflowing {
-            scene.pop_layer();
+            cx.scene().pop_layer();
         }
     }
 
@@ -451,15 +450,13 @@ impl<V: 'static> Element<V> for FlexItem<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx)
+        self.child.paint(bounds.origin(), visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/hook.rs b/crates/gpui/src/elements/hook.rs
index 579c2b682f41f37b19b5e587f8acdf3ea30012c4..c3fa0946f39f4c59b7a3977914d316c8669b6a96 100644
--- a/crates/gpui/src/elements/hook.rs
+++ b/crates/gpui/src/elements/hook.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 
 pub struct Hook<V> {
@@ -47,15 +47,13 @@ impl<V: 'static> Element<V> for Hook<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/image.rs b/crates/gpui/src/elements/image.rs
index aabf5469371ba17f9e34784cfbff5c3c92eb8d96..c1dbe33e68880645251273777143ff522590bfae 100644
--- a/crates/gpui/src/elements/image.rs
+++ b/crates/gpui/src/elements/image.rs
@@ -5,8 +5,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    scene, Element, ImageData, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    scene, Element, ImageData, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -92,15 +91,14 @@ impl<V: 'static> Element<V> for Image {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _: RectF,
         layout: &mut Self::LayoutState,
         _: &mut V,
-        _: &mut PaintContext<V>,
+        cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         if let Some(data) = layout {
-            scene.push_image(scene::Image {
+            cx.scene().push_image(scene::Image {
                 bounds,
                 border: self.style.border.into(),
                 corner_radii: self.style.corner_radius.into(),
diff --git a/crates/gpui/src/elements/keystroke_label.rs b/crates/gpui/src/elements/keystroke_label.rs
index 48a3971658d4ea4ca4d7c866b49d62dd228d92a6..cb473eeb087a239fdaa54176ad65aa46a21995e1 100644
--- a/crates/gpui/src/elements/keystroke_label.rs
+++ b/crates/gpui/src/elements/keystroke_label.rs
@@ -61,14 +61,13 @@ impl<V: 'static> Element<V> for KeystrokeLabel {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         element: &mut AnyElement<V>,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        element.paint(scene, bounds.origin(), visible_bounds, view, cx);
+        element.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/label.rs b/crates/gpui/src/elements/label.rs
index 281c2ce9b8de7736722cdc338e1558b45ef1146d..54d89bdaecedfedbaf1a2aa862867f7ab1af5208 100644
--- a/crates/gpui/src/elements/label.rs
+++ b/crates/gpui/src/elements/label.rs
@@ -8,7 +8,7 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle},
-    Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -158,7 +158,6 @@ impl<V: 'static> Element<V> for Label {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         line: &mut Self::LayoutState,
@@ -166,13 +165,7 @@ impl<V: 'static> Element<V> for Label {
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
-        line.paint(
-            scene,
-            bounds.origin(),
-            visible_bounds,
-            bounds.size().y(),
-            cx,
-        )
+        line.paint(bounds.origin(), visible_bounds, bounds.size().y(), cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index bcb80d8c7ecc60335045e36e664eaccadd5a9c32..e1052e9f8c3daeb7a16263d8cda85550d7442180 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -4,8 +4,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::json,
-    AnyElement, Element, LayoutContext, MouseRegion, PaintContext, SceneBuilder, SizeConstraint,
-    ViewContext,
+    AnyElement, Element, LayoutContext, MouseRegion, PaintContext, SizeConstraint, ViewContext,
 };
 use std::{cell::RefCell, collections::VecDeque, fmt::Debug, ops::Range, rc::Rc};
 use sum_tree::{Bias, SumTree};
@@ -250,7 +249,6 @@ impl<V: 'static> Element<V> for List<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         scroll_top: &mut ListOffset,
@@ -258,9 +256,10 @@ impl<V: 'static> Element<V> for List<V> {
         cx: &mut PaintContext<V>,
     ) {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
-        scene.push_layer(Some(visible_bounds));
-        scene.push_mouse_region(
-            MouseRegion::new::<Self>(cx.view_id(), 0, bounds).on_scroll({
+        cx.scene().push_layer(Some(visible_bounds));
+        let view_id = cx.view_id();
+        cx.scene()
+            .push_mouse_region(MouseRegion::new::<Self>(view_id, 0, bounds).on_scroll({
                 let state = self.state.clone();
                 let height = bounds.height();
                 let scroll_top = scroll_top.clone();
@@ -274,17 +273,14 @@ impl<V: 'static> Element<V> for List<V> {
                         cx,
                     )
                 }
-            }),
-        );
+            }));
 
         let state = &mut *self.state.0.borrow_mut();
         for (element, origin) in state.visible_elements(bounds, scroll_top) {
-            element
-                .borrow_mut()
-                .paint(scene, origin, visible_bounds, view, cx);
+            element.borrow_mut().paint(origin, visible_bounds, view, cx);
         }
 
-        scene.pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
@@ -957,15 +953,7 @@ mod tests {
             (self.size, ())
         }
 
-        fn paint(
-            &mut self,
-            _: &mut SceneBuilder,
-            _: RectF,
-            _: RectF,
-            _: &mut (),
-            _: &mut V,
-            _: &mut PaintContext<V>,
-        ) {
+        fn paint(&mut self, _: RectF, _: RectF, _: &mut (), _: &mut V, _: &mut PaintContext<V>) {
             unimplemented!()
         }
 
diff --git a/crates/gpui/src/elements/mouse_event_handler.rs b/crates/gpui/src/elements/mouse_event_handler.rs
index b1140a696045705a01af7f9f6cba89fc28401394..6e35fb90dd15d206e6a7120dcb6b71d0bfe54ca3 100644
--- a/crates/gpui/src/elements/mouse_event_handler.rs
+++ b/crates/gpui/src/elements/mouse_event_handler.rs
@@ -11,7 +11,7 @@ use crate::{
         MouseHover, MouseMove, MouseMoveOut, MouseScrollWheel, MouseUp, MouseUpOut,
     },
     AnyElement, Element, EventContext, LayoutContext, MouseRegion, MouseState, PaintContext,
-    SceneBuilder, SizeConstraint, TypeTag, ViewContext,
+    SizeConstraint, TypeTag, ViewContext,
 };
 use serde_json::json;
 use std::ops::Range;
@@ -236,26 +236,21 @@ impl<V: 'static> MouseEventHandler<V> {
         .round_out()
     }
 
-    fn paint_regions(
-        &self,
-        scene: &mut SceneBuilder,
-        bounds: RectF,
-        visible_bounds: RectF,
-        cx: &mut ViewContext<V>,
-    ) {
+    fn paint_regions(&self, bounds: RectF, visible_bounds: RectF, cx: &mut ViewContext<V>) {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
         let hit_bounds = self.hit_bounds(visible_bounds);
 
         if let Some(style) = self.cursor_style {
-            scene.push_cursor_region(CursorRegion {
+            cx.scene().push_cursor_region(CursorRegion {
                 bounds: hit_bounds,
                 style,
             });
         }
-        scene.push_mouse_region(
+        let view_id = cx.view_id();
+        cx.scene().push_mouse_region(
             MouseRegion::from_handlers(
                 self.tag,
-                cx.view_id(),
+                view_id,
                 self.region_id,
                 hit_bounds,
                 self.handlers.clone(),
@@ -282,7 +277,6 @@ impl<V: 'static> Element<V> for MouseEventHandler<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -290,16 +284,13 @@ impl<V: 'static> Element<V> for MouseEventHandler<V> {
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         if self.above {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx);
-
-            scene.paint_layer(None, |scene| {
-                self.paint_regions(scene, bounds, visible_bounds, cx);
+            self.child.paint(bounds.origin(), visible_bounds, view, cx);
+            cx.paint_layer(None, |cx| {
+                self.paint_regions(bounds, visible_bounds, cx);
             });
         } else {
-            self.paint_regions(scene, bounds, visible_bounds, cx);
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx);
+            self.paint_regions(bounds, visible_bounds, cx);
+            self.child.paint(bounds.origin(), visible_bounds, view, cx);
         }
     }
 
diff --git a/crates/gpui/src/elements/overlay.rs b/crates/gpui/src/elements/overlay.rs
index 14d19e802c0ea15b314f209418fdaa4f25af5644..f8d4708623c2ffdaf0f54128cced0da6a52bb362 100644
--- a/crates/gpui/src/elements/overlay.rs
+++ b/crates/gpui/src/elements/overlay.rs
@@ -3,8 +3,8 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::ToJson,
-    AnyElement, Axis, Element, LayoutContext, MouseRegion, PaintContext, SceneBuilder,
-    SizeConstraint, ViewContext,
+    AnyElement, Axis, Element, LayoutContext, MouseRegion, PaintContext, SizeConstraint,
+    ViewContext,
 };
 use serde_json::json;
 
@@ -138,7 +138,6 @@ impl<V: 'static> Element<V> for Overlay<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _: RectF,
         size: &mut Self::LayoutState,
@@ -213,25 +212,23 @@ impl<V: 'static> Element<V> for Overlay<V> {
             OverlayFitMode::None => {}
         }
 
-        scene.paint_stacking_context(None, self.z_index, |scene| {
-            if self.hoverable {
-                enum OverlayHoverCapture {}
-                // Block hovers in lower stacking contexts
-                scene.push_mouse_region(MouseRegion::new::<OverlayHoverCapture>(
-                    cx.view_id(),
-                    cx.view_id(),
-                    bounds,
+        cx.scene().push_stacking_context(None, self.z_index);
+        if self.hoverable {
+            enum OverlayHoverCapture {}
+            // Block hovers in lower stacking contexts
+            let view_id = cx.view_id();
+            cx.scene()
+                .push_mouse_region(MouseRegion::new::<OverlayHoverCapture>(
+                    view_id, view_id, bounds,
                 ));
-            }
-
-            self.child.paint(
-                scene,
-                bounds.origin(),
-                RectF::new(Vector2F::zero(), cx.window_size()),
-                view,
-                cx,
-            );
-        });
+        }
+        self.child.paint(
+            bounds.origin(),
+            RectF::new(Vector2F::zero(), cx.window_size()),
+            view,
+            cx,
+        );
+        cx.scene().pop_stacking_context();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/resizable.rs b/crates/gpui/src/elements/resizable.rs
index 3c2febcce34572b2e50ae5ea0077ac339c072fd7..e67ad70304140eea1e7590a1b1bfac1f672fdb85 100644
--- a/crates/gpui/src/elements/resizable.rs
+++ b/crates/gpui/src/elements/resizable.rs
@@ -7,7 +7,7 @@ use serde_json::json;
 use crate::{
     geometry::rect::RectF,
     platform::{CursorStyle, MouseButton},
-    AnyElement, AppContext, Axis, Element, LayoutContext, MouseRegion, PaintContext, SceneBuilder,
+    AnyElement, AppContext, Axis, Element, LayoutContext, MouseRegion, PaintContext,
     SizeConstraint, TypeTag, View, ViewContext,
 };
 
@@ -112,70 +112,70 @@ impl<V: 'static> Element<V> for Resizable<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: pathfinder_geometry::rect::RectF,
         visible_bounds: pathfinder_geometry::rect::RectF,
         constraint: &mut SizeConstraint,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
-        scene.push_stacking_context(None, None);
+        cx.scene().push_stacking_context(None, None);
 
         let handle_region = self.handle_side.of_rect(bounds, self.handle_size);
 
         enum ResizeHandle {}
-        scene.push_mouse_region(
-            MouseRegion::new::<ResizeHandle>(
-                cx.view_id(),
-                self.handle_side as usize,
-                handle_region,
-            )
-            .on_down(MouseButton::Left, |_, _: &mut V, _| {}) // This prevents the mouse down event from being propagated elsewhere
-            .on_click(MouseButton::Left, {
-                let on_resize = self.on_resize.clone();
-                move |click, v, cx| {
-                    if click.click_count == 2 {
-                        on_resize.borrow_mut()(v, None, cx);
+        let view_id = cx.view_id();
+        cx.scene().push_mouse_region(
+            MouseRegion::new::<ResizeHandle>(view_id, self.handle_side as usize, handle_region)
+                .on_down(MouseButton::Left, |_, _: &mut V, _| {}) // This prevents the mouse down event from being propagated elsewhere
+                .on_click(MouseButton::Left, {
+                    let on_resize = self.on_resize.clone();
+                    move |click, v, cx| {
+                        if click.click_count == 2 {
+                            on_resize.borrow_mut()(v, None, cx);
+                        }
                     }
-                }
-            })
-            .on_drag(MouseButton::Left, {
-                let bounds = bounds.clone();
-                let side = self.handle_side;
-                let prev_size = side.relevant_component(bounds.size());
-                let min_size = side.relevant_component(constraint.min);
-                let max_size = side.relevant_component(constraint.max);
-                let on_resize = self.on_resize.clone();
-                let tag = self.tag;
-                move |event, view: &mut V, cx| {
-                    if event.end {
-                        return;
+                })
+                .on_drag(MouseButton::Left, {
+                    let bounds = bounds.clone();
+                    let side = self.handle_side;
+                    let prev_size = side.relevant_component(bounds.size());
+                    let min_size = side.relevant_component(constraint.min);
+                    let max_size = side.relevant_component(constraint.max);
+                    let on_resize = self.on_resize.clone();
+                    let tag = self.tag;
+                    move |event, view: &mut V, cx| {
+                        if event.end {
+                            return;
+                        }
+
+                        let Some((bounds, _)) = get_bounds(tag, cx) else {
+                            return;
+                        };
+
+                        let new_size_raw = match side {
+                            // Handle on top side of element => Element is on bottom
+                            HandleSide::Top => {
+                                bounds.height() + bounds.origin_y() - event.position.y()
+                            }
+                            // Handle on right side of element => Element is on left
+                            HandleSide::Right => event.position.x() - bounds.lower_left().x(),
+                            // Handle on left side of element => Element is on the right
+                            HandleSide::Left => {
+                                bounds.width() + bounds.origin_x() - event.position.x()
+                            }
+                            // Handle on bottom side of element => Element is on the top
+                            HandleSide::Bottom => event.position.y() - bounds.lower_left().y(),
+                        };
+
+                        let new_size = min_size.max(new_size_raw).min(max_size).round();
+                        if new_size != prev_size {
+                            on_resize.borrow_mut()(view, Some(new_size), cx);
+                        }
                     }
-
-                    let Some((bounds, _)) = get_bounds(tag, cx) else {
-                        return;
-                    };
-
-                    let new_size_raw = match side {
-                        // Handle on top side of element => Element is on bottom
-                        HandleSide::Top => bounds.height() + bounds.origin_y() - event.position.y(),
-                        // Handle on right side of element => Element is on left
-                        HandleSide::Right => event.position.x() - bounds.lower_left().x(),
-                        // Handle on left side of element => Element is on the right
-                        HandleSide::Left => bounds.width() + bounds.origin_x() - event.position.x(),
-                        // Handle on bottom side of element => Element is on the top
-                        HandleSide::Bottom => event.position.y() - bounds.lower_left().y(),
-                    };
-
-                    let new_size = min_size.max(new_size_raw).min(max_size).round();
-                    if new_size != prev_size {
-                        on_resize.borrow_mut()(view, Some(new_size), cx);
-                    }
-                }
-            }),
+                }),
         );
 
-        scene.push_cursor_region(crate::CursorRegion {
+        cx.scene().push_cursor_region(crate::CursorRegion {
             bounds: handle_region,
             style: match self.handle_side.axis() {
                 Axis::Horizontal => CursorStyle::ResizeLeftRight,
@@ -183,10 +183,9 @@ impl<V: 'static> Element<V> for Resizable<V> {
             },
         });
 
-        scene.pop_stacking_context();
+        cx.scene().pop_stacking_context();
 
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
@@ -249,7 +248,6 @@ impl<V: View, P: 'static> Element<V> for BoundsProvider<V, P> {
 
     fn paint(
         &mut self,
-        scene: &mut crate::SceneBuilder,
         bounds: pathfinder_geometry::rect::RectF,
         visible_bounds: pathfinder_geometry::rect::RectF,
         _: &mut Self::LayoutState,
@@ -260,8 +258,7 @@ impl<V: View, P: 'static> Element<V> for BoundsProvider<V, P> {
             map.0.insert(TypeTag::new::<P>(), (bounds, visible_bounds));
         });
 
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx)
+        self.child.paint(bounds.origin(), visible_bounds, view, cx)
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/elements/stack.rs b/crates/gpui/src/elements/stack.rs
index e73e2f0b4024c42a0bc583856009fa30c36c5517..72f129b1da3646eb212e98888b6d6e27d61a0a58 100644
--- a/crates/gpui/src/elements/stack.rs
+++ b/crates/gpui/src/elements/stack.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::{self, json, ToJson},
-    AnyElement, Element, LayoutContext, PaintContext, SceneBuilder, SizeConstraint, ViewContext,
+    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
 };
 
 /// Element which renders it's children in a stack on top of each other.
@@ -52,7 +52,6 @@ impl<V: 'static> Element<V> for Stack<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -60,9 +59,9 @@ impl<V: 'static> Element<V> for Stack<V> {
         cx: &mut PaintContext<V>,
     ) -> Self::PaintState {
         for child in &mut self.children {
-            scene.paint_layer(None, |scene| {
-                child.paint(scene, bounds.origin(), visible_bounds, view, cx);
-            });
+            cx.scene().push_layer(None);
+            child.paint(bounds.origin(), visible_bounds, view, cx);
+            cx.scene().pop_layer();
         }
     }
 
diff --git a/crates/gpui/src/elements/svg.rs b/crates/gpui/src/elements/svg.rs
index 0d5bcd59e4a74545f23dd79aa1bd536df505967a..c81e5a2892f43582129c2858411a713e25a3e49b 100644
--- a/crates/gpui/src/elements/svg.rs
+++ b/crates/gpui/src/elements/svg.rs
@@ -7,7 +7,7 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    scene, Element, LayoutContext, SceneBuilder, SizeConstraint, ViewContext,
+    scene, Element, LayoutContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde_derive::Deserialize;
@@ -69,15 +69,14 @@ impl<V: 'static> Element<V> for Svg {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         _visible_bounds: RectF,
         svg: &mut Self::LayoutState,
         _: &mut V,
-        _: &mut PaintContext<V>,
+        cx: &mut PaintContext<V>,
     ) {
         if let Some(svg) = svg.clone() {
-            scene.push_icon(scene::Icon {
+            cx.scene().push_icon(scene::Icon {
                 bounds,
                 svg,
                 path: self.path.clone(),
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 3f5888345604a32138a60c4969e853472d502330..224397d067f2adabd3ff0fa96634f0f2f11152c3 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -7,8 +7,8 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle, ShapedBoundary},
-    AppContext, Element, FontCache, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    TextLayoutCache, ViewContext,
+    Element, FontCache, LayoutContext, PaintContext, SizeConstraint, TextLayoutCache, ViewContext,
+    WindowContext,
 };
 use log::warn;
 use serde_json::json;
@@ -21,7 +21,7 @@ pub struct Text {
     highlights: Option<Box<[(Range<usize>, HighlightStyle)]>>,
     custom_runs: Option<(
         Box<[Range<usize>]>,
-        Box<dyn FnMut(usize, RectF, &mut SceneBuilder, &mut AppContext)>,
+        Box<dyn FnMut(usize, RectF, &mut WindowContext)>,
     )>,
 }
 
@@ -58,7 +58,7 @@ impl Text {
     pub fn with_custom_runs(
         mut self,
         runs: impl Into<Box<[Range<usize>]>>,
-        callback: impl 'static + FnMut(usize, RectF, &mut SceneBuilder, &mut AppContext),
+        callback: impl 'static + FnMut(usize, RectF, &mut WindowContext),
     ) -> Self {
         self.custom_runs = Some((runs.into(), Box::new(callback)));
         self
@@ -166,7 +166,6 @@ impl<V: 'static> Element<V> for Text {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -175,7 +174,7 @@ impl<V: 'static> Element<V> for Text {
     ) -> Self::PaintState {
         let mut origin = bounds.origin();
         let empty = Vec::new();
-        let mut callback = |_, _, _: &mut SceneBuilder, _: &mut AppContext| {};
+        let mut callback = |_, _, _: &mut WindowContext| {};
 
         let mouse_runs;
         let custom_run_callback;
@@ -202,7 +201,6 @@ impl<V: 'static> Element<V> for Text {
             if boundaries.intersects(visible_bounds) {
                 if self.soft_wrap {
                     line.paint_wrapped(
-                        scene,
                         origin,
                         visible_bounds,
                         layout.line_height,
@@ -210,7 +208,7 @@ impl<V: 'static> Element<V> for Text {
                         cx,
                     );
                 } else {
-                    line.paint(scene, origin, visible_bounds, layout.line_height, cx);
+                    line.paint(origin, visible_bounds, layout.line_height, cx);
                 }
             }
 
@@ -248,7 +246,7 @@ impl<V: 'static> Element<V> for Text {
                                     *run_origin,
                                     glyph_origin + vec2f(0., layout.line_height),
                                 );
-                                custom_run_callback(*run_ix, bounds, scene, cx);
+                                custom_run_callback(*run_ix, bounds, cx);
                                 *run_origin =
                                     vec2f(origin.x(), glyph_origin.y() + layout.line_height);
                             }
@@ -264,7 +262,7 @@ impl<V: 'static> Element<V> for Text {
                                     run_origin,
                                     glyph_origin + vec2f(0., layout.line_height),
                                 );
-                                custom_run_callback(run_ix, bounds, scene, cx);
+                                custom_run_callback(run_ix, bounds, cx);
                                 custom_runs.next();
                             }
 
@@ -294,7 +292,7 @@ impl<V: 'static> Element<V> for Text {
                             run_origin,
                             line_end + vec2f(0., layout.line_height),
                         );
-                        custom_run_callback(run_ix, bounds, scene, cx);
+                        custom_run_callback(run_ix, bounds, cx);
                         if end_offset == run_end_offset {
                             custom_runs.next();
                         }
diff --git a/crates/gpui/src/elements/tooltip.rs b/crates/gpui/src/elements/tooltip.rs
index d3a1db713e6af4570cf9754e5ccd58cb7d3fe96a..1c521751f9c5db0b3bebb0788d260deb1851ea2f 100644
--- a/crates/gpui/src/elements/tooltip.rs
+++ b/crates/gpui/src/elements/tooltip.rs
@@ -6,8 +6,8 @@ use crate::{
     fonts::TextStyle,
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    Action, Axis, ElementStateHandle, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    Task, TypeTag, ViewContext,
+    Action, Axis, ElementStateHandle, LayoutContext, PaintContext, SizeConstraint, Task, TypeTag,
+    ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -204,17 +204,15 @@ impl<V: 'static> Element<V> for Tooltip<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
         cx: &mut PaintContext<V>,
     ) {
-        self.child
-            .paint(scene, bounds.origin(), visible_bounds, view, cx);
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
         if let Some(tooltip) = self.tooltip.as_mut() {
-            tooltip.paint(scene, bounds.origin(), visible_bounds, view, cx);
+            tooltip.paint(bounds.origin(), visible_bounds, view, cx);
         }
     }
 
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index c7279d6389623c9b801f09961977e9759b94595b..e75e13438695169a226679ee50cfeaeece782830 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -6,7 +6,7 @@ use crate::{
     },
     json::{self, json},
     platform::ScrollWheelEvent,
-    AnyElement, LayoutContext, MouseRegion, PaintContext, SceneBuilder, ViewContext,
+    AnyElement, LayoutContext, MouseRegion, PaintContext, ViewContext,
 };
 use json::ToJson;
 use std::{cell::RefCell, cmp, ops::Range, rc::Rc};
@@ -272,7 +272,6 @@ impl<V: 'static> Element<V> for UniformList<V> {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -281,9 +280,9 @@ impl<V: 'static> Element<V> for UniformList<V> {
     ) -> Self::PaintState {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
 
-        scene.push_layer(Some(visible_bounds));
+        cx.scene().push_layer(Some(visible_bounds));
 
-        scene.push_mouse_region(
+        cx.scene().push_mouse_region(
             MouseRegion::new::<Self>(self.view_id, 0, visible_bounds).on_scroll({
                 let scroll_max = layout.scroll_max;
                 let state = self.state.clone();
@@ -312,11 +311,11 @@ impl<V: 'static> Element<V> for UniformList<V> {
             );
 
         for item in &mut layout.items {
-            item.paint(scene, item_origin, visible_bounds, view, cx);
+            item.paint(item_origin, visible_bounds, view, cx);
             item_origin += vec2f(0.0, layout.item_height);
         }
 
-        scene.pop_layer();
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index e8b9936d8109c6c3acf22d156e8f360034218f16..59584bf0869fd56723378d5ba8b9dbcaf85ee098 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -26,7 +26,6 @@ pub use mouse_event::*;
 pub use mouse_region::*;
 
 pub struct SceneBuilder {
-    scale_factor: f32,
     stacking_contexts: Vec<StackingContext>,
     active_stacking_context_stack: Vec<usize>,
     /// Used by the gpui2 crate.
@@ -245,43 +244,38 @@ impl Scene {
 }
 
 impl SceneBuilder {
-    pub fn new(scale_factor: f32) -> Self {
-        let stacking_context = StackingContext::new(None, 0);
-        SceneBuilder {
-            scale_factor,
-            stacking_contexts: vec![stacking_context],
-            active_stacking_context_stack: vec![0],
+    pub fn new() -> Self {
+        let mut this = SceneBuilder {
+            stacking_contexts: Vec::new(),
+            active_stacking_context_stack: Vec::new(),
             #[cfg(debug_assertions)]
-            mouse_region_ids: Default::default(),
+            mouse_region_ids: HashSet::default(),
             event_handlers: Vec::new(),
-        }
+        };
+        this.clear();
+        this
     }
 
-    pub fn build(mut self) -> Scene {
-        self.stacking_contexts
-            .sort_by_key(|context| context.z_index);
-        Scene {
-            scale_factor: self.scale_factor,
-            stacking_contexts: self.stacking_contexts,
-            event_handlers: self.event_handlers,
-        }
+    pub fn clear(&mut self) {
+        self.stacking_contexts.clear();
+        self.stacking_contexts.push(StackingContext::new(None, 0));
+        self.active_stacking_context_stack.clear();
+        self.active_stacking_context_stack.push(0);
+        #[cfg(debug_assertions)]
+        self.mouse_region_ids.clear();
     }
 
-    pub fn scale_factor(&self) -> f32 {
-        self.scale_factor
-    }
+    pub fn build(&mut self, scale_factor: f32) -> Scene {
+        let mut stacking_contexts = std::mem::take(&mut self.stacking_contexts);
+        stacking_contexts.sort_by_key(|context| context.z_index);
+        let event_handlers = std::mem::take(&mut self.event_handlers);
+        self.clear();
 
-    pub fn paint_stacking_context<F>(
-        &mut self,
-        clip_bounds: Option<RectF>,
-        z_index: Option<usize>,
-        f: F,
-    ) where
-        F: FnOnce(&mut Self),
-    {
-        self.push_stacking_context(clip_bounds, z_index);
-        f(self);
-        self.pop_stacking_context();
+        Scene {
+            scale_factor,
+            stacking_contexts,
+            event_handlers,
+        }
     }
 
     pub fn push_stacking_context(&mut self, clip_bounds: Option<RectF>, z_index: Option<usize>) {
@@ -297,15 +291,6 @@ impl SceneBuilder {
         assert!(!self.active_stacking_context_stack.is_empty());
     }
 
-    pub fn paint_layer<F>(&mut self, clip_bounds: Option<RectF>, f: F)
-    where
-        F: FnOnce(&mut Self),
-    {
-        self.push_layer(clip_bounds);
-        f(self);
-        self.pop_layer();
-    }
-
     pub fn push_layer(&mut self, clip_bounds: Option<RectF>) {
         self.active_stacking_context().push_layer(clip_bounds);
     }
diff --git a/crates/gpui/src/text_layout.rs b/crates/gpui/src/text_layout.rs
index d287d639abfb27e31c75d23afcf1604f5eb5ab40..97f4b7a12d7a2aa95159dc049e57c6b5a4eb2e21 100644
--- a/crates/gpui/src/text_layout.rs
+++ b/crates/gpui/src/text_layout.rs
@@ -9,7 +9,6 @@ use crate::{
     platform::FontSystem,
     scene,
     window::WindowContext,
-    SceneBuilder,
 };
 use ordered_float::OrderedFloat;
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
@@ -284,7 +283,6 @@ impl Line {
 
     pub fn paint(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         line_height: f32,
@@ -347,7 +345,7 @@ impl Line {
                 }
 
                 if let Some((underline_origin, underline_style)) = finished_underline {
-                    scene.push_underline(scene::Underline {
+                    cx.scene().push_underline(scene::Underline {
                         origin: underline_origin,
                         width: glyph_origin.x() - underline_origin.x(),
                         thickness: underline_style.thickness.into(),
@@ -357,14 +355,14 @@ impl Line {
                 }
 
                 if glyph.is_emoji {
-                    scene.push_image_glyph(scene::ImageGlyph {
+                    cx.scene().push_image_glyph(scene::ImageGlyph {
                         font_id: run.font_id,
                         font_size: self.layout.font_size,
                         id: glyph.id,
                         origin: glyph_origin,
                     });
                 } else {
-                    scene.push_glyph(scene::Glyph {
+                    cx.scene().push_glyph(scene::Glyph {
                         font_id: run.font_id,
                         font_size: self.layout.font_size,
                         id: glyph.id,
@@ -377,7 +375,7 @@ impl Line {
 
         if let Some((underline_start, underline_style)) = underline.take() {
             let line_end_x = origin.x() + self.layout.width;
-            scene.push_underline(scene::Underline {
+            cx.scene().push_underline(scene::Underline {
                 origin: underline_start,
                 width: line_end_x - underline_start.x(),
                 color: underline_style.color.unwrap(),
@@ -389,7 +387,6 @@ impl Line {
 
     pub fn paint_wrapped(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         line_height: f32,
@@ -417,7 +414,7 @@ impl Line {
                 {
                     boundaries.next();
                     if let Some((underline_origin, underline_style)) = underline {
-                        scene.push_underline(scene::Underline {
+                        cx.scene().push_underline(scene::Underline {
                             origin: underline_origin,
                             width: glyph_origin.x() - underline_origin.x(),
                             thickness: underline_style.thickness.into(),
@@ -461,7 +458,7 @@ impl Line {
                 }
 
                 if let Some((underline_origin, underline_style)) = finished_underline {
-                    scene.push_underline(scene::Underline {
+                    cx.scene().push_underline(scene::Underline {
                         origin: underline_origin,
                         width: glyph_origin.x() - underline_origin.x(),
                         thickness: underline_style.thickness.into(),
@@ -477,14 +474,14 @@ impl Line {
                 );
                 if glyph_bounds.intersects(visible_bounds) {
                     if glyph.is_emoji {
-                        scene.push_image_glyph(scene::ImageGlyph {
+                        cx.scene().push_image_glyph(scene::ImageGlyph {
                             font_id: run.font_id,
                             font_size: self.layout.font_size,
                             id: glyph.id,
                             origin: glyph_bounds.origin() + baseline_offset,
                         });
                     } else {
-                        scene.push_glyph(scene::Glyph {
+                        cx.scene().push_glyph(scene::Glyph {
                             font_id: run.font_id,
                             font_size: self.layout.font_size,
                             id: glyph.id,
@@ -498,7 +495,7 @@ impl Line {
 
         if let Some((underline_origin, underline_style)) = underline.take() {
             let line_end_x = glyph_origin.x() + self.layout.width - prev_position;
-            scene.push_underline(scene::Underline {
+            cx.scene().push_underline(scene::Underline {
                 origin: underline_origin,
                 width: line_end_x - underline_origin.x(),
                 thickness: underline_style.thickness.into(),
diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
index d1bc7ac290e3b9ac44eb3e54e8951cbf4a0aba29..e0b5483d06634cee5addd851769dc0ddd2b11281 100644
--- a/crates/gpui2/src/adapter.rs
+++ b/crates/gpui2/src/adapter.rs
@@ -36,7 +36,6 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
 
     fn paint(
         &mut self,
-        scene: &mut gpui::SceneBuilder,
         bounds: RectF,
         _visible_bounds: RectF,
         layout_data: &mut Option<(LayoutEngine, LayoutId)>,
@@ -45,7 +44,7 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
     ) -> Self::PaintState {
         let (layout_engine, layout_id) = layout_data.take().unwrap();
         legacy_cx.push_layout_engine(layout_engine);
-        let mut cx = PaintContext::new(legacy_cx, scene);
+        let mut cx = PaintContext::new(legacy_cx);
         self.0.paint(view, bounds.origin(), &mut cx);
         *layout_data = legacy_cx.pop_layout_engine().zip(Some(layout_id));
         debug_assert!(layout_data.is_some());
diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index f32b22434a87a2db3601af0477d4ae07ab15c379..598b564ab1704e219aa91f519a98b53ef1ae17c7 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -88,7 +88,7 @@ impl<V: 'static> Element<V> for Div<V> {
         // TODO: Support only one dimension being hidden
         let mut pop_layer = false;
         if style.overflow.y != Overflow::Visible || style.overflow.x != Overflow::Visible {
-            cx.scene.push_layer(Some(bounds));
+            cx.scene().push_layer(Some(bounds));
             pop_layer = true;
         }
 
@@ -97,7 +97,7 @@ impl<V: 'static> Element<V> for Div<V> {
         }
 
         if pop_layer {
-            cx.scene.pop_layer();
+            cx.scene().pop_layer();
         }
 
         style.paint_foreground(bounds, cx);
@@ -221,7 +221,7 @@ impl<V: 'static> Div<V> {
         let hovered = bounds.contains_point(cx.mouse_position());
         if hovered {
             let rem_size = cx.rem_size();
-            cx.scene.push_quad(scene::Quad {
+            cx.scene().push_quad(scene::Quad {
                 bounds,
                 background: Some(hsla(0., 0., 1., 0.05).into()),
                 border: gpui::Border {
diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs
index a4934c54155eb649c4b975980b90289832add82e..829a6d111655480b270a3a7d75a86ee579d1b0fb 100644
--- a/crates/gpui2/src/elements/img.rs
+++ b/crates/gpui2/src/elements/img.rs
@@ -70,7 +70,7 @@ impl<V: 'static> Element<V> for Img {
                 .and_then(ResultExt::log_err)
             {
                 let rem_size = cx.rem_size();
-                cx.scene.push_image(scene::Image {
+                cx.scene().push_image(scene::Image {
                     bounds,
                     border: gpui::Border {
                         color: style.border_color.unwrap_or_default().into(),
diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs
index ebf06178aa8c174c63fc65c7adc6e7c694f7ac0e..c17cdbe3c6675c0992a9c9e66d4de47736123620 100644
--- a/crates/gpui2/src/elements/svg.rs
+++ b/crates/gpui2/src/elements/svg.rs
@@ -63,7 +63,7 @@ impl<V: 'static> Element<V> for Svg {
                     color: Rgba::from(fill_color).into(),
                 };
 
-                cx.scene.push_icon(icon);
+                cx.scene().push_icon(icon);
             }
         }
     }
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 97b911201acd4897d5e4c92594de23eb6564f354..3b3acb45231e1ef0678735c51fd0b3aa198da38c 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -92,13 +92,7 @@ impl<V: 'static> Element<V> for Text {
 
         // TODO: We haven't added visible bounds to the new element system yet, so this is a placeholder.
         let visible_bounds = bounds;
-        line.paint(
-            cx.scene,
-            bounds.origin(),
-            visible_bounds,
-            line_height,
-            cx.legacy_cx,
-        );
+        line.paint(bounds.origin(), visible_bounds, line_height, cx.legacy_cx);
     }
 }
 
diff --git a/crates/gpui2/src/paint_context.rs b/crates/gpui2/src/paint_context.rs
index 0760b13cd33396b3d8c14e907c7ea8dc46eca1ae..9f8548d51927b07b80a6dcc6ca8775c8e5c78ba3 100644
--- a/crates/gpui2/src/paint_context.rs
+++ b/crates/gpui2/src/paint_context.rs
@@ -11,15 +11,11 @@ pub struct PaintContext<'a, 'b, 'c, 'd, V> {
     #[deref]
     #[deref_mut]
     pub(crate) legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
-    pub(crate) scene: &'d mut gpui::SceneBuilder,
 }
 
 impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
-    pub fn new(
-        legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
-        scene: &'d mut gpui::SceneBuilder,
-    ) -> Self {
-        Self { legacy_cx, scene }
+    pub fn new(legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>) -> Self {
+        Self { legacy_cx }
     }
 
     pub fn on_event<E: 'static>(
@@ -29,7 +25,7 @@ impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
     ) {
         let view = self.weak_handle();
 
-        self.scene.event_handlers.push(EventHandler {
+        self.scene().event_handlers.push(EventHandler {
             order,
             handler: Rc::new(move |event, window_cx| {
                 if let Some(view) = view.upgrade(window_cx) {
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 790cea6614caf9878060f6d8de60b26451f6df87..8a02dda5d76afd62ee9ae4e0d7262bfefcd190e3 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -167,7 +167,7 @@ impl Style {
     pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
         let rem_size = cx.rem_size();
         if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
-            cx.scene.push_quad(gpui::Quad {
+            cx.scene().push_quad(gpui::Quad {
                 bounds,
                 background: Some(color.into()),
                 corner_radii: self.corner_radii.to_gpui(bounds.size(), rem_size),
@@ -183,7 +183,7 @@ impl Style {
         if let Some(color) = self.border_color {
             let border = self.border_widths.to_pixels(rem_size);
             if !border.is_empty() {
-                cx.scene.push_quad(gpui::Quad {
+                cx.scene().push_quad(gpui::Quad {
                     bounds,
                     background: None,
                     corner_radii: self.corner_radii.to_gpui(bounds.size(), rem_size),
diff --git a/crates/gpui_macros/src/gpui_macros.rs b/crates/gpui_macros/src/gpui_macros.rs
index 16f293afbe286bcf2529125909e317ea5811fa82..b712aace69f493a537ae06bba098e580e87b7c36 100644
--- a/crates/gpui_macros/src/gpui_macros.rs
+++ b/crates/gpui_macros/src/gpui_macros.rs
@@ -338,14 +338,13 @@ pub fn element_derive(input: TokenStream) -> TokenStream {
 
             fn paint(
                 &mut self,
-                scene: &mut gpui::SceneBuilder,
                 bounds: gpui::geometry::rect::RectF,
                 visible_bounds: gpui::geometry::rect::RectF,
                 element: &mut gpui::elements::AnyElement<V>,
                 view: &mut V,
                 cx: &mut gpui::PaintContext<V>,
             ) {
-                element.paint(scene, bounds.origin(), visible_bounds, view, cx);
+                element.paint(bounds.origin(), visible_bounds, view, cx);
             }
 
             fn rect_for_text_range(
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index b3d87f531ad5794b86f4b56dbe307e3078a5ffd3..7892dfe70e64f791db9a28254121e4ea63d96514 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -11,8 +11,8 @@ use gpui::{
     serde_json::json,
     text_layout::{Line, RunStyle},
     AnyElement, Element, EventContext, FontCache, LayoutContext, ModelContext, MouseRegion,
-    PaintContext, Quad, SceneBuilder, SizeConstraint, TextLayoutCache, ViewContext,
-    WeakModelHandle,
+    PaintContext, Quad, SizeConstraint, TextLayoutCache, ViewContext, WeakModelHandle,
+    WindowContext,
 };
 use itertools::Itertools;
 use language::CursorShape;
@@ -86,12 +86,11 @@ impl LayoutCell {
 
     fn paint(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         layout: &LayoutState,
         visible_bounds: RectF,
         _view: &mut TerminalView,
-        cx: &mut ViewContext<TerminalView>,
+        cx: &mut WindowContext,
     ) {
         let pos = {
             let point = self.point;
@@ -102,7 +101,7 @@ impl LayoutCell {
         };
 
         self.text
-            .paint(scene, pos, visible_bounds, layout.size.line_height, cx);
+            .paint(pos, visible_bounds, layout.size.line_height, cx);
     }
 }
 
@@ -132,11 +131,10 @@ impl LayoutRect {
 
     fn paint(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         layout: &LayoutState,
         _view: &mut TerminalView,
-        _cx: &mut ViewContext<TerminalView>,
+        cx: &mut ViewContext<TerminalView>,
     ) {
         let position = {
             let point = self.point;
@@ -150,7 +148,7 @@ impl LayoutRect {
             layout.size.line_height,
         );
 
-        scene.push_quad(Quad {
+        cx.scene().push_quad(Quad {
             bounds: RectF::new(position, size),
             background: Some(self.color),
             border: Default::default(),
@@ -387,7 +385,6 @@ impl TerminalElement {
 
     fn attach_mouse_handlers(
         &self,
-        scene: &mut SceneBuilder,
         origin: Vector2F,
         visible_bounds: RectF,
         mode: TermMode,
@@ -518,7 +515,7 @@ impl TerminalElement {
                 )
         }
 
-        scene.push_mouse_region(region);
+        cx.scene().push_mouse_region(region);
     }
 }
 
@@ -733,7 +730,6 @@ impl Element<TerminalView> for TerminalElement {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
@@ -745,13 +741,13 @@ impl Element<TerminalView> for TerminalElement {
         //Setup element stuff
         let clip_bounds = Some(visible_bounds);
 
-        scene.paint_layer(clip_bounds, |scene| {
+        cx.paint_layer(clip_bounds, |cx| {
             let origin = bounds.origin() + vec2f(layout.gutter, 0.);
 
             // Elements are ephemeral, only at paint time do we know what could be clicked by a mouse
-            self.attach_mouse_handlers(scene, origin, visible_bounds, layout.mode, cx);
+            self.attach_mouse_handlers(origin, visible_bounds, layout.mode, cx);
 
-            scene.push_cursor_region(gpui::CursorRegion {
+            cx.scene().push_cursor_region(gpui::CursorRegion {
                 bounds,
                 style: if layout.hyperlink_tooltip.is_some() {
                     CursorStyle::PointingHand
@@ -760,9 +756,9 @@ impl Element<TerminalView> for TerminalElement {
                 },
             });
 
-            scene.paint_layer(clip_bounds, |scene| {
+            cx.paint_layer(clip_bounds, |cx| {
                 //Start with a background color
-                scene.push_quad(Quad {
+                cx.scene().push_quad(Quad {
                     bounds: RectF::new(bounds.origin(), bounds.size()),
                     background: Some(layout.background_color),
                     border: Default::default(),
@@ -770,12 +766,12 @@ impl Element<TerminalView> for TerminalElement {
                 });
 
                 for rect in &layout.rects {
-                    rect.paint(scene, origin, layout, view, cx)
+                    rect.paint(origin, layout, view, cx);
                 }
             });
 
             //Draw Highlighted Backgrounds
-            scene.paint_layer(clip_bounds, |scene| {
+            cx.paint_layer(clip_bounds, |cx| {
                 for (relative_highlighted_range, color) in layout.relative_highlighted_ranges.iter()
                 {
                     if let Some((start_y, highlighted_range_lines)) =
@@ -789,29 +785,29 @@ impl Element<TerminalView> for TerminalElement {
                             //Copied from editor. TODO: move to theme or something
                             corner_radius: 0.15 * layout.size.line_height,
                         };
-                        hr.paint(bounds, scene);
+                        hr.paint(bounds, cx);
                     }
                 }
             });
 
             //Draw the text cells
-            scene.paint_layer(clip_bounds, |scene| {
+            cx.paint_layer(clip_bounds, |cx| {
                 for cell in &layout.cells {
-                    cell.paint(scene, origin, layout, visible_bounds, view, cx);
+                    cell.paint(origin, layout, visible_bounds, view, cx);
                 }
             });
 
             //Draw cursor
             if self.cursor_visible {
                 if let Some(cursor) = &layout.cursor {
-                    scene.paint_layer(clip_bounds, |scene| {
-                        cursor.paint(scene, origin, cx);
+                    cx.paint_layer(clip_bounds, |cx| {
+                        cursor.paint(origin, cx);
                     })
                 }
             }
 
             if let Some(element) = &mut layout.hyperlink_tooltip {
-                element.paint(scene, origin, visible_bounds, view, cx)
+                element.paint(origin, visible_bounds, view, cx)
             }
         });
     }
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index fe3173ac9b92dbe27a4b4c3d36987c8c6b0ab634..d31f0d9749b3af4ac0d36d00803232607d92b842 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -1440,10 +1440,10 @@ impl Pane {
                 None
             };
 
-            Canvas::new(move |scene, bounds, _, _, _| {
+            Canvas::new(move |bounds, _, _, cx| {
                 if let Some(color) = icon_color {
                     let square = RectF::new(bounds.origin(), vec2f(diameter, diameter));
-                    scene.push_quad(Quad {
+                    cx.scene().push_quad(Quad {
                         bounds: square,
                         background: Some(color),
                         border: Default::default(),
@@ -2007,7 +2007,6 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
 
     fn paint(
         &mut self,
-        scene: &mut gpui::SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -2018,14 +2017,14 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
 
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
 
-        scene.push_quad(gpui::Quad {
+        cx.scene().push_quad(gpui::Quad {
             bounds: RectF::new(bounds.origin(), bounds.size()),
             background: Some(background),
             ..Default::default()
         });
 
         let child_view_id = self.child_view;
-        scene.push_mouse_region(
+        cx.scene().push_mouse_region(
             MouseRegion::new::<Self>(child_view_id, 0, visible_bounds).on_down(
                 gpui::platform::MouseButton::Left,
                 move |_, _: &mut V, cx| {
@@ -2035,10 +2034,9 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
             ),
         );
 
-        scene.paint_layer(Some(bounds), |scene| {
-            self.child
-                .paint(scene, bounds.origin(), visible_bounds, view, cx)
-        })
+        cx.scene().push_layer(Some(bounds));
+        self.child.paint(bounds.origin(), visible_bounds, view, cx);
+        cx.scene().pop_layer();
     }
 
     fn rect_for_text_range(
diff --git a/crates/workspace/src/pane/dragged_item_receiver.rs b/crates/workspace/src/pane/dragged_item_receiver.rs
index bbe391b5b543dbc698385c10d34f4f6f8e946505..e4d0a636b825b1c8016bf9f013c6ba40e20d71f0 100644
--- a/crates/workspace/src/pane/dragged_item_receiver.rs
+++ b/crates/workspace/src/pane/dragged_item_receiver.rs
@@ -50,7 +50,7 @@ where
         Stack::new()
             .with_child(render_child(state, cx))
             .with_children(drag_position.map(|drag_position| {
-                Canvas::new(move |scene, bounds, _, _, cx| {
+                Canvas::new(move |bounds, _, _, cx| {
                     if bounds.contains_point(drag_position) {
                         let overlay_region = split_margin
                             .and_then(|split_margin| {
@@ -60,14 +60,15 @@ where
                             .map(|(dir, margin)| dir.along_edge(bounds, margin))
                             .unwrap_or(bounds);
 
-                        scene.paint_stacking_context(None, None, |scene| {
-                            scene.push_quad(Quad {
-                                bounds: overlay_region,
-                                background: Some(overlay_color(cx)),
-                                border: Default::default(),
-                                corner_radii: Default::default(),
-                            });
+                        cx.scene().push_stacking_context(None, None);
+                        let background = overlay_color(cx);
+                        cx.scene().push_quad(Quad {
+                            bounds: overlay_region,
+                            background: Some(background),
+                            border: Default::default(),
+                            corner_radii: Default::default(),
                         });
+                        cx.scene().pop_stacking_context();
                     }
                 })
             }))
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index aa6ca143dfc4b982f8d458e19112edfe47c13387..9747bda2d5fe93c39c8bc55c83746f6a1c7e42e3 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -595,7 +595,7 @@ mod element {
         platform::{CursorStyle, MouseButton},
         scene::MouseDrag,
         AnyElement, Axis, CursorRegion, Element, EventContext, LayoutContext, MouseRegion,
-        PaintContext, RectFExt, SceneBuilder, SizeConstraint, Vector2FExt, ViewContext,
+        PaintContext, RectFExt, SizeConstraint, Vector2FExt, ViewContext,
     };
 
     use crate::{
@@ -851,7 +851,6 @@ mod element {
 
         fn paint(
             &mut self,
-            scene: &mut SceneBuilder,
             bounds: RectF,
             visible_bounds: RectF,
             remaining_space: &mut Self::LayoutState,
@@ -863,7 +862,7 @@ mod element {
 
             let overflowing = *remaining_space < 0.;
             if overflowing {
-                scene.push_layer(Some(visible_bounds));
+                cx.scene().push_layer(Some(visible_bounds));
             }
 
             let mut child_origin = bounds.origin();
@@ -874,7 +873,7 @@ mod element {
             let mut children_iter = self.children.iter_mut().enumerate().peekable();
             while let Some((ix, child)) = children_iter.next() {
                 let child_start = child_origin.clone();
-                child.paint(scene, child_origin, visible_bounds, view, cx);
+                child.paint(child_origin, visible_bounds, view, cx);
 
                 bounding_boxes.push(Some(RectF::new(child_origin, child.size())));
 
@@ -884,7 +883,7 @@ mod element {
                 }
 
                 if can_resize && children_iter.peek().is_some() {
-                    scene.push_stacking_context(None, None);
+                    cx.scene().push_stacking_context(None, None);
 
                     let handle_origin = match self.axis {
                         Axis::Horizontal => child_origin - vec2f(HANDLE_HITBOX_SIZE / 2., 0.0),
@@ -907,7 +906,7 @@ mod element {
                         Axis::Vertical => CursorStyle::ResizeUpDown,
                     };
 
-                    scene.push_cursor_region(CursorRegion {
+                    cx.scene().push_cursor_region(CursorRegion {
                         bounds: handle_bounds,
                         style,
                     });
@@ -940,14 +939,14 @@ mod element {
                                 }
                             }
                         });
-                    scene.push_mouse_region(mouse_region);
+                    cx.scene().push_mouse_region(mouse_region);
 
-                    scene.pop_stacking_context();
+                    cx.scene().pop_stacking_context();
                 }
             }
 
             if overflowing {
-                scene.pop_layer();
+                cx.scene().pop_layer();
             }
         }
 
diff --git a/crates/workspace/src/shared_screen.rs b/crates/workspace/src/shared_screen.rs
index 10a466cb61b92fdb98c1114126bc12cc43df0252..7b97174dfee71eb2ea43514f2fea4b26e7a308f0 100644
--- a/crates/workspace/src/shared_screen.rs
+++ b/crates/workspace/src/shared_screen.rs
@@ -73,14 +73,14 @@ impl View for SharedScreen {
 
         let frame = self.frame.clone();
         MouseEventHandler::new::<Focus, _>(0, cx, |_, cx| {
-            Canvas::new(move |scene, bounds, _, _, _| {
+            Canvas::new(move |bounds, _, _, cx| {
                 if let Some(frame) = frame.clone() {
                     let size = constrain_size_preserving_aspect_ratio(
                         bounds.size(),
                         vec2f(frame.width() as f32, frame.height() as f32),
                     );
                     let origin = bounds.origin() + (bounds.size() / 2.) - size / 2.;
-                    scene.push_surface(gpui::platform::mac::Surface {
+                    cx.scene().push_surface(gpui::platform::mac::Surface {
                         bounds: RectF::new(origin, size),
                         image_buffer: frame.image(),
                     });
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
index 81925f309030a6217c2ce0fa2796fd0f249bbbcc..c05b93ff9559bcd98714f4660e1e4e8f9b227393 100644
--- a/crates/workspace/src/status_bar.rs
+++ b/crates/workspace/src/status_bar.rs
@@ -8,8 +8,8 @@ use gpui::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    AnyElement, AnyViewHandle, Entity, LayoutContext, PaintContext, SceneBuilder, SizeConstraint,
-    Subscription, View, ViewContext, ViewHandle, WindowContext,
+    AnyElement, AnyViewHandle, Entity, LayoutContext, PaintContext, SizeConstraint, Subscription,
+    View, ViewContext, ViewHandle, WindowContext,
 };
 
 pub trait StatusItemView: View {
@@ -226,7 +226,6 @@ impl Element<StatusBar> for StatusBarElement {
 
     fn paint(
         &mut self,
-        scene: &mut SceneBuilder,
         bounds: RectF,
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
@@ -237,12 +236,10 @@ impl Element<StatusBar> for StatusBarElement {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
 
         let left_origin = vec2f(bounds.lower_left().x(), origin_y);
-        self.left
-            .paint(scene, left_origin, visible_bounds, view, cx);
+        self.left.paint(left_origin, visible_bounds, view, cx);
 
         let right_origin = vec2f(bounds.upper_right().x() - self.right.size().x(), origin_y);
-        self.right
-            .paint(scene, right_origin, visible_bounds, view, cx);
+        self.right.paint(right_origin, visible_bounds, view, cx);
     }
 
     fn rect_for_text_range(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index be8148256d0b0f294bbeeafbcfb59e47ec4862d7..953a52928173601c962307074746fd8717755215 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -3626,13 +3626,13 @@ fn notify_of_new_dock(workspace: &WeakViewHandle<Workspace>, cx: &mut AsyncAppCo
                             "Looking for the dock? Try ctrl-`!\nshift-escape now zooms your pane.",
                             text,
                         )
-                        .with_custom_runs(vec![26..32, 34..46], |_, bounds, scene, cx| {
+                        .with_custom_runs(vec![26..32, 34..46], |_, bounds, cx| {
                             let code_span_background_color = settings::get::<ThemeSettings>(cx)
                                 .theme
                                 .editor
                                 .document_highlight_read_background;
 
-                            scene.push_quad(gpui::Quad {
+                            cx.scene().push_quad(gpui::Quad {
                                 bounds,
                                 background: Some(code_span_background_color),
                                 border: Default::default(),

From ba1c350dad27cc73e0887c243cfc9c7ac2a7ce5b Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 8 Sep 2023 13:55:13 -0600
Subject: [PATCH 075/109] vim: Add ZZ and ZQ

The major change here is a refactoring to allow controling the save
behaviour when closing items, which is pre-work needed for vim command
palette.

For zed-industries/community#1868
---
 assets/keymaps/vim.json                      |  12 ++
 crates/collab/src/tests/integration_tests.rs |   4 +-
 crates/file_finder/src/file_finder.rs        |   9 +-
 crates/terminal_view/src/terminal_view.rs    |   7 +-
 crates/workspace/src/item.rs                 |  10 +-
 crates/workspace/src/pane.rs                 | 198 ++++++++++++++-----
 crates/workspace/src/workspace.rs            |  46 +++--
 crates/zed/src/menus.rs                      |   7 +-
 crates/zed/src/zed.rs                        |  54 +++--
 9 files changed, 258 insertions(+), 89 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 45891adee66385bc748439294bc51cd533eab2ef..b47907783ea1d8397b84a5bbc47b8924a19c285f 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -198,6 +198,18 @@
       "z c": "editor::Fold",
       "z o": "editor::UnfoldLines",
       "z f": "editor::FoldSelectedRanges",
+      "shift-z shift-q": [
+        "pane::CloseActiveItem",
+        {
+          "saveBehavior": "dontSave"
+        }
+      ],
+      "shift-z shift-z": [
+        "pane::CloseActiveItem",
+        {
+          "saveBehavior": "promptOnConflict"
+        }
+      ],
       // Count support
       "1": [
         "vim::Number",
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 8121b0ac91d5021e2830236c1694a24a20cff3b5..405956e5dbd97947fba867c744cb2e109b1d1ec0 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -1530,7 +1530,9 @@ async fn test_host_disconnect(
 
     // Ensure client B is not prompted to save edits when closing window after disconnecting.
     let can_close = workspace_b
-        .update(cx_b, |workspace, cx| workspace.prepare_to_close(true, cx))
+        .update(cx_b, |workspace, cx| {
+            workspace.prepare_to_close(true, workspace::SaveBehavior::PromptOnWrite, cx)
+        })
         .await
         .unwrap();
     assert!(can_close);
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 523d6e8a5caeb9edea4c990237263c66e7d384e4..c2d8cc52b26f7483a40982cac04a96c4c8d92bb0 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1528,8 +1528,13 @@ mod tests {
         let active_pane = cx.read(|cx| workspace.read(cx).active_pane().clone());
         active_pane
             .update(cx, |pane, cx| {
-                pane.close_active_item(&workspace::CloseActiveItem, cx)
-                    .unwrap()
+                pane.close_active_item(
+                    &workspace::CloseActiveItem {
+                        save_behavior: None,
+                    },
+                    cx,
+                )
+                .unwrap()
             })
             .await
             .unwrap();
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 104d181a7b9de60460bafa0f12abac51f4ac22e2..a12f9d3c3c0447b82fde8db18b28d022f1d0cf4c 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -283,7 +283,12 @@ impl TerminalView {
     pub fn deploy_context_menu(&mut self, position: Vector2F, cx: &mut ViewContext<Self>) {
         let menu_entries = vec![
             ContextMenuItem::action("Clear", Clear),
-            ContextMenuItem::action("Close", pane::CloseActiveItem),
+            ContextMenuItem::action(
+                "Close",
+                pane::CloseActiveItem {
+                    save_behavior: None,
+                },
+            ),
         ];
 
         self.context_menu.update(cx, |menu, cx| {
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 4e24c831f4161e6f02478e533a44451f72e7694c..ea747b3a364720c653f91ce7b8bc609750509fe3 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -474,8 +474,14 @@ impl<T: Item> ItemHandle for ViewHandle<T> {
                     for item_event in T::to_item_events(event).into_iter() {
                         match item_event {
                             ItemEvent::CloseItem => {
-                                pane.update(cx, |pane, cx| pane.close_item_by_id(item.id(), cx))
-                                    .detach_and_log_err(cx);
+                                pane.update(cx, |pane, cx| {
+                                    pane.close_item_by_id(
+                                        item.id(),
+                                        crate::SaveBehavior::PromptOnWrite,
+                                        cx,
+                                    )
+                                })
+                                .detach_and_log_err(cx);
                                 return;
                             }
 
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index fe3173ac9b92dbe27a4b4c3d36987c8c6b0ab634..eb78e30e98c3a4322d0d2ebd085d8f3b470bad6f 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -43,6 +43,19 @@ use std::{
 };
 use theme::{Theme, ThemeSettings};
 
+#[derive(PartialEq, Clone, Copy, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub enum SaveBehavior {
+    /// ask before overwriting conflicting files (used by default with %s)
+    PromptOnConflict,
+    /// ask before writing any file that wouldn't be auto-saved (used by default with %w)
+    PromptOnWrite,
+    /// never prompt, write on conflict (used with vim's :w!)
+    SilentlyOverwrite,
+    /// skip all save-related behaviour (used with vim's :cq)
+    DontSave,
+}
+
 #[derive(Clone, Deserialize, PartialEq)]
 pub struct ActivateItem(pub usize);
 
@@ -64,13 +77,17 @@ pub struct CloseItemsToTheRightById {
     pub pane: WeakViewHandle<Pane>,
 }
 
+#[derive(Clone, PartialEq, Debug, Deserialize, Default)]
+pub struct CloseActiveItem {
+    pub save_behavior: Option<SaveBehavior>,
+}
+
 actions!(
     pane,
     [
         ActivatePrevItem,
         ActivateNextItem,
         ActivateLastItem,
-        CloseActiveItem,
         CloseInactiveItems,
         CloseCleanItems,
         CloseItemsToTheLeft,
@@ -86,7 +103,7 @@ actions!(
     ]
 );
 
-impl_actions!(pane, [ActivateItem]);
+impl_actions!(pane, [ActivateItem, CloseActiveItem]);
 
 const MAX_NAVIGATION_HISTORY_LEN: usize = 1024;
 
@@ -696,22 +713,29 @@ impl Pane {
 
     pub fn close_active_item(
         &mut self,
-        _: &CloseActiveItem,
+        action: &CloseActiveItem,
         cx: &mut ViewContext<Self>,
     ) -> Option<Task<Result<()>>> {
         if self.items.is_empty() {
             return None;
         }
         let active_item_id = self.items[self.active_item_index].id();
-        Some(self.close_item_by_id(active_item_id, cx))
+        Some(self.close_item_by_id(
+            active_item_id,
+            action.save_behavior.unwrap_or(SaveBehavior::PromptOnWrite),
+            cx,
+        ))
     }
 
     pub fn close_item_by_id(
         &mut self,
         item_id_to_close: usize,
+        save_behavior: SaveBehavior,
         cx: &mut ViewContext<Self>,
     ) -> Task<Result<()>> {
-        self.close_items(cx, move |view_id| view_id == item_id_to_close)
+        self.close_items(cx, save_behavior, move |view_id| {
+            view_id == item_id_to_close
+        })
     }
 
     pub fn close_inactive_items(
@@ -724,7 +748,11 @@ impl Pane {
         }
 
         let active_item_id = self.items[self.active_item_index].id();
-        Some(self.close_items(cx, move |item_id| item_id != active_item_id))
+        Some(
+            self.close_items(cx, SaveBehavior::PromptOnWrite, move |item_id| {
+                item_id != active_item_id
+            }),
+        )
     }
 
     pub fn close_clean_items(
@@ -737,7 +765,11 @@ impl Pane {
             .filter(|item| !item.is_dirty(cx))
             .map(|item| item.id())
             .collect();
-        Some(self.close_items(cx, move |item_id| item_ids.contains(&item_id)))
+        Some(
+            self.close_items(cx, SaveBehavior::PromptOnWrite, move |item_id| {
+                item_ids.contains(&item_id)
+            }),
+        )
     }
 
     pub fn close_items_to_the_left(
@@ -762,7 +794,9 @@ impl Pane {
             .take_while(|item| item.id() != item_id)
             .map(|item| item.id())
             .collect();
-        self.close_items(cx, move |item_id| item_ids.contains(&item_id))
+        self.close_items(cx, SaveBehavior::PromptOnWrite, move |item_id| {
+            item_ids.contains(&item_id)
+        })
     }
 
     pub fn close_items_to_the_right(
@@ -788,7 +822,9 @@ impl Pane {
             .take_while(|item| item.id() != item_id)
             .map(|item| item.id())
             .collect();
-        self.close_items(cx, move |item_id| item_ids.contains(&item_id))
+        self.close_items(cx, SaveBehavior::PromptOnWrite, move |item_id| {
+            item_ids.contains(&item_id)
+        })
     }
 
     pub fn close_all_items(
@@ -800,12 +836,13 @@ impl Pane {
             return None;
         }
 
-        Some(self.close_items(cx, move |_| true))
+        Some(self.close_items(cx, SaveBehavior::PromptOnWrite, |_| true))
     }
 
     pub fn close_items(
         &mut self,
         cx: &mut ViewContext<Pane>,
+        save_behavior: SaveBehavior,
         should_close: impl 'static + Fn(usize) -> bool,
     ) -> Task<Result<()>> {
         // Find the items to close.
@@ -858,8 +895,15 @@ impl Pane {
                     .any(|id| saved_project_items_ids.insert(*id));
 
                 if should_save
-                    && !Self::save_item(project.clone(), &pane, item_ix, &*item, true, &mut cx)
-                        .await?
+                    && !Self::save_item(
+                        project.clone(),
+                        &pane,
+                        item_ix,
+                        &*item,
+                        save_behavior,
+                        &mut cx,
+                    )
+                    .await?
                 {
                     break;
                 }
@@ -954,13 +998,17 @@ impl Pane {
         pane: &WeakViewHandle<Pane>,
         item_ix: usize,
         item: &dyn ItemHandle,
-        should_prompt_for_save: bool,
+        save_behavior: SaveBehavior,
         cx: &mut AsyncAppContext,
     ) -> Result<bool> {
         const CONFLICT_MESSAGE: &str =
             "This file has changed on disk since you started editing it. Do you want to overwrite it?";
         const DIRTY_MESSAGE: &str = "This file contains unsaved edits. Do you want to save it?";
 
+        if save_behavior == SaveBehavior::DontSave {
+            return Ok(true);
+        }
+
         let (has_conflict, is_dirty, can_save, is_singleton) = cx.read(|cx| {
             (
                 item.has_conflict(cx),
@@ -971,18 +1019,22 @@ impl Pane {
         });
 
         if has_conflict && can_save {
-            let mut answer = pane.update(cx, |pane, cx| {
-                pane.activate_item(item_ix, true, true, cx);
-                cx.prompt(
-                    PromptLevel::Warning,
-                    CONFLICT_MESSAGE,
-                    &["Overwrite", "Discard", "Cancel"],
-                )
-            })?;
-            match answer.next().await {
-                Some(0) => pane.update(cx, |_, cx| item.save(project, cx))?.await?,
-                Some(1) => pane.update(cx, |_, cx| item.reload(project, cx))?.await?,
-                _ => return Ok(false),
+            if save_behavior == SaveBehavior::SilentlyOverwrite {
+                pane.update(cx, |_, cx| item.save(project, cx))?.await?;
+            } else {
+                let mut answer = pane.update(cx, |pane, cx| {
+                    pane.activate_item(item_ix, true, true, cx);
+                    cx.prompt(
+                        PromptLevel::Warning,
+                        CONFLICT_MESSAGE,
+                        &["Overwrite", "Discard", "Cancel"],
+                    )
+                })?;
+                match answer.next().await {
+                    Some(0) => pane.update(cx, |_, cx| item.save(project, cx))?.await?,
+                    Some(1) => pane.update(cx, |_, cx| item.reload(project, cx))?.await?,
+                    _ => return Ok(false),
+                }
             }
         } else if is_dirty && (can_save || is_singleton) {
             let will_autosave = cx.read(|cx| {
@@ -991,7 +1043,7 @@ impl Pane {
                     AutosaveSetting::OnFocusChange | AutosaveSetting::OnWindowChange
                 ) && Self::can_autosave_item(&*item, cx)
             });
-            let should_save = if should_prompt_for_save && !will_autosave {
+            let should_save = if save_behavior == SaveBehavior::PromptOnWrite && !will_autosave {
                 let mut answer = pane.update(cx, |pane, cx| {
                     pane.activate_item(item_ix, true, true, cx);
                     cx.prompt(
@@ -1113,7 +1165,12 @@ impl Pane {
                 AnchorCorner::TopLeft,
                 if is_active_item {
                     vec![
-                        ContextMenuItem::action("Close Active Item", CloseActiveItem),
+                        ContextMenuItem::action(
+                            "Close Active Item",
+                            CloseActiveItem {
+                                save_behavior: None,
+                            },
+                        ),
                         ContextMenuItem::action("Close Inactive Items", CloseInactiveItems),
                         ContextMenuItem::action("Close Clean Items", CloseCleanItems),
                         ContextMenuItem::action("Close Items To The Left", CloseItemsToTheLeft),
@@ -1128,8 +1185,12 @@ impl Pane {
                             move |cx| {
                                 if let Some(pane) = pane.upgrade(cx) {
                                     pane.update(cx, |pane, cx| {
-                                        pane.close_item_by_id(target_item_id, cx)
-                                            .detach_and_log_err(cx);
+                                        pane.close_item_by_id(
+                                            target_item_id,
+                                            SaveBehavior::PromptOnWrite,
+                                            cx,
+                                        )
+                                        .detach_and_log_err(cx);
                                     })
                                 }
                             }
@@ -1278,7 +1339,12 @@ impl Pane {
                                 .on_click(MouseButton::Middle, {
                                     let item_id = item.id();
                                     move |_, pane, cx| {
-                                        pane.close_item_by_id(item_id, cx).detach_and_log_err(cx);
+                                        pane.close_item_by_id(
+                                            item_id,
+                                            SaveBehavior::PromptOnWrite,
+                                            cx,
+                                        )
+                                        .detach_and_log_err(cx);
                                     }
                                 })
                                 .on_down(
@@ -1486,7 +1552,8 @@ impl Pane {
                     cx.window_context().defer(move |cx| {
                         if let Some(pane) = pane.upgrade(cx) {
                             pane.update(cx, |pane, cx| {
-                                pane.close_item_by_id(item_id, cx).detach_and_log_err(cx);
+                                pane.close_item_by_id(item_id, SaveBehavior::PromptOnWrite, cx)
+                                    .detach_and_log_err(cx);
                             });
                         }
                     });
@@ -2089,7 +2156,14 @@ mod tests {
         let pane = workspace.read_with(cx, |workspace, _| workspace.active_pane().clone());
 
         pane.update(cx, |pane, cx| {
-            assert!(pane.close_active_item(&CloseActiveItem, cx).is_none())
+            assert!(pane
+                .close_active_item(
+                    &CloseActiveItem {
+                        save_behavior: None
+                    },
+                    cx
+                )
+                .is_none())
         });
     }
 
@@ -2339,31 +2413,59 @@ mod tests {
         add_labeled_item(&pane, "1", false, cx);
         assert_item_labels(&pane, ["A", "B", "1*", "C", "D"], cx);
 
-        pane.update(cx, |pane, cx| pane.close_active_item(&CloseActiveItem, cx))
-            .unwrap()
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_active_item(
+                &CloseActiveItem {
+                    save_behavior: None,
+                },
+                cx,
+            )
+        })
+        .unwrap()
+        .await
+        .unwrap();
         assert_item_labels(&pane, ["A", "B*", "C", "D"], cx);
 
         pane.update(cx, |pane, cx| pane.activate_item(3, false, false, cx));
         assert_item_labels(&pane, ["A", "B", "C", "D*"], cx);
 
-        pane.update(cx, |pane, cx| pane.close_active_item(&CloseActiveItem, cx))
-            .unwrap()
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_active_item(
+                &CloseActiveItem {
+                    save_behavior: None,
+                },
+                cx,
+            )
+        })
+        .unwrap()
+        .await
+        .unwrap();
         assert_item_labels(&pane, ["A", "B*", "C"], cx);
 
-        pane.update(cx, |pane, cx| pane.close_active_item(&CloseActiveItem, cx))
-            .unwrap()
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_active_item(
+                &CloseActiveItem {
+                    save_behavior: None,
+                },
+                cx,
+            )
+        })
+        .unwrap()
+        .await
+        .unwrap();
         assert_item_labels(&pane, ["A", "C*"], cx);
 
-        pane.update(cx, |pane, cx| pane.close_active_item(&CloseActiveItem, cx))
-            .unwrap()
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_active_item(
+                &CloseActiveItem {
+                    save_behavior: None,
+                },
+                cx,
+            )
+        })
+        .unwrap()
+        .await
+        .unwrap();
         assert_item_labels(&pane, ["A*"], cx);
     }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index be8148256d0b0f294bbeeafbcfb59e47ec4862d7..abbed1fcf0546e7960f4b58de0929616f9e6628b 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1258,7 +1258,7 @@ impl Workspace {
         cx: &mut ViewContext<Self>,
     ) -> Option<Task<Result<()>>> {
         let window = cx.window();
-        let prepare = self.prepare_to_close(false, cx);
+        let prepare = self.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx);
         Some(cx.spawn(|_, mut cx| async move {
             if prepare.await? {
                 window.remove(&mut cx);
@@ -1270,6 +1270,7 @@ impl Workspace {
     pub fn prepare_to_close(
         &mut self,
         quitting: bool,
+        save_behavior: SaveBehavior,
         cx: &mut ViewContext<Self>,
     ) -> Task<Result<bool>> {
         let active_call = self.active_call().cloned();
@@ -1308,13 +1309,15 @@ impl Workspace {
             }
 
             Ok(this
-                .update(&mut cx, |this, cx| this.save_all_internal(true, cx))?
+                .update(&mut cx, |this, cx| {
+                    this.save_all_internal(save_behavior, cx)
+                })?
                 .await?)
         })
     }
 
     fn save_all(&mut self, _: &SaveAll, cx: &mut ViewContext<Self>) -> Option<Task<Result<()>>> {
-        let save_all = self.save_all_internal(false, cx);
+        let save_all = self.save_all_internal(SaveBehavior::PromptOnConflict, cx);
         Some(cx.foreground().spawn(async move {
             save_all.await?;
             Ok(())
@@ -1323,7 +1326,7 @@ impl Workspace {
 
     fn save_all_internal(
         &mut self,
-        should_prompt_to_save: bool,
+        save_behaviour: SaveBehavior,
         cx: &mut ViewContext<Self>,
     ) -> Task<Result<bool>> {
         if self.project.read(cx).is_read_only() {
@@ -1358,7 +1361,7 @@ impl Workspace {
                             &pane,
                             ix,
                             &*item,
-                            should_prompt_to_save,
+                            save_behaviour,
                             &mut cx,
                         )
                         .await?
@@ -1404,7 +1407,7 @@ impl Workspace {
         let close_task = if is_remote || has_worktree || has_dirty_items {
             None
         } else {
-            Some(self.prepare_to_close(false, cx))
+            Some(self.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx))
         };
         let app_state = self.app_state.clone();
 
@@ -4099,7 +4102,7 @@ pub fn restart(_: &Restart, cx: &mut AppContext) {
         // If the user cancels any save prompt, then keep the app open.
         for window in workspace_windows {
             if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
-                workspace.prepare_to_close(true, cx)
+                workspace.prepare_to_close(true, SaveBehavior::PromptOnWrite, cx)
             }) {
                 if !should_close.await? {
                     return Ok(());
@@ -4289,7 +4292,9 @@ mod tests {
         // When there are no dirty items, there's nothing to do.
         let item1 = window.add_view(cx, |_| TestItem::new());
         workspace.update(cx, |w, cx| w.add_item(Box::new(item1.clone()), cx));
-        let task = workspace.update(cx, |w, cx| w.prepare_to_close(false, cx));
+        let task = workspace.update(cx, |w, cx| {
+            w.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx)
+        });
         assert!(task.await.unwrap());
 
         // When there are dirty untitled items, prompt to save each one. If the user
@@ -4304,7 +4309,9 @@ mod tests {
             w.add_item(Box::new(item2.clone()), cx);
             w.add_item(Box::new(item3.clone()), cx);
         });
-        let task = workspace.update(cx, |w, cx| w.prepare_to_close(false, cx));
+        let task = workspace.update(cx, |w, cx| {
+            w.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx)
+        });
         cx.foreground().run_until_parked();
         window.simulate_prompt_answer(2, cx); // cancel
         cx.foreground().run_until_parked();
@@ -4358,7 +4365,9 @@ mod tests {
             let item1_id = item1.id();
             let item3_id = item3.id();
             let item4_id = item4.id();
-            pane.close_items(cx, move |id| [item1_id, item3_id, item4_id].contains(&id))
+            pane.close_items(cx, SaveBehavior::PromptOnWrite, move |id| {
+                [item1_id, item3_id, item4_id].contains(&id)
+            })
         });
         cx.foreground().run_until_parked();
 
@@ -4493,7 +4502,9 @@ mod tests {
         // once for project entry 0, and once for project entry 2. After those two
         // prompts, the task should complete.
 
-        let close = left_pane.update(cx, |pane, cx| pane.close_items(cx, |_| true));
+        let close = left_pane.update(cx, |pane, cx| {
+            pane.close_items(cx, SaveBehavior::PromptOnWrite, move |_| true)
+        });
         cx.foreground().run_until_parked();
         left_pane.read_with(cx, |pane, cx| {
             assert_eq!(
@@ -4609,9 +4620,11 @@ mod tests {
             item.is_dirty = true;
         });
 
-        pane.update(cx, |pane, cx| pane.close_items(cx, move |id| id == item_id))
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_items(cx, SaveBehavior::PromptOnWrite, move |id| id == item_id)
+        })
+        .await
+        .unwrap();
         assert!(!window.has_pending_prompt(cx));
         item.read_with(cx, |item, _| assert_eq!(item.save_count, 5));
 
@@ -4630,8 +4643,9 @@ mod tests {
         item.read_with(cx, |item, _| assert_eq!(item.save_count, 5));
 
         // Ensure autosave is prevented for deleted files also when closing the buffer.
-        let _close_items =
-            pane.update(cx, |pane, cx| pane.close_items(cx, move |id| id == item_id));
+        let _close_items = pane.update(cx, |pane, cx| {
+            pane.close_items(cx, SaveBehavior::PromptOnWrite, move |id| id == item_id)
+        });
         deterministic.run_until_parked();
         assert!(window.has_pending_prompt(cx));
         item.read_with(cx, |item, _| assert_eq!(item.save_count, 5));
diff --git a/crates/zed/src/menus.rs b/crates/zed/src/menus.rs
index 22a260b588e6ae002a6750e94179e5e118ee52a6..6b5f7b3a35868ffc20e9a26bc6b694bbe2a9ecba 100644
--- a/crates/zed/src/menus.rs
+++ b/crates/zed/src/menus.rs
@@ -41,7 +41,12 @@ pub fn menus() -> Vec<Menu<'static>> {
                 MenuItem::action("Save", workspace::Save),
                 MenuItem::action("Save As…", workspace::SaveAs),
                 MenuItem::action("Save All", workspace::SaveAll),
-                MenuItem::action("Close Editor", workspace::CloseActiveItem),
+                MenuItem::action(
+                    "Close Editor",
+                    workspace::CloseActiveItem {
+                        save_behavior: None,
+                    },
+                ),
                 MenuItem::action("Close Window", workspace::CloseWindow),
             ],
         },
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 424bce60f22c804d90df9ab8814992f472b10190..c00bb7ee0d654e625e218737279075ba5363a24d 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -438,7 +438,7 @@ fn quit(_: &Quit, cx: &mut gpui::AppContext) {
         // If the user cancels any save prompt, then keep the app open.
         for window in workspace_windows {
             if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
-                workspace.prepare_to_close(true, cx)
+                workspace.prepare_to_close(true, workspace::SaveBehavior::PromptOnWrite, cx)
             }) {
                 if !should_close.await? {
                     return Ok(());
@@ -733,7 +733,7 @@ mod tests {
     use theme::{ThemeRegistry, ThemeSettings};
     use workspace::{
         item::{Item, ItemHandle},
-        open_new, open_paths, pane, NewFile, SplitDirection, WorkspaceHandle,
+        open_new, open_paths, pane, NewFile, SaveBehavior, SplitDirection, WorkspaceHandle,
     };
 
     #[gpui::test]
@@ -1495,7 +1495,12 @@ mod tests {
 
             pane2_item.downcast::<Editor>().unwrap().downgrade()
         });
-        cx.dispatch_action(window.into(), workspace::CloseActiveItem);
+        cx.dispatch_action(
+            window.into(),
+            workspace::CloseActiveItem {
+                save_behavior: None,
+            },
+        );
 
         cx.foreground().run_until_parked();
         workspace.read_with(cx, |workspace, _| {
@@ -1503,7 +1508,12 @@ mod tests {
             assert_eq!(workspace.active_pane(), &pane_1);
         });
 
-        cx.dispatch_action(window.into(), workspace::CloseActiveItem);
+        cx.dispatch_action(
+            window.into(),
+            workspace::CloseActiveItem {
+                save_behavior: None,
+            },
+        );
         cx.foreground().run_until_parked();
         window.simulate_prompt_answer(1, cx);
         cx.foreground().run_until_parked();
@@ -1661,7 +1671,7 @@ mod tests {
         pane.update(cx, |pane, cx| {
             let editor3_id = editor3.id();
             drop(editor3);
-            pane.close_item_by_id(editor3_id, cx)
+            pane.close_item_by_id(editor3_id, SaveBehavior::PromptOnWrite, cx)
         })
         .await
         .unwrap();
@@ -1696,7 +1706,7 @@ mod tests {
         pane.update(cx, |pane, cx| {
             let editor2_id = editor2.id();
             drop(editor2);
-            pane.close_item_by_id(editor2_id, cx)
+            pane.close_item_by_id(editor2_id, SaveBehavior::PromptOnWrite, cx)
         })
         .await
         .unwrap();
@@ -1852,24 +1862,32 @@ mod tests {
         assert_eq!(active_path(&workspace, cx), Some(file4.clone()));
 
         // Close all the pane items in some arbitrary order.
-        pane.update(cx, |pane, cx| pane.close_item_by_id(file1_item_id, cx))
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_item_by_id(file1_item_id, SaveBehavior::PromptOnWrite, cx)
+        })
+        .await
+        .unwrap();
         assert_eq!(active_path(&workspace, cx), Some(file4.clone()));
 
-        pane.update(cx, |pane, cx| pane.close_item_by_id(file4_item_id, cx))
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_item_by_id(file4_item_id, SaveBehavior::PromptOnWrite, cx)
+        })
+        .await
+        .unwrap();
         assert_eq!(active_path(&workspace, cx), Some(file3.clone()));
 
-        pane.update(cx, |pane, cx| pane.close_item_by_id(file2_item_id, cx))
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_item_by_id(file2_item_id, SaveBehavior::PromptOnWrite, cx)
+        })
+        .await
+        .unwrap();
         assert_eq!(active_path(&workspace, cx), Some(file3.clone()));
 
-        pane.update(cx, |pane, cx| pane.close_item_by_id(file3_item_id, cx))
-            .await
-            .unwrap();
+        pane.update(cx, |pane, cx| {
+            pane.close_item_by_id(file3_item_id, SaveBehavior::PromptOnWrite, cx)
+        })
+        .await
+        .unwrap();
         assert_eq!(active_path(&workspace, cx), None);
 
         // Reopen all the closed items, ensuring they are reopened in the same order

From 4c92172ccac088825c8470b986159d1694787da8 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 8 Sep 2023 16:49:50 -0600
Subject: [PATCH 076/109] Partially roll back refactoring

---
 crates/collab/src/tests/integration_tests.rs |  4 +---
 crates/workspace/src/workspace.rs            | 17 ++++++-----------
 crates/zed/src/zed.rs                        |  2 +-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 405956e5dbd97947fba867c744cb2e109b1d1ec0..8121b0ac91d5021e2830236c1694a24a20cff3b5 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -1530,9 +1530,7 @@ async fn test_host_disconnect(
 
     // Ensure client B is not prompted to save edits when closing window after disconnecting.
     let can_close = workspace_b
-        .update(cx_b, |workspace, cx| {
-            workspace.prepare_to_close(true, workspace::SaveBehavior::PromptOnWrite, cx)
-        })
+        .update(cx_b, |workspace, cx| workspace.prepare_to_close(true, cx))
         .await
         .unwrap();
     assert!(can_close);
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index abbed1fcf0546e7960f4b58de0929616f9e6628b..f0cb94202665112484c6d9bf30a3897f787d559a 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1258,7 +1258,7 @@ impl Workspace {
         cx: &mut ViewContext<Self>,
     ) -> Option<Task<Result<()>>> {
         let window = cx.window();
-        let prepare = self.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx);
+        let prepare = self.prepare_to_close(false, cx);
         Some(cx.spawn(|_, mut cx| async move {
             if prepare.await? {
                 window.remove(&mut cx);
@@ -1270,7 +1270,6 @@ impl Workspace {
     pub fn prepare_to_close(
         &mut self,
         quitting: bool,
-        save_behavior: SaveBehavior,
         cx: &mut ViewContext<Self>,
     ) -> Task<Result<bool>> {
         let active_call = self.active_call().cloned();
@@ -1310,7 +1309,7 @@ impl Workspace {
 
             Ok(this
                 .update(&mut cx, |this, cx| {
-                    this.save_all_internal(save_behavior, cx)
+                    this.save_all_internal(SaveBehavior::PromptOnWrite, cx)
                 })?
                 .await?)
         })
@@ -1407,7 +1406,7 @@ impl Workspace {
         let close_task = if is_remote || has_worktree || has_dirty_items {
             None
         } else {
-            Some(self.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx))
+            Some(self.prepare_to_close(false, cx))
         };
         let app_state = self.app_state.clone();
 
@@ -4102,7 +4101,7 @@ pub fn restart(_: &Restart, cx: &mut AppContext) {
         // If the user cancels any save prompt, then keep the app open.
         for window in workspace_windows {
             if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
-                workspace.prepare_to_close(true, SaveBehavior::PromptOnWrite, cx)
+                workspace.prepare_to_close(true, cx)
             }) {
                 if !should_close.await? {
                     return Ok(());
@@ -4292,9 +4291,7 @@ mod tests {
         // When there are no dirty items, there's nothing to do.
         let item1 = window.add_view(cx, |_| TestItem::new());
         workspace.update(cx, |w, cx| w.add_item(Box::new(item1.clone()), cx));
-        let task = workspace.update(cx, |w, cx| {
-            w.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx)
-        });
+        let task = workspace.update(cx, |w, cx| w.prepare_to_close(false, cx));
         assert!(task.await.unwrap());
 
         // When there are dirty untitled items, prompt to save each one. If the user
@@ -4309,9 +4306,7 @@ mod tests {
             w.add_item(Box::new(item2.clone()), cx);
             w.add_item(Box::new(item3.clone()), cx);
         });
-        let task = workspace.update(cx, |w, cx| {
-            w.prepare_to_close(false, SaveBehavior::PromptOnWrite, cx)
-        });
+        let task = workspace.update(cx, |w, cx| w.prepare_to_close(false, cx));
         cx.foreground().run_until_parked();
         window.simulate_prompt_answer(2, cx); // cancel
         cx.foreground().run_until_parked();
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index c00bb7ee0d654e625e218737279075ba5363a24d..f12dc8a98bb108df5420eb769978a1587aa5b9c3 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -438,7 +438,7 @@ fn quit(_: &Quit, cx: &mut gpui::AppContext) {
         // If the user cancels any save prompt, then keep the app open.
         for window in workspace_windows {
             if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
-                workspace.prepare_to_close(true, workspace::SaveBehavior::PromptOnWrite, cx)
+                workspace.prepare_to_close(true, cx)
             }) {
                 if !should_close.await? {
                     return Ok(());

From 8dd6fcc18625bdeae9280a9fe111a0205ac6fcf5 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Fri, 8 Sep 2023 22:16:12 -0400
Subject: [PATCH 077/109] Add icon_button

---
 crates/storybook/src/component/icon_button.rs | 54 +++++++++++++++++++
 crates/storybook/src/component/mod.rs         |  1 +
 crates/storybook/src/storybook.rs             |  3 +-
 crates/storybook/src/workspace.rs             | 16 +++++-
 4 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 crates/storybook/src/component/icon_button.rs
 create mode 100644 crates/storybook/src/component/mod.rs

diff --git a/crates/storybook/src/component/icon_button.rs b/crates/storybook/src/component/icon_button.rs
new file mode 100644
index 0000000000000000000000000000000000000000..9e8df098be0616b03ac533f6f3455aa10e428d59
--- /dev/null
+++ b/crates/storybook/src/component/icon_button.rs
@@ -0,0 +1,54 @@
+use crate::theme::theme;
+use gpui2::elements::svg;
+use gpui2::style::{StyleHelpers, Styleable};
+use gpui2::{elements::div, IntoElement};
+use gpui2::{Element, ParentElement, ViewContext};
+
+#[derive(Element)]
+struct IconButton {
+    path: &'static str,
+    variant: Variant,
+}
+
+#[derive(PartialEq)]
+pub enum Variant {
+    Ghost,
+    Filled,
+}
+
+pub fn icon_button<V: 'static>(path: &'static str, variant: Variant) -> impl Element<V> {
+    IconButton { path, variant }
+}
+
+impl IconButton {
+    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+        let mut div = div();
+
+        if self.variant == Variant::Filled {
+            div = div.fill(theme.middle.base.default.background);
+        }
+
+        div.w_7()
+            .h_6()
+            .flex()
+            .items_center()
+            .justify_center()
+            .rounded_md()
+            .border()
+            .border_color(theme.middle.base.default.background)
+            .hover()
+            .fill(theme.middle.base.hovered.background)
+            .border_color(theme.middle.variant.hovered.border)
+            .active()
+            .fill(theme.middle.base.pressed.background)
+            .border_color(theme.middle.variant.pressed.border)
+            .child(
+                svg()
+                    .path(self.path)
+                    .w_4()
+                    .h_4()
+                    .fill(theme.middle.variant.default.foreground),
+            )
+    }
+}
diff --git a/crates/storybook/src/component/mod.rs b/crates/storybook/src/component/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e26b06c8ddba01bdc522f6d8c1aa5d6263276be0
--- /dev/null
+++ b/crates/storybook/src/component/mod.rs
@@ -0,0 +1 @@
+pub(crate) mod icon_button;
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 04e1038988fc640d54a2d1d289319af7c832d7c2..7f9aa8667238cc8865027830829985ffaa704436 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -10,6 +10,7 @@ use settings::{default_settings, SettingsStore};
 use simplelog::SimpleLogger;
 
 mod collab_panel;
+mod component;
 mod components;
 mod element_ext;
 mod theme;
@@ -40,7 +41,7 @@ fn main() {
             },
             |cx| {
                 view(|cx| {
-                    cx.enable_inspector();
+                    // cx.enable_inspector();
                     storybook(&mut ViewContext::new(cx))
                 })
             },
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index d9f9c22fcb41f73856c8ebb6be9b0d0024d48780..441a4c68fa1f8078d131f26e97e771d36d2b20ba 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,4 +1,8 @@
-use crate::{collab_panel::collab_panel, theme::theme};
+use crate::{
+    collab_panel::collab_panel,
+    component::icon_button::{icon_button, Variant},
+    theme::theme,
+};
 use gpui2::{
     elements::{div, div::ScrollState, img, svg},
     style::{StyleHelpers, Styleable},
@@ -38,7 +42,15 @@ impl WorkspaceElement {
                     .flex_row()
                     .overflow_hidden()
                     .child(collab_panel(self.left_scroll_state.clone()))
-                    .child(div().h_full().flex_1())
+                    .child(
+                        div().h_full().flex_1().child(
+                            div()
+                                .w_24()
+                                .h_24()
+                                .child(icon_button("icons/plus.svg", Variant::Ghost))
+                                .child(icon_button("icons/x.svg", Variant::Filled)),
+                        ),
+                    )
                     .child(collab_panel(self.right_scroll_state.clone())),
             )
             .child(statusbar())

From 7cc05c99c23bc161650565f2c2c389c86888ac8f Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 8 Sep 2023 23:46:12 -0600
Subject: [PATCH 078/109] Update getting started

Just ran through this again.
---
 README.md | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8849f1aa73f8ef05e52d8a5aaa0fb8f3daa5ad63..72936e274677935dec2f517d263708661d297973 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,31 @@ Welcome to Zed, a lightning-fast, collaborative code editor that makes your drea
 
 ### Dependencies
 
-* Install [Postgres.app](https://postgresapp.com) and start it.
+* Install Xcode from https://apps.apple.com/us/app/xcode/id497799835?mt=12, and accept the license:
+  ```
+  sudo xcodebuild -license
+  ```
+
+* Install homebrew, rust and node
+  ```
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+  brew install rust
+  brew install node
+  ```
+  
+* Ensure rust executables are in your $PATH
+  ```
+  echo $HOME/.cargo/bin | sudo tee /etc/paths.d/10-rust
+  ```
+  
+* Install postgres and configure the database
+  ```
+  brew install postgresql@15
+  brew services start postgresql@15
+  psql -c "CREATE ROLE postgres SUPERUSER LOGIN" postgres
+  psql -U postgres -c "CREATE DATABASE zed"
+  ```
+  
 * Install the `LiveKit` server and the `foreman` process supervisor:
 
     ```
@@ -41,6 +65,17 @@ Welcome to Zed, a lightning-fast, collaborative code editor that makes your drea
     GITHUB_TOKEN=<$token> script/bootstrap
     ```
 
+* Now try running zed with collaboration disabled:
+  ```
+  cargo run
+  ```
+
+### Common errors
+
+* `xcrun: error: unable to find utility "metal", not a developer tool or in PATH`
+  * You need to install Xcode and then run: `xcode-select --switch /Applications/Xcode.app/Contents/Developer`
+  * (see https://github.com/gfx-rs/gfx/issues/2309)
+
 ### Testing against locally-running servers
 
 Start the web and collab servers:

From 5ad9a6bb3c8c198296d62424ae0ef4be08ce4fae Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Sat, 9 Sep 2023 11:29:31 -0400
Subject: [PATCH 079/109] Add docs for `styleable_helpers` proc macros

---
 crates/gpui2_macros/src/styleable_helpers.rs | 163 +++++++++----------
 1 file changed, 81 insertions(+), 82 deletions(-)

diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index ae7b2d3b1b8dcc13eeaacadf00cbe2cfd0cd716c..121e3fe12b78fbc7d5efbb688154198c042a989d 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -28,24 +28,24 @@ fn generate_methods() -> Vec<TokenStream2> {
     let mut methods = Vec::new();
 
     for (prefix, auto_allowed, fields) in box_prefixes() {
-        for (suffix, length_tokens) in box_suffixes() {
+        for (suffix, length_tokens, doc_string) in box_suffixes() {
             if auto_allowed || suffix != "auto" {
-                let method = generate_method(prefix, suffix, &fields, length_tokens);
+                let method = generate_method(prefix, suffix, &fields, length_tokens, doc_string);
                 methods.push(method);
             }
         }
     }
 
     for (prefix, fields) in corner_prefixes() {
-        for (suffix, radius_tokens) in corner_suffixes() {
-            let method = generate_method(prefix, suffix, &fields, radius_tokens);
+        for (suffix, radius_tokens, doc_string) in corner_suffixes() {
+            let method = generate_method(prefix, suffix, &fields, radius_tokens, doc_string);
             methods.push(method);
         }
     }
 
     for (prefix, fields) in border_prefixes() {
-        for (suffix, width_tokens) in border_suffixes() {
-            let method = generate_method(prefix, suffix, &fields, width_tokens);
+        for (suffix, width_tokens, doc_string) in border_suffixes() {
+            let method = generate_method(prefix, suffix, &fields, width_tokens, doc_string);
             methods.push(method);
         }
     }
@@ -58,6 +58,7 @@ fn generate_method(
     suffix: &'static str,
     fields: &Vec<TokenStream2>,
     length_tokens: TokenStream2,
+    doc_string: &'static str,
 ) -> TokenStream2 {
     let method_name = if suffix.is_empty() {
         format_ident!("{}", prefix)
@@ -75,6 +76,7 @@ fn generate_method(
         .collect::<Vec<_>>();
 
     let method = quote! {
+        #[doc = #doc_string]
         fn #method_name(mut self) -> Self where Self: std::marker::Sized {
             let mut style = self.declared_style();
             #(#field_assignments)*
@@ -160,55 +162,52 @@ fn box_prefixes() -> Vec<(&'static str, bool, Vec<TokenStream2>)> {
     ]
 }
 
-fn box_suffixes() -> Vec<(&'static str, TokenStream2)> {
+fn box_suffixes() -> Vec<(&'static str, TokenStream2, &'static str)> {
     vec![
-        ("0", quote! { pixels(0.) }),
-        ("0p5", quote! { rems(0.125) }),
-        ("1", quote! { rems(0.25) }),
-        ("1p5", quote! { rems(0.375) }),
-        ("2", quote! { rems(0.5) }),
-        ("2p5", quote! { rems(0.625) }),
-        ("3", quote! { rems(0.75) }),
-        ("3p5", quote! { rems(0.875) }),
-        ("4", quote! { rems(1.) }),
-        ("5", quote! { rems(1.25) }),
-        ("6", quote! { rems(1.5) }),
-        ("7", quote! { rems(1.75) }),
-        ("8", quote! { rems(2.0) }),
-        ("9", quote! { rems(2.25) }),
-        ("10", quote! { rems(2.5) }),
-        ("11", quote! { rems(2.75) }),
-        ("12", quote! { rems(3.) }),
-        ("16", quote! { rems(4.) }),
-        ("20", quote! { rems(5.) }),
-        ("24", quote! { rems(6.) }),
-        ("32", quote! { rems(8.) }),
-        ("40", quote! { rems(10.) }),
-        ("48", quote! { rems(12.) }),
-        ("56", quote! { rems(14.) }),
-        ("64", quote! { rems(16.) }),
-        ("72", quote! { rems(18.) }),
-        ("80", quote! { rems(20.) }),
-        ("96", quote! { rems(24.) }),
-        ("auto", quote! { auto() }),
-        ("px", quote! { pixels(1.) }),
-        ("full", quote! { relative(1.) }),
-        ("1_2", quote! { relative(0.5) }),
-        ("1_3", quote! { relative(1./3.) }),
-        ("2_3", quote! { relative(2./3.) }),
-        ("1_4", quote! { relative(0.25) }),
-        ("2_4", quote! { relative(0.5) }),
-        ("3_4", quote! { relative(0.75) }),
-        ("1_5", quote! { relative(0.2) }),
-        ("2_5", quote! { relative(0.4) }),
-        ("3_5", quote! { relative(0.6) }),
-        ("4_5", quote! { relative(0.8) }),
-        ("1_6", quote! { relative(1./6.) }),
-        ("5_6", quote! { relative(5./6.) }),
-        ("1_12", quote! { relative(1./12.) }),
-        // ("screen_50", quote! { DefiniteLength::Vh(50.0) }),
-        // ("screen_75", quote! { DefiniteLength::Vh(75.0) }),
-        // ("screen", quote! { DefiniteLength::Vh(100.0) }),
+        ("0", quote! { pixels(0.) }, "0px"),
+        ("0p5", quote! { rems(0.125) }, "2px (0.125rem)"),
+        ("1", quote! { rems(0.25) }, "4px (0.25rem)"),
+        ("1p5", quote! { rems(0.375) }, "6px (0.375rem)"),
+        ("2", quote! { rems(0.5) }, "8px (0.5rem)"),
+        ("2p5", quote! { rems(0.625) }, "10px (0.625rem)"),
+        ("3", quote! { rems(0.75) }, "12px (0.75rem)"),
+        ("3p5", quote! { rems(0.875) }, "14px (0.875rem)"),
+        ("4", quote! { rems(1.) }, "16px (1rem)"),
+        ("5", quote! { rems(1.25) }, "20px (1.25rem)"),
+        ("6", quote! { rems(1.5) }, "24px (1.5rem)"),
+        ("7", quote! { rems(1.75) }, "28px (1.77rem)"),
+        ("8", quote! { rems(2.0) }, "32px (2rem)"),
+        ("9", quote! { rems(2.25) }, "36px (2.25rem)"),
+        ("10", quote! { rems(2.5) }, "40px (2.5rem)"),
+        ("11", quote! { rems(2.75) }, "44px (2.75rem)"),
+        ("12", quote! { rems(3.) }, "48px (3rem)"),
+        ("16", quote! { rems(4.) }, "64px (4rem)"),
+        ("20", quote! { rems(5.) }, "80px (5rem)"),
+        ("24", quote! { rems(6.) }, "96px (6rem)"),
+        ("32", quote! { rems(8.) }, "128px (8rem)"),
+        ("40", quote! { rems(10.) }, "160px (10rem)"),
+        ("48", quote! { rems(12.) }, "192px (12rem)"),
+        ("56", quote! { rems(14.) }, "224px (14rem)"),
+        ("64", quote! { rems(16.) }, "256px (16rem)"),
+        ("72", quote! { rems(18.) }, "288px (18rem)"),
+        ("80", quote! { rems(20.) }, "320px (20rem)"),
+        ("96", quote! { rems(24.) }, "384px (24rem)"),
+        ("auto", quote! { auto() }, "Auto"),
+        ("px", quote! { pixels(1.) }, "1px"),
+        ("full", quote! { relative(1.) }, "100%"),
+        ("1_2", quote! { relative(0.5) }, "50% (1/2)"),
+        ("1_3", quote! { relative(1./3.) }, "33% (1/3)"),
+        ("2_3", quote! { relative(2./3.) }, "66% (2/3)"),
+        ("1_4", quote! { relative(0.25) }, "25% (1/4)"),
+        ("2_4", quote! { relative(0.5) }, "50% (2/4)"),
+        ("3_4", quote! { relative(0.75) }, "75% (3/4)"),
+        ("1_5", quote! { relative(0.2) }, "20% (1/5)"),
+        ("2_5", quote! { relative(0.4) }, "40% (2/5)"),
+        ("3_5", quote! { relative(0.6) }, "60% (3/5)"),
+        ("4_5", quote! { relative(0.8) }, "80% (4/5)"),
+        ("1_6", quote! { relative(1./6.) }, "16% (1/6)"),
+        ("5_6", quote! { relative(5./6.) }, "80% (5/6)"),
+        ("1_12", quote! { relative(1./12.) }, "8% (1/12)"),
     ]
 }
 
@@ -258,16 +257,16 @@ fn corner_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
     ]
 }
 
-fn corner_suffixes() -> Vec<(&'static str, TokenStream2)> {
+fn corner_suffixes() -> Vec<(&'static str, TokenStream2, &'static str)> {
     vec![
-        ("none", quote! { pixels(0.) }),
-        ("sm", quote! { rems(0.125) }),
-        ("md", quote! { rems(0.25) }),
-        ("lg", quote! { rems(0.5) }),
-        ("xl", quote! { rems(0.75) }),
-        ("2xl", quote! { rems(1.) }),
-        ("3xl", quote! { rems(1.5) }),
-        ("full", quote! {  pixels(9999.) }),
+        ("none", quote! { pixels(0.) }, "0px"),
+        ("sm", quote! { rems(0.125) }, "2px (0.125rem)"),
+        ("md", quote! { rems(0.25) }, "4px (0.25rem)"),
+        ("lg", quote! { rems(0.5) }, "8px (0.5rem)"),
+        ("xl", quote! { rems(0.75) }, "12px (0.75rem)"),
+        ("2xl", quote! { rems(1.) }, "16px (1rem)"),
+        ("3xl", quote! { rems(1.5) }, "24px (1.5rem)"),
+        ("full", quote! {  pixels(9999.) }, "9999px"),
     ]
 }
 
@@ -303,25 +302,25 @@ fn border_prefixes() -> Vec<(&'static str, Vec<TokenStream2>)> {
     ]
 }
 
-fn border_suffixes() -> Vec<(&'static str, TokenStream2)> {
+fn border_suffixes() -> Vec<(&'static str, TokenStream2, &'static str)> {
     vec![
-        ("", quote! { pixels(1.) }),
-        ("0", quote! { pixels(0.) }),
-        ("1", quote! { pixels(1.) }),
-        ("2", quote! { pixels(2.) }),
-        ("3", quote! { pixels(3.) }),
-        ("4", quote! { pixels(4.) }),
-        ("5", quote! { pixels(5.) }),
-        ("6", quote! { pixels(6.) }),
-        ("7", quote! { pixels(7.) }),
-        ("8", quote! { pixels(8.) }),
-        ("9", quote! { pixels(9.) }),
-        ("10", quote! { pixels(10.) }),
-        ("11", quote! { pixels(11.) }),
-        ("12", quote! { pixels(12.) }),
-        ("16", quote! { pixels(16.) }),
-        ("20", quote! { pixels(20.) }),
-        ("24", quote! { pixels(24.) }),
-        ("32", quote! { pixels(32.) }),
+        ("", quote! { pixels(1.)}, "1px"),
+        ("0", quote! { pixels(0.)}, "0px"),
+        ("1", quote! { pixels(1.) }, "1px"),
+        ("2", quote! { pixels(2.) }, "2px"),
+        ("3", quote! { pixels(3.) }, "3px"),
+        ("4", quote! { pixels(4.) }, "4px"),
+        ("5", quote! { pixels(5.) }, "5px"),
+        ("6", quote! { pixels(6.) }, "6px"),
+        ("7", quote! { pixels(7.) }, "7px"),
+        ("8", quote! { pixels(8.) }, "8px"),
+        ("9", quote! { pixels(9.) }, "9px"),
+        ("10", quote! { pixels(10.) }, "10px"),
+        ("11", quote! { pixels(11.) }, "11px"),
+        ("12", quote! { pixels(12.) }, "12px"),
+        ("16", quote! { pixels(16.) }, "16px"),
+        ("20", quote! { pixels(20.) }, "20px"),
+        ("24", quote! { pixels(24.) }, "24px"),
+        ("32", quote! { pixels(32.) }, "32px"),
     ]
 }

From 69f380b689f0eddcdcc660ecea73e647fb509681 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Sat, 9 Sep 2023 11:30:35 -0400
Subject: [PATCH 080/109] Fix doc typo

---
 crates/gpui2_macros/src/styleable_helpers.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui2_macros/src/styleable_helpers.rs b/crates/gpui2_macros/src/styleable_helpers.rs
index 121e3fe12b78fbc7d5efbb688154198c042a989d..d5d76ff33b195254ad99ce75a4dbdd33abfdc6b3 100644
--- a/crates/gpui2_macros/src/styleable_helpers.rs
+++ b/crates/gpui2_macros/src/styleable_helpers.rs
@@ -175,7 +175,7 @@ fn box_suffixes() -> Vec<(&'static str, TokenStream2, &'static str)> {
         ("4", quote! { rems(1.) }, "16px (1rem)"),
         ("5", quote! { rems(1.25) }, "20px (1.25rem)"),
         ("6", quote! { rems(1.5) }, "24px (1.5rem)"),
-        ("7", quote! { rems(1.75) }, "28px (1.77rem)"),
+        ("7", quote! { rems(1.75) }, "28px (1.75rem)"),
         ("8", quote! { rems(2.0) }, "32px (2rem)"),
         ("9", quote! { rems(2.25) }, "36px (2.25rem)"),
         ("10", quote! { rems(2.5) }, "40px (2.5rem)"),

From 9bb8eae9850b12906c7798800dee04ccf17a37bd Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Sat, 9 Sep 2023 13:38:57 -0400
Subject: [PATCH 081/109] init `tab_bar`

---
 crates/storybook/src/component/icon_button.rs | 20 ++---
 crates/storybook/src/component/mod.rs         |  1 +
 crates/storybook/src/component/tab.rs         | 56 ++++++++++++
 crates/storybook/src/module/mod.rs            |  1 +
 crates/storybook/src/module/tab_bar.rs        | 89 +++++++++++++++++++
 crates/storybook/src/storybook.rs             |  1 +
 crates/storybook/src/workspace.rs             | 30 +++----
 7 files changed, 171 insertions(+), 27 deletions(-)
 create mode 100644 crates/storybook/src/component/tab.rs
 create mode 100644 crates/storybook/src/module/mod.rs
 create mode 100644 crates/storybook/src/module/tab_bar.rs

diff --git a/crates/storybook/src/component/icon_button.rs b/crates/storybook/src/component/icon_button.rs
index 9e8df098be0616b03ac533f6f3455aa10e428d59..50241acbe8ef09544ab23a7230fa62c7058af10f 100644
--- a/crates/storybook/src/component/icon_button.rs
+++ b/crates/storybook/src/component/icon_button.rs
@@ -7,16 +7,16 @@ use gpui2::{Element, ParentElement, ViewContext};
 #[derive(Element)]
 struct IconButton {
     path: &'static str,
-    variant: Variant,
+    variant: ButtonVariant,
 }
 
 #[derive(PartialEq)]
-pub enum Variant {
+pub enum ButtonVariant {
     Ghost,
     Filled,
 }
 
-pub fn icon_button<V: 'static>(path: &'static str, variant: Variant) -> impl Element<V> {
+pub fn icon_button<V: 'static>(path: &'static str, variant: ButtonVariant) -> impl Element<V> {
     IconButton { path, variant }
 }
 
@@ -25,8 +25,8 @@ impl IconButton {
         let theme = theme(cx);
         let mut div = div();
 
-        if self.variant == Variant::Filled {
-            div = div.fill(theme.middle.base.default.background);
+        if self.variant == ButtonVariant::Filled {
+            div = div.fill(theme.highest.base.default.background);
         }
 
         div.w_7()
@@ -35,20 +35,16 @@ impl IconButton {
             .items_center()
             .justify_center()
             .rounded_md()
-            .border()
-            .border_color(theme.middle.base.default.background)
             .hover()
-            .fill(theme.middle.base.hovered.background)
-            .border_color(theme.middle.variant.hovered.border)
+            .fill(theme.highest.base.hovered.background)
             .active()
-            .fill(theme.middle.base.pressed.background)
-            .border_color(theme.middle.variant.pressed.border)
+            .fill(theme.highest.base.pressed.background)
             .child(
                 svg()
                     .path(self.path)
                     .w_4()
                     .h_4()
-                    .fill(theme.middle.variant.default.foreground),
+                    .fill(theme.highest.variant.default.foreground),
             )
     }
 }
diff --git a/crates/storybook/src/component/mod.rs b/crates/storybook/src/component/mod.rs
index e26b06c8ddba01bdc522f6d8c1aa5d6263276be0..c45b936e9624305448466817d07fa9a127bd2794 100644
--- a/crates/storybook/src/component/mod.rs
+++ b/crates/storybook/src/component/mod.rs
@@ -1 +1,2 @@
 pub(crate) mod icon_button;
+pub(crate) mod tab;
diff --git a/crates/storybook/src/component/tab.rs b/crates/storybook/src/component/tab.rs
new file mode 100644
index 0000000000000000000000000000000000000000..91a0fb1be1c9b08dcae6c5cb32b2cfb57d6329d0
--- /dev/null
+++ b/crates/storybook/src/component/tab.rs
@@ -0,0 +1,56 @@
+use crate::theme::theme;
+use gpui2::elements::svg;
+use gpui2::style::{StyleHelpers, Styleable};
+use gpui2::{elements::div, IntoElement};
+use gpui2::{Element, ParentElement, ViewContext};
+
+#[derive(Element)]
+struct Tab {
+    title: &'static str,
+    active: bool,
+}
+
+pub fn tab<V: 'static>(title: &'static str, active: bool) -> impl Element<V> {
+    Tab { title, active }
+}
+
+impl Tab {
+    fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+
+        div()
+            .px_2()
+            .py_0p5()
+            .flex()
+            .items_center()
+            .justify_center()
+            .rounded_lg()
+            .fill(if self.active {
+                theme.highest.on.default.background
+            } else {
+                theme.highest.base.default.background
+            })
+            .hover()
+            .fill(if self.active {
+                theme.highest.on.hovered.background
+            } else {
+                theme.highest.base.hovered.background
+            })
+            .active()
+            .fill(if self.active {
+                theme.highest.on.pressed.background
+            } else {
+                theme.highest.base.pressed.background
+            })
+            .child(
+                div()
+                    .text_sm()
+                    .text_color(if self.active {
+                        theme.highest.base.default.foreground
+                    } else {
+                        theme.highest.variant.default.foreground
+                    })
+                    .child(self.title),
+            )
+    }
+}
diff --git a/crates/storybook/src/module/mod.rs b/crates/storybook/src/module/mod.rs
new file mode 100644
index 0000000000000000000000000000000000000000..078db8e167826c50fdd2e31aa55db0c3f8e2ac74
--- /dev/null
+++ b/crates/storybook/src/module/mod.rs
@@ -0,0 +1 @@
+pub(crate) mod tab_bar;
diff --git a/crates/storybook/src/module/tab_bar.rs b/crates/storybook/src/module/tab_bar.rs
new file mode 100644
index 0000000000000000000000000000000000000000..24f96337a03d161c4bab0286c093b8b475da7fd5
--- /dev/null
+++ b/crates/storybook/src/module/tab_bar.rs
@@ -0,0 +1,89 @@
+use std::marker::PhantomData;
+
+use crate::component::icon_button::{icon_button, ButtonVariant};
+use crate::component::tab::tab;
+use crate::theme::theme;
+use gpui2::elements::div::ScrollState;
+use gpui2::style::StyleHelpers;
+use gpui2::{elements::div, IntoElement};
+use gpui2::{Element, ParentElement, ViewContext};
+
+#[derive(Element)]
+pub struct TabBar<V: 'static> {
+    view_type: PhantomData<V>,
+    scroll_state: ScrollState,
+}
+
+pub fn tab_bar<V: 'static>(scroll_state: ScrollState) -> TabBar<V> {
+    TabBar {
+        view_type: PhantomData,
+        scroll_state,
+    }
+}
+
+impl<V: 'static> TabBar<V> {
+    fn render(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
+        let theme = theme(cx);
+
+        div()
+            .w_full()
+            .flex()
+            .items_center()
+            .fill(theme.highest.base.default.background)
+            // Left Side
+            .child(
+                div()
+                    .px_1()
+                    .flex()
+                    // Nate
+                    // This isn't what I wanted, but I wanted to try to get at least SOME x overflow scroll working
+                    // Ideally this should be on the "Tabs" div below
+                    // So only the tabs scroll, and the nav buttons stay pinned left, and the other controls stay pinned right
+                    .overflow_x_scroll(self.scroll_state.clone())
+                    .gap_2()
+                    // Nav Buttons
+                    .child(
+                        div()
+                            .flex()
+                            .items_center()
+                            .gap_px()
+                            .child(icon_button("icons/arrow_left.svg", ButtonVariant::Ghost))
+                            .child(icon_button("icons/arrow_right.svg", ButtonVariant::Ghost)),
+                    )
+                    // Tabs
+                    .child(
+                        div()
+                            .py_1()
+                            .flex()
+                            .items_center()
+                            .gap_px()
+                            .child(tab("Cargo.toml", false))
+                            .child(tab("Channels Panel", true))
+                            .child(tab("channels_panel.rs", false))
+                            .child(tab("workspace.rs", false))
+                            .child(tab("icon_button.rs", false))
+                            .child(tab("storybook.rs", false))
+                            .child(tab("theme.rs", false))
+                            .child(tab("theme_registry.rs", false))
+                            .child(tab("styleable_helpers.rs", false)),
+                    ),
+            )
+            // Right Side
+            .child(
+                div()
+                    .px_1()
+                    .flex()
+                    .flex_initial()
+                    .gap_2()
+                    // Nav Buttons
+                    .child(
+                        div()
+                            .flex()
+                            .items_center()
+                            .gap_px()
+                            .child(icon_button("icons/plus.svg", ButtonVariant::Ghost))
+                            .child(icon_button("icons/split.svg", ButtonVariant::Ghost)),
+                    ),
+            )
+    }
+}
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 7f9aa8667238cc8865027830829985ffaa704436..ed6f11e074193da265f59a887c7e781b4e98eb87 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -11,6 +11,7 @@ use simplelog::SimpleLogger;
 
 mod collab_panel;
 mod component;
+mod module;
 mod components;
 mod element_ext;
 mod theme;
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index 441a4c68fa1f8078d131f26e97e771d36d2b20ba..bbdfb22788c77871777cd0b3f233d2e92c196d2c 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,8 +1,4 @@
-use crate::{
-    collab_panel::collab_panel,
-    component::icon_button::{icon_button, Variant},
-    theme::theme,
-};
+use crate::{collab_panel::collab_panel, module::tab_bar::tab_bar, theme::theme};
 use gpui2::{
     elements::{div, div::ScrollState, img, svg},
     style::{StyleHelpers, Styleable},
@@ -13,6 +9,7 @@ use gpui2::{
 struct WorkspaceElement {
     left_scroll_state: ScrollState,
     right_scroll_state: ScrollState,
+    tab_bar_scroll_state: ScrollState,
 }
 
 pub fn workspace<V: 'static>() -> impl Element<V> {
@@ -41,17 +38,20 @@ impl WorkspaceElement {
                     .flex()
                     .flex_row()
                     .overflow_hidden()
-                    .child(collab_panel(self.left_scroll_state.clone()))
+                    // .child(collab_panel(self.left_scroll_state.clone()))
                     .child(
-                        div().h_full().flex_1().child(
-                            div()
-                                .w_24()
-                                .h_24()
-                                .child(icon_button("icons/plus.svg", Variant::Ghost))
-                                .child(icon_button("icons/x.svg", Variant::Filled)),
-                        ),
-                    )
-                    .child(collab_panel(self.right_scroll_state.clone())),
+                        div()
+                            .h_full()
+                            .flex_1()
+                            .fill(theme.highest.base.default.background)
+                            .child(
+                                div()
+                                    .flex()
+                                    .flex_col()
+                                    .flex_1()
+                                    .child(tab_bar(self.tab_bar_scroll_state.clone())),
+                            ),
+                    ), // .child(collab_panel(self.right_scroll_state.clone())),
             )
             .child(statusbar())
     }

From ef03e206d625063c68954ca6717fa22f0fe7e3e2 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Tue, 5 Sep 2023 11:01:55 -0700
Subject: [PATCH 082/109] WIP: Add nushell support

---
 Cargo.lock                                    | 10 +++
 Cargo.toml                                    |  1 +
 .../LiveKitBridge/Package.resolved            |  4 +-
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/languages.rs                   |  1 +
 crates/zed/src/languages/nushell.rs           |  0
 crates/zed/src/languages/nushell/config.toml  |  9 +++
 .../zed/src/languages/nushell/highlights.scm  | 61 +++++++++++++++++++
 8 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 crates/zed/src/languages/nushell.rs
 create mode 100644 crates/zed/src/languages/nushell/config.toml
 create mode 100644 crates/zed/src/languages/nushell/highlights.scm

diff --git a/Cargo.lock b/Cargo.lock
index d4b7beba7bd35541a5dd53c450f21fdae25880e2..4bbe29742c2449585b6b94774d940f6b3d7dc70b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8406,6 +8406,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-nu"
+version = "0.0.1"
+source = "git+https://github.com/mikayla-maki/tree-sitter-nu/?rev=6cf9ee39ceb3da79501de7646b10e5e1da800ab8#6cf9ee39ceb3da79501de7646b10e5e1da800ab8"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-php"
 version = "0.19.1"
@@ -9868,6 +9877,7 @@ dependencies = [
  "tree-sitter-lua",
  "tree-sitter-markdown",
  "tree-sitter-nix",
+ "tree-sitter-nu",
  "tree-sitter-php",
  "tree-sitter-python",
  "tree-sitter-racket",
diff --git a/Cargo.toml b/Cargo.toml
index 5938ecb40240765844c1849662b082afeae07a3a..01f42c306219883950fa156121c073e384b48d82 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,6 +141,7 @@ tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-rack
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930"}
 tree-sitter-lua = "0.0.14"
 tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
+tree-sitter-nu = { git = "https://github.com/mikayla-maki/tree-sitter-nu/", rev = "6cf9ee39ceb3da79501de7646b10e5e1da800ab8"}
 
 [patch.crates-io]
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "35a6052fbcafc5e5fc0f9415b8652be7dcaf7222" }
diff --git a/crates/live_kit_client/LiveKitBridge/Package.resolved b/crates/live_kit_client/LiveKitBridge/Package.resolved
index 85ae0885652d9054356ca19b9be6d5fd8642d16d..b925bc8f0d5ef290993fa0d49adcf221dd3570f6 100644
--- a/crates/live_kit_client/LiveKitBridge/Package.resolved
+++ b/crates/live_kit_client/LiveKitBridge/Package.resolved
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/apple/swift-protobuf.git",
         "state": {
           "branch": null,
-          "revision": "0af9125c4eae12a4973fb66574c53a54962a9e1e",
-          "version": "1.21.0"
+          "revision": "ce20dc083ee485524b802669890291c0d8090170",
+          "version": "1.22.1"
         }
       }
     ]
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index e102a665191ee019531eac42d295d67965028e5c..1d014197e1e14262180763151c2649dd04158686 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -132,6 +132,7 @@ tree-sitter-racket.workspace = true
 tree-sitter-yaml.workspace = true
 tree-sitter-lua.workspace = true
 tree-sitter-nix.workspace = true
+tree-sitter-nu.workspace = true
 
 url = "2.2"
 urlencoding = "2.1.2"
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 3fbb5aa14f70bd0b295172104bdb607427367411..0b1fa750c084dd44a006cad258f4e7d11fc153f9 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -170,6 +170,7 @@ pub fn init(languages: Arc<LanguageRegistry>, node_runtime: Arc<dyn NodeRuntime>
     language("elm", tree_sitter_elm::language(), vec![]);
     language("glsl", tree_sitter_glsl::language(), vec![]);
     language("nix", tree_sitter_nix::language(), vec![]);
+    language("nu", tree_sitter_nu::language(), vec![]);
 }
 
 #[cfg(any(test, feature = "test-support"))]
diff --git a/crates/zed/src/languages/nushell.rs b/crates/zed/src/languages/nushell.rs
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/crates/zed/src/languages/nushell/config.toml b/crates/zed/src/languages/nushell/config.toml
new file mode 100644
index 0000000000000000000000000000000000000000..d382b0705aa32cf54624f4a38ad348e3a9502ad3
--- /dev/null
+++ b/crates/zed/src/languages/nushell/config.toml
@@ -0,0 +1,9 @@
+name = "Nu"
+path_suffixes = ["nu"]
+line_comment = "# "
+autoclose_before = ";:.,=}])>` \n\t\""
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+]
diff --git a/crates/zed/src/languages/nushell/highlights.scm b/crates/zed/src/languages/nushell/highlights.scm
new file mode 100644
index 0000000000000000000000000000000000000000..b97ed9836e659a3822f845a188b103b6eca07895
--- /dev/null
+++ b/crates/zed/src/languages/nushell/highlights.scm
@@ -0,0 +1,61 @@
+(string) @string
+(type) @type
+(value_path) @variable
+(comment) @comment
+
+(number_literal) @number
+(range from: (number_literal) @number)
+(range to: (number_literal) @number)
+
+(command cmd_name: (identifier) @function)
+(function_definition func_name: (identifier) @function)
+
+[
+    (variable_declaration name: (identifier))
+    (parameter (identifier))
+    (flag (flag_name))
+    (flag (flag_shorthand_name))
+    (record_entry entry_name: (identifier))
+    (block_args block_param: (identifier))
+] @property
+; (parameter (identifier) @variable.parameter) ; -- alternative highlighting group?
+
+(cmd_invocation) @embedded
+
+
+((identifier) @constant
+ (.match? @constant "^[A-Z][A-Z\\d_]*$"))
+
+[
+ "if"
+ "else"
+ "not"
+ "let"
+ "def"
+ "def-env"
+ "export"
+ "true"
+ "false"
+ "and"
+ "or"
+] @keyword
+
+[
+  ; "/" Not making / an operator may lead to better highlighting?
+  "$"
+  "|"
+  "+"
+  "-"
+  "*"
+  "="
+  "!="
+  "and"
+  "or"
+  "=="
+  ">"
+] @operator
+
+["."
+ ","
+ ";"
+] @delimiter

From e84e791dde16cb9171a509755ed80587ca4e56e7 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Sat, 9 Sep 2023 17:51:23 -0400
Subject: [PATCH 083/109] Checkpoint

---
 crates/storybook/src/module/tab_bar.rs | 25 +++++++++++++++----------
 crates/storybook/src/storybook.rs      |  4 ++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/crates/storybook/src/module/tab_bar.rs b/crates/storybook/src/module/tab_bar.rs
index 24f96337a03d161c4bab0286c093b8b475da7fd5..c3d145ed83c369e84ea9b7cc5a0d0ff45f856b3c 100644
--- a/crates/storybook/src/module/tab_bar.rs
+++ b/crates/storybook/src/module/tab_bar.rs
@@ -29,17 +29,15 @@ impl<V: 'static> TabBar<V> {
             .w_full()
             .flex()
             .items_center()
+            .overflow_hidden()
+            .justify_between()
             .fill(theme.highest.base.default.background)
             // Left Side
             .child(
                 div()
                     .px_1()
                     .flex()
-                    // Nate
-                    // This isn't what I wanted, but I wanted to try to get at least SOME x overflow scroll working
-                    // Ideally this should be on the "Tabs" div below
-                    // So only the tabs scroll, and the nav buttons stay pinned left, and the other controls stay pinned right
-                    .overflow_x_scroll(self.scroll_state.clone())
+                    .flex_none()
                     .gap_2()
                     // Nav Buttons
                     .child(
@@ -49,14 +47,21 @@ impl<V: 'static> TabBar<V> {
                             .gap_px()
                             .child(icon_button("icons/arrow_left.svg", ButtonVariant::Ghost))
                             .child(icon_button("icons/arrow_right.svg", ButtonVariant::Ghost)),
-                    )
-                    // Tabs
+                    ),
+            )
+            // Tabs
+            .child(
+                div()
+                    .flex_1()
+                    .py_1()
+                    .overflow_hidden()
+                    .items_center()
+                    .fill(theme.highest.accent.default.background)
                     .child(
                         div()
-                            .py_1()
                             .flex()
-                            .items_center()
                             .gap_px()
+                            .overflow_x_scroll(self.scroll_state.clone())
                             .child(tab("Cargo.toml", false))
                             .child(tab("Channels Panel", true))
                             .child(tab("channels_panel.rs", false))
@@ -73,7 +78,7 @@ impl<V: 'static> TabBar<V> {
                 div()
                     .px_1()
                     .flex()
-                    .flex_initial()
+                    .flex_none()
                     .gap_2()
                     // Nav Buttons
                     .child(
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index ed6f11e074193da265f59a887c7e781b4e98eb87..9a7868a9e75e5b0726123f9d538b5795369671b7 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -11,9 +11,9 @@ use simplelog::SimpleLogger;
 
 mod collab_panel;
 mod component;
-mod module;
 mod components;
 mod element_ext;
+mod module;
 mod theme;
 mod workspace;
 
@@ -36,7 +36,7 @@ fn main() {
 
         cx.add_window(
             gpui2::WindowOptions {
-                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(1400., 900.))),
+                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(700., 900.))),
                 center: true,
                 ..Default::default()
             },

From 2be34ef254f27ee22e3a5e586cc611db1732b629 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Sat, 9 Sep 2023 14:44:52 -0700
Subject: [PATCH 084/109] Add syntax highlighting for nu scripts

---
 Cargo.lock                                    |   2 +-
 Cargo.toml                                    |   2 +-
 crates/zed/src/languages/nu/brackets.scm      |   4 +
 .../src/languages/{nushell => nu}/config.toml |   0
 crates/zed/src/languages/nu/highlights.scm    | 302 ++++++++++++++++++
 crates/zed/src/languages/nu/indents.scm       |   3 +
 crates/zed/src/languages/nushell.rs           |   0
 .../zed/src/languages/nushell/highlights.scm  |  61 ----
 8 files changed, 311 insertions(+), 63 deletions(-)
 create mode 100644 crates/zed/src/languages/nu/brackets.scm
 rename crates/zed/src/languages/{nushell => nu}/config.toml (100%)
 create mode 100644 crates/zed/src/languages/nu/highlights.scm
 create mode 100644 crates/zed/src/languages/nu/indents.scm
 delete mode 100644 crates/zed/src/languages/nushell.rs
 delete mode 100644 crates/zed/src/languages/nushell/highlights.scm

diff --git a/Cargo.lock b/Cargo.lock
index 4bbe29742c2449585b6b94774d940f6b3d7dc70b..d1cd868eaac92ed3456f00394e7337bc8ff88a0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8409,7 +8409,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter-nu"
 version = "0.0.1"
-source = "git+https://github.com/mikayla-maki/tree-sitter-nu/?rev=6cf9ee39ceb3da79501de7646b10e5e1da800ab8#6cf9ee39ceb3da79501de7646b10e5e1da800ab8"
+source = "git+https://github.com/nushell/tree-sitter-nu?rev=786689b0562b9799ce53e824cb45a1a2a04dc673#786689b0562b9799ce53e824cb45a1a2a04dc673"
 dependencies = [
  "cc",
  "tree-sitter",
diff --git a/Cargo.toml b/Cargo.toml
index 01f42c306219883950fa156121c073e384b48d82..c233c74b55816334347c88208624b294abd921f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,7 +141,7 @@ tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-rack
 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930"}
 tree-sitter-lua = "0.0.14"
 tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
-tree-sitter-nu = { git = "https://github.com/mikayla-maki/tree-sitter-nu/", rev = "6cf9ee39ceb3da79501de7646b10e5e1da800ab8"}
+tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "786689b0562b9799ce53e824cb45a1a2a04dc673"}
 
 [patch.crates-io]
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "35a6052fbcafc5e5fc0f9415b8652be7dcaf7222" }
diff --git a/crates/zed/src/languages/nu/brackets.scm b/crates/zed/src/languages/nu/brackets.scm
new file mode 100644
index 0000000000000000000000000000000000000000..7ede7a61926f47e75000b99b8b1436b057fe8346
--- /dev/null
+++ b/crates/zed/src/languages/nu/brackets.scm
@@ -0,0 +1,4 @@
+("(" @open ")" @close)
+("[" @open "]" @close)
+("{" @open "}" @close)
+(parameter_pipes "|" @open "|" @close)
diff --git a/crates/zed/src/languages/nushell/config.toml b/crates/zed/src/languages/nu/config.toml
similarity index 100%
rename from crates/zed/src/languages/nushell/config.toml
rename to crates/zed/src/languages/nu/config.toml
diff --git a/crates/zed/src/languages/nu/highlights.scm b/crates/zed/src/languages/nu/highlights.scm
new file mode 100644
index 0000000000000000000000000000000000000000..97f46d3879c28ab77cc6b641abf7bd4260836a4a
--- /dev/null
+++ b/crates/zed/src/languages/nu/highlights.scm
@@ -0,0 +1,302 @@
+;;; ---
+;;; keywords
+[
+    "def"
+    "def-env"
+    "alias"
+    "export-env"
+    "export"
+    "extern"
+    "module"
+
+    "let"
+    "let-env"
+    "mut"
+    "const"
+
+    "hide-env"
+
+    "source"
+    "source-env"
+
+    "overlay"
+    "register"
+
+    "loop"
+    "while"
+    "error"
+
+    "do"
+    "if"
+    "else"
+    "try"
+    "catch"
+    "match"
+
+    "break"
+    "continue"
+    "return"
+
+] @keyword
+
+(hide_mod "hide" @keyword)
+(decl_use "use" @keyword)
+
+(ctrl_for
+    "for" @keyword
+    "in" @keyword
+)
+(overlay_list "list" @keyword)
+(overlay_hide "hide" @keyword)
+(overlay_new "new" @keyword)
+(overlay_use
+    "use" @keyword
+    "as" @keyword
+)
+(ctrl_error "make" @keyword)
+
+;;; ---
+;;; literals
+(val_number) @constant
+(val_duration
+    unit: [
+        "ns" "µs" "us" "ms" "sec" "min" "hr" "day" "wk"
+    ] @variable
+)
+(val_filesize
+    unit: [
+        "b" "B"
+
+        "kb" "kB" "Kb" "KB"
+        "mb" "mB" "Mb" "MB"
+        "gb" "gB" "Gb" "GB"
+        "tb" "tB" "Tb" "TB"
+        "pb" "pB" "Pb" "PB"
+        "eb" "eB" "Eb" "EB"
+        "zb" "zB" "Zb" "ZB"
+
+        "kib" "kiB" "kIB" "kIb" "Kib" "KIb" "KIB"
+        "mib" "miB" "mIB" "mIb" "Mib" "MIb" "MIB"
+        "gib" "giB" "gIB" "gIb" "Gib" "GIb" "GIB"
+        "tib" "tiB" "tIB" "tIb" "Tib" "TIb" "TIB"
+        "pib" "piB" "pIB" "pIb" "Pib" "PIb" "PIB"
+        "eib" "eiB" "eIB" "eIb" "Eib" "EIb" "EIB"
+        "zib" "ziB" "zIB" "zIb" "Zib" "ZIb" "ZIB"
+    ] @variable
+)
+(val_binary
+    [
+       "0b"
+       "0o"
+       "0x"
+    ] @constant
+    "[" @punctuation.bracket
+    digit: [
+        "," @punctuation.delimiter
+        (hex_digit) @constant
+    ]
+    "]" @punctuation.bracket
+) @constant
+(val_bool) @constant.builtin
+(val_nothing) @constant.builtin
+(val_string) @string
+(val_date) @constant
+(inter_escape_sequence) @constant
+(escape_sequence) @constant
+(val_interpolated [
+    "$\""
+    "$\'"
+    "\""
+    "\'"
+] @string)
+(unescaped_interpolated_content) @string
+(escaped_interpolated_content) @string
+(expr_interpolated ["(" ")"] @variable)
+
+;;; ---
+;;; operators
+(expr_binary [
+    "+"
+    "-"
+    "*"
+    "/"
+    "mod"
+    "//"
+    "++"
+    "**"
+    "=="
+    "!="
+    "<"
+    "<="
+    ">"
+    ">="
+    "=~"
+    "!~"
+    "and"
+    "or"
+    "xor"
+    "bit-or"
+    "bit-xor"
+    "bit-and"
+    "bit-shl"
+    "bit-shr"
+    "in"
+    "not-in"
+    "starts-with"
+    "ends-with"
+] @operator)
+
+(expr_binary opr: ([
+    "and"
+    "or"
+    "xor"
+    "bit-or"
+    "bit-xor"
+    "bit-and"
+    "bit-shl"
+    "bit-shr"
+    "in"
+    "not-in"
+    "starts-with"
+    "ends-with"
+]) @keyword)
+
+(where_command [
+    "+"
+    "-"
+    "*"
+    "/"
+    "mod"
+    "//"
+    "++"
+    "**"
+    "=="
+    "!="
+    "<"
+    "<="
+    ">"
+    ">="
+    "=~"
+    "!~"
+    "and"
+    "or"
+    "xor"
+    "bit-or"
+    "bit-xor"
+    "bit-and"
+    "bit-shl"
+    "bit-shr"
+    "in"
+    "not-in"
+    "starts-with"
+    "ends-with"
+] @operator)
+
+(assignment [
+    "="
+    "+="
+    "-="
+    "*="
+    "/="
+    "++="
+] @operator)
+
+(expr_unary ["not" "-"] @operator)
+
+(val_range [
+    ".."
+    "..="
+    "..<"
+] @operator)
+
+["=>" "=" "|"] @operator
+
+[
+    "o>"   "out>"
+    "e>"   "err>"
+    "e+o>" "err+out>"
+    "o+e>" "out+err>"
+] @special
+
+;;; ---
+;;; punctuation
+[
+    ","
+    ";"
+] @punctuation.delimiter
+
+(param_short_flag "-" @punctuation.delimiter)
+(param_long_flag ["--"] @punctuation.delimiter)
+(long_flag ["--"] @punctuation.delimiter)
+(param_rest "..." @punctuation.delimiter)
+(param_type [":"] @punctuation.special)
+(param_value ["="] @punctuation.special)
+(param_cmd ["@"] @punctuation.special)
+(param_opt ["?"] @punctuation.special)
+
+[
+    "(" ")"
+    "{" "}"
+    "[" "]"
+] @punctuation.bracket
+
+(val_record
+  (record_entry ":" @punctuation.delimiter))
+;;; ---
+;;; identifiers
+(param_rest
+    name: (_) @variable)
+(param_opt
+    name: (_) @variable)
+(parameter
+    param_name: (_) @variable)
+(param_cmd
+    (cmd_identifier) @string)
+(param_long_flag) @variable
+(param_short_flag) @variable
+
+(short_flag) @variable
+(long_flag) @variable
+
+(scope_pattern [(wild_card) @function])
+
+(cmd_identifier) @function
+
+(command
+    "^" @punctuation.delimiter
+    head: (_) @function
+)
+
+"where" @function
+
+(path
+  ["." "?"] @punctuation.delimiter
+) @variable
+
+(val_variable
+  "$" @operator
+  [
+   (identifier) @variable
+   "in" @type.builtin
+   "nu" @type.builtin
+   "env" @type.builtin
+   "nothing" @type.builtin
+   ]  ; If we have a special styling, use it here
+)
+;;; ---
+;;; types
+(flat_type) @type.builtin
+(list_type
+    "list" @type
+    ["<" ">"] @punctuation.bracket
+)
+(collection_type
+    ["record" "table"] @type
+    "<" @punctuation.bracket
+    key: (_) @variable
+    ["," ":"] @punctuation.delimiter
+    ">" @punctuation.bracket
+)
+
+(shebang) @comment
+(comment) @comment
diff --git a/crates/zed/src/languages/nu/indents.scm b/crates/zed/src/languages/nu/indents.scm
new file mode 100644
index 0000000000000000000000000000000000000000..112b414aa45f277138d0c681851129a608ee96e0
--- /dev/null
+++ b/crates/zed/src/languages/nu/indents.scm
@@ -0,0 +1,3 @@
+(_ "[" "]" @end) @indent
+(_ "{" "}" @end) @indent
+(_ "(" ")" @end) @indent
diff --git a/crates/zed/src/languages/nushell.rs b/crates/zed/src/languages/nushell.rs
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/crates/zed/src/languages/nushell/highlights.scm b/crates/zed/src/languages/nushell/highlights.scm
deleted file mode 100644
index b97ed9836e659a3822f845a188b103b6eca07895..0000000000000000000000000000000000000000
--- a/crates/zed/src/languages/nushell/highlights.scm
+++ /dev/null
@@ -1,61 +0,0 @@
-(string) @string
-(type) @type
-(value_path) @variable
-(comment) @comment
-
-(number_literal) @number
-(range from: (number_literal) @number)
-(range to: (number_literal) @number)
-
-(command cmd_name: (identifier) @function)
-(function_definition func_name: (identifier) @function)
-
-[
-    (variable_declaration name: (identifier))
-    (parameter (identifier))
-    (flag (flag_name))
-    (flag (flag_shorthand_name))
-    (record_entry entry_name: (identifier))
-    (block_args block_param: (identifier))
-] @property
-; (parameter (identifier) @variable.parameter) ; -- alternative highlighting group?
-
-(cmd_invocation) @embedded
-
-
-((identifier) @constant
- (.match? @constant "^[A-Z][A-Z\\d_]*$"))
-
-[
- "if"
- "else"
- "not"
- "let"
- "def"
- "def-env"
- "export"
- "true"
- "false"
- "and"
- "or"
-] @keyword
-
-[
-  ; "/" Not making / an operator may lead to better highlighting?
-  "$"
-  "|"
-  "+"
-  "-"
-  "*"
-  "="
-  "!="
-  "and"
-  "or"
-  "=="
-  ">"
-] @operator
-
-["."
- ","
- ";"
-] @delimiter

From 7df21f86ddcbcbdc6eea31f898d14c28ceb5e92c Mon Sep 17 00:00:00 2001
From: KCaverly <kyle@zed.dev>
Date: Mon, 11 Sep 2023 10:11:40 -0400
Subject: [PATCH 085/109] move cx notify observe for rate_limit_expiry into
 ProjectState in the semantic index

Co-authored-by: Antonio <antonio@zed.dev>
---
 crates/search/src/project_search.rs         | 31 +++++++++++++++++----
 crates/semantic_index/src/semantic_index.rs | 21 ++++----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 5a1d5992a662ae4ce8f11831276a9c80e049c9d8..b85d0b9b4049169f98c587178d6009c13dcca29e 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -34,7 +34,7 @@ use std::{
     ops::{Not, Range},
     path::PathBuf,
     sync::Arc,
-    time::SystemTime,
+    time::{Duration, SystemTime},
 };
 use util::ResultExt as _;
 use workspace::{
@@ -131,6 +131,7 @@ pub struct ProjectSearchView {
 
 struct SemanticState {
     index_status: SemanticIndexStatus,
+    maintain_rate_limit: Option<Task<()>>,
     _subscription: Subscription,
 }
 
@@ -322,14 +323,14 @@ impl View for ProjectSearchView {
                     SemanticIndexStatus::Indexed => Some("Indexing complete".to_string()),
                     SemanticIndexStatus::Indexing {
                         remaining_files,
-                        rate_limit_expiration_time,
+                        rate_limit_expiry,
                     } => {
                         if remaining_files == 0 {
                             Some(format!("Indexing..."))
                         } else {
-                            if let Some(rate_limit_expiration_time) = rate_limit_expiration_time {
+                            if let Some(rate_limit_expiry) = rate_limit_expiry {
                                 if let Ok(remaining_seconds) =
-                                    rate_limit_expiration_time.duration_since(SystemTime::now())
+                                    rate_limit_expiry.duration_since(SystemTime::now())
                                 {
                                     Some(format!(
                                         "Remaining files to index (rate limit resets in {}s): {}",
@@ -669,9 +670,10 @@ impl ProjectSearchView {
 
             self.semantic_state = Some(SemanticState {
                 index_status: semantic_index.read(cx).status(&project),
+                maintain_rate_limit: None,
                 _subscription: cx.observe(&semantic_index, Self::semantic_index_changed),
             });
-            cx.notify();
+            self.semantic_index_changed(semantic_index, cx);
         }
     }
 
@@ -682,8 +684,25 @@ impl ProjectSearchView {
     ) {
         let project = self.model.read(cx).project.clone();
         if let Some(semantic_state) = self.semantic_state.as_mut() {
-            semantic_state.index_status = semantic_index.read(cx).status(&project);
             cx.notify();
+            semantic_state.index_status = semantic_index.read(cx).status(&project);
+            if let SemanticIndexStatus::Indexing {
+                rate_limit_expiry: Some(_),
+                ..
+            } = &semantic_state.index_status
+            {
+                if semantic_state.maintain_rate_limit.is_none() {
+                    semantic_state.maintain_rate_limit =
+                        Some(cx.spawn(|this, mut cx| async move {
+                            loop {
+                                cx.background().timer(Duration::from_secs(1)).await;
+                                this.update(&mut cx, |_, cx| cx.notify()).log_err();
+                            }
+                        }));
+                    return;
+                }
+            }
+            semantic_state.maintain_rate_limit = None;
         }
     }
 
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index 92b11f00d10cc0084c158370488dcee282186606..efcc1ba242e747423d229c5f176f2f3d837e9986 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -112,7 +112,7 @@ pub enum SemanticIndexStatus {
     Indexed,
     Indexing {
         remaining_files: usize,
-        rate_limit_expiration_time: Option<SystemTime>,
+        rate_limit_expiry: Option<SystemTime>,
     },
 }
 
@@ -232,20 +232,9 @@ impl ProjectState {
             _observe_pending_file_count: cx.spawn_weak({
                 let mut pending_file_count_rx = pending_file_count_rx.clone();
                 |this, mut cx| async move {
-                    loop {
-                        let mut timer = cx.background().timer(Duration::from_millis(350)).fuse();
-                        let mut pending_file_count = pending_file_count_rx.next().fuse();
-                        futures::select_biased! {
-                            _ = pending_file_count => {
-                                if let Some(this) = this.upgrade(&cx) {
-                                    this.update(&mut cx, |_, cx| cx.notify());
-                                }
-                            },
-                            _ = timer => {
-                                if let Some(this) = this.upgrade(&cx) {
-                                    this.update(&mut cx, |_, cx| cx.notify());
-                                }
-                            }
+                    while let Some(_) = pending_file_count_rx.next().await {
+                        if let Some(this) = this.upgrade(&cx) {
+                            this.update(&mut cx, |_, cx| cx.notify());
                         }
                     }
                 }
@@ -304,7 +293,7 @@ impl SemanticIndex {
             } else {
                 SemanticIndexStatus::Indexing {
                     remaining_files: project_state.pending_file_count_rx.borrow().clone(),
-                    rate_limit_expiration_time: self.embedding_provider.rate_limit_expiration(),
+                    rate_limit_expiry: self.embedding_provider.rate_limit_expiration(),
                 }
             }
         } else {

From e678c7d9ee29cd7de6ab788c866c8a950b843306 Mon Sep 17 00:00:00 2001
From: KCaverly <kyle@zed.dev>
Date: Mon, 11 Sep 2023 10:26:14 -0400
Subject: [PATCH 086/109] swap SystemTime for Instant throughout
 rate_limit_expiry tracking

---
 crates/search/src/project_search.rs            |  8 ++++----
 crates/semantic_index/src/embedding.rs         | 18 +++++++++---------
 crates/semantic_index/src/semantic_index.rs    |  2 +-
 .../semantic_index/src/semantic_index_tests.rs |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index b85d0b9b4049169f98c587178d6009c13dcca29e..6ca492880385437d8cc254dd1dd702c1d639f8e6 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -34,7 +34,7 @@ use std::{
     ops::{Not, Range},
     path::PathBuf,
     sync::Arc,
-    time::{Duration, SystemTime},
+    time::{Duration, Instant},
 };
 use util::ResultExt as _;
 use workspace::{
@@ -329,9 +329,9 @@ impl View for ProjectSearchView {
                             Some(format!("Indexing..."))
                         } else {
                             if let Some(rate_limit_expiry) = rate_limit_expiry {
-                                if let Ok(remaining_seconds) =
-                                    rate_limit_expiry.duration_since(SystemTime::now())
-                                {
+                                let remaining_seconds =
+                                    rate_limit_expiry.duration_since(Instant::now());
+                                if remaining_seconds > Duration::from_secs(0) {
                                     Some(format!(
                                         "Remaining files to index (rate limit resets in {}s): {}",
                                         remaining_seconds.as_secs(),
diff --git a/crates/semantic_index/src/embedding.rs b/crates/semantic_index/src/embedding.rs
index 7bac809c9720c39c2d861bde58884a0badbc4fb1..42d90f0fdb23b1838966926d73664275981f1430 100644
--- a/crates/semantic_index/src/embedding.rs
+++ b/crates/semantic_index/src/embedding.rs
@@ -16,7 +16,7 @@ use serde::{Deserialize, Serialize};
 use std::env;
 use std::ops::Add;
 use std::sync::Arc;
-use std::time::{Duration, SystemTime};
+use std::time::{Duration, Instant};
 use tiktoken_rs::{cl100k_base, CoreBPE};
 use util::http::{HttpClient, Request};
 
@@ -85,8 +85,8 @@ impl ToSql for Embedding {
 pub struct OpenAIEmbeddings {
     pub client: Arc<dyn HttpClient>,
     pub executor: Arc<Background>,
-    rate_limit_count_rx: watch::Receiver<Option<SystemTime>>,
-    rate_limit_count_tx: Arc<Mutex<watch::Sender<Option<SystemTime>>>>,
+    rate_limit_count_rx: watch::Receiver<Option<Instant>>,
+    rate_limit_count_tx: Arc<Mutex<watch::Sender<Option<Instant>>>>,
 }
 
 #[derive(Serialize)]
@@ -119,14 +119,14 @@ pub trait EmbeddingProvider: Sync + Send {
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>>;
     fn max_tokens_per_batch(&self) -> usize;
     fn truncate(&self, span: &str) -> (String, usize);
-    fn rate_limit_expiration(&self) -> Option<SystemTime>;
+    fn rate_limit_expiration(&self) -> Option<Instant>;
 }
 
 pub struct DummyEmbeddings {}
 
 #[async_trait]
 impl EmbeddingProvider for DummyEmbeddings {
-    fn rate_limit_expiration(&self) -> Option<SystemTime> {
+    fn rate_limit_expiration(&self) -> Option<Instant> {
         None
     }
     async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>> {
@@ -174,7 +174,7 @@ impl OpenAIEmbeddings {
         let reset_time = *self.rate_limit_count_tx.lock().borrow();
 
         if let Some(reset_time) = reset_time {
-            if SystemTime::now() >= reset_time {
+            if Instant::now() >= reset_time {
                 *self.rate_limit_count_tx.lock().borrow_mut() = None
             }
         }
@@ -185,7 +185,7 @@ impl OpenAIEmbeddings {
         );
     }
 
-    fn update_reset_time(&self, reset_time: SystemTime) {
+    fn update_reset_time(&self, reset_time: Instant) {
         let original_time = *self.rate_limit_count_tx.lock().borrow();
 
         let updated_time = if let Some(original_time) = original_time {
@@ -232,7 +232,7 @@ impl EmbeddingProvider for OpenAIEmbeddings {
         50000
     }
 
-    fn rate_limit_expiration(&self) -> Option<SystemTime> {
+    fn rate_limit_expiration(&self) -> Option<Instant> {
         *self.rate_limit_count_rx.borrow()
     }
     fn truncate(&self, span: &str) -> (String, usize) {
@@ -319,7 +319,7 @@ impl EmbeddingProvider for OpenAIEmbeddings {
                     };
 
                     // If we've previously rate limited, increment the duration but not the count
-                    let reset_time = SystemTime::now().add(delay_duration);
+                    let reset_time = Instant::now().add(delay_duration);
                     self.update_reset_time(reset_time);
 
                     log::trace!(
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index efcc1ba242e747423d229c5f176f2f3d837e9986..115bf5d7a85b6f9d7e44982d08e5968e97d14aca 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -112,7 +112,7 @@ pub enum SemanticIndexStatus {
     Indexed,
     Indexing {
         remaining_files: usize,
-        rate_limit_expiry: Option<SystemTime>,
+        rate_limit_expiry: Option<Instant>,
     },
 }
 
diff --git a/crates/semantic_index/src/semantic_index_tests.rs b/crates/semantic_index/src/semantic_index_tests.rs
index 4bc95bec62e7980744dca209dec28f0213d12526..9035327b2e8d910312ebb2f7c117a51d300f5d6a 100644
--- a/crates/semantic_index/src/semantic_index_tests.rs
+++ b/crates/semantic_index/src/semantic_index_tests.rs
@@ -21,7 +21,7 @@ use std::{
         atomic::{self, AtomicUsize},
         Arc,
     },
-    time::SystemTime,
+    time::{Instant, SystemTime},
 };
 use unindent::Unindent;
 use util::RandomCharIter;
@@ -1275,7 +1275,7 @@ impl EmbeddingProvider for FakeEmbeddingProvider {
         200
     }
 
-    fn rate_limit_expiration(&self) -> Option<SystemTime> {
+    fn rate_limit_expiration(&self) -> Option<Instant> {
         None
     }
 

From 2774eae21aea56036cf48a067d91e535911fa22c Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Mon, 11 Sep 2023 10:36:49 -0400
Subject: [PATCH 087/109] Checkpoint

---
 crates/storybook/src/component/icon_button.rs |  3 +-
 crates/storybook/src/component/tab.rs         |  1 -
 crates/storybook/src/module/tab_bar.rs        | 41 +++++++------------
 crates/storybook/src/storybook.rs             |  2 +-
 crates/storybook/src/workspace.rs             |  7 ++--
 5 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/crates/storybook/src/component/icon_button.rs b/crates/storybook/src/component/icon_button.rs
index 50241acbe8ef09544ab23a7230fa62c7058af10f..91c61b363da78ec6baa41474961768b33b5e6e04 100644
--- a/crates/storybook/src/component/icon_button.rs
+++ b/crates/storybook/src/component/icon_button.rs
@@ -23,10 +23,11 @@ pub fn icon_button<V: 'static>(path: &'static str, variant: ButtonVariant) -> im
 impl IconButton {
     fn render<V: 'static>(&mut self, _: &mut V, cx: &mut ViewContext<V>) -> impl IntoElement<V> {
         let theme = theme(cx);
+
         let mut div = div();
 
         if self.variant == ButtonVariant::Filled {
-            div = div.fill(theme.highest.base.default.background);
+            div = div.fill(theme.highest.negative.default.background);
         }
 
         div.w_7()
diff --git a/crates/storybook/src/component/tab.rs b/crates/storybook/src/component/tab.rs
index 91a0fb1be1c9b08dcae6c5cb32b2cfb57d6329d0..4aae374f802466d672a0b16b66f63e3f424bb831 100644
--- a/crates/storybook/src/component/tab.rs
+++ b/crates/storybook/src/component/tab.rs
@@ -1,5 +1,4 @@
 use crate::theme::theme;
-use gpui2::elements::svg;
 use gpui2::style::{StyleHelpers, Styleable};
 use gpui2::{elements::div, IntoElement};
 use gpui2::{Element, ParentElement, ViewContext};
diff --git a/crates/storybook/src/module/tab_bar.rs b/crates/storybook/src/module/tab_bar.rs
index c3d145ed83c369e84ea9b7cc5a0d0ff45f856b3c..8dc2e8cfd43d613a784622e9482f48f928067ac9 100644
--- a/crates/storybook/src/module/tab_bar.rs
+++ b/crates/storybook/src/module/tab_bar.rs
@@ -28,10 +28,6 @@ impl<V: 'static> TabBar<V> {
         div()
             .w_full()
             .flex()
-            .items_center()
-            .overflow_hidden()
-            .justify_between()
-            .fill(theme.highest.base.default.background)
             // Left Side
             .child(
                 div()
@@ -49,29 +45,22 @@ impl<V: 'static> TabBar<V> {
                             .child(icon_button("icons/arrow_right.svg", ButtonVariant::Ghost)),
                     ),
             )
-            // Tabs
             .child(
-                div()
-                    .flex_1()
-                    .py_1()
-                    .overflow_hidden()
-                    .items_center()
-                    .fill(theme.highest.accent.default.background)
-                    .child(
-                        div()
-                            .flex()
-                            .gap_px()
-                            .overflow_x_scroll(self.scroll_state.clone())
-                            .child(tab("Cargo.toml", false))
-                            .child(tab("Channels Panel", true))
-                            .child(tab("channels_panel.rs", false))
-                            .child(tab("workspace.rs", false))
-                            .child(tab("icon_button.rs", false))
-                            .child(tab("storybook.rs", false))
-                            .child(tab("theme.rs", false))
-                            .child(tab("theme_registry.rs", false))
-                            .child(tab("styleable_helpers.rs", false)),
-                    ),
+                div().w_0().flex_1().h_full().child(
+                    div()
+                        .flex()
+                        .gap_px()
+                        .overflow_x_scroll(self.scroll_state.clone())
+                        .child(tab("Cargo.toml", false))
+                        .child(tab("Channels Panel", true))
+                        .child(tab("channels_panel.rs", false))
+                        .child(tab("workspace.rs", false))
+                        .child(tab("icon_button.rs", false))
+                        .child(tab("storybook.rs", false))
+                        .child(tab("theme.rs", false))
+                        .child(tab("theme_registry.rs", false))
+                        .child(tab("styleable_helpers.rs", false)),
+                ),
             )
             // Right Side
             .child(
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 9a7868a9e75e5b0726123f9d538b5795369671b7..1d44129ea838d68560a0035f63589e704a9c197b 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -36,7 +36,7 @@ fn main() {
 
         cx.add_window(
             gpui2::WindowOptions {
-                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(700., 900.))),
+                bounds: WindowBounds::Fixed(RectF::new(vec2f(0., 0.), vec2f(1600., 900.))),
                 center: true,
                 ..Default::default()
             },
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index bbdfb22788c77871777cd0b3f233d2e92c196d2c..ca55f9d3cc1fd7b642a7515fb244ac6156d62ebd 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -38,7 +38,7 @@ impl WorkspaceElement {
                     .flex()
                     .flex_row()
                     .overflow_hidden()
-                    // .child(collab_panel(self.left_scroll_state.clone()))
+                    .child(collab_panel(self.left_scroll_state.clone()))
                     .child(
                         div()
                             .h_full()
@@ -50,8 +50,9 @@ impl WorkspaceElement {
                                     .flex_col()
                                     .flex_1()
                                     .child(tab_bar(self.tab_bar_scroll_state.clone())),
-                            ),
-                    ), // .child(collab_panel(self.right_scroll_state.clone())),
+                            )
+                            .child(collab_panel(self.right_scroll_state.clone())),
+                    ),
             )
             .child(statusbar())
     }

From a24d94cfdad47102ebbffb8590157646d18f00ca Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Mon, 11 Sep 2023 08:47:00 -0600
Subject: [PATCH 088/109] Eliminate LayoutContext

---
 crates/collab_ui/src/collab_titlebar_item.rs  |  6 +-
 crates/collab_ui/src/face_pile.rs             |  4 +-
 crates/editor/src/element.rs                  | 20 ++--
 crates/gpui/examples/corner_radii.rs          |  2 +-
 crates/gpui/src/app.rs                        | 91 ++-----------------
 crates/gpui/src/app/window.rs                 |  9 +-
 crates/gpui/src/elements.rs                   | 19 ++--
 crates/gpui/src/elements/align.rs             |  4 +-
 crates/gpui/src/elements/canvas.rs            |  2 +-
 crates/gpui/src/elements/clipped.rs           |  4 +-
 crates/gpui/src/elements/component.rs         |  6 +-
 crates/gpui/src/elements/constrained_box.rs   | 11 +--
 crates/gpui/src/elements/container.rs         |  4 +-
 crates/gpui/src/elements/empty.rs             |  4 +-
 crates/gpui/src/elements/expanded.rs          |  4 +-
 crates/gpui/src/elements/flex.rs              | 12 +--
 crates/gpui/src/elements/hook.rs              |  4 +-
 crates/gpui/src/elements/image.rs             |  4 +-
 crates/gpui/src/elements/keystroke_label.rs   |  2 +-
 crates/gpui/src/elements/label.rs             |  4 +-
 crates/gpui/src/elements/list.rs              | 20 ++--
 .../gpui/src/elements/mouse_event_handler.rs  |  6 +-
 crates/gpui/src/elements/overlay.rs           |  5 +-
 crates/gpui/src/elements/resizable.rs         |  8 +-
 crates/gpui/src/elements/stack.rs             |  4 +-
 crates/gpui/src/elements/svg.rs               |  4 +-
 crates/gpui/src/elements/text.rs              |  8 +-
 crates/gpui/src/elements/tooltip.rs           |  5 +-
 crates/gpui/src/elements/uniform_list.rs      |  4 +-
 crates/gpui2/src/adapter.rs                   |  2 +-
 crates/gpui_macros/src/gpui_macros.rs         |  2 +-
 crates/terminal_view/src/terminal_element.rs  |  7 +-
 crates/workspace/src/pane.rs                  |  6 +-
 crates/workspace/src/pane_group.rs            |  8 +-
 crates/workspace/src/status_bar.rs            |  6 +-
 35 files changed, 108 insertions(+), 203 deletions(-)

diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 8f3a434a830a3adc254302ae38e60357c8d3d4a1..a12e7b8663da69fba09ab825e0c3199cd161d7ef 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -13,8 +13,8 @@ use gpui::{
     geometry::{rect::RectF, vector::vec2f, PathBuilder},
     json::{self, ToJson},
     platform::{CursorStyle, MouseButton},
-    AppContext, Entity, ImageData, LayoutContext, ModelHandle, PaintContext, Subscription, View,
-    ViewContext, ViewHandle, WeakViewHandle,
+    AppContext, Entity, ImageData, ModelHandle, PaintContext, Subscription, View, ViewContext,
+    ViewHandle, WeakViewHandle,
 };
 use picker::PickerEvent;
 use project::{Project, RepositoryEntry};
@@ -1165,7 +1165,7 @@ impl Element<CollabTitlebarItem> for AvatarRibbon {
         &mut self,
         constraint: gpui::SizeConstraint,
         _: &mut CollabTitlebarItem,
-        _: &mut LayoutContext<CollabTitlebarItem>,
+        _: &mut ViewContext<CollabTitlebarItem>,
     ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
         (constraint.max, ())
     }
diff --git a/crates/collab_ui/src/face_pile.rs b/crates/collab_ui/src/face_pile.rs
index 835d730d95ab7471714e04b3ab5ca58d2a5b6800..ef0368dd32f026fe07123b587954d70aa2f101a5 100644
--- a/crates/collab_ui/src/face_pile.rs
+++ b/crates/collab_ui/src/face_pile.rs
@@ -7,7 +7,7 @@ use gpui::{
     },
     json::ToJson,
     serde_json::{self, json},
-    AnyElement, Axis, Element, LayoutContext, PaintContext, View, ViewContext,
+    AnyElement, Axis, Element, PaintContext, View, ViewContext,
 };
 
 pub(crate) struct FacePile<V: View> {
@@ -32,7 +32,7 @@ impl<V: View> Element<V> for FacePile<V> {
         &mut self,
         constraint: gpui::SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         debug_assert!(constraint.max_along(Axis::Horizontal) == f32::INFINITY);
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 942b4550bcd52417bb431fd1bb62e1628446f258..7a8235224530cba8c77d978863170873686ef0de 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -32,8 +32,8 @@ use gpui::{
     json::{self, ToJson},
     platform::{CursorStyle, Modifiers, MouseButton, MouseButtonEvent, MouseMovedEvent},
     text_layout::{self, Line, RunStyle, TextLayoutCache},
-    AnyElement, Axis, CursorRegion, Element, EventContext, FontCache, LayoutContext, MouseRegion,
-    PaintContext, Quad, SizeConstraint, ViewContext, WindowContext,
+    AnyElement, Axis, CursorRegion, Element, EventContext, FontCache, MouseRegion, PaintContext,
+    Quad, SizeConstraint, ViewContext, WindowContext,
 };
 use itertools::Itertools;
 use json::json;
@@ -1670,7 +1670,7 @@ impl EditorElement {
         style: &EditorStyle,
         line_layouts: &[LineWithInvisibles],
         editor: &mut Editor,
-        cx: &mut LayoutContext<Editor>,
+        cx: &mut ViewContext<Editor>,
     ) -> (f32, Vec<BlockLayout>) {
         let mut block_id = 0;
         let scroll_x = snapshot.scroll_anchor.offset.x();
@@ -2092,7 +2092,7 @@ impl Element<Editor> for EditorElement {
         &mut self,
         constraint: SizeConstraint,
         editor: &mut Editor,
-        cx: &mut LayoutContext<Editor>,
+        cx: &mut ViewContext<Editor>,
     ) -> (Vector2F, Self::LayoutState) {
         let mut size = constraint.max;
         if size.x().is_infinite() {
@@ -3177,11 +3177,10 @@ mod tests {
                     Point::new(5, 6)..Point::new(6, 0),
                 ]);
             });
-            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
-                &mut layout_cx,
+                cx,
             )
         });
         assert_eq!(state.selections.len(), 1);
@@ -3262,11 +3261,10 @@ mod tests {
                     DisplayPoint::new(10, 0)..DisplayPoint::new(13, 0),
                 ]);
             });
-            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
-                &mut layout_cx,
+                cx,
             )
         });
 
@@ -3322,11 +3320,10 @@ mod tests {
 
         let mut element = EditorElement::new(editor.read_with(cx, |editor, cx| editor.style(cx)));
         let (size, mut state) = editor.update(cx, |editor, cx| {
-            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(500., 500.), vec2f(500., 500.)),
                 editor,
-                &mut layout_cx,
+                cx,
             )
         });
 
@@ -3517,11 +3514,10 @@ mod tests {
             editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
             editor.set_wrap_width(Some(editor_width), cx);
 
-            let mut layout_cx = LayoutContext::new(cx);
             element.layout(
                 SizeConstraint::new(vec2f(editor_width, 500.), vec2f(editor_width, 500.)),
                 editor,
-                &mut layout_cx,
+                cx,
             )
         });
 
diff --git a/crates/gpui/examples/corner_radii.rs b/crates/gpui/examples/corner_radii.rs
index 8e5393e31a1428e0cc79d27f1f9e21d4cf0307c6..c2f6b99ceba3247b5d7f711408dd13517bcc5677 100644
--- a/crates/gpui/examples/corner_radii.rs
+++ b/crates/gpui/examples/corner_radii.rs
@@ -42,7 +42,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
         &mut self,
         constraint: gpui::SizeConstraint,
         _: &mut V,
-        _: &mut gpui::LayoutContext<V>,
+        _: &mut gpui::ViewContext<V>,
     ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
         (constraint.max, ())
     }
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 7f2af36a90f1872f7b4b3017984663160cf7185e..5fc7f54a7a178cfec814c6bbd6a998f5ea30a25f 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3495,75 +3495,6 @@ impl<V> BorrowWindowContext for ViewContext<'_, '_, V> {
     }
 }
 
-pub struct LayoutContext<'a, 'b, 'c, V> {
-    // Nathan: Making this is public while I work on gpui2.
-    pub view_context: &'c mut ViewContext<'a, 'b, V>,
-}
-
-impl<'a, 'b, 'c, V> LayoutContext<'a, 'b, 'c, V> {
-    pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>) -> Self {
-        Self { view_context }
-    }
-
-    pub fn view_context(&mut self) -> &mut ViewContext<'a, 'b, V> {
-        self.view_context
-    }
-}
-
-impl<'a, 'b, 'c, V> Deref for LayoutContext<'a, 'b, 'c, V> {
-    type Target = ViewContext<'a, 'b, V>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.view_context
-    }
-}
-
-impl<V> DerefMut for LayoutContext<'_, '_, '_, V> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.view_context
-    }
-}
-
-impl<V> BorrowAppContext for LayoutContext<'_, '_, '_, V> {
-    fn read_with<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
-        BorrowAppContext::read_with(&*self.view_context, f)
-    }
-
-    fn update<T, F: FnOnce(&mut AppContext) -> T>(&mut self, f: F) -> T {
-        BorrowAppContext::update(&mut *self.view_context, f)
-    }
-}
-
-impl<V> BorrowWindowContext for LayoutContext<'_, '_, '_, V> {
-    type Result<T> = T;
-
-    fn read_window<T, F: FnOnce(&WindowContext) -> T>(&self, window: AnyWindowHandle, f: F) -> T {
-        BorrowWindowContext::read_window(&*self.view_context, window, f)
-    }
-
-    fn read_window_optional<T, F>(&self, window: AnyWindowHandle, f: F) -> Option<T>
-    where
-        F: FnOnce(&WindowContext) -> Option<T>,
-    {
-        BorrowWindowContext::read_window_optional(&*self.view_context, window, f)
-    }
-
-    fn update_window<T, F: FnOnce(&mut WindowContext) -> T>(
-        &mut self,
-        window: AnyWindowHandle,
-        f: F,
-    ) -> T {
-        BorrowWindowContext::update_window(&mut *self.view_context, window, f)
-    }
-
-    fn update_window_optional<T, F>(&mut self, window: AnyWindowHandle, f: F) -> Option<T>
-    where
-        F: FnOnce(&mut WindowContext) -> Option<T>,
-    {
-        BorrowWindowContext::update_window_optional(&mut *self.view_context, window, f)
-    }
-}
-
 pub struct PaintContext<'a, 'b, 'c, V> {
     pub view_context: &'c mut ViewContext<'a, 'b, V>,
 }
@@ -6489,25 +6420,21 @@ mod tests {
         view_1.update(cx, |_, cx| {
             view_2.update(cx, |_, cx| {
                 // Sanity check
-                let mut layout_cx = LayoutContext::new(cx);
                 assert_eq!(
-                    layout_cx
-                        .keystrokes_for_action(view_1_id, &Action1)
+                    cx.keystrokes_for_action(view_1_id, &Action1)
                         .unwrap()
                         .as_slice(),
                     &[Keystroke::parse("a").unwrap()]
                 );
                 assert_eq!(
-                    layout_cx
-                        .keystrokes_for_action(view_2.id(), &Action2)
+                    cx.keystrokes_for_action(view_2.id(), &Action2)
                         .unwrap()
                         .as_slice(),
                     &[Keystroke::parse("b").unwrap()]
                 );
-                assert_eq!(layout_cx.keystrokes_for_action(view_1.id(), &Action3), None);
+                assert_eq!(cx.keystrokes_for_action(view_1.id(), &Action3), None);
                 assert_eq!(
-                    layout_cx
-                        .keystrokes_for_action(view_2.id(), &Action3)
+                    cx.keystrokes_for_action(view_2.id(), &Action3)
                         .unwrap()
                         .as_slice(),
                     &[Keystroke::parse("c").unwrap()]
@@ -6516,21 +6443,17 @@ mod tests {
                 // The 'a' keystroke propagates up the view tree from view_2
                 // to view_1. The action, Action1, is handled by view_1.
                 assert_eq!(
-                    layout_cx
-                        .keystrokes_for_action(view_2.id(), &Action1)
+                    cx.keystrokes_for_action(view_2.id(), &Action1)
                         .unwrap()
                         .as_slice(),
                     &[Keystroke::parse("a").unwrap()]
                 );
 
                 // Actions that are handled below the current view don't have bindings
-                assert_eq!(layout_cx.keystrokes_for_action(view_1_id, &Action2), None);
+                assert_eq!(cx.keystrokes_for_action(view_1_id, &Action2), None);
 
                 // Actions that are handled in other branches of the tree should not have a binding
-                assert_eq!(
-                    layout_cx.keystrokes_for_action(view_2.id(), &GlobalAction),
-                    None
-                );
+                assert_eq!(cx.keystrokes_for_action(view_2.id(), &GlobalAction), None);
             });
         });
 
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 63462abad991dd6d4f7a3abb72c494cfd86cedec..96ff9988c03f31632befafd2ceffab1b1364965b 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -16,9 +16,8 @@ use crate::{
     text_layout::TextLayoutCache,
     util::post_inc,
     Action, AnyView, AnyViewHandle, AnyWindowHandle, AppContext, BorrowAppContext,
-    BorrowWindowContext, Effect, Element, Entity, Handle, LayoutContext, MouseRegion,
-    MouseRegionId, PaintContext, SceneBuilder, Subscription, View, ViewContext, ViewHandle,
-    WindowInvalidation,
+    BorrowWindowContext, Effect, Element, Entity, Handle, MouseRegion, MouseRegionId, PaintContext,
+    SceneBuilder, Subscription, View, ViewContext, ViewHandle, WindowInvalidation,
 };
 use anyhow::{anyhow, bail, Result};
 use collections::{HashMap, HashSet};
@@ -1677,13 +1676,13 @@ impl<V: 'static> Element<V> for ChildView {
         &mut self,
         constraint: SizeConstraint,
         _: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         if let Some(mut rendered_view) = cx.window.rendered_views.remove(&self.view_id) {
             let parent_id = cx.view_id();
             cx.window.new_parents.insert(self.view_id, parent_id);
             let size = rendered_view
-                .layout(constraint, cx.view_context)
+                .layout(constraint, cx)
                 .log_err()
                 .unwrap_or(Vector2F::zero());
             cx.window.rendered_views.insert(self.view_id, rendered_view);
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index 9924db0f1a9657e0fe3108ae351c7fc223731759..94373485ba068227b544d0ea39066f42bef53dd4 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -34,8 +34,8 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    json, Action, Entity, LayoutContext, PaintContext, SizeConstraint, TypeTag, View, ViewContext,
-    WeakViewHandle, WindowContext,
+    json, Action, Entity, PaintContext, SizeConstraint, TypeTag, View, ViewContext, WeakViewHandle,
+    WindowContext,
 };
 use anyhow::{anyhow, Result};
 use core::panic;
@@ -59,7 +59,7 @@ pub trait Element<V: 'static>: 'static {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState);
 
     fn paint(
@@ -259,7 +259,7 @@ trait AnyElementState<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Vector2F;
 
     fn paint(
@@ -310,7 +310,7 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Vector2F {
         let result;
         *self = match mem::take(self) {
@@ -510,7 +510,7 @@ impl<V> AnyElement<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Vector2F {
         self.state.layout(constraint, view, cx)
     }
@@ -570,7 +570,7 @@ impl<V: 'static> Element<V> for AnyElement<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let size = self.layout(constraint, view, cx);
         (size, ())
@@ -659,10 +659,7 @@ impl<V: View> AnyRootElement for RootElement<V> {
             .view
             .upgrade(cx)
             .ok_or_else(|| anyhow!("layout called on a root element for a dropped view"))?;
-        view.update(cx, |view, cx| {
-            let mut cx = LayoutContext::new(cx);
-            Ok(self.element.layout(constraint, view, &mut cx))
-        })
+        view.update(cx, |view, cx| Ok(self.element.layout(constraint, view, cx)))
     }
 
     fn paint(
diff --git a/crates/gpui/src/elements/align.rs b/crates/gpui/src/elements/align.rs
index e79b37299d3380232cdfda11109b65f8ed1a5451..daec48deb8a1b3ef8f4af1283d8b3484bb4fe0c7 100644
--- a/crates/gpui/src/elements/align.rs
+++ b/crates/gpui/src/elements/align.rs
@@ -1,6 +1,6 @@
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
 };
 use json::ToJson;
 
@@ -48,7 +48,7 @@ impl<V: 'static> Element<V> for Align<V> {
         &mut self,
         mut constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let mut size = constraint.max;
         constraint.min = Vector2F::zero();
diff --git a/crates/gpui/src/elements/canvas.rs b/crates/gpui/src/elements/canvas.rs
index 93cc0bdfdbb03fbc779dbb4c05cadb8b705819e9..ec6beaafeb38dd18d9b15fe124db6a2b2424be3b 100644
--- a/crates/gpui/src/elements/canvas.rs
+++ b/crates/gpui/src/elements/canvas.rs
@@ -33,7 +33,7 @@ where
         &mut self,
         constraint: crate::SizeConstraint,
         _: &mut V,
-        _: &mut crate::LayoutContext<V>,
+        _: &mut crate::ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let x = if constraint.max.x().is_finite() {
             constraint.max.x()
diff --git a/crates/gpui/src/elements/clipped.rs b/crates/gpui/src/elements/clipped.rs
index e521794f3c49a82a124eed3a3d28cef3431b9a64..50fe3dc4dfb5354d4c09f4a3051d33465265fcca 100644
--- a/crates/gpui/src/elements/clipped.rs
+++ b/crates/gpui/src/elements/clipped.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 use serde_json::json;
 
-use crate::{json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext};
+use crate::{json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext};
 
 pub struct Clipped<V> {
     child: AnyElement<V>,
@@ -23,7 +23,7 @@ impl<V: 'static> Element<V> for Clipped<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         (self.child.layout(constraint, view, cx), ())
     }
diff --git a/crates/gpui/src/elements/component.rs b/crates/gpui/src/elements/component.rs
index 48f139e7935feab9b1da4f47aa963a232097b92b..a663574f43a4daff4e8d5630301375e44cddfc4b 100644
--- a/crates/gpui/src/elements/component.rs
+++ b/crates/gpui/src/elements/component.rs
@@ -2,7 +2,7 @@ use std::{any::Any, marker::PhantomData};
 
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 
-use crate::{AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext};
+use crate::{AnyElement, Element, PaintContext, SizeConstraint, ViewContext};
 
 use super::Empty;
 
@@ -282,14 +282,14 @@ impl<V: 'static, C: StatefulComponent<V> + 'static> Element<V> for ComponentAdap
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         if self.element.is_none() {
             let element = self
                 .component
                 .take()
                 .expect("Component can only be rendered once")
-                .render(view, cx.view_context());
+                .render(view, cx);
             self.element = Some(element);
         }
         let constraint = self.element.as_mut().unwrap().layout(constraint, view, cx);
diff --git a/crates/gpui/src/elements/constrained_box.rs b/crates/gpui/src/elements/constrained_box.rs
index fe49bd091987983faba0f3953cd274ac583cc334..5a693869e529e80a4b7812ca3450bf4d43ed0024 100644
--- a/crates/gpui/src/elements/constrained_box.rs
+++ b/crates/gpui/src/elements/constrained_box.rs
@@ -5,7 +5,7 @@ use serde_json::json;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
 };
 
 pub struct ConstrainedBox<V> {
@@ -15,7 +15,7 @@ pub struct ConstrainedBox<V> {
 
 pub enum Constraint<V> {
     Static(SizeConstraint),
-    Dynamic(Box<dyn FnMut(SizeConstraint, &mut V, &mut LayoutContext<V>) -> SizeConstraint>),
+    Dynamic(Box<dyn FnMut(SizeConstraint, &mut V, &mut ViewContext<V>) -> SizeConstraint>),
 }
 
 impl<V> ToJson for Constraint<V> {
@@ -37,8 +37,7 @@ impl<V: 'static> ConstrainedBox<V> {
 
     pub fn dynamically(
         mut self,
-        constraint: impl 'static
-            + FnMut(SizeConstraint, &mut V, &mut LayoutContext<V>) -> SizeConstraint,
+        constraint: impl 'static + FnMut(SizeConstraint, &mut V, &mut ViewContext<V>) -> SizeConstraint,
     ) -> Self {
         self.constraint = Constraint::Dynamic(Box::new(constraint));
         self
@@ -120,7 +119,7 @@ impl<V: 'static> ConstrainedBox<V> {
         &mut self,
         input_constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> SizeConstraint {
         match &mut self.constraint {
             Constraint::Static(constraint) => *constraint,
@@ -139,7 +138,7 @@ impl<V: 'static> Element<V> for ConstrainedBox<V> {
         &mut self,
         mut parent_constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let constraint = self.constraint(parent_constraint, view, cx);
         parent_constraint.min = parent_constraint.min.max(constraint.min);
diff --git a/crates/gpui/src/elements/container.rs b/crates/gpui/src/elements/container.rs
index 6a0f860594d01099dd709e86388d74cf65c7c5b2..caa9af457cc86a0e33f953a0ea2f4261babc84a3 100644
--- a/crates/gpui/src/elements/container.rs
+++ b/crates/gpui/src/elements/container.rs
@@ -10,7 +10,7 @@ use crate::{
     json::ToJson,
     platform::CursorStyle,
     scene::{self, CornerRadii, CursorRegion, Quad},
-    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -371,7 +371,7 @@ impl<V: 'static> Element<V> for Container<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let mut size_buffer = self.margin_size() + self.padding_size();
         if !self.style.border.overlay {
diff --git a/crates/gpui/src/elements/empty.rs b/crates/gpui/src/elements/empty.rs
index 021c58ecba61eb5561dc032602387ee58e4bab29..65acdf329542ea1fa1e3b6df354bd0a5939503cd 100644
--- a/crates/gpui/src/elements/empty.rs
+++ b/crates/gpui/src/elements/empty.rs
@@ -6,7 +6,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    LayoutContext, PaintContext, ViewContext,
+    PaintContext, ViewContext,
 };
 use crate::{Element, SizeConstraint};
 
@@ -34,7 +34,7 @@ impl<V: 'static> Element<V> for Empty {
         &mut self,
         constraint: SizeConstraint,
         _: &mut V,
-        _: &mut LayoutContext<V>,
+        _: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let x = if constraint.max.x().is_finite() && !self.collapsed {
             constraint.max.x()
diff --git a/crates/gpui/src/elements/expanded.rs b/crates/gpui/src/elements/expanded.rs
index 0baab03ed875ee6f0ae024a0d9a9224da66d8a61..9dd301b2029f4937a276c6b7858731cabc9c335a 100644
--- a/crates/gpui/src/elements/expanded.rs
+++ b/crates/gpui/src/elements/expanded.rs
@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
 };
 use serde_json::json;
 
@@ -42,7 +42,7 @@ impl<V: 'static> Element<V> for Expanded<V> {
         &mut self,
         mut constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         if self.full_width {
             constraint.min.set_x(constraint.max.x());
diff --git a/crates/gpui/src/elements/flex.rs b/crates/gpui/src/elements/flex.rs
index 37cb512bd36ba93a9a9c53901013140dbfa9e750..b7d69fff6129ae102b8c1c236c8727c5877b146e 100644
--- a/crates/gpui/src/elements/flex.rs
+++ b/crates/gpui/src/elements/flex.rs
@@ -2,8 +2,8 @@ use std::{any::Any, cell::Cell, f32::INFINITY, ops::Range, rc::Rc};
 
 use crate::{
     json::{self, ToJson, Value},
-    AnyElement, Axis, Element, ElementStateHandle, LayoutContext, PaintContext, SizeConstraint,
-    Vector2FExt, ViewContext,
+    AnyElement, Axis, Element, ElementStateHandle, PaintContext, SizeConstraint, Vector2FExt,
+    ViewContext,
 };
 use pathfinder_geometry::{
     rect::RectF,
@@ -85,7 +85,7 @@ impl<V: 'static> Flex<V> {
         remaining_flex: &mut f32,
         cross_axis_max: &mut f32,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         let cross_axis = self.axis.invert();
         for child in self.children.iter_mut() {
@@ -136,7 +136,7 @@ impl<V: 'static> Element<V> for Flex<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let mut total_flex = None;
         let mut fixed_space = self.children.len().saturating_sub(1) as f32 * self.spacing;
@@ -225,7 +225,7 @@ impl<V: 'static> Element<V> for Flex<V> {
         }
 
         if let Some(scroll_state) = self.scroll_state.as_ref() {
-            scroll_state.0.update(cx.view_context(), |scroll_state, _| {
+            scroll_state.0.update(cx, |scroll_state, _| {
                 if let Some(scroll_to) = scroll_state.scroll_to.take() {
                     let visible_start = scroll_state.scroll_position.get();
                     let visible_end = visible_start + size.along(self.axis);
@@ -442,7 +442,7 @@ impl<V: 'static> Element<V> for FlexItem<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let size = self.child.layout(constraint, view, cx);
         (size, ())
diff --git a/crates/gpui/src/elements/hook.rs b/crates/gpui/src/elements/hook.rs
index c3fa0946f39f4c59b7a3977914d316c8669b6a96..5b0c5c4c48a8b80aa7320de4a486ab3255935854 100644
--- a/crates/gpui/src/elements/hook.rs
+++ b/crates/gpui/src/elements/hook.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
 };
 
 pub struct Hook<V> {
@@ -36,7 +36,7 @@ impl<V: 'static> Element<V> for Hook<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let size = self.child.layout(constraint, view, cx);
         if let Some(handler) = self.after_layout.as_mut() {
diff --git a/crates/gpui/src/elements/image.rs b/crates/gpui/src/elements/image.rs
index c1dbe33e68880645251273777143ff522590bfae..a0b710187c4b3f48878d6f2c72c70893002bdf91 100644
--- a/crates/gpui/src/elements/image.rs
+++ b/crates/gpui/src/elements/image.rs
@@ -5,7 +5,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    scene, Element, ImageData, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    scene, Element, ImageData, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -64,7 +64,7 @@ impl<V: 'static> Element<V> for Image {
         &mut self,
         constraint: SizeConstraint,
         _: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let data = match &self.source {
             ImageSource::Path(path) => match cx.asset_cache.png(path) {
diff --git a/crates/gpui/src/elements/keystroke_label.rs b/crates/gpui/src/elements/keystroke_label.rs
index cb473eeb087a239fdaa54176ad65aa46a21995e1..7f32f86c5e9d53e78582e95673e8298d42b860f6 100644
--- a/crates/gpui/src/elements/keystroke_label.rs
+++ b/crates/gpui/src/elements/keystroke_label.rs
@@ -39,7 +39,7 @@ impl<V: 'static> Element<V> for KeystrokeLabel {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, AnyElement<V>) {
         let mut element = if let Some(keystrokes) =
             cx.keystrokes_for_action(self.view_id, self.action.as_ref())
diff --git a/crates/gpui/src/elements/label.rs b/crates/gpui/src/elements/label.rs
index 54d89bdaecedfedbaf1a2aa862867f7ab1af5208..8ff2f1588382c3f43b1f7c1afaee9f2896e1039a 100644
--- a/crates/gpui/src/elements/label.rs
+++ b/crates/gpui/src/elements/label.rs
@@ -8,7 +8,7 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle},
-    Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    Element, PaintContext, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -136,7 +136,7 @@ impl<V: 'static> Element<V> for Label {
         &mut self,
         constraint: SizeConstraint,
         _: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let runs = self.compute_runs();
         let line = cx.text_layout_cache().layout_str(
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index e1052e9f8c3daeb7a16263d8cda85550d7442180..0b9b018311af042f4df73872cb67dba737b49bc3 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -4,7 +4,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::json,
-    AnyElement, Element, LayoutContext, MouseRegion, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, MouseRegion, PaintContext, SizeConstraint, ViewContext,
 };
 use std::{cell::RefCell, collections::VecDeque, fmt::Debug, ops::Range, rc::Rc};
 use sum_tree::{Bias, SumTree};
@@ -99,7 +99,7 @@ impl<V: 'static> Element<V> for List<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let state = &mut *self.state.0.borrow_mut();
         let size = constraint.max;
@@ -449,7 +449,7 @@ impl<V: 'static> StateInner<V> {
         existing_element: Option<&ListItem<V>>,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Option<Rc<RefCell<AnyElement<V>>>> {
         if let Some(ListItem::Rendered(element)) = existing_element {
             Some(element.clone())
@@ -662,8 +662,7 @@ mod tests {
             });
 
             let mut list = List::new(state.clone());
-            let mut layout_cx = LayoutContext::new(cx);
-            let (size, _) = list.layout(constraint, &mut view, &mut layout_cx);
+            let (size, _) = list.layout(constraint, &mut view, cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
                 state.0.borrow().items.summary().clone(),
@@ -687,8 +686,7 @@ mod tests {
                 cx,
             );
 
-            let mut layout_cx = LayoutContext::new(cx);
-            let (_, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
+            let (_, logical_scroll_top) = list.layout(constraint, &mut view, cx);
             assert_eq!(
                 logical_scroll_top,
                 ListOffset {
@@ -712,8 +710,7 @@ mod tests {
                 }
             );
 
-            let mut layout_cx = LayoutContext::new(cx);
-            let (size, logical_scroll_top) = list.layout(constraint, &mut view, &mut layout_cx);
+            let (size, logical_scroll_top) = list.layout(constraint, &mut view, cx);
             assert_eq!(size, vec2f(100., 40.));
             assert_eq!(
                 state.0.borrow().items.summary().clone(),
@@ -831,11 +828,10 @@ mod tests {
 
                 let mut list = List::new(state.clone());
                 let window_size = vec2f(width, height);
-                let mut layout_cx = LayoutContext::new(cx);
                 let (size, logical_scroll_top) = list.layout(
                     SizeConstraint::new(vec2f(0., 0.), window_size),
                     &mut view,
-                    &mut layout_cx,
+                    cx,
                 );
                 assert_eq!(size, window_size);
                 last_logical_scroll_top = Some(logical_scroll_top);
@@ -948,7 +944,7 @@ mod tests {
             &mut self,
             _: SizeConstraint,
             _: &mut V,
-            _: &mut LayoutContext<V>,
+            _: &mut ViewContext<V>,
         ) -> (Vector2F, ()) {
             (self.size, ())
         }
diff --git a/crates/gpui/src/elements/mouse_event_handler.rs b/crates/gpui/src/elements/mouse_event_handler.rs
index 6e35fb90dd15d206e6a7120dcb6b71d0bfe54ca3..672b8011c9a590fe7ad3c3e542f5976d3f0505b0 100644
--- a/crates/gpui/src/elements/mouse_event_handler.rs
+++ b/crates/gpui/src/elements/mouse_event_handler.rs
@@ -10,8 +10,8 @@ use crate::{
         CursorRegion, HandlerSet, MouseClick, MouseClickOut, MouseDown, MouseDownOut, MouseDrag,
         MouseHover, MouseMove, MouseMoveOut, MouseScrollWheel, MouseUp, MouseUpOut,
     },
-    AnyElement, Element, EventContext, LayoutContext, MouseRegion, MouseState, PaintContext,
-    SizeConstraint, TypeTag, ViewContext,
+    AnyElement, Element, EventContext, MouseRegion, MouseState, PaintContext, SizeConstraint,
+    TypeTag, ViewContext,
 };
 use serde_json::json;
 use std::ops::Range;
@@ -270,7 +270,7 @@ impl<V: 'static> Element<V> for MouseEventHandler<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         (self.child.layout(constraint, view, cx), ())
     }
diff --git a/crates/gpui/src/elements/overlay.rs b/crates/gpui/src/elements/overlay.rs
index f8d4708623c2ffdaf0f54128cced0da6a52bb362..081d018b25f1a4592cd773f61fb9f7aab794e4b4 100644
--- a/crates/gpui/src/elements/overlay.rs
+++ b/crates/gpui/src/elements/overlay.rs
@@ -3,8 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::ToJson,
-    AnyElement, Axis, Element, LayoutContext, MouseRegion, PaintContext, SizeConstraint,
-    ViewContext,
+    AnyElement, Axis, Element, MouseRegion, PaintContext, SizeConstraint, ViewContext,
 };
 use serde_json::json;
 
@@ -125,7 +124,7 @@ impl<V: 'static> Element<V> for Overlay<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let constraint = if self.anchor_position.is_some() {
             SizeConstraint::new(Vector2F::zero(), cx.window_size())
diff --git a/crates/gpui/src/elements/resizable.rs b/crates/gpui/src/elements/resizable.rs
index e67ad70304140eea1e7590a1b1bfac1f672fdb85..343ef92486358007e5ea6d06bff9b8b78d2e88ec 100644
--- a/crates/gpui/src/elements/resizable.rs
+++ b/crates/gpui/src/elements/resizable.rs
@@ -7,8 +7,8 @@ use serde_json::json;
 use crate::{
     geometry::rect::RectF,
     platform::{CursorStyle, MouseButton},
-    AnyElement, AppContext, Axis, Element, LayoutContext, MouseRegion, PaintContext,
-    SizeConstraint, TypeTag, View, ViewContext,
+    AnyElement, AppContext, Axis, Element, MouseRegion, PaintContext, SizeConstraint, TypeTag,
+    View, ViewContext,
 };
 
 #[derive(Copy, Clone, Debug)]
@@ -105,7 +105,7 @@ impl<V: 'static> Element<V> for Resizable<V> {
         &mut self,
         constraint: crate::SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         (self.child.layout(constraint, view, cx), constraint)
     }
@@ -241,7 +241,7 @@ impl<V: View, P: 'static> Element<V> for BoundsProvider<V, P> {
         &mut self,
         constraint: crate::SizeConstraint,
         view: &mut V,
-        cx: &mut crate::LayoutContext<V>,
+        cx: &mut crate::ViewContext<V>,
     ) -> (pathfinder_geometry::vector::Vector2F, Self::LayoutState) {
         (self.child.layout(constraint, view, cx), ())
     }
diff --git a/crates/gpui/src/elements/stack.rs b/crates/gpui/src/elements/stack.rs
index 72f129b1da3646eb212e98888b6d6e27d61a0a58..aac71595dda4488c0d3889ec1567454eacf6abd7 100644
--- a/crates/gpui/src/elements/stack.rs
+++ b/crates/gpui/src/elements/stack.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::{self, json, ToJson},
-    AnyElement, Element, LayoutContext, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
 };
 
 /// Element which renders it's children in a stack on top of each other.
@@ -34,7 +34,7 @@ impl<V: 'static> Element<V> for Stack<V> {
         &mut self,
         mut constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let mut size = constraint.min;
         let mut children = self.children.iter_mut();
diff --git a/crates/gpui/src/elements/svg.rs b/crates/gpui/src/elements/svg.rs
index c81e5a2892f43582129c2858411a713e25a3e49b..d6b0bc8d107c6ab0708bfcaf14af1092dbd566e5 100644
--- a/crates/gpui/src/elements/svg.rs
+++ b/crates/gpui/src/elements/svg.rs
@@ -7,7 +7,7 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    scene, Element, LayoutContext, SizeConstraint, ViewContext,
+    scene, Element, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde_derive::Deserialize;
@@ -49,7 +49,7 @@ impl<V: 'static> Element<V> for Svg {
         &mut self,
         constraint: SizeConstraint,
         _: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         match cx.asset_cache.svg(&self.path) {
             Ok(tree) => {
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 224397d067f2adabd3ff0fa96634f0f2f11152c3..0e154d80ffa16248ff65ae72a28a8f9510780685 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -7,8 +7,7 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle, ShapedBoundary},
-    Element, FontCache, LayoutContext, PaintContext, SizeConstraint, TextLayoutCache, ViewContext,
-    WindowContext,
+    Element, FontCache, PaintContext, SizeConstraint, TextLayoutCache, ViewContext, WindowContext,
 };
 use log::warn;
 use serde_json::json;
@@ -78,7 +77,7 @@ impl<V: 'static> Element<V> for Text {
         &mut self,
         constraint: SizeConstraint,
         _: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         // Convert the string and highlight ranges into an iterator of highlighted chunks.
 
@@ -409,11 +408,10 @@ mod tests {
             let mut view = TestView;
             fonts::with_font_cache(cx.font_cache().clone(), || {
                 let mut text = Text::new("Hello\r\n", Default::default()).with_soft_wrap(true);
-                let mut layout_cx = LayoutContext::new(cx);
                 let (_, state) = text.layout(
                     SizeConstraint::new(Default::default(), vec2f(f32::INFINITY, f32::INFINITY)),
                     &mut view,
-                    &mut layout_cx,
+                    cx,
                 );
                 assert_eq!(state.shaped_lines.len(), 2);
                 assert_eq!(state.wrap_boundaries.len(), 2);
diff --git a/crates/gpui/src/elements/tooltip.rs b/crates/gpui/src/elements/tooltip.rs
index 1c521751f9c5db0b3bebb0788d260deb1851ea2f..d16752c022dca0be0c89785a8c7b706341f4c61d 100644
--- a/crates/gpui/src/elements/tooltip.rs
+++ b/crates/gpui/src/elements/tooltip.rs
@@ -6,8 +6,7 @@ use crate::{
     fonts::TextStyle,
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    Action, Axis, ElementStateHandle, LayoutContext, PaintContext, SizeConstraint, Task, TypeTag,
-    ViewContext,
+    Action, Axis, ElementStateHandle, PaintContext, SizeConstraint, Task, TypeTag, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -189,7 +188,7 @@ impl<V: 'static> Element<V> for Tooltip<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let size = self.child.layout(constraint, view, cx);
         if let Some(tooltip) = self.tooltip.as_mut() {
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index e75e13438695169a226679ee50cfeaeece782830..d3463b1d2cdffe260b6770a8dc744d92c2e87cfc 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -6,7 +6,7 @@ use crate::{
     },
     json::{self, json},
     platform::ScrollWheelEvent,
-    AnyElement, LayoutContext, MouseRegion, PaintContext, ViewContext,
+    AnyElement, MouseRegion, PaintContext, ViewContext,
 };
 use json::ToJson;
 use std::{cell::RefCell, cmp, ops::Range, rc::Rc};
@@ -158,7 +158,7 @@ impl<V: 'static> Element<V> for UniformList<V> {
         &mut self,
         constraint: SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         if constraint.max.y().is_infinite() {
             unimplemented!(
diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
index e0b5483d06634cee5addd851769dc0ddd2b11281..0a4133e07371bd93836e8eb760df36820ad431c3 100644
--- a/crates/gpui2/src/adapter.rs
+++ b/crates/gpui2/src/adapter.rs
@@ -13,7 +13,7 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
         &mut self,
         constraint: gpui::SizeConstraint,
         view: &mut V,
-        cx: &mut gpui::LayoutContext<V>,
+        cx: &mut gpui::ViewContext<V>,
     ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
         cx.push_layout_engine(LayoutEngine::new());
 
diff --git a/crates/gpui_macros/src/gpui_macros.rs b/crates/gpui_macros/src/gpui_macros.rs
index b712aace69f493a537ae06bba098e580e87b7c36..f68573074427c8aa24fddf7bfe6ffa2e694e13eb 100644
--- a/crates/gpui_macros/src/gpui_macros.rs
+++ b/crates/gpui_macros/src/gpui_macros.rs
@@ -329,7 +329,7 @@ pub fn element_derive(input: TokenStream) -> TokenStream {
                 &mut self,
                 constraint: gpui::SizeConstraint,
                 view: &mut V,
-                cx: &mut gpui::LayoutContext<V>,
+                cx: &mut gpui::ViewContext<V>,
             ) -> (gpui::geometry::vector::Vector2F, gpui::elements::AnyElement<V>) {
                 let mut element = self.render(view, cx).into_any();
                 let size = element.layout(constraint, view, cx);
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 7892dfe70e64f791db9a28254121e4ea63d96514..30bea0962782bd79e2e3eacd25a4fe52250bd025 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -10,9 +10,8 @@ use gpui::{
     platform::{CursorStyle, MouseButton},
     serde_json::json,
     text_layout::{Line, RunStyle},
-    AnyElement, Element, EventContext, FontCache, LayoutContext, ModelContext, MouseRegion,
-    PaintContext, Quad, SizeConstraint, TextLayoutCache, ViewContext, WeakModelHandle,
-    WindowContext,
+    AnyElement, Element, EventContext, FontCache, ModelContext, MouseRegion, PaintContext, Quad,
+    SizeConstraint, TextLayoutCache, ViewContext, WeakModelHandle, WindowContext,
 };
 use itertools::Itertools;
 use language::CursorShape;
@@ -527,7 +526,7 @@ impl Element<TerminalView> for TerminalElement {
         &mut self,
         constraint: gpui::SizeConstraint,
         view: &mut TerminalView,
-        cx: &mut LayoutContext<TerminalView>,
+        cx: &mut ViewContext<TerminalView>,
     ) -> (gpui::geometry::vector::Vector2F, Self::LayoutState) {
         let settings = settings::get::<ThemeSettings>(cx);
         let terminal_settings = settings::get::<TerminalSettings>(cx);
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index d31f0d9749b3af4ac0d36d00803232607d92b842..69d4b1da00de4d9a0a6c0c311ee39d63515a9cdd 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -25,8 +25,8 @@ use gpui::{
     keymap_matcher::KeymapContext,
     platform::{CursorStyle, MouseButton, NavigationDirection, PromptLevel},
     Action, AnyViewHandle, AnyWeakViewHandle, AppContext, AsyncAppContext, Entity, EventContext,
-    LayoutContext, ModelHandle, MouseRegion, PaintContext, Quad, Task, View, ViewContext,
-    ViewHandle, WeakViewHandle, WindowContext,
+    ModelHandle, MouseRegion, PaintContext, Quad, Task, View, ViewContext, ViewHandle,
+    WeakViewHandle, WindowContext,
 };
 use project::{Project, ProjectEntryId, ProjectPath};
 use serde::Deserialize;
@@ -1999,7 +1999,7 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
         &mut self,
         constraint: gpui::SizeConstraint,
         view: &mut V,
-        cx: &mut LayoutContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> (Vector2F, Self::LayoutState) {
         let size = self.child.layout(constraint, view, cx);
         (size, ())
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 9747bda2d5fe93c39c8bc55c83746f6a1c7e42e3..c3729d097656154c26a50c85d3dfb939af5fcab0 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -594,8 +594,8 @@ mod element {
         json::{self, ToJson},
         platform::{CursorStyle, MouseButton},
         scene::MouseDrag,
-        AnyElement, Axis, CursorRegion, Element, EventContext, LayoutContext, MouseRegion,
-        PaintContext, RectFExt, SizeConstraint, Vector2FExt, ViewContext,
+        AnyElement, Axis, CursorRegion, Element, EventContext, MouseRegion, PaintContext, RectFExt,
+        SizeConstraint, Vector2FExt, ViewContext,
     };
 
     use crate::{
@@ -641,7 +641,7 @@ mod element {
             remaining_flex: &mut f32,
             cross_axis_max: &mut f32,
             view: &mut Workspace,
-            cx: &mut LayoutContext<Workspace>,
+            cx: &mut ViewContext<Workspace>,
         ) {
             let flexes = self.flexes.borrow();
             let cross_axis = self.axis.invert();
@@ -789,7 +789,7 @@ mod element {
             &mut self,
             constraint: SizeConstraint,
             view: &mut Workspace,
-            cx: &mut LayoutContext<Workspace>,
+            cx: &mut ViewContext<Workspace>,
         ) -> (Vector2F, Self::LayoutState) {
             debug_assert!(self.children.len() == self.flexes.borrow().len());
 
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
index c05b93ff9559bcd98714f4660e1e4e8f9b227393..0da51623537e8b2db3cc66a51b275d95ae3be213 100644
--- a/crates/workspace/src/status_bar.rs
+++ b/crates/workspace/src/status_bar.rs
@@ -8,8 +8,8 @@ use gpui::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    AnyElement, AnyViewHandle, Entity, LayoutContext, PaintContext, SizeConstraint, Subscription,
-    View, ViewContext, ViewHandle, WindowContext,
+    AnyElement, AnyViewHandle, Entity, PaintContext, SizeConstraint, Subscription, View,
+    ViewContext, ViewHandle, WindowContext,
 };
 
 pub trait StatusItemView: View {
@@ -208,7 +208,7 @@ impl Element<StatusBar> for StatusBarElement {
         &mut self,
         mut constraint: SizeConstraint,
         view: &mut StatusBar,
-        cx: &mut LayoutContext<StatusBar>,
+        cx: &mut ViewContext<StatusBar>,
     ) -> (Vector2F, Self::LayoutState) {
         let max_width = constraint.max.x();
         constraint.min = vec2f(0., constraint.min.y());

From e0fdc7d0aa08a00f7d53b7f0687afdeb7e2c31db Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Mon, 11 Sep 2023 09:00:59 -0600
Subject: [PATCH 089/109] Eliminate PaintContext

---
 crates/collab_ui/src/collab_titlebar_item.rs  |  6 +-
 crates/collab_ui/src/face_pile.rs             |  4 +-
 crates/editor/src/element.rs                  | 20 ++---
 crates/gpui/examples/corner_radii.rs          |  2 +-
 crates/gpui/src/app.rs                        | 86 +++----------------
 crates/gpui/src/app/window.rs                 |  6 +-
 crates/gpui/src/elements.rs                   | 31 ++-----
 crates/gpui/src/elements/align.rs             |  4 +-
 crates/gpui/src/elements/canvas.rs            |  8 +-
 crates/gpui/src/elements/clipped.rs           |  4 +-
 crates/gpui/src/elements/component.rs         |  4 +-
 crates/gpui/src/elements/constrained_box.rs   |  4 +-
 crates/gpui/src/elements/container.rs         |  4 +-
 crates/gpui/src/elements/empty.rs             |  4 +-
 crates/gpui/src/elements/expanded.rs          |  4 +-
 crates/gpui/src/elements/flex.rs              |  7 +-
 crates/gpui/src/elements/hook.rs              |  4 +-
 crates/gpui/src/elements/image.rs             |  4 +-
 crates/gpui/src/elements/keystroke_label.rs   |  2 +-
 crates/gpui/src/elements/label.rs             |  4 +-
 crates/gpui/src/elements/list.rs              |  8 +-
 .../gpui/src/elements/mouse_event_handler.rs  |  6 +-
 crates/gpui/src/elements/overlay.rs           |  4 +-
 crates/gpui/src/elements/resizable.rs         |  7 +-
 crates/gpui/src/elements/stack.rs             |  4 +-
 crates/gpui/src/elements/svg.rs               |  3 +-
 crates/gpui/src/elements/text.rs              |  4 +-
 crates/gpui/src/elements/tooltip.rs           |  4 +-
 crates/gpui/src/elements/uniform_list.rs      |  4 +-
 crates/gpui2/src/adapter.rs                   | 12 +--
 crates/gpui2/src/element.rs                   |  9 +-
 crates/gpui2/src/elements/div.rs              |  7 +-
 crates/gpui2/src/elements/hoverable.rs        |  3 +-
 crates/gpui2/src/elements/img.rs              |  2 +-
 crates/gpui2/src/elements/pressable.rs        |  3 +-
 crates/gpui2/src/elements/svg.rs              |  2 +-
 crates/gpui2/src/elements/text.rs             |  3 +-
 crates/gpui2/src/gpui2.rs                     |  1 -
 crates/gpui2/src/interactive.rs               |  4 +-
 crates/gpui2/src/paint_context.rs             | 50 -----------
 crates/gpui2/src/style.rs                     |  6 +-
 crates/gpui2/src/view_context.rs              | 34 +++++++-
 crates/gpui2_macros/src/derive_element.rs     |  2 +-
 crates/gpui_macros/src/gpui_macros.rs         |  2 +-
 crates/storybook/src/theme.rs                 |  7 +-
 crates/terminal_view/src/terminal_element.rs  |  6 +-
 crates/workspace/src/pane.rs                  |  6 +-
 crates/workspace/src/pane_group.rs            |  4 +-
 crates/workspace/src/status_bar.rs            |  6 +-
 49 files changed, 156 insertions(+), 269 deletions(-)
 delete mode 100644 crates/gpui2/src/paint_context.rs

diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index a12e7b8663da69fba09ab825e0c3199cd161d7ef..f0e09e139e648d21381bddc54eecfe541bb43a74 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -13,8 +13,8 @@ use gpui::{
     geometry::{rect::RectF, vector::vec2f, PathBuilder},
     json::{self, ToJson},
     platform::{CursorStyle, MouseButton},
-    AppContext, Entity, ImageData, ModelHandle, PaintContext, Subscription, View, ViewContext,
-    ViewHandle, WeakViewHandle,
+    AppContext, Entity, ImageData, ModelHandle, Subscription, View, ViewContext, ViewHandle,
+    WeakViewHandle,
 };
 use picker::PickerEvent;
 use project::{Project, RepositoryEntry};
@@ -1176,7 +1176,7 @@ impl Element<CollabTitlebarItem> for AvatarRibbon {
         _: RectF,
         _: &mut Self::LayoutState,
         _: &mut CollabTitlebarItem,
-        cx: &mut PaintContext<CollabTitlebarItem>,
+        cx: &mut ViewContext<CollabTitlebarItem>,
     ) -> Self::PaintState {
         let mut path = PathBuilder::new();
         path.reset(bounds.lower_left());
diff --git a/crates/collab_ui/src/face_pile.rs b/crates/collab_ui/src/face_pile.rs
index ef0368dd32f026fe07123b587954d70aa2f101a5..5017666f7b05d64423260e63da86c951cec5955d 100644
--- a/crates/collab_ui/src/face_pile.rs
+++ b/crates/collab_ui/src/face_pile.rs
@@ -7,7 +7,7 @@ use gpui::{
     },
     json::ToJson,
     serde_json::{self, json},
-    AnyElement, Axis, Element, PaintContext, View, ViewContext,
+    AnyElement, Axis, Element, View, ViewContext,
 };
 
 pub(crate) struct FacePile<V: View> {
@@ -57,7 +57,7 @@ impl<V: View> Element<V> for FacePile<V> {
         visible_bounds: RectF,
         _layout: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
 
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 7a8235224530cba8c77d978863170873686ef0de..b7e34fda5377d6370d33cdec35087a4e544cd7d9 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -32,8 +32,8 @@ use gpui::{
     json::{self, ToJson},
     platform::{CursorStyle, Modifiers, MouseButton, MouseButtonEvent, MouseMovedEvent},
     text_layout::{self, Line, RunStyle, TextLayoutCache},
-    AnyElement, Axis, CursorRegion, Element, EventContext, FontCache, MouseRegion, PaintContext,
-    Quad, SizeConstraint, ViewContext, WindowContext,
+    AnyElement, Axis, CursorRegion, Element, EventContext, FontCache, MouseRegion, Quad,
+    SizeConstraint, ViewContext, WindowContext,
 };
 use itertools::Itertools;
 use json::json;
@@ -635,7 +635,7 @@ impl EditorElement {
         visible_bounds: RectF,
         layout: &mut LayoutState,
         editor: &mut Editor,
-        cx: &mut PaintContext<Editor>,
+        cx: &mut ViewContext<Editor>,
     ) {
         let line_height = layout.position_map.line_height;
 
@@ -778,7 +778,7 @@ impl EditorElement {
         visible_bounds: RectF,
         layout: &mut LayoutState,
         editor: &mut Editor,
-        cx: &mut PaintContext<Editor>,
+        cx: &mut ViewContext<Editor>,
     ) {
         let style = &self.style;
         let scroll_position = layout.position_map.snapshot.scroll_position();
@@ -1351,7 +1351,7 @@ impl EditorElement {
         visible_bounds: RectF,
         layout: &mut LayoutState,
         editor: &mut Editor,
-        cx: &mut PaintContext<Editor>,
+        cx: &mut ViewContext<Editor>,
     ) {
         let scroll_position = layout.position_map.snapshot.scroll_position();
         let scroll_left = scroll_position.x() * layout.position_map.em_width;
@@ -2570,7 +2570,7 @@ impl Element<Editor> for EditorElement {
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
         editor: &mut Editor,
-        cx: &mut PaintContext<Editor>,
+        cx: &mut ViewContext<Editor>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
         cx.scene().push_layer(Some(visible_bounds));
@@ -3340,13 +3340,7 @@ mod tests {
         // Don't panic.
         let bounds = RectF::new(Default::default(), size);
         editor.update(cx, |editor, cx| {
-            element.paint(
-                bounds,
-                bounds,
-                &mut state,
-                editor,
-                &mut PaintContext::new(cx),
-            );
+            element.paint(bounds, bounds, &mut state, editor, cx);
         });
     }
 
diff --git a/crates/gpui/examples/corner_radii.rs b/crates/gpui/examples/corner_radii.rs
index c2f6b99ceba3247b5d7f711408dd13517bcc5677..75ea3aeec6579bfa2b5b0e2afe78b8dcfc0a75d5 100644
--- a/crates/gpui/examples/corner_radii.rs
+++ b/crates/gpui/examples/corner_radii.rs
@@ -53,7 +53,7 @@ impl<V: View> gpui::Element<V> for CornersElement {
         _: pathfinder_geometry::rect::RectF,
         _: &mut Self::LayoutState,
         _: &mut V,
-        cx: &mut gpui::PaintContext<V>,
+        cx: &mut gpui::ViewContext<V>,
     ) -> Self::PaintState {
         cx.scene().push_quad(Quad {
             bounds,
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 5fc7f54a7a178cfec814c6bbd6a998f5ea30a25f..c95c0a610561b283de7c61481c698f8575298637 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3404,6 +3404,16 @@ impl<'a, 'b, V: 'static> ViewContext<'a, 'b, V> {
             .or_default()
             .push(self_view_id);
     }
+
+    pub fn paint_layer<F, R>(&mut self, clip_bounds: Option<RectF>, f: F) -> R
+    where
+        F: FnOnce(&mut Self) -> R,
+    {
+        self.scene().push_layer(clip_bounds);
+        let result = f(self);
+        self.scene().pop_layer();
+        result
+    }
 }
 
 impl<V: View> ViewContext<'_, '_, V> {
@@ -3495,82 +3505,6 @@ impl<V> BorrowWindowContext for ViewContext<'_, '_, V> {
     }
 }
 
-pub struct PaintContext<'a, 'b, 'c, V> {
-    pub view_context: &'c mut ViewContext<'a, 'b, V>,
-}
-
-impl<'a, 'b, 'c, V> PaintContext<'a, 'b, 'c, V> {
-    pub fn new(view_context: &'c mut ViewContext<'a, 'b, V>) -> Self {
-        Self { view_context }
-    }
-
-    pub fn paint_layer<F, R>(&mut self, clip_bounds: Option<RectF>, f: F) -> R
-    where
-        F: FnOnce(&mut Self) -> R,
-    {
-        self.scene().push_layer(clip_bounds);
-        let result = f(self);
-        self.scene().pop_layer();
-        result
-    }
-}
-
-impl<'a, 'b, 'c, V> Deref for PaintContext<'a, 'b, 'c, V> {
-    type Target = ViewContext<'a, 'b, V>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.view_context
-    }
-}
-
-impl<V> DerefMut for PaintContext<'_, '_, '_, V> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.view_context
-    }
-}
-
-impl<V> BorrowAppContext for PaintContext<'_, '_, '_, V> {
-    fn read_with<T, F: FnOnce(&AppContext) -> T>(&self, f: F) -> T {
-        BorrowAppContext::read_with(&*self.view_context, f)
-    }
-
-    fn update<T, F: FnOnce(&mut AppContext) -> T>(&mut self, f: F) -> T {
-        BorrowAppContext::update(&mut *self.view_context, f)
-    }
-}
-
-impl<V> BorrowWindowContext for PaintContext<'_, '_, '_, V> {
-    type Result<T> = T;
-
-    fn read_window<T, F>(&self, window: AnyWindowHandle, f: F) -> Self::Result<T>
-    where
-        F: FnOnce(&WindowContext) -> T,
-    {
-        BorrowWindowContext::read_window(self.view_context, window, f)
-    }
-
-    fn read_window_optional<T, F>(&self, window: AnyWindowHandle, f: F) -> Option<T>
-    where
-        F: FnOnce(&WindowContext) -> Option<T>,
-    {
-        BorrowWindowContext::read_window_optional(self.view_context, window, f)
-    }
-
-    fn update_window<T, F>(&mut self, window: AnyWindowHandle, f: F) -> Self::Result<T>
-    where
-        F: FnOnce(&mut WindowContext) -> T,
-    {
-        BorrowWindowContext::update_window(self.view_context, window, f)
-    }
-
-    fn update_window_optional<T, F>(&mut self, window: AnyWindowHandle, f: F) -> Option<T>
-    where
-        F: FnOnce(&mut WindowContext) -> Option<T>,
-    {
-        BorrowWindowContext::update_window_optional(self.view_context, window, f)
-    }
-}
-
 pub struct EventContext<'a, 'b, 'c, V> {
     view_context: &'c mut ViewContext<'a, 'b, V>,
     pub(crate) handled: bool,
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 96ff9988c03f31632befafd2ceffab1b1364965b..e17795910f434d99b5129513ee3783c494d1972b 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -16,8 +16,8 @@ use crate::{
     text_layout::TextLayoutCache,
     util::post_inc,
     Action, AnyView, AnyViewHandle, AnyWindowHandle, AppContext, BorrowAppContext,
-    BorrowWindowContext, Effect, Element, Entity, Handle, MouseRegion, MouseRegionId, PaintContext,
-    SceneBuilder, Subscription, View, ViewContext, ViewHandle, WindowInvalidation,
+    BorrowWindowContext, Effect, Element, Entity, Handle, MouseRegion, MouseRegionId, SceneBuilder,
+    Subscription, View, ViewContext, ViewHandle, WindowInvalidation,
 };
 use anyhow::{anyhow, bail, Result};
 use collections::{HashMap, HashSet};
@@ -1703,7 +1703,7 @@ impl<V: 'static> Element<V> for ChildView {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         _: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         if let Some(mut rendered_view) = cx.window.rendered_views.remove(&self.view_id) {
             rendered_view
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index 94373485ba068227b544d0ea39066f42bef53dd4..cf01a1ddc1e8ed907c551adb12cab2ce1f13b2c7 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -34,7 +34,7 @@ use crate::{
         rect::RectF,
         vector::{vec2f, Vector2F},
     },
-    json, Action, Entity, PaintContext, SizeConstraint, TypeTag, View, ViewContext, WeakViewHandle,
+    json, Action, Entity, SizeConstraint, TypeTag, View, ViewContext, WeakViewHandle,
     WindowContext,
 };
 use anyhow::{anyhow, Result};
@@ -68,7 +68,7 @@ pub trait Element<V: 'static>: 'static {
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState;
 
     fn rect_for_text_range(
@@ -267,7 +267,7 @@ trait AnyElementState<V> {
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     );
 
     fn rect_for_text_range(
@@ -347,7 +347,7 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         *self = match mem::take(self) {
             ElementState::PostLayout {
@@ -357,13 +357,7 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
                 mut layout,
             } => {
                 let bounds = RectF::new(origin, size);
-                let paint = element.paint(
-                    bounds,
-                    visible_bounds,
-                    &mut layout,
-                    view,
-                    &mut PaintContext::new(cx),
-                );
+                let paint = element.paint(bounds, visible_bounds, &mut layout, view, cx);
                 ElementState::PostPaint {
                     element,
                     constraint,
@@ -381,13 +375,7 @@ impl<V, E: Element<V>> AnyElementState<V> for ElementState<V, E> {
                 ..
             } => {
                 let bounds = RectF::new(origin, bounds.size());
-                let paint = element.paint(
-                    bounds,
-                    visible_bounds,
-                    &mut layout,
-                    view,
-                    &mut PaintContext::new(cx),
-                );
+                let paint = element.paint(bounds, visible_bounds, &mut layout, view, cx);
                 ElementState::PostPaint {
                     element,
                     constraint,
@@ -520,7 +508,7 @@ impl<V> AnyElement<V> {
         origin: Vector2F,
         visible_bounds: RectF,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         self.state.paint(origin, visible_bounds, view, cx);
     }
@@ -582,7 +570,7 @@ impl<V: 'static> Element<V> for AnyElement<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         self.paint(bounds.origin(), visible_bounds, view, cx);
     }
@@ -674,8 +662,7 @@ impl<V: View> AnyRootElement for RootElement<V> {
             .ok_or_else(|| anyhow!("paint called on a root element for a dropped view"))?;
 
         view.update(cx, |view, cx| {
-            let mut cx = PaintContext::new(cx);
-            self.element.paint(origin, visible_bounds, view, &mut cx);
+            self.element.paint(origin, visible_bounds, view, cx);
             Ok(())
         })
     }
diff --git a/crates/gpui/src/elements/align.rs b/crates/gpui/src/elements/align.rs
index daec48deb8a1b3ef8f4af1283d8b3484bb4fe0c7..ba302f409442136ede9286c3aafef3a22286a099 100644
--- a/crates/gpui/src/elements/align.rs
+++ b/crates/gpui/src/elements/align.rs
@@ -1,6 +1,6 @@
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
+    json, AnyElement, Element, SizeConstraint, ViewContext,
 };
 use json::ToJson;
 
@@ -68,7 +68,7 @@ impl<V: 'static> Element<V> for Align<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let my_center = bounds.size() / 2.;
         let my_target = my_center + my_center * self.alignment;
diff --git a/crates/gpui/src/elements/canvas.rs b/crates/gpui/src/elements/canvas.rs
index ec6beaafeb38dd18d9b15fe124db6a2b2424be3b..494d9747c5159bfbea08a250bc34f40f6d8c3103 100644
--- a/crates/gpui/src/elements/canvas.rs
+++ b/crates/gpui/src/elements/canvas.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use super::Element;
 use crate::{
     json::{self, json},
-    PaintContext, ViewContext,
+    ViewContext,
 };
 use json::ToJson;
 use pathfinder_geometry::{
@@ -15,7 +15,7 @@ pub struct Canvas<V, F>(F, PhantomData<V>);
 
 impl<V, F> Canvas<V, F>
 where
-    F: FnMut(RectF, RectF, &mut V, &mut PaintContext<V>),
+    F: FnMut(RectF, RectF, &mut V, &mut ViewContext<V>),
 {
     pub fn new(f: F) -> Self {
         Self(f, PhantomData)
@@ -24,7 +24,7 @@ where
 
 impl<V: 'static, F> Element<V> for Canvas<V, F>
 where
-    F: 'static + FnMut(RectF, RectF, &mut V, &mut PaintContext<V>),
+    F: 'static + FnMut(RectF, RectF, &mut V, &mut ViewContext<V>),
 {
     type LayoutState = ();
     type PaintState = ();
@@ -54,7 +54,7 @@ where
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         self.0(bounds, visible_bounds, view, cx)
     }
diff --git a/crates/gpui/src/elements/clipped.rs b/crates/gpui/src/elements/clipped.rs
index 50fe3dc4dfb5354d4c09f4a3051d33465265fcca..3bd16306bc441aab5608d56c632dc6659a012a31 100644
--- a/crates/gpui/src/elements/clipped.rs
+++ b/crates/gpui/src/elements/clipped.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 use serde_json::json;
 
-use crate::{json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext};
+use crate::{json, AnyElement, Element, SizeConstraint, ViewContext};
 
 pub struct Clipped<V> {
     child: AnyElement<V>,
@@ -34,7 +34,7 @@ impl<V: 'static> Element<V> for Clipped<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         cx.scene().push_layer(Some(bounds));
         let state = self.child.paint(bounds.origin(), visible_bounds, view, cx);
diff --git a/crates/gpui/src/elements/component.rs b/crates/gpui/src/elements/component.rs
index a663574f43a4daff4e8d5630301375e44cddfc4b..1d52ede4560a48b4b4c36be3b9be2e72e435a060 100644
--- a/crates/gpui/src/elements/component.rs
+++ b/crates/gpui/src/elements/component.rs
@@ -2,7 +2,7 @@ use std::{any::Any, marker::PhantomData};
 
 use pathfinder_geometry::{rect::RectF, vector::Vector2F};
 
-use crate::{AnyElement, Element, PaintContext, SizeConstraint, ViewContext};
+use crate::{AnyElement, Element, SizeConstraint, ViewContext};
 
 use super::Empty;
 
@@ -302,7 +302,7 @@ impl<V: 'static, C: StatefulComponent<V> + 'static> Element<V> for ComponentAdap
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         self.element
             .as_mut()
diff --git a/crates/gpui/src/elements/constrained_box.rs b/crates/gpui/src/elements/constrained_box.rs
index 5a693869e529e80a4b7812ca3450bf4d43ed0024..0b49b0951dd3346c0a76f03e3f53234fde976ac1 100644
--- a/crates/gpui/src/elements/constrained_box.rs
+++ b/crates/gpui/src/elements/constrained_box.rs
@@ -5,7 +5,7 @@ use serde_json::json;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
+    json, AnyElement, Element, SizeConstraint, ViewContext,
 };
 
 pub struct ConstrainedBox<V> {
@@ -154,7 +154,7 @@ impl<V: 'static> Element<V> for ConstrainedBox<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         cx.scene().push_layer(Some(visible_bounds));
         self.child.paint(bounds.origin(), visible_bounds, view, cx);
diff --git a/crates/gpui/src/elements/container.rs b/crates/gpui/src/elements/container.rs
index caa9af457cc86a0e33f953a0ea2f4261babc84a3..c2d8fd38bd7d8ccd89fd0dc3b715ae1494af12f9 100644
--- a/crates/gpui/src/elements/container.rs
+++ b/crates/gpui/src/elements/container.rs
@@ -10,7 +10,7 @@ use crate::{
     json::ToJson,
     platform::CursorStyle,
     scene::{self, CornerRadii, CursorRegion, Quad},
-    AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -391,7 +391,7 @@ impl<V: 'static> Element<V> for Container<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let quad_bounds = RectF::from_points(
             bounds.origin() + vec2f(self.style.margin.left, self.style.margin.top),
diff --git a/crates/gpui/src/elements/empty.rs b/crates/gpui/src/elements/empty.rs
index 65acdf329542ea1fa1e3b6df354bd0a5939503cd..43441992785ab12d0e6c68386af1be79db07a0a6 100644
--- a/crates/gpui/src/elements/empty.rs
+++ b/crates/gpui/src/elements/empty.rs
@@ -6,7 +6,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    PaintContext, ViewContext,
+    ViewContext,
 };
 use crate::{Element, SizeConstraint};
 
@@ -56,7 +56,7 @@ impl<V: 'static> Element<V> for Empty {
         _: RectF,
         _: &mut Self::LayoutState,
         _: &mut V,
-        _: &mut PaintContext<V>,
+        _: &mut ViewContext<V>,
     ) -> Self::PaintState {
     }
 
diff --git a/crates/gpui/src/elements/expanded.rs b/crates/gpui/src/elements/expanded.rs
index 9dd301b2029f4937a276c6b7858731cabc9c335a..0cafa3f1191ac69b4ceb06d0717995aaea164166 100644
--- a/crates/gpui/src/elements/expanded.rs
+++ b/crates/gpui/src/elements/expanded.rs
@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
-    json, AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
+    json, AnyElement, Element, SizeConstraint, ViewContext,
 };
 use serde_json::json;
 
@@ -60,7 +60,7 @@ impl<V: 'static> Element<V> for Expanded<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
diff --git a/crates/gpui/src/elements/flex.rs b/crates/gpui/src/elements/flex.rs
index b7d69fff6129ae102b8c1c236c8727c5877b146e..cdce0423fd6d9eef4e0e5be11e584b02d58fec76 100644
--- a/crates/gpui/src/elements/flex.rs
+++ b/crates/gpui/src/elements/flex.rs
@@ -2,8 +2,7 @@ use std::{any::Any, cell::Cell, f32::INFINITY, ops::Range, rc::Rc};
 
 use crate::{
     json::{self, ToJson, Value},
-    AnyElement, Axis, Element, ElementStateHandle, PaintContext, SizeConstraint, Vector2FExt,
-    ViewContext,
+    AnyElement, Axis, Element, ElementStateHandle, SizeConstraint, Vector2FExt, ViewContext,
 };
 use pathfinder_geometry::{
     rect::RectF,
@@ -264,7 +263,7 @@ impl<V: 'static> Element<V> for Flex<V> {
         visible_bounds: RectF,
         remaining_space: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
 
@@ -454,7 +453,7 @@ impl<V: 'static> Element<V> for FlexItem<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         self.child.paint(bounds.origin(), visible_bounds, view, cx)
     }
diff --git a/crates/gpui/src/elements/hook.rs b/crates/gpui/src/elements/hook.rs
index 5b0c5c4c48a8b80aa7320de4a486ab3255935854..8797899f038455ca336fef3828efa03ac4bb55ec 100644
--- a/crates/gpui/src/elements/hook.rs
+++ b/crates/gpui/src/elements/hook.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, SizeConstraint, ViewContext,
 };
 
 pub struct Hook<V> {
@@ -51,7 +51,7 @@ impl<V: 'static> Element<V> for Hook<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         self.child.paint(bounds.origin(), visible_bounds, view, cx);
     }
diff --git a/crates/gpui/src/elements/image.rs b/crates/gpui/src/elements/image.rs
index a0b710187c4b3f48878d6f2c72c70893002bdf91..7e0c7d5daa61e5fce6c82175f17bf64d61dfa718 100644
--- a/crates/gpui/src/elements/image.rs
+++ b/crates/gpui/src/elements/image.rs
@@ -5,7 +5,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    scene, Element, ImageData, PaintContext, SizeConstraint, ViewContext,
+    scene, Element, ImageData, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -95,7 +95,7 @@ impl<V: 'static> Element<V> for Image {
         _: RectF,
         layout: &mut Self::LayoutState,
         _: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         if let Some(data) = layout {
             cx.scene().push_image(scene::Image {
diff --git a/crates/gpui/src/elements/keystroke_label.rs b/crates/gpui/src/elements/keystroke_label.rs
index 7f32f86c5e9d53e78582e95673e8298d42b860f6..5ebb9ea6882a2cc3f298d9ded7a0e4707e34cea8 100644
--- a/crates/gpui/src/elements/keystroke_label.rs
+++ b/crates/gpui/src/elements/keystroke_label.rs
@@ -65,7 +65,7 @@ impl<V: 'static> Element<V> for KeystrokeLabel {
         visible_bounds: RectF,
         element: &mut AnyElement<V>,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         element.paint(bounds.origin(), visible_bounds, view, cx);
     }
diff --git a/crates/gpui/src/elements/label.rs b/crates/gpui/src/elements/label.rs
index 8ff2f1588382c3f43b1f7c1afaee9f2896e1039a..d8e6bd3ea6f8782eb0342a1ea425ca9de27f153f 100644
--- a/crates/gpui/src/elements/label.rs
+++ b/crates/gpui/src/elements/label.rs
@@ -8,7 +8,7 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle},
-    Element, PaintContext, SizeConstraint, ViewContext,
+    Element, SizeConstraint, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -162,7 +162,7 @@ impl<V: 'static> Element<V> for Label {
         visible_bounds: RectF,
         line: &mut Self::LayoutState,
         _: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
         line.paint(bounds.origin(), visible_bounds, bounds.size().y(), cx)
diff --git a/crates/gpui/src/elements/list.rs b/crates/gpui/src/elements/list.rs
index 0b9b018311af042f4df73872cb67dba737b49bc3..a23b6fc5e3eb335b84fd4039697c11a2fc07e84d 100644
--- a/crates/gpui/src/elements/list.rs
+++ b/crates/gpui/src/elements/list.rs
@@ -4,7 +4,7 @@ use crate::{
         vector::{vec2f, Vector2F},
     },
     json::json,
-    AnyElement, Element, MouseRegion, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, MouseRegion, SizeConstraint, ViewContext,
 };
 use std::{cell::RefCell, collections::VecDeque, fmt::Debug, ops::Range, rc::Rc};
 use sum_tree::{Bias, SumTree};
@@ -253,7 +253,7 @@ impl<V: 'static> Element<V> for List<V> {
         visible_bounds: RectF,
         scroll_top: &mut ListOffset,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
         cx.scene().push_layer(Some(visible_bounds));
@@ -643,7 +643,7 @@ impl<'a> sum_tree::SeekTarget<'a, ListItemSummary, ListItemSummary> for Height {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{elements::Empty, geometry::vector::vec2f, Entity, PaintContext};
+    use crate::{elements::Empty, geometry::vector::vec2f, Entity};
     use rand::prelude::*;
     use std::env;
 
@@ -949,7 +949,7 @@ mod tests {
             (self.size, ())
         }
 
-        fn paint(&mut self, _: RectF, _: RectF, _: &mut (), _: &mut V, _: &mut PaintContext<V>) {
+        fn paint(&mut self, _: RectF, _: RectF, _: &mut (), _: &mut V, _: &mut ViewContext<V>) {
             unimplemented!()
         }
 
diff --git a/crates/gpui/src/elements/mouse_event_handler.rs b/crates/gpui/src/elements/mouse_event_handler.rs
index 672b8011c9a590fe7ad3c3e542f5976d3f0505b0..0a632ba382e9aefe7eda60c13f2a76901c7f6145 100644
--- a/crates/gpui/src/elements/mouse_event_handler.rs
+++ b/crates/gpui/src/elements/mouse_event_handler.rs
@@ -10,8 +10,8 @@ use crate::{
         CursorRegion, HandlerSet, MouseClick, MouseClickOut, MouseDown, MouseDownOut, MouseDrag,
         MouseHover, MouseMove, MouseMoveOut, MouseScrollWheel, MouseUp, MouseUpOut,
     },
-    AnyElement, Element, EventContext, MouseRegion, MouseState, PaintContext, SizeConstraint,
-    TypeTag, ViewContext,
+    AnyElement, Element, EventContext, MouseRegion, MouseState, SizeConstraint, TypeTag,
+    ViewContext,
 };
 use serde_json::json;
 use std::ops::Range;
@@ -281,7 +281,7 @@ impl<V: 'static> Element<V> for MouseEventHandler<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         if self.above {
             self.child.paint(bounds.origin(), visible_bounds, view, cx);
diff --git a/crates/gpui/src/elements/overlay.rs b/crates/gpui/src/elements/overlay.rs
index 081d018b25f1a4592cd773f61fb9f7aab794e4b4..11956bc211aa192478b43420599c9db8294c380d 100644
--- a/crates/gpui/src/elements/overlay.rs
+++ b/crates/gpui/src/elements/overlay.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::ToJson,
-    AnyElement, Axis, Element, MouseRegion, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Axis, Element, MouseRegion, SizeConstraint, ViewContext,
 };
 use serde_json::json;
 
@@ -141,7 +141,7 @@ impl<V: 'static> Element<V> for Overlay<V> {
         _: RectF,
         size: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         let (anchor_position, mut bounds) = match self.position_mode {
             OverlayPositionMode::Window => {
diff --git a/crates/gpui/src/elements/resizable.rs b/crates/gpui/src/elements/resizable.rs
index 343ef92486358007e5ea6d06bff9b8b78d2e88ec..123225cc64fd2d4fc11f760c8eae35cd622afea7 100644
--- a/crates/gpui/src/elements/resizable.rs
+++ b/crates/gpui/src/elements/resizable.rs
@@ -7,8 +7,7 @@ use serde_json::json;
 use crate::{
     geometry::rect::RectF,
     platform::{CursorStyle, MouseButton},
-    AnyElement, AppContext, Axis, Element, MouseRegion, PaintContext, SizeConstraint, TypeTag,
-    View, ViewContext,
+    AnyElement, AppContext, Axis, Element, MouseRegion, SizeConstraint, TypeTag, View, ViewContext,
 };
 
 #[derive(Copy, Clone, Debug)]
@@ -116,7 +115,7 @@ impl<V: 'static> Element<V> for Resizable<V> {
         visible_bounds: pathfinder_geometry::rect::RectF,
         constraint: &mut SizeConstraint,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         cx.scene().push_stacking_context(None, None);
 
@@ -252,7 +251,7 @@ impl<V: View, P: 'static> Element<V> for BoundsProvider<V, P> {
         visible_bounds: pathfinder_geometry::rect::RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut crate::PaintContext<V>,
+        cx: &mut crate::ViewContext<V>,
     ) -> Self::PaintState {
         cx.update_default_global::<ProviderMap, _, _>(|map, _| {
             map.0.insert(TypeTag::new::<P>(), (bounds, visible_bounds));
diff --git a/crates/gpui/src/elements/stack.rs b/crates/gpui/src/elements/stack.rs
index aac71595dda4488c0d3889ec1567454eacf6abd7..ad5080907bb4c83cb91b3b02c183df46fbae552b 100644
--- a/crates/gpui/src/elements/stack.rs
+++ b/crates/gpui/src/elements/stack.rs
@@ -3,7 +3,7 @@ use std::ops::Range;
 use crate::{
     geometry::{rect::RectF, vector::Vector2F},
     json::{self, json, ToJson},
-    AnyElement, Element, PaintContext, SizeConstraint, ViewContext,
+    AnyElement, Element, SizeConstraint, ViewContext,
 };
 
 /// Element which renders it's children in a stack on top of each other.
@@ -56,7 +56,7 @@ impl<V: 'static> Element<V> for Stack<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         for child in &mut self.children {
             cx.scene().push_layer(None);
diff --git a/crates/gpui/src/elements/svg.rs b/crates/gpui/src/elements/svg.rs
index d6b0bc8d107c6ab0708bfcaf14af1092dbd566e5..7f67719d8a71e3dd621b23dd53238062edd1048b 100644
--- a/crates/gpui/src/elements/svg.rs
+++ b/crates/gpui/src/elements/svg.rs
@@ -1,6 +1,5 @@
 use super::constrain_size_preserving_aspect_ratio;
 use crate::json::ToJson;
-use crate::PaintContext;
 use crate::{
     color::Color,
     geometry::{
@@ -73,7 +72,7 @@ impl<V: 'static> Element<V> for Svg {
         _visible_bounds: RectF,
         svg: &mut Self::LayoutState,
         _: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         if let Some(svg) = svg.clone() {
             cx.scene().push_icon(scene::Icon {
diff --git a/crates/gpui/src/elements/text.rs b/crates/gpui/src/elements/text.rs
index 0e154d80ffa16248ff65ae72a28a8f9510780685..c8238406920e8ef65f10b2e2582e969eca727b47 100644
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -7,7 +7,7 @@ use crate::{
     },
     json::{ToJson, Value},
     text_layout::{Line, RunStyle, ShapedBoundary},
-    Element, FontCache, PaintContext, SizeConstraint, TextLayoutCache, ViewContext, WindowContext,
+    Element, FontCache, SizeConstraint, TextLayoutCache, ViewContext, WindowContext,
 };
 use log::warn;
 use serde_json::json;
@@ -169,7 +169,7 @@ impl<V: 'static> Element<V> for Text {
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
         _: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let mut origin = bounds.origin();
         let empty = Vec::new();
diff --git a/crates/gpui/src/elements/tooltip.rs b/crates/gpui/src/elements/tooltip.rs
index d16752c022dca0be0c89785a8c7b706341f4c61d..59892b6279b9f9e753c8d8cb3ff3fbc4bdf2c887 100644
--- a/crates/gpui/src/elements/tooltip.rs
+++ b/crates/gpui/src/elements/tooltip.rs
@@ -6,7 +6,7 @@ use crate::{
     fonts::TextStyle,
     geometry::{rect::RectF, vector::Vector2F},
     json::json,
-    Action, Axis, ElementStateHandle, PaintContext, SizeConstraint, Task, TypeTag, ViewContext,
+    Action, Axis, ElementStateHandle, SizeConstraint, Task, TypeTag, ViewContext,
 };
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -207,7 +207,7 @@ impl<V: 'static> Element<V> for Tooltip<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         self.child.paint(bounds.origin(), visible_bounds, view, cx);
         if let Some(tooltip) = self.tooltip.as_mut() {
diff --git a/crates/gpui/src/elements/uniform_list.rs b/crates/gpui/src/elements/uniform_list.rs
index d3463b1d2cdffe260b6770a8dc744d92c2e87cfc..037b003b209c08cba9e522dd9ce23f6c19b6800f 100644
--- a/crates/gpui/src/elements/uniform_list.rs
+++ b/crates/gpui/src/elements/uniform_list.rs
@@ -6,7 +6,7 @@ use crate::{
     },
     json::{self, json},
     platform::ScrollWheelEvent,
-    AnyElement, MouseRegion, PaintContext, ViewContext,
+    AnyElement, MouseRegion, ViewContext,
 };
 use json::ToJson;
 use std::{cell::RefCell, cmp, ops::Range, rc::Rc};
@@ -276,7 +276,7 @@ impl<V: 'static> Element<V> for UniformList<V> {
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let visible_bounds = visible_bounds.intersection(bounds).unwrap_or_default();
 
diff --git a/crates/gpui2/src/adapter.rs b/crates/gpui2/src/adapter.rs
index 0a4133e07371bd93836e8eb760df36820ad431c3..c36966d72262495f868900e463502ced21ddd2d1 100644
--- a/crates/gpui2/src/adapter.rs
+++ b/crates/gpui2/src/adapter.rs
@@ -1,4 +1,4 @@
-use crate::{paint_context::PaintContext, ViewContext};
+use crate::ViewContext;
 use gpui::{geometry::rect::RectF, LayoutEngine, LayoutId};
 use util::ResultExt;
 
@@ -40,13 +40,13 @@ impl<V: 'static> gpui::Element<V> for AdapterElement<V> {
         _visible_bounds: RectF,
         layout_data: &mut Option<(LayoutEngine, LayoutId)>,
         view: &mut V,
-        legacy_cx: &mut gpui::PaintContext<V>,
+        cx: &mut gpui::ViewContext<V>,
     ) -> Self::PaintState {
         let (layout_engine, layout_id) = layout_data.take().unwrap();
-        legacy_cx.push_layout_engine(layout_engine);
-        let mut cx = PaintContext::new(legacy_cx);
-        self.0.paint(view, bounds.origin(), &mut cx);
-        *layout_data = legacy_cx.pop_layout_engine().zip(Some(layout_id));
+        cx.push_layout_engine(layout_engine);
+        self.0
+            .paint(view, bounds.origin(), &mut ViewContext::new(cx));
+        *layout_data = cx.pop_layout_engine().zip(Some(layout_id));
         debug_assert!(layout_data.is_some());
     }
 
diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs
index d2a8efee830518aa695ca2c6bc8bb8e6a886de4b..ba90a7d7df102abe0a29f989bbe57fd8d4e585d6 100644
--- a/crates/gpui2/src/element.rs
+++ b/crates/gpui2/src/element.rs
@@ -1,4 +1,3 @@
-pub use crate::paint_context::PaintContext;
 pub use crate::ViewContext;
 use anyhow::Result;
 use gpui::geometry::vector::Vector2F;
@@ -22,7 +21,7 @@ pub trait Element<V: 'static>: 'static + IntoElement<V> {
         parent_origin: Vector2F,
         layout: &Layout,
         state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) where
         Self: Sized;
 
@@ -40,7 +39,7 @@ pub trait Element<V: 'static>: 'static + IntoElement<V> {
 /// Used to make ElementState<V, E> into a trait object, so we can wrap it in AnyElement<V>.
 trait AnyStatefulElement<V> {
     fn layout(&mut self, view: &mut V, cx: &mut ViewContext<V>) -> Result<LayoutId>;
-    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>);
+    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut ViewContext<V>);
 }
 
 /// A wrapper around an element that stores its layout state.
@@ -105,7 +104,7 @@ impl<V, E: Element<V>> AnyStatefulElement<V> for StatefulElement<V, E> {
         result
     }
 
-    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
+    fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut ViewContext<V>) {
         self.phase = match std::mem::take(&mut self.phase) {
             ElementPhase::PostLayout {
                 layout_id,
@@ -149,7 +148,7 @@ impl<V> AnyElement<V> {
         self.0.layout(view, cx)
     }
 
-    pub fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut PaintContext<V>) {
+    pub fn paint(&mut self, view: &mut V, parent_origin: Vector2F, cx: &mut ViewContext<V>) {
         self.0.paint(view, parent_origin, cx)
     }
 }
diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs
index 598b564ab1704e219aa91f519a98b53ef1ae17c7..885b14f2dd5e23ecbe0e6b7eff5f27687fb48de1 100644
--- a/crates/gpui2/src/elements/div.rs
+++ b/crates/gpui2/src/elements/div.rs
@@ -3,7 +3,6 @@ use std::{cell::Cell, rc::Rc};
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     hsla,
-    paint_context::PaintContext,
     style::{CornerRadii, Overflow, Style, StyleHelpers, Styleable},
     InteractionHandlers, Interactive, ViewContext,
 };
@@ -69,7 +68,7 @@ impl<V: 'static> Element<V> for Div<V> {
         parent_origin: Vector2F,
         layout: &Layout,
         child_layouts: &mut Vec<LayoutId>,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) where
         Self: Sized,
     {
@@ -167,7 +166,7 @@ impl<V: 'static> Div<V> {
         bounds: RectF,
         overflow: Point<Overflow>,
         child_layout_ids: &[LayoutId],
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         if overflow.y == Overflow::Scroll || overflow.x == Overflow::Scroll {
             let mut scroll_max = Vector2F::zero();
@@ -214,7 +213,7 @@ impl<V: 'static> Div<V> {
         }
     }
 
-    fn paint_inspector(&self, parent_origin: Vector2F, layout: &Layout, cx: &mut PaintContext<V>) {
+    fn paint_inspector(&self, parent_origin: Vector2F, layout: &Layout, cx: &mut ViewContext<V>) {
         let style = self.styles.merged();
         let bounds = layout.bounds + parent_origin;
 
diff --git a/crates/gpui2/src/elements/hoverable.rs b/crates/gpui2/src/elements/hoverable.rs
index ba8109038fdaa05bfb05467c7b9009b280b4c87b..eec4b4ff61c47f09bb4fd018c53486b84f2e7f7a 100644
--- a/crates/gpui2/src/elements/hoverable.rs
+++ b/crates/gpui2/src/elements/hoverable.rs
@@ -1,7 +1,6 @@
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     interactive::{InteractionHandlers, Interactive},
-    paint_context::PaintContext,
     style::{Style, StyleHelpers, Styleable},
     ViewContext,
 };
@@ -59,7 +58,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Hoverable<E> {
         parent_origin: Vector2F,
         layout: &Layout,
         paint_state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) where
         Self: Sized,
     {
diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs
index 829a6d111655480b270a3a7d75a86ee579d1b0fb..866f2fa97169131ff32d64581ac7eccdc19db664 100644
--- a/crates/gpui2/src/elements/img.rs
+++ b/crates/gpui2/src/elements/img.rs
@@ -53,7 +53,7 @@ impl<V: 'static> Element<V> for Img {
         parent_origin: Vector2F,
         layout: &gpui::Layout,
         _: &mut Self::PaintState,
-        cx: &mut crate::paint_context::PaintContext<V>,
+        cx: &mut crate::ViewContext<V>,
     ) where
         Self: Sized,
     {
diff --git a/crates/gpui2/src/elements/pressable.rs b/crates/gpui2/src/elements/pressable.rs
index 1b696e7ef6030c78337f56fcd3657b4c1e14bcaf..960342a5e62821ed0af5073b72bb4fdb941fecd9 100644
--- a/crates/gpui2/src/elements/pressable.rs
+++ b/crates/gpui2/src/elements/pressable.rs
@@ -1,7 +1,6 @@
 use crate::{
     element::{AnyElement, Element, IntoElement, Layout, ParentElement},
     interactive::{InteractionHandlers, Interactive},
-    paint_context::PaintContext,
     style::{Style, StyleHelpers, Styleable},
     ViewContext,
 };
@@ -59,7 +58,7 @@ impl<V: 'static, E: Element<V> + Styleable> Element<V> for Pressable<E> {
         parent_origin: Vector2F,
         layout: &Layout,
         paint_state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) where
         Self: Sized,
     {
diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs
index c17cdbe3c6675c0992a9c9e66d4de47736123620..07f31d8b6ef79cd32a0caeaed8887c6a836bd032 100644
--- a/crates/gpui2/src/elements/svg.rs
+++ b/crates/gpui2/src/elements/svg.rs
@@ -49,7 +49,7 @@ impl<V: 'static> Element<V> for Svg {
         parent_origin: Vector2F,
         layout: &Layout,
         _: &mut Self::PaintState,
-        cx: &mut crate::paint_context::PaintContext<V>,
+        cx: &mut crate::ViewContext<V>,
     ) where
         Self: Sized,
     {
diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs
index 3b3acb45231e1ef0678735c51fd0b3aa198da38c..6f89375df09085e828350d85274d9681f5f0aaa7 100644
--- a/crates/gpui2/src/elements/text.rs
+++ b/crates/gpui2/src/elements/text.rs
@@ -1,6 +1,5 @@
 use crate::{
     element::{Element, IntoElement, Layout},
-    paint_context::PaintContext,
     ViewContext,
 };
 use anyhow::Result;
@@ -71,7 +70,7 @@ impl<V: 'static> Element<V> for Text {
         parent_origin: Vector2F,
         layout: &Layout,
         paint_state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) {
         let bounds = layout.bounds + parent_origin;
 
diff --git a/crates/gpui2/src/gpui2.rs b/crates/gpui2/src/gpui2.rs
index 11d5279ec134336751d8b91eb466fb17548c560c..355697595ff2fc6e6d610b8ce7ce4d4cd8126c4c 100644
--- a/crates/gpui2/src/gpui2.rs
+++ b/crates/gpui2/src/gpui2.rs
@@ -3,7 +3,6 @@ pub mod color;
 pub mod element;
 pub mod elements;
 pub mod interactive;
-pub mod paint_context;
 pub mod style;
 pub mod view;
 pub mod view_context;
diff --git a/crates/gpui2/src/interactive.rs b/crates/gpui2/src/interactive.rs
index aa9627286077cbd43064c7c39f72c58a3c6fe064..4533e7dbecb7038062e617027c9c94ee1a0b4f96 100644
--- a/crates/gpui2/src/interactive.rs
+++ b/crates/gpui2/src/interactive.rs
@@ -6,7 +6,7 @@ use gpui::{
 use smallvec::SmallVec;
 use std::{cell::Cell, rc::Rc};
 
-use crate::element::PaintContext;
+use crate::ViewContext;
 
 pub trait Interactive<V: 'static> {
     fn interaction_handlers(&mut self) -> &mut InteractionHandlers<V>;
@@ -121,7 +121,7 @@ pub struct InteractionHandlers<V: 'static> {
 }
 
 impl<V: 'static> InteractionHandlers<V> {
-    pub fn paint(&self, order: u32, bounds: RectF, cx: &mut PaintContext<V>) {
+    pub fn paint(&self, order: u32, bounds: RectF, cx: &mut ViewContext<V>) {
         for handler in self.mouse_down.iter().cloned() {
             cx.on_event(order, move |view, event: &MouseButtonEvent, cx| {
                 if event.is_down && bounds.contains_point(event.position) {
diff --git a/crates/gpui2/src/paint_context.rs b/crates/gpui2/src/paint_context.rs
deleted file mode 100644
index 9f8548d51927b07b80a6dcc6ca8775c8e5c78ba3..0000000000000000000000000000000000000000
--- a/crates/gpui2/src/paint_context.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use anyhow::{anyhow, Result};
-use derive_more::{Deref, DerefMut};
-pub use gpui::taffy::tree::NodeId;
-use gpui::{
-    scene::EventHandler, EventContext, Layout, LayoutId, PaintContext as LegacyPaintContext,
-};
-use std::{any::TypeId, rc::Rc};
-
-#[derive(Deref, DerefMut)]
-pub struct PaintContext<'a, 'b, 'c, 'd, V> {
-    #[deref]
-    #[deref_mut]
-    pub(crate) legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>,
-}
-
-impl<'a, 'b, 'c, 'd, V: 'static> PaintContext<'a, 'b, 'c, 'd, V> {
-    pub fn new(legacy_cx: &'d mut LegacyPaintContext<'a, 'b, 'c, V>) -> Self {
-        Self { legacy_cx }
-    }
-
-    pub fn on_event<E: 'static>(
-        &mut self,
-        order: u32,
-        handler: impl Fn(&mut V, &E, &mut EventContext<V>) + 'static,
-    ) {
-        let view = self.weak_handle();
-
-        self.scene().event_handlers.push(EventHandler {
-            order,
-            handler: Rc::new(move |event, window_cx| {
-                if let Some(view) = view.upgrade(window_cx) {
-                    view.update(window_cx, |view, view_cx| {
-                        let mut event_cx = EventContext::new(view_cx);
-                        handler(view, event.downcast_ref().unwrap(), &mut event_cx);
-                        event_cx.bubble
-                    })
-                } else {
-                    true
-                }
-            }),
-            event_type: TypeId::of::<E>(),
-        })
-    }
-
-    pub(crate) fn computed_layout(&mut self, layout_id: LayoutId) -> Result<Layout> {
-        self.layout_engine()
-            .ok_or_else(|| anyhow!("no layout engine present"))?
-            .computed_layout(layout_id)
-    }
-}
diff --git a/crates/gpui2/src/style.rs b/crates/gpui2/src/style.rs
index 8a02dda5d76afd62ee9ae4e0d7262bfefcd190e3..e3e0f5b0c4655fb75d76aaf15935b6de271d3ff1 100644
--- a/crates/gpui2/src/style.rs
+++ b/crates/gpui2/src/style.rs
@@ -2,7 +2,7 @@ use crate::{
     color::Hsla,
     elements::hoverable::{hoverable, Hoverable},
     elements::pressable::{pressable, Pressable},
-    paint_context::PaintContext,
+    ViewContext,
 };
 pub use fonts::Style as FontStyle;
 pub use fonts::Weight as FontWeight;
@@ -164,7 +164,7 @@ impl Style {
     }
 
     /// Paints the background of an element styled with this style.
-    pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
+    pub fn paint_background<V: 'static>(&self, bounds: RectF, cx: &mut ViewContext<V>) {
         let rem_size = cx.rem_size();
         if let Some(color) = self.fill.as_ref().and_then(Fill::color) {
             cx.scene().push_quad(gpui::Quad {
@@ -177,7 +177,7 @@ impl Style {
     }
 
     /// Paints the foreground of an element styled with this style.
-    pub fn paint_foreground<V: 'static>(&self, bounds: RectF, cx: &mut PaintContext<V>) {
+    pub fn paint_foreground<V: 'static>(&self, bounds: RectF, cx: &mut ViewContext<V>) {
         let rem_size = cx.rem_size();
 
         if let Some(color) = self.border_color {
diff --git a/crates/gpui2/src/view_context.rs b/crates/gpui2/src/view_context.rs
index 43d8093240d6cecfa6d8616d25701f23e15e6f57..d6c0960a348bfef2dfff8adeafd24e7f7019549f 100644
--- a/crates/gpui2/src/view_context.rs
+++ b/crates/gpui2/src/view_context.rs
@@ -1,7 +1,9 @@
+use std::{any::TypeId, rc::Rc};
+
 use crate::{element::LayoutId, style::Style};
 use anyhow::{anyhow, Result};
 use derive_more::{Deref, DerefMut};
-use gpui::{geometry::Size, MeasureParams};
+use gpui::{geometry::Size, scene::EventHandler, EventContext, Layout, MeasureParams};
 pub use gpui::{taffy::tree::NodeId, ViewContext as LegacyViewContext};
 
 #[derive(Deref, DerefMut)]
@@ -44,4 +46,34 @@ impl<'a, 'b, 'c, V: 'static> ViewContext<'a, 'b, 'c, V> {
 
         Ok(layout_id)
     }
+
+    pub fn on_event<E: 'static>(
+        &mut self,
+        order: u32,
+        handler: impl Fn(&mut V, &E, &mut EventContext<V>) + 'static,
+    ) {
+        let view = self.weak_handle();
+
+        self.scene().event_handlers.push(EventHandler {
+            order,
+            handler: Rc::new(move |event, window_cx| {
+                if let Some(view) = view.upgrade(window_cx) {
+                    view.update(window_cx, |view, view_cx| {
+                        let mut event_cx = EventContext::new(view_cx);
+                        handler(view, event.downcast_ref().unwrap(), &mut event_cx);
+                        event_cx.bubble
+                    })
+                } else {
+                    true
+                }
+            }),
+            event_type: TypeId::of::<E>(),
+        })
+    }
+
+    pub(crate) fn computed_layout(&mut self, layout_id: LayoutId) -> Result<Layout> {
+        self.layout_engine()
+            .ok_or_else(|| anyhow!("no layout engine present"))?
+            .computed_layout(layout_id)
+    }
 }
diff --git a/crates/gpui2_macros/src/derive_element.rs b/crates/gpui2_macros/src/derive_element.rs
index a769437676e5cd93957852ba62887518d773d17f..304caa99e6ca12adf9e42ed3dc2ec3ef19f32a66 100644
--- a/crates/gpui2_macros/src/derive_element.rs
+++ b/crates/gpui2_macros/src/derive_element.rs
@@ -80,7 +80,7 @@ pub fn derive_element(input: TokenStream) -> TokenStream {
                 parent_origin: gpui2::Vector2F,
                 _: &gpui2::element::Layout,
                 rendered_element: &mut Self::PaintState,
-                cx: &mut gpui2::element::PaintContext<V>,
+                cx: &mut gpui2::ViewContext<V>,
             ) {
                 rendered_element.paint(view, parent_origin, cx);
             }
diff --git a/crates/gpui_macros/src/gpui_macros.rs b/crates/gpui_macros/src/gpui_macros.rs
index f68573074427c8aa24fddf7bfe6ffa2e694e13eb..aa55c27eaad9069fd8964ea2f2b4f64195bd458c 100644
--- a/crates/gpui_macros/src/gpui_macros.rs
+++ b/crates/gpui_macros/src/gpui_macros.rs
@@ -342,7 +342,7 @@ pub fn element_derive(input: TokenStream) -> TokenStream {
                 visible_bounds: gpui::geometry::rect::RectF,
                 element: &mut gpui::elements::AnyElement<V>,
                 view: &mut V,
-                cx: &mut gpui::PaintContext<V>,
+                cx: &mut gpui::ViewContext<V>,
             ) {
                 element.paint(bounds.origin(), visible_bounds, view, cx);
             }
diff --git a/crates/storybook/src/theme.rs b/crates/storybook/src/theme.rs
index 45327e1ffcf6ca781413590ab652e3525909320b..0a86a61499f6d1d642d56b25cab3caaa0bb509ed 100644
--- a/crates/storybook/src/theme.rs
+++ b/crates/storybook/src/theme.rs
@@ -1,7 +1,6 @@
 use gpui2::{
-    color::Hsla,
-    element::{Element, PaintContext},
-    serde_json, AppContext, IntoElement, Vector2F, ViewContext, WindowContext,
+    color::Hsla, element::Element, serde_json, AppContext, IntoElement, Vector2F, ViewContext,
+    WindowContext,
 };
 use serde::{de::Visitor, Deserialize, Deserializer};
 use std::{collections::HashMap, fmt, marker::PhantomData};
@@ -162,7 +161,7 @@ impl<V: 'static, E: Element<V>> Element<V> for Themed<V, E> {
         parent_origin: Vector2F,
         layout: &gpui2::Layout,
         state: &mut Self::PaintState,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) where
         Self: Sized,
     {
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 30bea0962782bd79e2e3eacd25a4fe52250bd025..30dbccf4559f2175901b6fbfc74e090020b89f34 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -10,8 +10,8 @@ use gpui::{
     platform::{CursorStyle, MouseButton},
     serde_json::json,
     text_layout::{Line, RunStyle},
-    AnyElement, Element, EventContext, FontCache, ModelContext, MouseRegion, PaintContext, Quad,
-    SizeConstraint, TextLayoutCache, ViewContext, WeakModelHandle, WindowContext,
+    AnyElement, Element, EventContext, FontCache, ModelContext, MouseRegion, Quad, SizeConstraint,
+    TextLayoutCache, ViewContext, WeakModelHandle, WindowContext,
 };
 use itertools::Itertools;
 use language::CursorShape;
@@ -733,7 +733,7 @@ impl Element<TerminalView> for TerminalElement {
         visible_bounds: RectF,
         layout: &mut Self::LayoutState,
         view: &mut TerminalView,
-        cx: &mut PaintContext<TerminalView>,
+        cx: &mut ViewContext<TerminalView>,
     ) -> Self::PaintState {
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
 
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 69d4b1da00de4d9a0a6c0c311ee39d63515a9cdd..23541e1f0643a2c876d8f817f19c4f32d9348963 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -25,8 +25,8 @@ use gpui::{
     keymap_matcher::KeymapContext,
     platform::{CursorStyle, MouseButton, NavigationDirection, PromptLevel},
     Action, AnyViewHandle, AnyWeakViewHandle, AppContext, AsyncAppContext, Entity, EventContext,
-    ModelHandle, MouseRegion, PaintContext, Quad, Task, View, ViewContext, ViewHandle,
-    WeakViewHandle, WindowContext,
+    ModelHandle, MouseRegion, Quad, Task, View, ViewContext, ViewHandle, WeakViewHandle,
+    WindowContext,
 };
 use project::{Project, ProjectEntryId, ProjectPath};
 use serde::Deserialize;
@@ -2011,7 +2011,7 @@ impl<V: 'static> Element<V> for PaneBackdrop<V> {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut V,
-        cx: &mut PaintContext<V>,
+        cx: &mut ViewContext<V>,
     ) -> Self::PaintState {
         let background = theme::current(cx).editor.background;
 
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index c3729d097656154c26a50c85d3dfb939af5fcab0..bffdce0f3ec52d86b08241d067861eee359844d5 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -594,7 +594,7 @@ mod element {
         json::{self, ToJson},
         platform::{CursorStyle, MouseButton},
         scene::MouseDrag,
-        AnyElement, Axis, CursorRegion, Element, EventContext, MouseRegion, PaintContext, RectFExt,
+        AnyElement, Axis, CursorRegion, Element, EventContext, MouseRegion, RectFExt,
         SizeConstraint, Vector2FExt, ViewContext,
     };
 
@@ -855,7 +855,7 @@ mod element {
             visible_bounds: RectF,
             remaining_space: &mut Self::LayoutState,
             view: &mut Workspace,
-            cx: &mut PaintContext<Workspace>,
+            cx: &mut ViewContext<Workspace>,
         ) -> Self::PaintState {
             let can_resize = settings::get::<WorkspaceSettings>(cx).active_pane_magnification == 1.;
             let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
diff --git a/crates/workspace/src/status_bar.rs b/crates/workspace/src/status_bar.rs
index 0da51623537e8b2db3cc66a51b275d95ae3be213..b62dae2114084460f4c2a9a49aa5054073fba7c4 100644
--- a/crates/workspace/src/status_bar.rs
+++ b/crates/workspace/src/status_bar.rs
@@ -8,8 +8,8 @@ use gpui::{
         vector::{vec2f, Vector2F},
     },
     json::{json, ToJson},
-    AnyElement, AnyViewHandle, Entity, PaintContext, SizeConstraint, Subscription, View,
-    ViewContext, ViewHandle, WindowContext,
+    AnyElement, AnyViewHandle, Entity, SizeConstraint, Subscription, View, ViewContext, ViewHandle,
+    WindowContext,
 };
 
 pub trait StatusItemView: View {
@@ -230,7 +230,7 @@ impl Element<StatusBar> for StatusBarElement {
         visible_bounds: RectF,
         _: &mut Self::LayoutState,
         view: &mut StatusBar,
-        cx: &mut PaintContext<StatusBar>,
+        cx: &mut ViewContext<StatusBar>,
     ) -> Self::PaintState {
         let origin_y = bounds.upper_right().y();
         let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();

From 917884ffaf9a59e41b08badd9f9f72e1f57d75ed Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Mon, 11 Sep 2023 11:05:10 -0400
Subject: [PATCH 090/109] Restructure storybook modules and components

Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
---
 crates/storybook/src/component/mod.rs                       | 2 --
 crates/storybook/src/components.rs                          | 6 ++++++
 .../storybook/src/{component => components}/icon_button.rs  | 2 +-
 crates/storybook/src/{component => components}/tab.rs       | 2 +-
 crates/storybook/src/module/mod.rs                          | 1 -
 crates/storybook/src/modules.rs                             | 3 +++
 crates/storybook/src/{module => modules}/tab_bar.rs         | 3 +--
 crates/storybook/src/storybook.rs                           | 3 +--
 crates/storybook/src/workspace.rs                           | 2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 crates/storybook/src/component/mod.rs
 rename crates/storybook/src/{component => components}/icon_button.rs (97%)
 rename crates/storybook/src/{component => components}/tab.rs (98%)
 delete mode 100644 crates/storybook/src/module/mod.rs
 create mode 100644 crates/storybook/src/modules.rs
 rename crates/storybook/src/{module => modules}/tab_bar.rs (96%)

diff --git a/crates/storybook/src/component/mod.rs b/crates/storybook/src/component/mod.rs
deleted file mode 100644
index c45b936e9624305448466817d07fa9a127bd2794..0000000000000000000000000000000000000000
--- a/crates/storybook/src/component/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) mod icon_button;
-pub(crate) mod tab;
diff --git a/crates/storybook/src/components.rs b/crates/storybook/src/components.rs
index 1aafefc1a6a0a89728f64b6c6299e8c68ef1cc20..d07c2651a02b81a63f02873484752eabdae1971e 100644
--- a/crates/storybook/src/components.rs
+++ b/crates/storybook/src/components.rs
@@ -4,6 +4,12 @@ use gpui2::{
 };
 use std::{marker::PhantomData, rc::Rc};
 
+mod icon_button;
+mod tab;
+
+pub(crate) use icon_button::{icon_button, ButtonVariant};
+pub(crate) use tab::tab;
+
 struct ButtonHandlers<V, D> {
     click: Option<Rc<dyn Fn(&mut V, &D, &mut EventContext<V>)>>,
 }
diff --git a/crates/storybook/src/component/icon_button.rs b/crates/storybook/src/components/icon_button.rs
similarity index 97%
rename from crates/storybook/src/component/icon_button.rs
rename to crates/storybook/src/components/icon_button.rs
index 91c61b363da78ec6baa41474961768b33b5e6e04..5cdddd655a995473226cec741bc4b1ded071fd89 100644
--- a/crates/storybook/src/component/icon_button.rs
+++ b/crates/storybook/src/components/icon_button.rs
@@ -5,7 +5,7 @@ use gpui2::{elements::div, IntoElement};
 use gpui2::{Element, ParentElement, ViewContext};
 
 #[derive(Element)]
-struct IconButton {
+pub(crate) struct IconButton {
     path: &'static str,
     variant: ButtonVariant,
 }
diff --git a/crates/storybook/src/component/tab.rs b/crates/storybook/src/components/tab.rs
similarity index 98%
rename from crates/storybook/src/component/tab.rs
rename to crates/storybook/src/components/tab.rs
index 4aae374f802466d672a0b16b66f63e3f424bb831..eeb4a0b8a67ff75165a3423704161cb48b339192 100644
--- a/crates/storybook/src/component/tab.rs
+++ b/crates/storybook/src/components/tab.rs
@@ -4,7 +4,7 @@ use gpui2::{elements::div, IntoElement};
 use gpui2::{Element, ParentElement, ViewContext};
 
 #[derive(Element)]
-struct Tab {
+pub(crate) struct Tab {
     title: &'static str,
     active: bool,
 }
diff --git a/crates/storybook/src/module/mod.rs b/crates/storybook/src/module/mod.rs
deleted file mode 100644
index 078db8e167826c50fdd2e31aa55db0c3f8e2ac74..0000000000000000000000000000000000000000
--- a/crates/storybook/src/module/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub(crate) mod tab_bar;
diff --git a/crates/storybook/src/modules.rs b/crates/storybook/src/modules.rs
new file mode 100644
index 0000000000000000000000000000000000000000..bc8ba73b08f8fe51f218076570e6182796c75f0f
--- /dev/null
+++ b/crates/storybook/src/modules.rs
@@ -0,0 +1,3 @@
+mod tab_bar;
+
+pub(crate) use tab_bar::tab_bar;
diff --git a/crates/storybook/src/module/tab_bar.rs b/crates/storybook/src/modules/tab_bar.rs
similarity index 96%
rename from crates/storybook/src/module/tab_bar.rs
rename to crates/storybook/src/modules/tab_bar.rs
index 8dc2e8cfd43d613a784622e9482f48f928067ac9..75bc7e86d6cc4c0345926ce3555049d25f4bd578 100644
--- a/crates/storybook/src/module/tab_bar.rs
+++ b/crates/storybook/src/modules/tab_bar.rs
@@ -1,7 +1,6 @@
 use std::marker::PhantomData;
 
-use crate::component::icon_button::{icon_button, ButtonVariant};
-use crate::component::tab::tab;
+use crate::components::{icon_button, tab, ButtonVariant};
 use crate::theme::theme;
 use gpui2::elements::div::ScrollState;
 use gpui2::style::StyleHelpers;
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 1d44129ea838d68560a0035f63589e704a9c197b..1b40bc2dc482cf2bad94d8d2a662202cc8bbd2ef 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -10,10 +10,9 @@ use settings::{default_settings, SettingsStore};
 use simplelog::SimpleLogger;
 
 mod collab_panel;
-mod component;
 mod components;
 mod element_ext;
-mod module;
+mod modules;
 mod theme;
 mod workspace;
 
diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index ca55f9d3cc1fd7b642a7515fb244ac6156d62ebd..b2d71608feda5039180a3f7a422f29dbbd6df6cd 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -1,4 +1,4 @@
-use crate::{collab_panel::collab_panel, module::tab_bar::tab_bar, theme::theme};
+use crate::{collab_panel::collab_panel, modules::tab_bar, theme::theme};
 use gpui2::{
     elements::{div, div::ScrollState, img, svg},
     style::{StyleHelpers, Styleable},

From 1376115db2d5376ef2807bc6622737889dc3560f Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Mon, 11 Sep 2023 11:40:03 -0400
Subject: [PATCH 091/109] Use `enabled` for active tabs

---
 crates/storybook/src/components/icon_button.rs |  3 +--
 crates/storybook/src/components/tab.rs         | 14 +++++++-------
 crates/storybook/src/modules/tab_bar.rs        |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/crates/storybook/src/components/icon_button.rs b/crates/storybook/src/components/icon_button.rs
index 5cdddd655a995473226cec741bc4b1ded071fd89..0a9b2ca285345aaca7bd91b1ff22990b0a8be407 100644
--- a/crates/storybook/src/components/icon_button.rs
+++ b/crates/storybook/src/components/icon_button.rs
@@ -25,9 +25,8 @@ impl IconButton {
         let theme = theme(cx);
 
         let mut div = div();
-
         if self.variant == ButtonVariant::Filled {
-            div = div.fill(theme.highest.negative.default.background);
+            div = div.fill(theme.highest.on.default.background);
         }
 
         div.w_7()
diff --git a/crates/storybook/src/components/tab.rs b/crates/storybook/src/components/tab.rs
index eeb4a0b8a67ff75165a3423704161cb48b339192..b945e113e555104e064044292f0017a449aaeb8f 100644
--- a/crates/storybook/src/components/tab.rs
+++ b/crates/storybook/src/components/tab.rs
@@ -6,11 +6,11 @@ use gpui2::{Element, ParentElement, ViewContext};
 #[derive(Element)]
 pub(crate) struct Tab {
     title: &'static str,
-    active: bool,
+    enabled: bool,
 }
 
-pub fn tab<V: 'static>(title: &'static str, active: bool) -> impl Element<V> {
-    Tab { title, active }
+pub fn tab<V: 'static>(title: &'static str, enabled: bool) -> impl Element<V> {
+    Tab { title, enabled }
 }
 
 impl Tab {
@@ -24,19 +24,19 @@ impl Tab {
             .items_center()
             .justify_center()
             .rounded_lg()
-            .fill(if self.active {
+            .fill(if self.enabled {
                 theme.highest.on.default.background
             } else {
                 theme.highest.base.default.background
             })
             .hover()
-            .fill(if self.active {
+            .fill(if self.enabled {
                 theme.highest.on.hovered.background
             } else {
                 theme.highest.base.hovered.background
             })
             .active()
-            .fill(if self.active {
+            .fill(if self.enabled {
                 theme.highest.on.pressed.background
             } else {
                 theme.highest.base.pressed.background
@@ -44,7 +44,7 @@ impl Tab {
             .child(
                 div()
                     .text_sm()
-                    .text_color(if self.active {
+                    .text_color(if self.enabled {
                         theme.highest.base.default.foreground
                     } else {
                         theme.highest.variant.default.foreground
diff --git a/crates/storybook/src/modules/tab_bar.rs b/crates/storybook/src/modules/tab_bar.rs
index 75bc7e86d6cc4c0345926ce3555049d25f4bd578..06029c5dc223c0d4852c1250c3d67c2c669b2876 100644
--- a/crates/storybook/src/modules/tab_bar.rs
+++ b/crates/storybook/src/modules/tab_bar.rs
@@ -40,7 +40,7 @@ impl<V: 'static> TabBar<V> {
                             .flex()
                             .items_center()
                             .gap_px()
-                            .child(icon_button("icons/arrow_left.svg", ButtonVariant::Ghost))
+                            .child(icon_button("icons/arrow_left.svg", ButtonVariant::Filled))
                             .child(icon_button("icons/arrow_right.svg", ButtonVariant::Ghost)),
                     ),
             )

From 04fc9d2d3352bc772182dec839c625228b2059d1 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Mon, 11 Sep 2023 11:42:54 -0400
Subject: [PATCH 092/109] Fix incorrect workspace order

---
 crates/storybook/src/workspace.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/storybook/src/workspace.rs b/crates/storybook/src/workspace.rs
index b2d71608feda5039180a3f7a422f29dbbd6df6cd..c37b3f16ea3abac79ab659e4f3fe138e4017d20a 100644
--- a/crates/storybook/src/workspace.rs
+++ b/crates/storybook/src/workspace.rs
@@ -50,9 +50,9 @@ impl WorkspaceElement {
                                     .flex_col()
                                     .flex_1()
                                     .child(tab_bar(self.tab_bar_scroll_state.clone())),
-                            )
-                            .child(collab_panel(self.right_scroll_state.clone())),
-                    ),
+                            ),
+                    )
+                    .child(collab_panel(self.right_scroll_state.clone())),
             )
             .child(statusbar())
     }

From f66dd43a847fb52297045fd14487dd5f58b05fa4 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 11 Sep 2023 17:50:09 +0200
Subject: [PATCH 093/109] Z 2620 - Sort command palette's entries by name and
 use count (#2954)

Release Notes:
- Improved command palette's command ordering; commands are sorted
lexicographically and by command's use count in the current session.
---
 crates/command_palette/src/command_palette.rs | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index 101d4dc545cc2ecc2130a19989b8d57fea62fe97..4f9bb231ce1aaa68c4fa994bf4f85a09db05fb95 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -1,11 +1,11 @@
-use collections::CommandPaletteFilter;
+use collections::{CommandPaletteFilter, HashMap};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
     actions, anyhow::anyhow, elements::*, keymap_matcher::Keystroke, Action, AnyWindowHandle,
     AppContext, Element, MouseState, ViewContext,
 };
 use picker::{Picker, PickerDelegate, PickerEvent};
-use std::cmp;
+use std::cmp::{self, Reverse};
 use util::ResultExt;
 use workspace::Workspace;
 
@@ -33,13 +33,18 @@ pub enum Event {
         action: Box<dyn Action>,
     },
 }
-
 struct Command {
     name: String,
     action: Box<dyn Action>,
     keystrokes: Vec<Keystroke>,
 }
 
+/// Hit count for each command in the palette.
+/// We only account for commands triggered directly via command palette and not by e.g. keystrokes because
+/// if an user already knows a keystroke for a command, they are unlikely to use a command palette to look for it.
+#[derive(Default)]
+struct HitCounts(HashMap<String, usize>);
+
 fn toggle_command_palette(workspace: &mut Workspace, _: &Toggle, cx: &mut ViewContext<Workspace>) {
     let focused_view_id = cx.focused_view_id().unwrap_or_else(|| cx.view_id());
     workspace.toggle_modal(cx, |_, cx| {
@@ -83,7 +88,7 @@ impl PickerDelegate for CommandPaletteDelegate {
         let view_id = self.focused_view_id;
         let window = cx.window();
         cx.spawn(move |picker, mut cx| async move {
-            let actions = window
+            let mut actions = window
                 .available_actions(view_id, &cx)
                 .into_iter()
                 .flatten()
@@ -112,6 +117,16 @@ impl PickerDelegate for CommandPaletteDelegate {
                     }
                 })
                 .collect::<Vec<_>>();
+            let actions = cx.read(move |cx| {
+                let hit_counts = cx.optional_global::<HitCounts>();
+                actions.sort_by_key(|action| {
+                    (
+                        Reverse(hit_counts.and_then(|map| map.0.get(&action.name)).cloned()),
+                        action.name.clone(),
+                    )
+                });
+                actions
+            });
             let candidates = actions
                 .iter()
                 .enumerate()
@@ -166,7 +181,12 @@ impl PickerDelegate for CommandPaletteDelegate {
             let window = cx.window();
             let focused_view_id = self.focused_view_id;
             let action_ix = self.matches[self.selected_ix].candidate_id;
-            let action = self.actions.remove(action_ix).action;
+            let command = self.actions.remove(action_ix);
+            cx.update_default_global(|hit_counts: &mut HitCounts, _| {
+                *hit_counts.0.entry(command.name).or_default() += 1;
+            });
+            let action = command.action;
+
             cx.app_context()
                 .spawn(move |mut cx| async move {
                     window
@@ -319,6 +339,21 @@ mod tests {
             workspace.modal::<CommandPalette>().unwrap()
         });
 
+        palette
+            .update(cx, |palette, cx| {
+                // Fill up palette's command list by running an empty query;
+                // we only need it to subsequently assert that the palette is initially
+                // sorted by command's name.
+                palette.delegate_mut().update_matches("".to_string(), cx)
+            })
+            .await;
+
+        palette.update(cx, |palette, _| {
+            let is_sorted =
+                |actions: &[Command]| actions.windows(2).all(|pair| pair[0].name <= pair[1].name);
+            assert!(is_sorted(&palette.delegate().actions));
+        });
+
         palette
             .update(cx, |palette, cx| {
                 palette

From b922d0f1325880ec9378d150caf54f645b2e72cd Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 10:15:22 -0600
Subject: [PATCH 094/109] Use rustup (not brew) for rust

---
 README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 72936e274677935dec2f517d263708661d297973..961c8f9ff384370cef0c60c4e65cc7f6cf1908e0 100644
--- a/README.md
+++ b/README.md
@@ -13,16 +13,15 @@ Welcome to Zed, a lightning-fast, collaborative code editor that makes your drea
   sudo xcodebuild -license
   ```
 
-* Install homebrew, rust and node
+* Install rustup (rust, cargo, etc.)
   ```
-  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-  brew install rust
-  brew install node
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
   ```
   
-* Ensure rust executables are in your $PATH
+* Install homebrew and node
   ```
-  echo $HOME/.cargo/bin | sudo tee /etc/paths.d/10-rust
+  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+  brew install node
   ```
   
 * Install postgres and configure the database

From 0a6e577e108676cce4b1e4b8c74b600640e36857 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 09:37:58 -0600
Subject: [PATCH 095/109] Fix some international keybindings

This adds primitive interaction with the IME system for keyboard
shortcuts in zed.

For zed-industries/community#1981
For zed-industroes/community#1913
---
 crates/gpui/src/platform/mac/window.rs | 27 +++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 3be425d3122a97b161c13444d41b082b22c98f74..a3d4c39418f7a5db0a52b3ea96d3c9989a2d1a32 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -988,7 +988,32 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
                         .flatten()
                         .is_some();
                 if !is_composing {
-                    handled = callback(Event::KeyDown(event));
+                    // if the IME has changed the key, we'll first emit an event with the character
+                    // generated by the IME system; then fallback to the keystroke if that is not
+                    // handled.
+                    // (e.g. on a brazillian keyboard to type a quote you type quote then space)
+                    // (e.g. on a czech keyboard typing a $ requires option+shift+4)
+                    if ime_text.is_some() && ime_text.as_ref() != Some(&event.keystroke.key) {
+                        let event_with_ime_text = KeyDownEvent {
+                            is_held: false,
+                            keystroke: Keystroke {
+                                ctrl: false,
+                                alt: false,
+                                shift: false,
+                                cmd: false,
+                                function: false,
+                                key: ime_text.clone().unwrap(),
+                            },
+                        };
+                        handled = callback(Event::KeyDown(event_with_ime_text));
+                    }
+                    if !handled {
+                        // empty key happens when you type a deadkey in input composition.
+                        // (e.g. on a brazillian keyboard typing quote is a deadkey)
+                        if !event.keystroke.key.is_empty() {
+                            handled = callback(Event::KeyDown(event));
+                        }
+                    }
                 }
 
                 if !handled {

From e017dc6a5e17c170397d0e00f784bb3ba9980a7d Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 11:16:18 -0600
Subject: [PATCH 096/109] Fix ctrl-` on Brazillian too

---
 crates/gpui/src/platform/mac/window.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index a3d4c39418f7a5db0a52b3ea96d3c9989a2d1a32..e7befc2728817081766e79bdd80aa0b84046a160 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -991,13 +991,21 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
                     // if the IME has changed the key, we'll first emit an event with the character
                     // generated by the IME system; then fallback to the keystroke if that is not
                     // handled.
-                    // (e.g. on a brazillian keyboard to type a quote you type quote then space)
-                    // (e.g. on a czech keyboard typing a $ requires option+shift+4)
+                    // cases that we have working:
+                    // - " on a brazillian layout by typing <quote><space>
+                    // - ctrl-` on a brazillian layout by typing <ctrl-`>
+                    // - $ on a czech QWERTY layout by typing <alt-4>
+                    // - 4 on a czech QWERTY layout by typing <shift-4>
+                    // - ctrl-4 on a czech QWERTY layout by typing <ctrl-alt-4> (or <ctrl-shift-4>)
                     if ime_text.is_some() && ime_text.as_ref() != Some(&event.keystroke.key) {
                         let event_with_ime_text = KeyDownEvent {
                             is_held: false,
                             keystroke: Keystroke {
-                                ctrl: false,
+                                // we match ctrl because some use-cases need it.
+                                // we don't match alt because it's often used to generate the optional character
+                                // we don't match shift because we're not here with letters (usually)
+                                // we don't match cmd/fn because they don't seem to use IME
+                                ctrl: event.keystroke.ctrl,
                                 alt: false,
                                 shift: false,
                                 cmd: false,

From 017aa1fdfb3ae779f2ed432048db0b69be33f5e2 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 11 Sep 2023 21:35:08 +0300
Subject: [PATCH 097/109] Allow installing rustup via homebrew

---
 README.md | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 961c8f9ff384370cef0c60c4e65cc7f6cf1908e0..2ee426a2a6777c7fc7a0f1b1784ee47aa98ce014 100644
--- a/README.md
+++ b/README.md
@@ -12,16 +12,12 @@ Welcome to Zed, a lightning-fast, collaborative code editor that makes your drea
   ```
   sudo xcodebuild -license
   ```
-
-* Install rustup (rust, cargo, etc.)
-  ```
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-  ```
   
-* Install homebrew and node
+* Install homebrew, node and rustup-init (rutup, rust, cargo, etc.)
   ```
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-  brew install node
+  brew install node rustup-init
+  rustup-init # follow the installation steps
   ```
   
 * Install postgres and configure the database

From e8a6ecd6ac5d4cb1657d2b373b81e343a0f51a0f Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 13:07:11 -0600
Subject: [PATCH 098/109] Allow a count with CurrentLine

Add _ and g_ too while we're here.
---
 assets/keymaps/vim.json  |  2 ++
 crates/vim/src/motion.rs | 27 ++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index b47907783ea1d8397b84a5bbc47b8924a19c285f..62b6a49b901d229f22bc62acac64bd14d7b712c1 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -32,6 +32,8 @@
       "right": "vim::Right",
       "$": "vim::EndOfLine",
       "^": "vim::FirstNonWhitespace",
+      "_": "vim::StartOfLineDownward",
+      "g _": "vim::EndOfLineDownward",
       "shift-g": "vim::EndOfDocument",
       "w": "vim::NextWordStart",
       "{": "vim::StartOfParagraph",
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index c232ff98493ece4890cd09d84a1aef34d4670e08..5179b56b1f2a0fe8b93cad21dc7d06ae6c3a4904 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -40,6 +40,8 @@ pub enum Motion {
     FindForward { before: bool, char: char },
     FindBackward { after: bool, char: char },
     NextLineStart,
+    StartOfLineDownward,
+    EndOfLineDownward,
 }
 
 #[derive(Clone, Deserialize, PartialEq)]
@@ -117,6 +119,8 @@ actions!(
         EndOfDocument,
         Matching,
         NextLineStart,
+        StartOfLineDownward,
+        EndOfLineDownward,
     ]
 );
 impl_actions!(
@@ -207,6 +211,12 @@ pub fn init(cx: &mut AppContext) {
          cx: _| { motion(Motion::PreviousWordStart { ignore_punctuation }, cx) },
     );
     cx.add_action(|_: &mut Workspace, &NextLineStart, cx: _| motion(Motion::NextLineStart, cx));
+    cx.add_action(|_: &mut Workspace, &StartOfLineDownward, cx: _| {
+        motion(Motion::StartOfLineDownward, cx)
+    });
+    cx.add_action(|_: &mut Workspace, &EndOfLineDownward, cx: _| {
+        motion(Motion::EndOfLineDownward, cx)
+    });
     cx.add_action(|_: &mut Workspace, action: &RepeatFind, cx: _| {
         repeat_motion(action.backwards, cx)
     })
@@ -272,6 +282,7 @@ impl Motion {
             | EndOfDocument
             | CurrentLine
             | NextLineStart
+            | StartOfLineDownward
             | StartOfParagraph
             | EndOfParagraph => true,
             EndOfLine { .. }
@@ -282,6 +293,7 @@ impl Motion {
             | Backspace
             | Right
             | StartOfLine { .. }
+            | EndOfLineDownward
             | NextWordStart { .. }
             | PreviousWordStart { .. }
             | FirstNonWhitespace { .. }
@@ -305,6 +317,8 @@ impl Motion {
             | StartOfLine { .. }
             | StartOfParagraph
             | EndOfParagraph
+            | StartOfLineDownward
+            | EndOfLineDownward
             | NextWordStart { .. }
             | PreviousWordStart { .. }
             | FirstNonWhitespace { .. }
@@ -322,6 +336,7 @@ impl Motion {
             | EndOfDocument
             | CurrentLine
             | EndOfLine { .. }
+            | EndOfLineDownward
             | NextWordEnd { .. }
             | Matching
             | FindForward { .. }
@@ -330,6 +345,7 @@ impl Motion {
             | Backspace
             | Right
             | StartOfLine { .. }
+            | StartOfLineDownward
             | StartOfParagraph
             | EndOfParagraph
             | NextWordStart { .. }
@@ -396,7 +412,7 @@ impl Motion {
                 map.clip_at_line_end(movement::end_of_paragraph(map, point, times)),
                 SelectionGoal::None,
             ),
-            CurrentLine => (end_of_line(map, false, point), SelectionGoal::None),
+            CurrentLine => (next_line_end(map, point, 1), SelectionGoal::None),
             StartOfDocument => (start_of_document(map, point, times), SelectionGoal::None),
             EndOfDocument => (
                 end_of_document(map, point, maybe_times),
@@ -412,6 +428,8 @@ impl Motion {
                 SelectionGoal::None,
             ),
             NextLineStart => (next_line_start(map, point, times), SelectionGoal::None),
+            StartOfLineDownward => (next_line_start(map, point, times - 1), SelectionGoal::None),
+            EndOfLineDownward => (next_line_end(map, point, times), SelectionGoal::None),
         };
 
         (new_point != point || infallible).then_some((new_point, goal))
@@ -849,6 +867,13 @@ fn next_line_start(map: &DisplaySnapshot, point: DisplayPoint, times: usize) ->
     first_non_whitespace(map, false, correct_line)
 }
 
+fn next_line_end(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> DisplayPoint {
+    if times > 1 {
+        point = down(map, point, SelectionGoal::None, times - 1).0;
+    }
+    end_of_line(map, false, point)
+}
+
 #[cfg(test)]
 
 mod test {

From cee549e1ef2703b4ef8a9242e75ff108c92de497 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 13:10:01 -0600
Subject: [PATCH 099/109] vim: Fix count handling to allow pre/post counts

Fixes 2yy, d3d, etc.

For zed-industries/community#970
For zed-industries/community#1496
---
 assets/keymaps/vim.json                       |  4 +-
 crates/vim/src/motion.rs                      |  8 +--
 crates/vim/src/normal.rs                      | 10 +--
 crates/vim/src/normal/case.rs                 |  2 +-
 crates/vim/src/normal/delete.rs               | 36 ++++++++++
 crates/vim/src/normal/repeat.rs               | 40 ++++++++++-
 crates/vim/src/normal/scroll.rs               |  2 +-
 crates/vim/src/normal/search.rs               |  4 +-
 crates/vim/src/normal/substitute.rs           |  4 +-
 crates/vim/src/state.rs                       | 20 +++++-
 crates/vim/src/vim.rs                         | 70 ++++++++++---------
 .../test_data/test_delete_with_counts.json    | 16 +++++
 .../test_data/test_repeat_motion_counts.json  | 13 ++++
 13 files changed, 175 insertions(+), 54 deletions(-)
 create mode 100644 crates/vim/test_data/test_delete_with_counts.json
 create mode 100644 crates/vim/test_data/test_repeat_motion_counts.json

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 62b6a49b901d229f22bc62acac64bd14d7b712c1..bbc0a51b28109174d84a937c2397ea54f0c6aed1 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -328,7 +328,7 @@
     }
   },
   {
-    "context": "Editor && vim_mode == normal && (vim_operator == none || vim_operator == n) && !VimWaiting",
+    "context": "Editor && vim_mode == normal && vim_operator == none && !VimWaiting",
     "bindings": {
       ".": "vim::Repeat",
       "c": [
@@ -391,7 +391,7 @@
     }
   },
   {
-    "context": "Editor && vim_operator == n",
+    "context": "Editor && VimCount",
     "bindings": {
       "0": [
         "vim::Number",
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 5179b56b1f2a0fe8b93cad21dc7d06ae6c3a4904..6821ec64e5ebc988dc1678126a1a3671aeb6ba9d 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -229,11 +229,11 @@ pub(crate) fn motion(motion: Motion, cx: &mut WindowContext) {
         Vim::update(cx, |vim, cx| vim.pop_operator(cx));
     }
 
-    let times = Vim::update(cx, |vim, cx| vim.pop_number_operator(cx));
+    let count = Vim::update(cx, |vim, _| vim.take_count());
     let operator = Vim::read(cx).active_operator();
     match Vim::read(cx).state().mode {
-        Mode::Normal => normal_motion(motion, operator, times, cx),
-        Mode::Visual | Mode::VisualLine | Mode::VisualBlock => visual_motion(motion, times, cx),
+        Mode::Normal => normal_motion(motion, operator, count, cx),
+        Mode::Visual | Mode::VisualLine | Mode::VisualBlock => visual_motion(motion, count, cx),
         Mode::Insert => {
             // Shouldn't execute a motion in insert mode. Ignoring
         }
@@ -412,7 +412,7 @@ impl Motion {
                 map.clip_at_line_end(movement::end_of_paragraph(map, point, times)),
                 SelectionGoal::None,
             ),
-            CurrentLine => (next_line_end(map, point, 1), SelectionGoal::None),
+            CurrentLine => (next_line_end(map, point, times), SelectionGoal::None),
             StartOfDocument => (start_of_document(map, point, times), SelectionGoal::None),
             EndOfDocument => (
                 end_of_document(map, point, maybe_times),
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index d920abee9017b46b8ecf9cf38047bbf0f06c64f9..3ef3f9ddd327e9d29ab9049cfd27301de7e1845c 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -68,21 +68,21 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &DeleteLeft, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let times = vim.pop_number_operator(cx);
+            let times = vim.take_count();
             delete_motion(vim, Motion::Left, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteRight, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let times = vim.pop_number_operator(cx);
+            let times = vim.take_count();
             delete_motion(vim, Motion::Right, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &ChangeToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
             vim.start_recording(cx);
-            let times = vim.pop_number_operator(cx);
+            let times = vim.take_count();
             change_motion(
                 vim,
                 Motion::EndOfLine {
@@ -96,7 +96,7 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &DeleteToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let times = vim.pop_number_operator(cx);
+            let times = vim.take_count();
             delete_motion(
                 vim,
                 Motion::EndOfLine {
@@ -110,7 +110,7 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &JoinLines, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let mut times = vim.pop_number_operator(cx).unwrap_or(1);
+            let mut times = vim.take_count().unwrap_or(1);
             if vim.state().mode.is_visual() {
                 times = 1;
             } else if times > 1 {
diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs
index 12fd8dbd2b66df8ef94ea61e9f80718769c6a28c..34b81fbb4c7419bd6059b294ea87edb4168331da 100644
--- a/crates/vim/src/normal/case.rs
+++ b/crates/vim/src/normal/case.rs
@@ -8,7 +8,7 @@ use crate::{normal::ChangeCase, state::Mode, Vim};
 pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
         vim.record_current_action(cx);
-        let count = vim.pop_number_operator(cx).unwrap_or(1) as u32;
+        let count = vim.take_count().unwrap_or(1) as u32;
         vim.update_active_editor(cx, |editor, cx| {
             let mut ranges = Vec::new();
             let mut cursor_positions = Vec::new();
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index ae85acaab55a5344281ebf8ad268f9ddc54b1f27..1126eb11551353a5e05c79139fd02b9f18d78f4f 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -387,4 +387,40 @@ mod test {
         assert_eq!(cx.active_operator(), None);
         assert_eq!(cx.mode(), Mode::Normal);
     }
+
+    #[gpui::test]
+    async fn test_delete_with_counts(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        cx.set_shared_state(indoc! {"
+                The ˇquick brown
+                fox jumps over
+                the lazy dog"})
+            .await;
+        cx.simulate_shared_keystrokes(["d", "2", "d"]).await;
+        cx.assert_shared_state(indoc! {"
+        the ˇlazy dog"})
+            .await;
+
+        cx.set_shared_state(indoc! {"
+                The ˇquick brown
+                fox jumps over
+                the lazy dog"})
+            .await;
+        cx.simulate_shared_keystrokes(["2", "d", "d"]).await;
+        cx.assert_shared_state(indoc! {"
+        the ˇlazy dog"})
+            .await;
+
+        cx.set_shared_state(indoc! {"
+                The ˇquick brown
+                fox jumps over
+                the moon,
+                a star, and
+                the lazy dog"})
+            .await;
+        cx.simulate_shared_keystrokes(["2", "d", "2", "d"]).await;
+        cx.assert_shared_state(indoc! {"
+        the ˇlazy dog"})
+            .await;
+    }
 }
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index 1a7c789aad9a680eddef208eed182b5b237ca286..28f9e3c2a43359258856b1ea80d0373dd566f6b3 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -34,7 +34,7 @@ pub(crate) fn init(cx: &mut AppContext) {
             let Some(editor) = vim.active_editor.clone() else {
                 return None;
             };
-            let count = vim.pop_number_operator(cx);
+            let count = vim.take_count();
 
             vim.workspace_state.replaying = true;
 
@@ -424,4 +424,42 @@ mod test {
         })
         .await;
     }
+
+    #[gpui::test]
+    async fn test_repeat_motion_counts(
+        deterministic: Arc<Deterministic>,
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.set_shared_state(indoc! {
+            "ˇthe quick brown
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["3", "d", "3", "l"]).await;
+        cx.assert_shared_state(indoc! {
+            "ˇ brown
+            fox jumps over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["j", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            " brown
+            ˇ over
+            the lazy dog"
+        })
+        .await;
+        cx.simulate_shared_keystrokes(["j", "2", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state(indoc! {
+            " brown
+             over
+            ˇe lazy dog"
+        })
+        .await;
+    }
 }
diff --git a/crates/vim/src/normal/scroll.rs b/crates/vim/src/normal/scroll.rs
index 1b3dcee6adc4827d42bd6d71c298d49fa991fda9..6319ba1663eddd79ed92de4ea056d750df35c90b 100644
--- a/crates/vim/src/normal/scroll.rs
+++ b/crates/vim/src/normal/scroll.rs
@@ -48,7 +48,7 @@ pub fn init(cx: &mut AppContext) {
 
 fn scroll(cx: &mut ViewContext<Workspace>, by: fn(c: Option<f32>) -> ScrollAmount) {
     Vim::update(cx, |vim, cx| {
-        let amount = by(vim.pop_number_operator(cx).map(|c| c as f32));
+        let amount = by(vim.take_count().map(|c| c as f32));
         vim.update_active_editor(cx, |editor, cx| scroll_editor(editor, &amount, cx));
     })
 }
diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
index 4ca0c42909d7542a1f454247ad54ae8f58f98acc..b488a879f2fade76a2da98defee03291b049ac88 100644
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -52,7 +52,7 @@ fn search(workspace: &mut Workspace, action: &Search, cx: &mut ViewContext<Works
         Direction::Next
     };
     Vim::update(cx, |vim, cx| {
-        let count = vim.pop_number_operator(cx).unwrap_or(1);
+        let count = vim.take_count().unwrap_or(1);
         pane.update(cx, |pane, cx| {
             if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
                 search_bar.update(cx, |search_bar, cx| {
@@ -119,7 +119,7 @@ pub fn move_to_internal(
 ) {
     Vim::update(cx, |vim, cx| {
         let pane = workspace.active_pane().clone();
-        let count = vim.pop_number_operator(cx).unwrap_or(1);
+        let count = vim.take_count().unwrap_or(1);
         pane.update(cx, |pane, cx| {
             if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
                 let search = search_bar.update(cx, |search_bar, cx| {
diff --git a/crates/vim/src/normal/substitute.rs b/crates/vim/src/normal/substitute.rs
index d0dbb9e3068c9de28b2fe90258ef22112f9c8bb3..26aff7baa420a37b40f71a0e01b1ba440326bd1f 100644
--- a/crates/vim/src/normal/substitute.rs
+++ b/crates/vim/src/normal/substitute.rs
@@ -11,7 +11,7 @@ pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &Substitute, cx| {
         Vim::update(cx, |vim, cx| {
             vim.start_recording(cx);
-            let count = vim.pop_number_operator(cx);
+            let count = vim.take_count();
             substitute(vim, count, vim.state().mode == Mode::VisualLine, cx);
         })
     });
@@ -22,7 +22,7 @@ pub(crate) fn init(cx: &mut AppContext) {
             if matches!(vim.state().mode, Mode::VisualBlock | Mode::Visual) {
                 vim.switch_mode(Mode::VisualLine, false, cx)
             }
-            let count = vim.pop_number_operator(cx);
+            let count = vim.take_count();
             substitute(vim, count, true, cx)
         })
     });
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 7359178f0eba91b06780301f4ddc6b00c03b97e5..8fd4049767bfada65bbfd57142eb96c43c310366 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -33,7 +33,6 @@ impl Default for Mode {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize)]
 pub enum Operator {
-    Number(usize),
     Change,
     Delete,
     Yank,
@@ -47,6 +46,12 @@ pub enum Operator {
 pub struct EditorState {
     pub mode: Mode,
     pub last_mode: Mode,
+
+    /// pre_count is the number before an operator is specified (3 in 3d2d)
+    pub pre_count: Option<usize>,
+    /// post_count is the number after an operator is specified (2 in 3d2d)
+    pub post_count: Option<usize>,
+
     pub operator_stack: Vec<Operator>,
 }
 
@@ -158,6 +163,10 @@ impl EditorState {
         }
     }
 
+    pub fn active_operator(&self) -> Option<Operator> {
+        self.operator_stack.last().copied()
+    }
+
     pub fn keymap_context_layer(&self) -> KeymapContext {
         let mut context = KeymapContext::default();
         context.add_identifier("VimEnabled");
@@ -174,7 +183,13 @@ impl EditorState {
             context.add_identifier("VimControl");
         }
 
-        let active_operator = self.operator_stack.last();
+        if self.active_operator().is_none() && self.pre_count.is_some()
+            || self.active_operator().is_some() && self.post_count.is_some()
+        {
+            context.add_identifier("VimCount");
+        }
+
+        let active_operator = self.active_operator();
 
         if let Some(active_operator) = active_operator {
             for context_flag in active_operator.context_flags().into_iter() {
@@ -194,7 +209,6 @@ impl EditorState {
 impl Operator {
     pub fn id(&self) -> &'static str {
         match self {
-            Operator::Number(_) => "n",
             Operator::Object { around: false } => "i",
             Operator::Object { around: true } => "a",
             Operator::Change => "c",
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 03a74d46ce07f76ade67875d578d7f1551a30563..74363bc7b77e844ccea6936182a3f4e7b8c82ed1 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -40,9 +40,12 @@ pub struct SwitchMode(pub Mode);
 pub struct PushOperator(pub Operator);
 
 #[derive(Clone, Deserialize, PartialEq)]
-struct Number(u8);
+struct Number(usize);
 
-actions!(vim, [Tab, Enter]);
+actions!(
+    vim,
+    [Tab, Enter, Object, InnerObject, FindForward, FindBackward]
+);
 impl_actions!(vim, [Number, SwitchMode, PushOperator]);
 
 #[derive(Copy, Clone, Debug)]
@@ -70,7 +73,7 @@ pub fn init(cx: &mut AppContext) {
         },
     );
     cx.add_action(|_: &mut Workspace, n: &Number, cx: _| {
-        Vim::update(cx, |vim, cx| vim.push_number(n, cx));
+        Vim::update(cx, |vim, _| vim.push_count_digit(n.0));
     });
 
     cx.add_action(|_: &mut Workspace, _: &Tab, cx| {
@@ -236,12 +239,7 @@ impl Vim {
         if !self.workspace_state.replaying {
             self.workspace_state.recording = true;
             self.workspace_state.recorded_actions = Default::default();
-            self.workspace_state.recorded_count =
-                if let Some(Operator::Number(number)) = self.active_operator() {
-                    Some(number)
-                } else {
-                    None
-                };
+            self.workspace_state.recorded_count = None;
 
             let selections = self
                 .active_editor
@@ -352,6 +350,36 @@ impl Vim {
         });
     }
 
+    fn push_count_digit(&mut self, number: usize) {
+        if self.active_operator().is_some() {
+            self.update_state(|state| {
+                state.post_count = Some(state.post_count.unwrap_or(0) * 10 + number)
+            })
+        } else {
+            self.update_state(|state| {
+                state.pre_count = Some(state.pre_count.unwrap_or(0) * 10 + number)
+            })
+        }
+    }
+
+    fn take_count(&mut self) -> Option<usize> {
+        if self.workspace_state.replaying {
+            return self.workspace_state.recorded_count;
+        }
+
+        let count = if self.state().post_count == None && self.state().pre_count == None {
+            return None;
+        } else {
+            Some(self.update_state(|state| {
+                state.post_count.take().unwrap_or(1) * state.pre_count.take().unwrap_or(1)
+            }))
+        };
+        if self.workspace_state.recording {
+            self.workspace_state.recorded_count = count;
+        }
+        count
+    }
+
     fn push_operator(&mut self, operator: Operator, cx: &mut WindowContext) {
         if matches!(
             operator,
@@ -363,15 +391,6 @@ impl Vim {
         self.sync_vim_settings(cx);
     }
 
-    fn push_number(&mut self, Number(number): &Number, cx: &mut WindowContext) {
-        if let Some(Operator::Number(current_number)) = self.active_operator() {
-            self.pop_operator(cx);
-            self.push_operator(Operator::Number(current_number * 10 + *number as usize), cx);
-        } else {
-            self.push_operator(Operator::Number(*number as usize), cx);
-        }
-    }
-
     fn maybe_pop_operator(&mut self) -> Option<Operator> {
         self.update_state(|state| state.operator_stack.pop())
     }
@@ -382,21 +401,6 @@ impl Vim {
         self.sync_vim_settings(cx);
         popped_operator
     }
-
-    fn pop_number_operator(&mut self, cx: &mut WindowContext) -> Option<usize> {
-        if self.workspace_state.replaying {
-            if let Some(number) = self.workspace_state.recorded_count {
-                return Some(number);
-            }
-        }
-
-        if let Some(Operator::Number(number)) = self.active_operator() {
-            self.pop_operator(cx);
-            return Some(number);
-        }
-        None
-    }
-
     fn clear_operator(&mut self, cx: &mut WindowContext) {
         self.update_state(|state| state.operator_stack.clear());
         self.sync_vim_settings(cx);
diff --git a/crates/vim/test_data/test_delete_with_counts.json b/crates/vim/test_data/test_delete_with_counts.json
new file mode 100644
index 0000000000000000000000000000000000000000..de19c5d29d17cbb13a7a1db58c526e6534dee751
--- /dev/null
+++ b/crates/vim/test_data/test_delete_with_counts.json
@@ -0,0 +1,16 @@
+{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
+{"Key":"d"}
+{"Key":"2"}
+{"Key":"d"}
+{"Get":{"state":"the ˇlazy dog","mode":"Normal"}}
+{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe lazy dog"}}
+{"Key":"2"}
+{"Key":"d"}
+{"Key":"d"}
+{"Get":{"state":"the ˇlazy dog","mode":"Normal"}}
+{"Put":{"state":"The ˇquick brown\nfox jumps over\nthe moon,\na star, and\nthe lazy dog"}}
+{"Key":"2"}
+{"Key":"d"}
+{"Key":"2"}
+{"Key":"d"}
+{"Get":{"state":"the ˇlazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_repeat_motion_counts.json b/crates/vim/test_data/test_repeat_motion_counts.json
new file mode 100644
index 0000000000000000000000000000000000000000..c39b8b09c098c5c5299ea922d459091bafff5794
--- /dev/null
+++ b/crates/vim/test_data/test_repeat_motion_counts.json
@@ -0,0 +1,13 @@
+{"Put":{"state":"ˇthe quick brown\nfox jumps over\nthe lazy dog"}}
+{"Key":"3"}
+{"Key":"d"}
+{"Key":"3"}
+{"Key":"l"}
+{"Get":{"state":"ˇ brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"."}
+{"Get":{"state":" brown\nˇ over\nthe lazy dog","mode":"Normal"}}
+{"Key":"j"}
+{"Key":"2"}
+{"Key":"."}
+{"Get":{"state":" brown\n over\nˇe lazy dog","mode":"Normal"}}

From d868d00985ba29df4605c202f8e3d4f04572cda3 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 18:01:58 -0600
Subject: [PATCH 100/109] vim: ALlow counts on insert actions

This re-uses the existing repeat infrastructure.
---
 assets/keymaps/default.json                   |   2 +-
 assets/keymaps/vim.json                       |   2 +-
 crates/vim/src/insert.rs                      | 119 +++++++-
 crates/vim/src/normal.rs                      |   2 +-
 crates/vim/src/normal/repeat.rs               | 271 +++++++++++-------
 crates/vim/src/vim.rs                         |  14 +-
 .../test_data/test_insert_with_counts.json    |  36 +++
 .../test_data/test_insert_with_repeat.json    |  23 ++
 8 files changed, 340 insertions(+), 129 deletions(-)
 create mode 100644 crates/vim/test_data/test_insert_with_counts.json
 create mode 100644 crates/vim/test_data/test_insert_with_repeat.json

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index fa62a74f3f7e27485cb0f36abd4c5ab5ab82ea38..2fb1c6f5fcaa8baf4c3a128644b372408260c501 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -533,7 +533,7 @@
       // TODO: Move this to a dock open action
       "cmd-shift-c": "collab_panel::ToggleFocus",
       "cmd-alt-i": "zed::DebugElements",
-      "ctrl-:": "editor::ToggleInlayHints",
+      "ctrl-:": "editor::ToggleInlayHints"
     }
   },
   {
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index bbc0a51b28109174d84a937c2397ea54f0c6aed1..1a7b81ee8f5cb7e16e1290b1e7141d834ee6a887 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -499,7 +499,7 @@
             "around": true
           }
         }
-      ],
+      ]
     }
   },
   {
diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs
index 9141a02ab3550c29262f235348e9beadfde15d9e..7495b302a29db477521fab56ddd8ee237bc0ed21 100644
--- a/crates/vim/src/insert.rs
+++ b/crates/vim/src/insert.rs
@@ -1,6 +1,6 @@
-use crate::{state::Mode, Vim};
+use crate::{normal::repeat, state::Mode, Vim};
 use editor::{scroll::autoscroll::Autoscroll, Bias};
-use gpui::{actions, AppContext, ViewContext};
+use gpui::{actions, Action, AppContext, ViewContext};
 use language::SelectionGoal;
 use workspace::Workspace;
 
@@ -10,24 +10,41 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(normal_before);
 }
 
-fn normal_before(_: &mut Workspace, _: &NormalBefore, cx: &mut ViewContext<Workspace>) {
-    Vim::update(cx, |vim, cx| {
-        vim.stop_recording();
-        vim.update_active_editor(cx, |editor, cx| {
-            editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
-                s.move_cursors_with(|map, mut cursor, _| {
-                    *cursor.column_mut() = cursor.column().saturating_sub(1);
-                    (map.clip_point(cursor, Bias::Left), SelectionGoal::None)
+fn normal_before(_: &mut Workspace, action: &NormalBefore, cx: &mut ViewContext<Workspace>) {
+    let should_repeat = Vim::update(cx, |vim, cx| {
+        let count = vim.take_count().unwrap_or(1);
+        vim.stop_recording_immediately(action.boxed_clone());
+        if count <= 1 || vim.workspace_state.replaying {
+            vim.update_active_editor(cx, |editor, cx| {
+                editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
+                    s.move_cursors_with(|map, mut cursor, _| {
+                        *cursor.column_mut() = cursor.column().saturating_sub(1);
+                        (map.clip_point(cursor, Bias::Left), SelectionGoal::None)
+                    });
                 });
             });
-        });
-        vim.switch_mode(Mode::Normal, false, cx);
-    })
+            vim.switch_mode(Mode::Normal, false, cx);
+            false
+        } else {
+            true
+        }
+    });
+
+    if should_repeat {
+        repeat::repeat(cx, true)
+    }
 }
 
 #[cfg(test)]
 mod test {
-    use crate::{state::Mode, test::VimTestContext};
+    use std::sync::Arc;
+
+    use gpui::executor::Deterministic;
+
+    use crate::{
+        state::Mode,
+        test::{NeovimBackedTestContext, VimTestContext},
+    };
 
     #[gpui::test]
     async fn test_enter_and_exit_insert_mode(cx: &mut gpui::TestAppContext) {
@@ -40,4 +57,78 @@ mod test {
         assert_eq!(cx.mode(), Mode::Normal);
         cx.assert_editor_state("Tesˇt");
     }
+
+    #[gpui::test]
+    async fn test_insert_with_counts(
+        deterministic: Arc<Deterministic>,
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.set_shared_state("ˇhello\n").await;
+        cx.simulate_shared_keystrokes(["5", "i", "-", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("----ˇ-hello\n").await;
+
+        cx.set_shared_state("ˇhello\n").await;
+        cx.simulate_shared_keystrokes(["5", "a", "-", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("h----ˇ-ello\n").await;
+
+        cx.simulate_shared_keystrokes(["4", "shift-i", "-", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("---ˇ-h-----ello\n").await;
+
+        cx.simulate_shared_keystrokes(["3", "shift-a", "-", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("----h-----ello--ˇ-\n").await;
+
+        cx.set_shared_state("ˇhello\n").await;
+        cx.simulate_shared_keystrokes(["3", "o", "o", "i", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("hello\noi\noi\noˇi\n").await;
+
+        cx.set_shared_state("ˇhello\n").await;
+        cx.simulate_shared_keystrokes(["3", "shift-o", "o", "i", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("oi\noi\noˇi\nhello\n").await;
+    }
+
+    #[gpui::test]
+    async fn test_insert_with_repeat(
+        deterministic: Arc<Deterministic>,
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.set_shared_state("ˇhello\n").await;
+        cx.simulate_shared_keystrokes(["3", "i", "-", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("--ˇ-hello\n").await;
+        cx.simulate_shared_keystrokes(["."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("----ˇ--hello\n").await;
+        cx.simulate_shared_keystrokes(["2", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("-----ˇ---hello\n").await;
+
+        cx.set_shared_state("ˇhello\n").await;
+        cx.simulate_shared_keystrokes(["2", "o", "k", "k", "escape"])
+            .await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("hello\nkk\nkˇk\n").await;
+        cx.simulate_shared_keystrokes(["."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("hello\nkk\nkk\nkk\nkˇk\n").await;
+        cx.simulate_shared_keystrokes(["1", "."]).await;
+        deterministic.run_until_parked();
+        cx.assert_shared_state("hello\nkk\nkk\nkk\nkk\nkˇk\n").await;
+    }
 }
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 3ef3f9ddd327e9d29ab9049cfd27301de7e1845c..16a4150dabafd578eb4347d38956bef56147290a 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -2,7 +2,7 @@ mod case;
 mod change;
 mod delete;
 mod paste;
-mod repeat;
+pub(crate) mod repeat;
 mod scroll;
 mod search;
 pub mod substitute;
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index 28f9e3c2a43359258856b1ea80d0373dd566f6b3..6954ace71fed459ec541e3ddf30e2ea14caed4af 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -1,10 +1,11 @@
 use crate::{
+    insert::NormalBefore,
     motion::Motion,
     state::{Mode, RecordedSelection, ReplayableAction},
     visual::visual_motion,
     Vim,
 };
-use gpui::{actions, Action, AppContext};
+use gpui::{actions, Action, AppContext, WindowContext};
 use workspace::Workspace;
 
 actions!(vim, [Repeat, EndRepeat,]);
@@ -17,6 +18,27 @@ fn should_replay(action: &Box<dyn Action>) -> bool {
     true
 }
 
+fn repeatable_insert(action: &ReplayableAction) -> Option<Box<dyn Action>> {
+    match action {
+        ReplayableAction::Action(action) => {
+            if super::InsertBefore.id() == action.id()
+                || super::InsertAfter.id() == action.id()
+                || super::InsertFirstNonWhitespace.id() == action.id()
+                || super::InsertEndOfLine.id() == action.id()
+            {
+                Some(super::InsertBefore.boxed_clone())
+            } else if super::InsertLineAbove.id() == action.id()
+                || super::InsertLineBelow.id() == action.id()
+            {
+                Some(super::InsertLineBelow.boxed_clone())
+            } else {
+                None
+            }
+        }
+        ReplayableAction::Insertion { .. } => None,
+    }
+}
+
 pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| {
         Vim::update(cx, |vim, cx| {
@@ -28,127 +50,156 @@ pub(crate) fn init(cx: &mut AppContext) {
         });
     });
 
-    cx.add_action(|_: &mut Workspace, _: &Repeat, cx| {
-        let Some((actions, editor, selection)) = Vim::update(cx, |vim, cx| {
-            let actions = vim.workspace_state.recorded_actions.clone();
-            let Some(editor) = vim.active_editor.clone() else {
-                return None;
-            };
-            let count = vim.take_count();
-
-            vim.workspace_state.replaying = true;
-
-            let selection = vim.workspace_state.recorded_selection.clone();
-            match selection {
-                RecordedSelection::SingleLine { .. } | RecordedSelection::Visual { .. } => {
-                    vim.workspace_state.recorded_count = None;
-                    vim.switch_mode(Mode::Visual, false, cx)
-                }
-                RecordedSelection::VisualLine { .. } => {
-                    vim.workspace_state.recorded_count = None;
-                    vim.switch_mode(Mode::VisualLine, false, cx)
-                }
-                RecordedSelection::VisualBlock { .. } => {
-                    vim.workspace_state.recorded_count = None;
-                    vim.switch_mode(Mode::VisualBlock, false, cx)
-                }
-                RecordedSelection::None => {
-                    if let Some(count) = count {
-                        vim.workspace_state.recorded_count = Some(count);
-                    }
-                }
-            }
-
-            if let Some(editor) = editor.upgrade(cx) {
-                editor.update(cx, |editor, _| {
-                    editor.show_local_selections = false;
-                })
-            } else {
-                return None;
-            }
+    cx.add_action(|_: &mut Workspace, _: &Repeat, cx| repeat(cx, false));
+}
 
-            Some((actions, editor, selection))
-        }) else {
-            return;
+pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
+    let Some((mut actions, editor, selection)) = Vim::update(cx, |vim, cx| {
+        let actions = vim.workspace_state.recorded_actions.clone();
+        let Some(editor) = vim.active_editor.clone() else {
+            return None;
         };
+        let count = vim.take_count();
 
+        let selection = vim.workspace_state.recorded_selection.clone();
         match selection {
-            RecordedSelection::SingleLine { cols } => {
-                if cols > 1 {
-                    visual_motion(Motion::Right, Some(cols as usize - 1), cx)
-                }
+            RecordedSelection::SingleLine { .. } | RecordedSelection::Visual { .. } => {
+                vim.workspace_state.recorded_count = None;
+                vim.switch_mode(Mode::Visual, false, cx)
             }
-            RecordedSelection::Visual { rows, cols } => {
-                visual_motion(
-                    Motion::Down {
-                        display_lines: false,
-                    },
-                    Some(rows as usize),
-                    cx,
-                );
-                visual_motion(
-                    Motion::StartOfLine {
-                        display_lines: false,
-                    },
-                    None,
-                    cx,
-                );
-                if cols > 1 {
-                    visual_motion(Motion::Right, Some(cols as usize - 1), cx)
-                }
+            RecordedSelection::VisualLine { .. } => {
+                vim.workspace_state.recorded_count = None;
+                vim.switch_mode(Mode::VisualLine, false, cx)
             }
-            RecordedSelection::VisualBlock { rows, cols } => {
-                visual_motion(
-                    Motion::Down {
-                        display_lines: false,
-                    },
-                    Some(rows as usize),
-                    cx,
-                );
-                if cols > 1 {
-                    visual_motion(Motion::Right, Some(cols as usize - 1), cx);
+            RecordedSelection::VisualBlock { .. } => {
+                vim.workspace_state.recorded_count = None;
+                vim.switch_mode(Mode::VisualBlock, false, cx)
+            }
+            RecordedSelection::None => {
+                if let Some(count) = count {
+                    vim.workspace_state.recorded_count = Some(count);
                 }
             }
-            RecordedSelection::VisualLine { rows } => {
-                visual_motion(
-                    Motion::Down {
-                        display_lines: false,
-                    },
-                    Some(rows as usize),
-                    cx,
-                );
+        }
+
+        if let Some(editor) = editor.upgrade(cx) {
+            editor.update(cx, |editor, _| {
+                editor.show_local_selections = false;
+            })
+        } else {
+            return None;
+        }
+
+        Some((actions, editor, selection))
+    }) else {
+        return;
+    };
+
+    match selection {
+        RecordedSelection::SingleLine { cols } => {
+            if cols > 1 {
+                visual_motion(Motion::Right, Some(cols as usize - 1), cx)
+            }
+        }
+        RecordedSelection::Visual { rows, cols } => {
+            visual_motion(
+                Motion::Down {
+                    display_lines: false,
+                },
+                Some(rows as usize),
+                cx,
+            );
+            visual_motion(
+                Motion::StartOfLine {
+                    display_lines: false,
+                },
+                None,
+                cx,
+            );
+            if cols > 1 {
+                visual_motion(Motion::Right, Some(cols as usize - 1), cx)
+            }
+        }
+        RecordedSelection::VisualBlock { rows, cols } => {
+            visual_motion(
+                Motion::Down {
+                    display_lines: false,
+                },
+                Some(rows as usize),
+                cx,
+            );
+            if cols > 1 {
+                visual_motion(Motion::Right, Some(cols as usize - 1), cx);
+            }
+        }
+        RecordedSelection::VisualLine { rows } => {
+            visual_motion(
+                Motion::Down {
+                    display_lines: false,
+                },
+                Some(rows as usize),
+                cx,
+            );
+        }
+        RecordedSelection::None => {}
+    }
+
+    // insert internally uses repeat to handle counts
+    // vim doesn't treat 3a1 as though you literally repeated a1
+    // 3 times, instead it inserts the content thrice at the insert position.
+    if let Some(to_repeat) = repeatable_insert(&actions[0]) {
+        if let Some(ReplayableAction::Action(action)) = actions.last() {
+            if action.id() == NormalBefore.id() {
+                actions.pop();
             }
-            RecordedSelection::None => {}
         }
 
-        let window = cx.window();
-        cx.app_context()
-            .spawn(move |mut cx| async move {
-                for action in actions {
-                    match action {
-                        ReplayableAction::Action(action) => {
-                            if should_replay(&action) {
-                                window
-                                    .dispatch_action(editor.id(), action.as_ref(), &mut cx)
-                                    .ok_or_else(|| anyhow::anyhow!("window was closed"))
-                            } else {
-                                Ok(())
-                            }
+        let mut new_actions = actions.clone();
+        actions[0] = ReplayableAction::Action(to_repeat.boxed_clone());
+
+        let mut count = Vim::read(cx).workspace_state.recorded_count.unwrap_or(1);
+
+        // if we came from insert mode we're just doing repititions 2 onwards.
+        if from_insert_mode {
+            count -= 1;
+            new_actions[0] = actions[0].clone();
+        }
+
+        for _ in 1..count {
+            new_actions.append(actions.clone().as_mut());
+        }
+        new_actions.push(ReplayableAction::Action(NormalBefore.boxed_clone()));
+        actions = new_actions;
+    }
+
+    Vim::update(cx, |vim, _| vim.workspace_state.replaying = true);
+    let window = cx.window();
+    cx.app_context()
+        .spawn(move |mut cx| async move {
+            for action in actions {
+                match action {
+                    ReplayableAction::Action(action) => {
+                        if should_replay(&action) {
+                            window
+                                .dispatch_action(editor.id(), action.as_ref(), &mut cx)
+                                .ok_or_else(|| anyhow::anyhow!("window was closed"))
+                        } else {
+                            Ok(())
                         }
-                        ReplayableAction::Insertion {
-                            text,
-                            utf16_range_to_replace,
-                        } => editor.update(&mut cx, |editor, cx| {
-                            editor.replay_insert_event(&text, utf16_range_to_replace.clone(), cx)
-                        }),
-                    }?
-                }
-                window
-                    .dispatch_action(editor.id(), &EndRepeat, &mut cx)
-                    .ok_or_else(|| anyhow::anyhow!("window was closed"))
-            })
-            .detach_and_log_err(cx);
-    });
+                    }
+                    ReplayableAction::Insertion {
+                        text,
+                        utf16_range_to_replace,
+                    } => editor.update(&mut cx, |editor, cx| {
+                        editor.replay_insert_event(&text, utf16_range_to_replace.clone(), cx)
+                    }),
+                }?
+            }
+            window
+                .dispatch_action(editor.id(), &EndRepeat, &mut cx)
+                .ok_or_else(|| anyhow::anyhow!("window was closed"))
+        })
+        .detach_and_log_err(cx);
 }
 
 #[cfg(test)]
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 74363bc7b77e844ccea6936182a3f4e7b8c82ed1..fea6f26ef1816defa70cd51363f46ebba021831f 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -15,8 +15,8 @@ use anyhow::Result;
 use collections::{CommandPaletteFilter, HashMap};
 use editor::{movement, Editor, EditorMode, Event};
 use gpui::{
-    actions, impl_actions, keymap_matcher::KeymapContext, keymap_matcher::MatchResult, AppContext,
-    Subscription, ViewContext, ViewHandle, WeakViewHandle, WindowContext,
+    actions, impl_actions, keymap_matcher::KeymapContext, keymap_matcher::MatchResult, Action,
+    AppContext, Subscription, ViewContext, ViewHandle, WeakViewHandle, WindowContext,
 };
 use language::{CursorShape, Point, Selection, SelectionGoal};
 pub use mode_indicator::ModeIndicator;
@@ -284,6 +284,16 @@ impl Vim {
         }
     }
 
+    pub fn stop_recording_immediately(&mut self, action: Box<dyn Action>) {
+        if self.workspace_state.recording {
+            self.workspace_state
+                .recorded_actions
+                .push(ReplayableAction::Action(action.boxed_clone()));
+            self.workspace_state.recording = false;
+            self.workspace_state.stop_recording_after_next_action = false;
+        }
+    }
+
     pub fn record_current_action(&mut self, cx: &mut WindowContext) {
         self.start_recording(cx);
         self.stop_recording();
diff --git a/crates/vim/test_data/test_insert_with_counts.json b/crates/vim/test_data/test_insert_with_counts.json
new file mode 100644
index 0000000000000000000000000000000000000000..470888cf6e94b78351a9479401b1b8d121a73510
--- /dev/null
+++ b/crates/vim/test_data/test_insert_with_counts.json
@@ -0,0 +1,36 @@
+{"Put":{"state":"ˇhello\n"}}
+{"Key":"5"}
+{"Key":"i"}
+{"Key":"-"}
+{"Key":"escape"}
+{"Get":{"state":"----ˇ-hello\n","mode":"Normal"}}
+{"Put":{"state":"ˇhello\n"}}
+{"Key":"5"}
+{"Key":"a"}
+{"Key":"-"}
+{"Key":"escape"}
+{"Get":{"state":"h----ˇ-ello\n","mode":"Normal"}}
+{"Key":"4"}
+{"Key":"shift-i"}
+{"Key":"-"}
+{"Key":"escape"}
+{"Get":{"state":"---ˇ-h-----ello\n","mode":"Normal"}}
+{"Key":"3"}
+{"Key":"shift-a"}
+{"Key":"-"}
+{"Key":"escape"}
+{"Get":{"state":"----h-----ello--ˇ-\n","mode":"Normal"}}
+{"Put":{"state":"ˇhello\n"}}
+{"Key":"3"}
+{"Key":"o"}
+{"Key":"o"}
+{"Key":"i"}
+{"Key":"escape"}
+{"Get":{"state":"hello\noi\noi\noˇi\n","mode":"Normal"}}
+{"Put":{"state":"ˇhello\n"}}
+{"Key":"3"}
+{"Key":"shift-o"}
+{"Key":"o"}
+{"Key":"i"}
+{"Key":"escape"}
+{"Get":{"state":"oi\noi\noˇi\nhello\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_insert_with_repeat.json b/crates/vim/test_data/test_insert_with_repeat.json
new file mode 100644
index 0000000000000000000000000000000000000000..ac6637633c384a3d5e129ef59bd82a2775f87342
--- /dev/null
+++ b/crates/vim/test_data/test_insert_with_repeat.json
@@ -0,0 +1,23 @@
+{"Put":{"state":"ˇhello\n"}}
+{"Key":"3"}
+{"Key":"i"}
+{"Key":"-"}
+{"Key":"escape"}
+{"Get":{"state":"--ˇ-hello\n","mode":"Normal"}}
+{"Key":"."}
+{"Get":{"state":"----ˇ--hello\n","mode":"Normal"}}
+{"Key":"2"}
+{"Key":"."}
+{"Get":{"state":"-----ˇ---hello\n","mode":"Normal"}}
+{"Put":{"state":"ˇhello\n"}}
+{"Key":"2"}
+{"Key":"o"}
+{"Key":"k"}
+{"Key":"k"}
+{"Key":"escape"}
+{"Get":{"state":"hello\nkk\nkˇk\n","mode":"Normal"}}
+{"Key":"."}
+{"Get":{"state":"hello\nkk\nkk\nkk\nkˇk\n","mode":"Normal"}}
+{"Key":"1"}
+{"Key":"."}
+{"Get":{"state":"hello\nkk\nkk\nkk\nkk\nkˇk\n","mode":"Normal"}}

From 76d55244a1c28f7a5132717fec99a51373cb5b76 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 18:30:31 -0600
Subject: [PATCH 101/109] Clear counts when switching modes

---
 crates/vim/src/test.rs                      | 19 +++++++++++++++++++
 crates/vim/src/vim.rs                       |  4 ++++
 crates/vim/test_data/test_clear_counts.json |  7 +++++++
 3 files changed, 30 insertions(+)
 create mode 100644 crates/vim/test_data/test_clear_counts.json

diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index 9aa9fffc0a76905e65ab49d6fda6a85c64dad484..70a0b7c7a64a535b3e63e3e011c1c16ffc5336f0 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -574,3 +574,22 @@ async fn test_folds(cx: &mut gpui::TestAppContext) {
     "})
         .await;
 }
+
+#[gpui::test]
+async fn test_clear_counts(cx: &mut gpui::TestAppContext) {
+    let mut cx = NeovimBackedTestContext::new(cx).await;
+
+    cx.set_shared_state(indoc! {"
+        The quick brown
+        fox juˇmps over
+        the lazy dog"})
+        .await;
+
+    cx.simulate_shared_keystrokes(["4", "escape", "3", "d", "l"])
+        .await;
+    cx.set_shared_state(indoc! {"
+        The quick brown
+        fox juˇ over
+        the lazy dog"})
+        .await;
+}
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index fea6f26ef1816defa70cd51363f46ebba021831f..c6488fe171c5d352750d7e8fc4f380134ab199b7 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -308,6 +308,9 @@ impl Vim {
             state.mode = mode;
             state.operator_stack.clear();
         });
+        if mode != Mode::Insert {
+            self.take_count();
+        }
 
         cx.emit_global(VimEvent::ModeChanged { mode });
 
@@ -412,6 +415,7 @@ impl Vim {
         popped_operator
     }
     fn clear_operator(&mut self, cx: &mut WindowContext) {
+        self.take_count();
         self.update_state(|state| state.operator_stack.clear());
         self.sync_vim_settings(cx);
     }
diff --git a/crates/vim/test_data/test_clear_counts.json b/crates/vim/test_data/test_clear_counts.json
new file mode 100644
index 0000000000000000000000000000000000000000..8bc78de7d367678b32ec2a19ef9d5109a8708854
--- /dev/null
+++ b/crates/vim/test_data/test_clear_counts.json
@@ -0,0 +1,7 @@
+{"Put":{"state":"The quick brown\nfox juˇmps over\nthe lazy dog"}}
+{"Key":"4"}
+{"Key":"escape"}
+{"Key":"3"}
+{"Key":"d"}
+{"Key":"l"}
+{"Put":{"state":"The quick brown\nfox juˇ over\nthe lazy dog"}}

From c2c521015a0655ce46542b572b341e8e31e2a4b8 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 11 Sep 2023 18:48:24 -0600
Subject: [PATCH 102/109] Fix bug where cursors became invisible if replaying
 was interrupted

---
 crates/vim/src/editor_events.rs |  2 ++
 crates/vim/src/normal/repeat.rs | 34 ++++++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/crates/vim/src/editor_events.rs b/crates/vim/src/editor_events.rs
index da5c7d46eda3813c784eeff238c965528fb3cca3..ae6a2808cffdc9def7deda372b931b02ec3e2bad 100644
--- a/crates/vim/src/editor_events.rs
+++ b/crates/vim/src/editor_events.rs
@@ -34,7 +34,9 @@ fn focused(EditorFocused(editor): &EditorFocused, cx: &mut AppContext) {
 fn blurred(EditorBlurred(editor): &EditorBlurred, cx: &mut AppContext) {
     editor.window().update(cx, |cx| {
         Vim::update(cx, |vim, cx| {
+            vim.clear_operator(cx);
             vim.workspace_state.recording = false;
+            vim.workspace_state.recorded_actions.clear();
             if let Some(previous_editor) = vim.active_editor.clone() {
                 if previous_editor == editor.clone() {
                     vim.active_editor = None;
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index 6954ace71fed459ec541e3ddf30e2ea14caed4af..d7d8c3077382c281e729a9ccb686074db4cc420d 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -43,9 +43,6 @@ pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &EndRepeat, cx| {
         Vim::update(cx, |vim, cx| {
             vim.workspace_state.replaying = false;
-            vim.update_active_editor(cx, |editor, _| {
-                editor.show_local_selections = true;
-            });
             vim.switch_mode(Mode::Normal, false, cx)
         });
     });
@@ -56,6 +53,10 @@ pub(crate) fn init(cx: &mut AppContext) {
 pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
     let Some((mut actions, editor, selection)) = Vim::update(cx, |vim, cx| {
         let actions = vim.workspace_state.recorded_actions.clone();
+        if actions.is_empty() {
+            return None;
+        }
+
         let Some(editor) = vim.active_editor.clone() else {
             return None;
         };
@@ -82,14 +83,6 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
             }
         }
 
-        if let Some(editor) = editor.upgrade(cx) {
-            editor.update(cx, |editor, _| {
-                editor.show_local_selections = false;
-            })
-        } else {
-            return None;
-        }
-
         Some((actions, editor, selection))
     }) else {
         return;
@@ -176,6 +169,9 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
     let window = cx.window();
     cx.app_context()
         .spawn(move |mut cx| async move {
+            editor.update(&mut cx, |editor, _| {
+                editor.show_local_selections = false;
+            })?;
             for action in actions {
                 match action {
                     ReplayableAction::Action(action) => {
@@ -195,6 +191,9 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
                     }),
                 }?
             }
+            editor.update(&mut cx, |editor, _| {
+                editor.show_local_selections = true;
+            })?;
             window
                 .dispatch_action(editor.id(), &EndRepeat, &mut cx)
                 .ok_or_else(|| anyhow::anyhow!("window was closed"))
@@ -513,4 +512,17 @@ mod test {
         })
         .await;
     }
+
+    #[gpui::test]
+    async fn test_record_interrupted(
+        deterministic: Arc<Deterministic>,
+        cx: &mut gpui::TestAppContext,
+    ) {
+        let mut cx = VimTestContext::new(cx, true).await;
+
+        cx.set_state("ˇhello\n", Mode::Normal);
+        cx.simulate_keystrokes(["4", "i", "j", "cmd-shift-p", "escape", "escape"]);
+        deterministic.run_until_parked();
+        cx.assert_state("ˇjhello\n", Mode::Normal);
+    }
 }

From 7daed1b2c3a6b2ce4b8255c6b56fdc696de8a202 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 12 Sep 2023 09:56:23 -0600
Subject: [PATCH 103/109] Fix 0 used in a count

---
 crates/vim/src/insert.rs                      |  2 +-
 crates/vim/src/motion.rs                      |  2 +-
 crates/vim/src/normal.rs                      | 10 +++----
 crates/vim/src/normal/case.rs                 |  2 +-
 crates/vim/src/normal/repeat.rs               |  4 +--
 crates/vim/src/normal/scroll.rs               |  2 +-
 crates/vim/src/normal/search.rs               |  4 +--
 crates/vim/src/normal/substitute.rs           |  4 +--
 crates/vim/src/state.rs                       |  1 +
 crates/vim/src/test.rs                        | 27 ++++++++++++++++++-
 .../src/test/neovim_backed_test_context.rs    | 14 ++++++++++
 crates/vim/src/vim.rs                         | 19 ++++++-------
 crates/vim/test_data/test_clear_counts.json   |  2 +-
 crates/vim/test_data/test_dot_repeat.json     |  2 +-
 crates/vim/test_data/test_zero.json           |  7 +++++
 15 files changed, 73 insertions(+), 29 deletions(-)
 create mode 100644 crates/vim/test_data/test_zero.json

diff --git a/crates/vim/src/insert.rs b/crates/vim/src/insert.rs
index 7495b302a29db477521fab56ddd8ee237bc0ed21..fb567fab6a7aecc66931be5edca2ff0300536cac 100644
--- a/crates/vim/src/insert.rs
+++ b/crates/vim/src/insert.rs
@@ -12,7 +12,7 @@ pub fn init(cx: &mut AppContext) {
 
 fn normal_before(_: &mut Workspace, action: &NormalBefore, cx: &mut ViewContext<Workspace>) {
     let should_repeat = Vim::update(cx, |vim, cx| {
-        let count = vim.take_count().unwrap_or(1);
+        let count = vim.take_count(cx).unwrap_or(1);
         vim.stop_recording_immediately(action.boxed_clone());
         if count <= 1 || vim.workspace_state.replaying {
             vim.update_active_editor(cx, |editor, cx| {
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 6821ec64e5ebc988dc1678126a1a3671aeb6ba9d..3e65e6d504c6a3de90fcc06f84155315f4025eb8 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -229,7 +229,7 @@ pub(crate) fn motion(motion: Motion, cx: &mut WindowContext) {
         Vim::update(cx, |vim, cx| vim.pop_operator(cx));
     }
 
-    let count = Vim::update(cx, |vim, _| vim.take_count());
+    let count = Vim::update(cx, |vim, cx| vim.take_count(cx));
     let operator = Vim::read(cx).active_operator();
     match Vim::read(cx).state().mode {
         Mode::Normal => normal_motion(motion, operator, count, cx),
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 16a4150dabafd578eb4347d38956bef56147290a..20344366944b382c42034ce39285f00fb78e6a31 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -68,21 +68,21 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &DeleteLeft, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let times = vim.take_count();
+            let times = vim.take_count(cx);
             delete_motion(vim, Motion::Left, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &DeleteRight, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let times = vim.take_count();
+            let times = vim.take_count(cx);
             delete_motion(vim, Motion::Right, times, cx);
         })
     });
     cx.add_action(|_: &mut Workspace, _: &ChangeToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
             vim.start_recording(cx);
-            let times = vim.take_count();
+            let times = vim.take_count(cx);
             change_motion(
                 vim,
                 Motion::EndOfLine {
@@ -96,7 +96,7 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &DeleteToEndOfLine, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let times = vim.take_count();
+            let times = vim.take_count(cx);
             delete_motion(
                 vim,
                 Motion::EndOfLine {
@@ -110,7 +110,7 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &JoinLines, cx| {
         Vim::update(cx, |vim, cx| {
             vim.record_current_action(cx);
-            let mut times = vim.take_count().unwrap_or(1);
+            let mut times = vim.take_count(cx).unwrap_or(1);
             if vim.state().mode.is_visual() {
                 times = 1;
             } else if times > 1 {
diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs
index 34b81fbb4c7419bd6059b294ea87edb4168331da..22d09f8359f52060a7435cef321ca0c7f71bd37c 100644
--- a/crates/vim/src/normal/case.rs
+++ b/crates/vim/src/normal/case.rs
@@ -8,7 +8,7 @@ use crate::{normal::ChangeCase, state::Mode, Vim};
 pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Workspace>) {
     Vim::update(cx, |vim, cx| {
         vim.record_current_action(cx);
-        let count = vim.take_count().unwrap_or(1) as u32;
+        let count = vim.take_count(cx).unwrap_or(1) as u32;
         vim.update_active_editor(cx, |editor, cx| {
             let mut ranges = Vec::new();
             let mut cursor_positions = Vec::new();
diff --git a/crates/vim/src/normal/repeat.rs b/crates/vim/src/normal/repeat.rs
index d7d8c3077382c281e729a9ccb686074db4cc420d..df9e9a32ad7d5c602526801ca857feb3c1226da7 100644
--- a/crates/vim/src/normal/repeat.rs
+++ b/crates/vim/src/normal/repeat.rs
@@ -60,7 +60,7 @@ pub(crate) fn repeat(cx: &mut WindowContext, from_insert_mode: bool) {
         let Some(editor) = vim.active_editor.clone() else {
             return None;
         };
-        let count = vim.take_count();
+        let count = vim.take_count(cx);
 
         let selection = vim.workspace_state.recorded_selection.clone();
         match selection {
@@ -253,7 +253,7 @@ mod test {
         deterministic.run_until_parked();
         cx.simulate_shared_keystrokes(["."]).await;
         deterministic.run_until_parked();
-        cx.set_shared_state("THE QUICK ˇbrown fox").await;
+        cx.assert_shared_state("THE QUICK ˇbrown fox").await;
     }
 
     #[gpui::test]
diff --git a/crates/vim/src/normal/scroll.rs b/crates/vim/src/normal/scroll.rs
index 6319ba1663eddd79ed92de4ea056d750df35c90b..877fff328bb1fdb1f4fc83e01258daf3a8ac28b7 100644
--- a/crates/vim/src/normal/scroll.rs
+++ b/crates/vim/src/normal/scroll.rs
@@ -48,7 +48,7 @@ pub fn init(cx: &mut AppContext) {
 
 fn scroll(cx: &mut ViewContext<Workspace>, by: fn(c: Option<f32>) -> ScrollAmount) {
     Vim::update(cx, |vim, cx| {
-        let amount = by(vim.take_count().map(|c| c as f32));
+        let amount = by(vim.take_count(cx).map(|c| c as f32));
         vim.update_active_editor(cx, |editor, cx| scroll_editor(editor, &amount, cx));
     })
 }
diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs
index b488a879f2fade76a2da98defee03291b049ac88..d0c8a56249447100409bfd5cf385b2278752ca3d 100644
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@@ -52,7 +52,7 @@ fn search(workspace: &mut Workspace, action: &Search, cx: &mut ViewContext<Works
         Direction::Next
     };
     Vim::update(cx, |vim, cx| {
-        let count = vim.take_count().unwrap_or(1);
+        let count = vim.take_count(cx).unwrap_or(1);
         pane.update(cx, |pane, cx| {
             if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
                 search_bar.update(cx, |search_bar, cx| {
@@ -119,7 +119,7 @@ pub fn move_to_internal(
 ) {
     Vim::update(cx, |vim, cx| {
         let pane = workspace.active_pane().clone();
-        let count = vim.take_count().unwrap_or(1);
+        let count = vim.take_count(cx).unwrap_or(1);
         pane.update(cx, |pane, cx| {
             if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
                 let search = search_bar.update(cx, |search_bar, cx| {
diff --git a/crates/vim/src/normal/substitute.rs b/crates/vim/src/normal/substitute.rs
index 26aff7baa420a37b40f71a0e01b1ba440326bd1f..bb6e1abf92a0a687e32c7ee6a1e92787a1a82ba9 100644
--- a/crates/vim/src/normal/substitute.rs
+++ b/crates/vim/src/normal/substitute.rs
@@ -11,7 +11,7 @@ pub(crate) fn init(cx: &mut AppContext) {
     cx.add_action(|_: &mut Workspace, _: &Substitute, cx| {
         Vim::update(cx, |vim, cx| {
             vim.start_recording(cx);
-            let count = vim.take_count();
+            let count = vim.take_count(cx);
             substitute(vim, count, vim.state().mode == Mode::VisualLine, cx);
         })
     });
@@ -22,7 +22,7 @@ pub(crate) fn init(cx: &mut AppContext) {
             if matches!(vim.state().mode, Mode::VisualBlock | Mode::Visual) {
                 vim.switch_mode(Mode::VisualLine, false, cx)
             }
-            let count = vim.take_count();
+            let count = vim.take_count(cx);
             substitute(vim, count, true, cx)
         })
     });
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 8fd4049767bfada65bbfd57142eb96c43c310366..2cb5e058e8726e88a8282b4969b8f3b2b659b6ed 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -186,6 +186,7 @@ impl EditorState {
         if self.active_operator().is_none() && self.pre_count.is_some()
             || self.active_operator().is_some() && self.post_count.is_some()
         {
+            dbg!("VimCount");
             context.add_identifier("VimCount");
         }
 
diff --git a/crates/vim/src/test.rs b/crates/vim/src/test.rs
index 70a0b7c7a64a535b3e63e3e011c1c16ffc5336f0..a708d3c12adece2d758e95ffd762f86bae5b5fc8 100644
--- a/crates/vim/src/test.rs
+++ b/crates/vim/src/test.rs
@@ -587,9 +587,34 @@ async fn test_clear_counts(cx: &mut gpui::TestAppContext) {
 
     cx.simulate_shared_keystrokes(["4", "escape", "3", "d", "l"])
         .await;
-    cx.set_shared_state(indoc! {"
+    cx.assert_shared_state(indoc! {"
         The quick brown
         fox juˇ over
         the lazy dog"})
         .await;
 }
+
+#[gpui::test]
+async fn test_zero(cx: &mut gpui::TestAppContext) {
+    let mut cx = NeovimBackedTestContext::new(cx).await;
+
+    cx.set_shared_state(indoc! {"
+        The quˇick brown
+        fox jumps over
+        the lazy dog"})
+        .await;
+
+    cx.simulate_shared_keystrokes(["0"]).await;
+    cx.assert_shared_state(indoc! {"
+        ˇThe quick brown
+        fox jumps over
+        the lazy dog"})
+        .await;
+
+    cx.simulate_shared_keystrokes(["1", "0", "l"]).await;
+    cx.assert_shared_state(indoc! {"
+        The quick ˇbrown
+        fox jumps over
+        the lazy dog"})
+        .await;
+}
diff --git a/crates/vim/src/test/neovim_backed_test_context.rs b/crates/vim/src/test/neovim_backed_test_context.rs
index b433a6bfc05ea61b0758bcb8ac81ba189c57573c..97df989e4d57e6123ff84e39d7a8427134b40533 100644
--- a/crates/vim/src/test/neovim_backed_test_context.rs
+++ b/crates/vim/src/test/neovim_backed_test_context.rs
@@ -68,6 +68,8 @@ pub struct NeovimBackedTestContext<'a> {
 
     last_set_state: Option<String>,
     recent_keystrokes: Vec<String>,
+
+    is_dirty: bool,
 }
 
 impl<'a> NeovimBackedTestContext<'a> {
@@ -81,6 +83,7 @@ impl<'a> NeovimBackedTestContext<'a> {
 
             last_set_state: None,
             recent_keystrokes: Default::default(),
+            is_dirty: false,
         }
     }
 
@@ -128,6 +131,7 @@ impl<'a> NeovimBackedTestContext<'a> {
         self.last_set_state = Some(marked_text.to_string());
         self.recent_keystrokes = Vec::new();
         self.neovim.set_state(marked_text).await;
+        self.is_dirty = true;
         context_handle
     }
 
@@ -153,6 +157,7 @@ impl<'a> NeovimBackedTestContext<'a> {
     }
 
     pub async fn assert_shared_state(&mut self, marked_text: &str) {
+        self.is_dirty = false;
         let marked_text = marked_text.replace("•", " ");
         let neovim = self.neovim_state().await;
         let editor = self.editor_state();
@@ -258,6 +263,7 @@ impl<'a> NeovimBackedTestContext<'a> {
     }
 
     pub async fn assert_state_matches(&mut self) {
+        self.is_dirty = false;
         let neovim = self.neovim_state().await;
         let editor = self.editor_state();
         let initial_state = self
@@ -383,6 +389,14 @@ impl<'a> DerefMut for NeovimBackedTestContext<'a> {
     }
 }
 
+impl<'a> Drop for NeovimBackedTestContext<'a> {
+    fn drop(&mut self) {
+        if self.is_dirty {
+            panic!("Test context was dropped after set_shared_state before assert_shared_state")
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use gpui::TestAppContext;
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index c6488fe171c5d352750d7e8fc4f380134ab199b7..79117177655d6a6baa8163168e8c35f40d7409c8 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -73,7 +73,7 @@ pub fn init(cx: &mut AppContext) {
         },
     );
     cx.add_action(|_: &mut Workspace, n: &Number, cx: _| {
-        Vim::update(cx, |vim, _| vim.push_count_digit(n.0));
+        Vim::update(cx, |vim, cx| vim.push_count_digit(n.0, cx));
     });
 
     cx.add_action(|_: &mut Workspace, _: &Tab, cx| {
@@ -228,13 +228,7 @@ impl Vim {
         let editor = self.active_editor.clone()?.upgrade(cx)?;
         Some(editor.update(cx, update))
     }
-    // ~, shift-j, x, shift-x, p
-    // shift-c, shift-d, shift-i, i, a, o, shift-o, s
-    // c, d
-    // r
 
-    // TODO: shift-j?
-    //
     pub fn start_recording(&mut self, cx: &mut WindowContext) {
         if !self.workspace_state.replaying {
             self.workspace_state.recording = true;
@@ -309,7 +303,7 @@ impl Vim {
             state.operator_stack.clear();
         });
         if mode != Mode::Insert {
-            self.take_count();
+            self.take_count(cx);
         }
 
         cx.emit_global(VimEvent::ModeChanged { mode });
@@ -363,7 +357,7 @@ impl Vim {
         });
     }
 
-    fn push_count_digit(&mut self, number: usize) {
+    fn push_count_digit(&mut self, number: usize, cx: &mut WindowContext) {
         if self.active_operator().is_some() {
             self.update_state(|state| {
                 state.post_count = Some(state.post_count.unwrap_or(0) * 10 + number)
@@ -373,9 +367,11 @@ impl Vim {
                 state.pre_count = Some(state.pre_count.unwrap_or(0) * 10 + number)
             })
         }
+        // update the keymap so that 0 works
+        self.sync_vim_settings(cx)
     }
 
-    fn take_count(&mut self) -> Option<usize> {
+    fn take_count(&mut self, cx: &mut WindowContext) -> Option<usize> {
         if self.workspace_state.replaying {
             return self.workspace_state.recorded_count;
         }
@@ -390,6 +386,7 @@ impl Vim {
         if self.workspace_state.recording {
             self.workspace_state.recorded_count = count;
         }
+        self.sync_vim_settings(cx);
         count
     }
 
@@ -415,7 +412,7 @@ impl Vim {
         popped_operator
     }
     fn clear_operator(&mut self, cx: &mut WindowContext) {
-        self.take_count();
+        self.take_count(cx);
         self.update_state(|state| state.operator_stack.clear());
         self.sync_vim_settings(cx);
     }
diff --git a/crates/vim/test_data/test_clear_counts.json b/crates/vim/test_data/test_clear_counts.json
index 8bc78de7d367678b32ec2a19ef9d5109a8708854..6ef6b3601786f21a340367cfeef38b1bf8555cbb 100644
--- a/crates/vim/test_data/test_clear_counts.json
+++ b/crates/vim/test_data/test_clear_counts.json
@@ -4,4 +4,4 @@
 {"Key":"3"}
 {"Key":"d"}
 {"Key":"l"}
-{"Put":{"state":"The quick brown\nfox juˇ over\nthe lazy dog"}}
+{"Get":{"state":"The quick brown\nfox juˇ over\nthe lazy dog","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_dot_repeat.json b/crates/vim/test_data/test_dot_repeat.json
index f1a1a3c138509420d6e0e92daf679fb347a6e673..331ef52ecb96174e6669b3a4665b39b476e88972 100644
--- a/crates/vim/test_data/test_dot_repeat.json
+++ b/crates/vim/test_data/test_dot_repeat.json
@@ -35,4 +35,4 @@
 {"Key":"."}
 {"Put":{"state":"THE QUIˇck brown fox"}}
 {"Key":"."}
-{"Put":{"state":"THE QUICK ˇbrown fox"}}
+{"Get":{"state":"THE QUICK ˇbrown fox","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_zero.json b/crates/vim/test_data/test_zero.json
new file mode 100644
index 0000000000000000000000000000000000000000..bc1253deb580ab8218bf75dd36a7e5c3f63d613c
--- /dev/null
+++ b/crates/vim/test_data/test_zero.json
@@ -0,0 +1,7 @@
+{"Put":{"state":"The quˇick brown\nfox jumps over\nthe lazy dog"}}
+{"Key":"0"}
+{"Get":{"state":"ˇThe quick brown\nfox jumps over\nthe lazy dog","mode":"Normal"}}
+{"Key":"1"}
+{"Key":"0"}
+{"Key":"l"}
+{"Get":{"state":"The quick ˇbrown\nfox jumps over\nthe lazy dog","mode":"Normal"}}

From dcaba9d9e7d981397c048a8e3e08011d62f97100 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 12 Sep 2023 10:13:24 -0600
Subject: [PATCH 104/109] Remove supported exception

(and refactor tests to be more linear)
---
 crates/vim/src/normal/change.rs               | 170 ++++++++++--------
 crates/vim/src/normal/delete.rs               |  48 ++---
 .../src/test/neovim_backed_test_context.rs    |  10 +-
 3 files changed, 123 insertions(+), 105 deletions(-)

diff --git a/crates/vim/src/normal/change.rs b/crates/vim/src/normal/change.rs
index 836ce1492b6fa128ee88a232bcf816accc790e7c..e9f3001392c9a7571c211d298dd171e2aa5ae411 100644
--- a/crates/vim/src/normal/change.rs
+++ b/crates/vim/src/normal/change.rs
@@ -121,7 +121,7 @@ fn expand_changed_word_selection(
 mod test {
     use indoc::indoc;
 
-    use crate::test::{ExemptionFeatures, NeovimBackedTestContext};
+    use crate::test::NeovimBackedTestContext;
 
     #[gpui::test]
     async fn test_change_h(cx: &mut gpui::TestAppContext) {
@@ -239,150 +239,178 @@ mod test {
 
     #[gpui::test]
     async fn test_change_0(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await.binding(["c", "0"]);
-        cx.assert(indoc! {"
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.assert_neovim_compatible(
+            indoc! {"
             The qˇuick
-            brown fox"})
-            .await;
-        cx.assert(indoc! {"
+            brown fox"},
+            ["c", "0"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             ˇ
-            brown fox"})
-            .await;
+            brown fox"},
+            ["c", "0"],
+        )
+        .await;
     }
 
     #[gpui::test]
     async fn test_change_k(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await.binding(["c", "k"]);
-        cx.assert(indoc! {"
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brown ˇfox
-            jumps over"})
-            .await;
-        cx.assert(indoc! {"
+            jumps over"},
+            ["c", "k"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brown fox
-            jumps ˇover"})
-            .await;
-        cx.assert_exempted(
+            jumps ˇover"},
+            ["c", "k"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
             indoc! {"
             The qˇuick
             brown fox
             jumps over"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "k"],
         )
         .await;
-        cx.assert_exempted(
+        cx.assert_neovim_compatible(
             indoc! {"
             ˇ
             brown fox
             jumps over"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "k"],
         )
         .await;
     }
 
     #[gpui::test]
     async fn test_change_j(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await.binding(["c", "j"]);
-        cx.assert(indoc! {"
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brown ˇfox
-            jumps over"})
-            .await;
-        cx.assert_exempted(
+            jumps over"},
+            ["c", "j"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
             indoc! {"
             The quick
             brown fox
             jumps ˇover"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "j"],
         )
         .await;
-        cx.assert(indoc! {"
+        cx.assert_neovim_compatible(
+            indoc! {"
             The qˇuick
             brown fox
-            jumps over"})
-            .await;
-        cx.assert_exempted(
+            jumps over"},
+            ["c", "j"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
             indoc! {"
             The quick
             brown fox
             ˇ"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "j"],
         )
         .await;
     }
 
     #[gpui::test]
     async fn test_change_end_of_document(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx)
-            .await
-            .binding(["c", "shift-g"]);
-        cx.assert(indoc! {"
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brownˇ fox
             jumps over
-            the lazy"})
-            .await;
-        cx.assert(indoc! {"
+            the lazy"},
+            ["c", "shift-g"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brownˇ fox
             jumps over
-            the lazy"})
-            .await;
-        cx.assert_exempted(
+            the lazy"},
+            ["c", "shift-g"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
             indoc! {"
             The quick
             brown fox
             jumps over
             the lˇazy"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "shift-g"],
         )
         .await;
-        cx.assert_exempted(
+        cx.assert_neovim_compatible(
             indoc! {"
             The quick
             brown fox
             jumps over
             ˇ"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "shift-g"],
         )
         .await;
     }
 
     #[gpui::test]
     async fn test_change_gg(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx)
-            .await
-            .binding(["c", "g", "g"]);
-        cx.assert(indoc! {"
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brownˇ fox
             jumps over
-            the lazy"})
-            .await;
-        cx.assert(indoc! {"
+            the lazy"},
+            ["c", "g", "g"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brown fox
             jumps over
-            the lˇazy"})
-            .await;
-        cx.assert_exempted(
+            the lˇazy"},
+            ["c", "g", "g"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
             indoc! {"
             The qˇuick
             brown fox
             jumps over
             the lazy"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "g", "g"],
         )
         .await;
-        cx.assert_exempted(
+        cx.assert_neovim_compatible(
             indoc! {"
             ˇ
             brown fox
             jumps over
             the lazy"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["c", "g", "g"],
         )
         .await;
     }
@@ -427,27 +455,17 @@ mod test {
     async fn test_repeated_cb(cx: &mut gpui::TestAppContext) {
         let mut cx = NeovimBackedTestContext::new(cx).await;
 
-        cx.add_initial_state_exemptions(
-            indoc! {"
-            ˇThe quick brown
-
-            fox jumps-over
-            the lazy dog
-            "},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
-        );
-
         for count in 1..=5 {
-            cx.assert_binding_matches_all(
-                ["c", &count.to_string(), "b"],
-                indoc! {"
-                    ˇThe quˇickˇ browˇn
-                    ˇ
-                    ˇfox ˇjumpsˇ-ˇoˇver
-                    ˇthe lazy dog
-                    "},
-            )
-            .await;
+            for marked_text in cx.each_marked_position(indoc! {"
+                ˇThe quˇickˇ browˇn
+                ˇ
+                ˇfox ˇjumpsˇ-ˇoˇver
+                ˇthe lazy dog
+                "})
+            {
+                cx.assert_neovim_compatible(&marked_text, ["c", &count.to_string(), "b"])
+                    .await;
+            }
         }
     }
 
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index 1126eb11551353a5e05c79139fd02b9f18d78f4f..19ea6af875f6508ccac20447ad9d4d102a238882 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -278,37 +278,41 @@ mod test {
 
     #[gpui::test]
     async fn test_delete_end_of_document(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx)
-            .await
-            .binding(["d", "shift-g"]);
-        cx.assert(indoc! {"
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brownˇ fox
             jumps over
-            the lazy"})
-            .await;
-        cx.assert(indoc! {"
+            the lazy"},
+            ["d", "shift-g"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brownˇ fox
             jumps over
-            the lazy"})
-            .await;
-        cx.assert_exempted(
+            the lazy"},
+            ["d", "shift-g"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
             indoc! {"
             The quick
             brown fox
             jumps over
             the lˇazy"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["d", "shift-g"],
         )
         .await;
-        cx.assert_exempted(
+        cx.assert_neovim_compatible(
             indoc! {"
             The quick
             brown fox
             jumps over
             ˇ"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            ["d", "shift-g"],
         )
         .await;
     }
@@ -318,34 +322,32 @@ mod test {
         let mut cx = NeovimBackedTestContext::new(cx)
             .await
             .binding(["d", "g", "g"]);
-        cx.assert(indoc! {"
+        cx.assert_neovim_compatible(indoc! {"
             The quick
             brownˇ fox
             jumps over
-            the lazy"})
+            the lazy"}, ["d", "g", "g"])
             .await;
-        cx.assert(indoc! {"
+        cx.assert_neovim_compatible(indoc! {"
             The quick
             brown fox
             jumps over
-            the lˇazy"})
+            the lˇazy"}, ["d", "g", "g"])
             .await;
-        cx.assert_exempted(
+        cx.assert_neovim_compatible(
             indoc! {"
             The qˇuick
             brown fox
             jumps over
-            the lazy"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            the lazy"},["d", "g", "g"]
         )
         .await;
-        cx.assert_exempted(
+        cx.assert_neovim_compatible(
             indoc! {"
             ˇ
             brown fox
             jumps over
-            the lazy"},
-            ExemptionFeatures::OperatorAbortsOnFailedMotion,
+            the lazy"},["d", "g", "g"]
         )
         .await;
     }
diff --git a/crates/vim/src/test/neovim_backed_test_context.rs b/crates/vim/src/test/neovim_backed_test_context.rs
index 97df989e4d57e6123ff84e39d7a8427134b40533..0df5c32136b2818bba631f8d2c64c104a274944f 100644
--- a/crates/vim/src/test/neovim_backed_test_context.rs
+++ b/crates/vim/src/test/neovim_backed_test_context.rs
@@ -13,10 +13,7 @@ use util::test::{generate_marked_text, marked_text_offsets};
 use super::{neovim_connection::NeovimConnection, NeovimBackedBindingTestContext, VimTestContext};
 use crate::state::Mode;
 
-pub const SUPPORTED_FEATURES: &[ExemptionFeatures] = &[
-    ExemptionFeatures::DeletionOnEmptyLine,
-    ExemptionFeatures::OperatorAbortsOnFailedMotion,
-];
+pub const SUPPORTED_FEATURES: &[ExemptionFeatures] = &[ExemptionFeatures::DeletionOnEmptyLine];
 
 /// Enum representing features we have tests for but which don't work, yet. Used
 /// to add exemptions and automatically
@@ -25,8 +22,6 @@ pub enum ExemptionFeatures {
     // MOTIONS
     // Deletions on empty lines miss some newlines
     DeletionOnEmptyLine,
-    // When a motion fails, it should should not apply linewise operations
-    OperatorAbortsOnFailedMotion,
     // When an operator completes at the end of the file, an extra newline is left
     OperatorLastNewlineRemains,
     // Deleting a word on an empty line doesn't remove the newline
@@ -389,6 +384,9 @@ impl<'a> DerefMut for NeovimBackedTestContext<'a> {
     }
 }
 
+// a common mistake in tests is to call set_shared_state when
+// you mean asswert_shared_state. This notices that and lets
+// you know.
 impl<'a> Drop for NeovimBackedTestContext<'a> {
     fn drop(&mut self) {
         if self.is_dirty {

From 4cb8647702d3b13cbc979e52c89d543bd0e295dd Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:46:54 +0200
Subject: [PATCH 105/109] Z 1200/replace in buffer (#2922)

This is still WIP, mostly pending styling. I added a pretty rudimentary
text field and no buttons whatsoever other than that. I am targeting a
Preview of 09.13, as I am gonna be on PTO for the next week.

I dislike the current implementation slightly because of `regex`'s crate
syntax and lack of support of backreferences. What strikes me as odd wrt
to syntax is that it will just replace a capture name with empty string
if that capture is missing from the regex. While this is perfectly fine
behaviour for conditionally-matched capture groups (e.g. `(foo)?`), I
think it should still error out if there's no group with a given name
(conditional or not).
Release Notes:

- Added "Replace" functionality to buffer search.
---
 assets/icons/select-all.svg               |   5 +
 crates/editor/src/items.rs                |  24 +-
 crates/feedback/src/feedback_editor.rs    |   9 +-
 crates/language_tools/src/lsp_log.rs      |  16 +-
 crates/project/src/search.rs              |  37 ++-
 crates/search/src/buffer_search.rs        | 314 ++++++++++++++++++----
 crates/search/src/search.rs               |  38 ++-
 crates/terminal_view/src/terminal_view.rs |  17 +-
 crates/theme/src/theme.rs                 |  10 +-
 crates/workspace/src/searchable.rs        |  18 +-
 styles/src/style_tree/search.ts           |  79 ++++--
 11 files changed, 471 insertions(+), 96 deletions(-)
 create mode 100644 assets/icons/select-all.svg

diff --git a/assets/icons/select-all.svg b/assets/icons/select-all.svg
new file mode 100644
index 0000000000000000000000000000000000000000..45a10bba42648ee0f6f9011f4386630609515e0c
--- /dev/null
+++ b/assets/icons/select-all.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.5 7V9.5M9.5 12V9.5M12 9.5H9.5M7 9.5H9.5M9.5 9.5L11.1667 7.83333M9.5 9.5L7.83333 11.1667M9.5 9.5L11.1667 11.1667M9.5 9.5L7.83333 7.83333" stroke="#11181C" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M2.19366 3.84943C2.19188 4.26418 2.32864 4.59864 2.60673 4.84707C2.88052 5.09166 3.25136 5.26933 3.71609 5.3824C3.71616 5.38242 3.71623 5.38243 3.7163 5.38245L4.30919 5.53134L4.30919 5.53134L4.30965 5.53145C4.50649 5.57891 4.67124 5.63133 4.80447 5.68843L4.80469 5.68852C4.93838 5.74508 5.03564 5.81206 5.10001 5.8877L5.10001 5.8877L5.10041 5.88816C5.16432 5.96142 5.19716 6.05222 5.19716 6.16389C5.19716 6.28412 5.1609 6.38933 5.0882 6.48141C5.01496 6.57418 4.91031 6.64838 4.77141 6.70259L4.77121 6.70266C4.63472 6.75659 4.47185 6.7843 4.28146 6.7843C4.08801 6.7843 3.91607 6.75496 3.76491 6.69726C3.61654 6.6382 3.49924 6.55209 3.41132 6.43942C3.3502 6.35821 3.30747 6.26204 3.28375 6.14992C3.26238 6.04888 3.1772 5.96225 3.06518 5.96225H2.26366C2.14682 5.96225 2.04842 6.05919 2.0592 6.18012C2.08842 6.50802 2.1826 6.79102 2.34331 7.02735L2.34352 7.02767C2.53217 7.30057 2.79377 7.50587 3.12633 7.64399L3.12642 7.64402C3.46009 7.78185 3.84993 7.85 4.29476 7.85C4.74293 7.85 5.12859 7.7828 5.45023 7.64651L5.45036 7.64646C5.77328 7.50857 6.02259 7.31417 6.19551 7.06217C6.37037 6.80817 6.4579 6.50901 6.45972 6.16682L6.45972 6.16616C6.4579 5.9333 6.41513 5.72482 6.33012 5.54178C6.2474 5.35987 6.13061 5.20175 5.98007 5.06773C5.83038 4.93448 5.65389 4.82273 5.4511 4.7322C5.24919 4.64206 5.02795 4.57016 4.78757 4.51632L4.29841 4.39935L4.29841 4.39934L4.29771 4.39919C4.18081 4.37301 4.07116 4.34168 3.9687 4.30523C3.86715 4.26734 3.77847 4.22375 3.70232 4.17471C3.62796 4.12508 3.57037 4.06717 3.52849 4.00124C3.49012 3.93815 3.47157 3.86312 3.47481 3.77407L3.47484 3.77407V3.77225C3.47484 3.66563 3.50527 3.57146 3.56612 3.48808C3.6287 3.40475 3.71977 3.33801 3.84235 3.28931L3.84235 3.28932L3.84289 3.28909C3.96465 3.23906 4.1165 3.21304 4.30008 3.21304C4.57006 3.21304 4.77746 3.27105 4.92754 3.38154C5.04235 3.46608 5.11838 3.57594 5.15673 3.71259C5.18352 3.80802 5.26636 3.89142 5.37611 3.89142H6.17259C6.28852 3.89142 6.38806 3.7953 6.37515 3.67382C6.34686 3.4077 6.26051 3.16831 6.1158 2.95658C5.94159 2.70169 5.6982 2.50368 5.38762 2.36201L5.36687 2.4075M2.19366 3.84943C2.19187 3.51004 2.28242 3.21139 2.46644 2.9556L2.46658 2.9554C2.65148 2.70093 2.90447 2.50326 3.22368 2.36179C3.54316 2.2202 3.90494 2.15 4.30807 2.15C4.71809 2.15 5.07841 2.22014 5.38773 2.36206L5.36687 2.4075M2.19366 3.84943C2.19366 3.84951 2.19366 3.84959 2.19366 3.84967L2.24366 3.8494L2.19366 3.84918C2.19366 3.84926 2.19366 3.84935 2.19366 3.84943ZM5.36687 2.4075C5.06537 2.26917 4.71244 2.2 4.30807 2.2C3.91079 2.2 3.55608 2.26917 3.24394 2.4075C2.93179 2.54584 2.68616 2.73827 2.50703 2.9848L3.82389 3.24285L3.82389 3.24285C3.95336 3.18964 4.11209 3.16304 4.30008 3.16304C4.57676 3.16304 4.79579 3.22245 4.95718 3.34128C5.08094 3.43239 5.1635 3.55166 5.20487 3.69908C5.2271 3.77827 5.29386 3.84142 5.37611 3.84142H6.17259C6.26198 3.84142 6.33488 3.76799 6.32543 3.6791C6.29797 3.4208 6.21433 3.18936 6.07452 2.9848C5.90603 2.73827 5.67015 2.54584 5.36687 2.4075ZM4.78958 6.74917C4.64593 6.80592 4.47655 6.8343 4.28146 6.8343C4.08283 6.8343 3.90458 6.80415 3.74674 6.74384C3.59067 6.68177 3.46563 6.59043 3.37163 6.46983L4.78958 6.74917ZM4.78958 6.74917C4.93502 6.69241 5.04764 6.61349 5.12745 6.5124M4.78958 6.74917L5.12745 6.5124M5.12745 6.5124C5.20726 6.4113 5.24716 6.29514 5.24716 6.16389M5.12745 6.5124L5.24716 6.16389M5.24716 6.16389C5.24716 6.04152 5.2108 5.93865 5.13809 5.85529L5.24716 6.16389Z" fill="#687076" stroke="#687076" stroke-width="0.1"/>
+</svg>
+
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index d9998725922f5154e299bb3bd7a32b04ff18c2d2..b31c9dcd1b8698e2f92585bca563c4ba4ea1b1fc 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -16,7 +16,7 @@ use language::{
     proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, OffsetRangeExt, Point,
     SelectionGoal,
 };
-use project::{FormatTrigger, Item as _, Project, ProjectPath};
+use project::{search::SearchQuery, FormatTrigger, Item as _, Project, ProjectPath};
 use rpc::proto::{self, update_view};
 use smallvec::SmallVec;
 use std::{
@@ -26,6 +26,7 @@ use std::{
     iter,
     ops::Range,
     path::{Path, PathBuf},
+    sync::Arc,
 };
 use text::Selection;
 use util::{
@@ -978,7 +979,26 @@ impl SearchableItem for Editor {
         }
         self.change_selections(None, cx, |s| s.select_ranges(ranges));
     }
+    fn replace(
+        &mut self,
+        identifier: &Self::Match,
+        query: &SearchQuery,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let text = self.buffer.read(cx);
+        let text = text.snapshot(cx);
+        let text = text.text_for_range(identifier.clone()).collect::<Vec<_>>();
+        let text: Cow<_> = if text.len() == 1 {
+            text.first().cloned().unwrap().into()
+        } else {
+            let joined_chunks = text.join("");
+            joined_chunks.into()
+        };
 
+        if let Some(replacement) = query.replacement(&text) {
+            self.edit([(identifier.clone(), Arc::from(&*replacement))], cx);
+        }
+    }
     fn match_index_for_direction(
         &mut self,
         matches: &Vec<Range<Anchor>>,
@@ -1030,7 +1050,7 @@ impl SearchableItem for Editor {
 
     fn find_matches(
         &mut self,
-        query: project::search::SearchQuery,
+        query: Arc<project::search::SearchQuery>,
         cx: &mut ViewContext<Self>,
     ) -> Task<Vec<Range<Anchor>>> {
         let buffer = self.buffer().read(cx).snapshot(cx);
diff --git a/crates/feedback/src/feedback_editor.rs b/crates/feedback/src/feedback_editor.rs
index a717223f6d7d3a5e3eb4dd2dd50f81154bee3072..0b8a29e1146333e9c08062e7a9b55de3d9fa7bde 100644
--- a/crates/feedback/src/feedback_editor.rs
+++ b/crates/feedback/src/feedback_editor.rs
@@ -13,7 +13,7 @@ use gpui::{
 use isahc::Request;
 use language::Buffer;
 use postage::prelude::Stream;
-use project::Project;
+use project::{search::SearchQuery, Project};
 use regex::Regex;
 use serde::Serialize;
 use smallvec::SmallVec;
@@ -418,10 +418,13 @@ impl SearchableItem for FeedbackEditor {
         self.editor
             .update(cx, |e, cx| e.select_matches(matches, cx))
     }
-
+    fn replace(&mut self, matches: &Self::Match, query: &SearchQuery, cx: &mut ViewContext<Self>) {
+        self.editor
+            .update(cx, |e, cx| e.replace(matches, query, cx));
+    }
     fn find_matches(
         &mut self,
-        query: project::search::SearchQuery,
+        query: Arc<project::search::SearchQuery>,
         cx: &mut ViewContext<Self>,
     ) -> Task<Vec<Self::Match>> {
         self.editor
diff --git a/crates/language_tools/src/lsp_log.rs b/crates/language_tools/src/lsp_log.rs
index a918e3d151aaa8e6f53bde31350e554550cf783f..587e6ed25aba2c5603ca700cf8e61e8391926705 100644
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -13,7 +13,7 @@ use gpui::{
 };
 use language::{Buffer, LanguageServerId, LanguageServerName};
 use lsp::IoKind;
-use project::{Project, Worktree};
+use project::{search::SearchQuery, Project, Worktree};
 use std::{borrow::Cow, sync::Arc};
 use theme::{ui, Theme};
 use workspace::{
@@ -524,12 +524,24 @@ impl SearchableItem for LspLogView {
 
     fn find_matches(
         &mut self,
-        query: project::search::SearchQuery,
+        query: Arc<project::search::SearchQuery>,
         cx: &mut ViewContext<Self>,
     ) -> gpui::Task<Vec<Self::Match>> {
         self.editor.update(cx, |e, cx| e.find_matches(query, cx))
     }
 
+    fn replace(&mut self, _: &Self::Match, _: &SearchQuery, _: &mut ViewContext<Self>) {
+        // Since LSP Log is read-only, it doesn't make sense to support replace operation.
+    }
+    fn supported_options() -> workspace::searchable::SearchOptions {
+        workspace::searchable::SearchOptions {
+            case: true,
+            word: true,
+            regex: true,
+            // LSP log is read-only.
+            replacement: false,
+        }
+    }
     fn active_match_index(
         &mut self,
         matches: Vec<Self::Match>,
diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
index 6c53d2e934e12c177d322da9ca73022683c54007..bf81158701310f61b77db9307064f7f526e99187 100644
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -7,6 +7,7 @@ use language::{char_kind, BufferSnapshot};
 use regex::{Regex, RegexBuilder};
 use smol::future::yield_now;
 use std::{
+    borrow::Cow,
     io::{BufRead, BufReader, Read},
     ops::Range,
     path::{Path, PathBuf},
@@ -35,6 +36,7 @@ impl SearchInputs {
 pub enum SearchQuery {
     Text {
         search: Arc<AhoCorasick<usize>>,
+        replacement: Option<String>,
         whole_word: bool,
         case_sensitive: bool,
         inner: SearchInputs,
@@ -42,7 +44,7 @@ pub enum SearchQuery {
 
     Regex {
         regex: Regex,
-
+        replacement: Option<String>,
         multiline: bool,
         whole_word: bool,
         case_sensitive: bool,
@@ -95,6 +97,7 @@ impl SearchQuery {
         };
         Self::Text {
             search: Arc::new(search),
+            replacement: None,
             whole_word,
             case_sensitive,
             inner,
@@ -130,6 +133,7 @@ impl SearchQuery {
         };
         Ok(Self::Regex {
             regex,
+            replacement: None,
             multiline,
             whole_word,
             case_sensitive,
@@ -156,7 +160,21 @@ impl SearchQuery {
             ))
         }
     }
-
+    pub fn with_replacement(mut self, new_replacement: Option<String>) -> Self {
+        match self {
+            Self::Text {
+                ref mut replacement,
+                ..
+            }
+            | Self::Regex {
+                ref mut replacement,
+                ..
+            } => {
+                *replacement = new_replacement;
+                self
+            }
+        }
+    }
     pub fn to_proto(&self, project_id: u64) -> proto::SearchProject {
         proto::SearchProject {
             project_id,
@@ -214,7 +232,20 @@ impl SearchQuery {
             }
         }
     }
-
+    pub fn replacement<'a>(&self, text: &'a str) -> Option<Cow<'a, str>> {
+        match self {
+            SearchQuery::Text { replacement, .. } => replacement.clone().map(Cow::from),
+            SearchQuery::Regex {
+                regex, replacement, ..
+            } => {
+                if let Some(replacement) = replacement {
+                    Some(regex.replace(text, replacement))
+                } else {
+                    None
+                }
+            }
+        }
+    }
     pub async fn search(
         &self,
         buffer: &BufferSnapshot,
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 78729df936c15140d034ce29a6c4ccb108c46deb..6a227812d17ef08bfe9f1153e378e34df333b4c7 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -2,19 +2,16 @@ use crate::{
     history::SearchHistory,
     mode::{next_mode, SearchMode, Side},
     search_bar::{render_nav_button, render_search_mode_button},
-    CycleMode, NextHistoryQuery, PreviousHistoryQuery, SearchOptions, SelectAllMatches,
-    SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive, ToggleWholeWord,
+    CycleMode, NextHistoryQuery, PreviousHistoryQuery, ReplaceAll, ReplaceNext, SearchOptions,
+    SelectAllMatches, SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive, ToggleReplace,
+    ToggleWholeWord,
 };
 use collections::HashMap;
 use editor::Editor;
 use futures::channel::oneshot;
 use gpui::{
-    actions,
-    elements::*,
-    impl_actions,
-    platform::{CursorStyle, MouseButton},
-    Action, AnyViewHandle, AppContext, Entity, Subscription, Task, View, ViewContext, ViewHandle,
-    WindowContext,
+    actions, elements::*, impl_actions, Action, AnyViewHandle, AppContext, Entity, Subscription,
+    Task, View, ViewContext, ViewHandle, WindowContext,
 };
 use project::search::SearchQuery;
 use serde::Deserialize;
@@ -54,6 +51,11 @@ pub fn init(cx: &mut AppContext) {
     cx.add_action(BufferSearchBar::previous_history_query);
     cx.add_action(BufferSearchBar::cycle_mode);
     cx.add_action(BufferSearchBar::cycle_mode_on_pane);
+    cx.add_action(BufferSearchBar::replace_all);
+    cx.add_action(BufferSearchBar::replace_next);
+    cx.add_action(BufferSearchBar::replace_all_on_pane);
+    cx.add_action(BufferSearchBar::replace_next_on_pane);
+    cx.add_action(BufferSearchBar::toggle_replace);
     add_toggle_option_action::<ToggleCaseSensitive>(SearchOptions::CASE_SENSITIVE, cx);
     add_toggle_option_action::<ToggleWholeWord>(SearchOptions::WHOLE_WORD, cx);
 }
@@ -73,9 +75,11 @@ fn add_toggle_option_action<A: Action>(option: SearchOptions, cx: &mut AppContex
 
 pub struct BufferSearchBar {
     query_editor: ViewHandle<Editor>,
+    replacement_editor: ViewHandle<Editor>,
     active_searchable_item: Option<Box<dyn SearchableItemHandle>>,
     active_match_index: Option<usize>,
     active_searchable_item_subscription: Option<Subscription>,
+    active_search: Option<Arc<SearchQuery>>,
     searchable_items_with_matches:
         HashMap<Box<dyn WeakSearchableItemHandle>, Vec<Box<dyn Any + Send>>>,
     pending_search: Option<Task<()>>,
@@ -85,6 +89,7 @@ pub struct BufferSearchBar {
     dismissed: bool,
     search_history: SearchHistory,
     current_mode: SearchMode,
+    replace_is_active: bool,
 }
 
 impl Entity for BufferSearchBar {
@@ -156,6 +161,9 @@ impl View for BufferSearchBar {
         self.query_editor.update(cx, |editor, cx| {
             editor.set_placeholder_text(new_placeholder_text, cx);
         });
+        self.replacement_editor.update(cx, |editor, cx| {
+            editor.set_placeholder_text("Replace with...", cx);
+        });
         let search_button_for_mode = |mode, side, cx: &mut ViewContext<BufferSearchBar>| {
             let is_active = self.current_mode == mode;
 
@@ -212,7 +220,6 @@ impl View for BufferSearchBar {
                 cx,
             )
         };
-
         let query_column = Flex::row()
             .with_child(
                 Svg::for_style(theme.search.editor_icon.clone().icon)
@@ -243,7 +250,57 @@ impl View for BufferSearchBar {
             .with_max_width(theme.search.editor.max_width)
             .with_height(theme.search.search_bar_row_height)
             .flex(1., false);
+        let should_show_replace_input = self.replace_is_active && supported_options.replacement;
 
+        let replacement = should_show_replace_input.then(|| {
+            Flex::row()
+                .with_child(
+                    Svg::for_style(theme.search.replace_icon.clone().icon)
+                        .contained()
+                        .with_style(theme.search.replace_icon.clone().container),
+                )
+                .with_child(ChildView::new(&self.replacement_editor, cx).flex(1., true))
+                .align_children_center()
+                .flex(1., true)
+                .contained()
+                .with_style(query_container_style)
+                .constrained()
+                .with_min_width(theme.search.editor.min_width)
+                .with_max_width(theme.search.editor.max_width)
+                .with_height(theme.search.search_bar_row_height)
+                .flex(1., false)
+        });
+        let replace_all = should_show_replace_input.then(|| {
+            super::replace_action(
+                ReplaceAll,
+                "Replace all",
+                "icons/replace_all.svg",
+                theme.tooltip.clone(),
+                theme.search.action_button.clone(),
+            )
+        });
+        let replace_next = should_show_replace_input.then(|| {
+            super::replace_action(
+                ReplaceNext,
+                "Replace next",
+                "icons/replace_next.svg",
+                theme.tooltip.clone(),
+                theme.search.action_button.clone(),
+            )
+        });
+        let switches_column = supported_options.replacement.then(|| {
+            Flex::row()
+                .align_children_center()
+                .with_child(super::toggle_replace_button(
+                    self.replace_is_active,
+                    theme.tooltip.clone(),
+                    theme.search.option_button_component.clone(),
+                ))
+                .constrained()
+                .with_height(theme.search.search_bar_row_height)
+                .contained()
+                .with_style(theme.search.option_button_group)
+        });
         let mode_column = Flex::row()
             .with_child(search_button_for_mode(
                 SearchMode::Text,
@@ -261,7 +318,10 @@ impl View for BufferSearchBar {
             .with_height(theme.search.search_bar_row_height);
 
         let nav_column = Flex::row()
-            .with_child(self.render_action_button("all", cx))
+            .align_children_center()
+            .with_children(replace_next)
+            .with_children(replace_all)
+            .with_child(self.render_action_button("icons/select-all.svg", cx))
             .with_child(Flex::row().with_children(match_count))
             .with_child(nav_button_for_direction("<", Direction::Prev, cx))
             .with_child(nav_button_for_direction(">", Direction::Next, cx))
@@ -271,6 +331,8 @@ impl View for BufferSearchBar {
 
         Flex::row()
             .with_child(query_column)
+            .with_children(switches_column)
+            .with_children(replacement)
             .with_child(mode_column)
             .with_child(nav_column)
             .contained()
@@ -345,9 +407,18 @@ impl BufferSearchBar {
         });
         cx.subscribe(&query_editor, Self::on_query_editor_event)
             .detach();
-
+        let replacement_editor = cx.add_view(|cx| {
+            Editor::auto_height(
+                2,
+                Some(Arc::new(|theme| theme.search.editor.input.clone())),
+                cx,
+            )
+        });
+        // cx.subscribe(&replacement_editor, Self::on_query_editor_event)
+        //     .detach();
         Self {
             query_editor,
+            replacement_editor,
             active_searchable_item: None,
             active_searchable_item_subscription: None,
             active_match_index: None,
@@ -359,6 +430,8 @@ impl BufferSearchBar {
             dismissed: true,
             search_history: SearchHistory::default(),
             current_mode: SearchMode::default(),
+            active_search: None,
+            replace_is_active: false,
         }
     }
 
@@ -441,7 +514,9 @@ impl BufferSearchBar {
     pub fn query(&self, cx: &WindowContext) -> String {
         self.query_editor.read(cx).text(cx)
     }
-
+    pub fn replacement(&self, cx: &WindowContext) -> String {
+        self.replacement_editor.read(cx).text(cx)
+    }
     pub fn query_suggestion(&mut self, cx: &mut ViewContext<Self>) -> Option<String> {
         self.active_searchable_item
             .as_ref()
@@ -477,37 +552,16 @@ impl BufferSearchBar {
     ) -> AnyElement<Self> {
         let tooltip = "Select All Matches";
         let tooltip_style = theme::current(cx).tooltip.clone();
-        let action_type_id = 0_usize;
-        let has_matches = self.active_match_index.is_some();
-        let cursor_style = if has_matches {
-            CursorStyle::PointingHand
-        } else {
-            CursorStyle::default()
-        };
-        enum ActionButton {}
-        MouseEventHandler::new::<ActionButton, _>(action_type_id, cx, |state, cx| {
-            let theme = theme::current(cx);
-            let style = theme
-                .search
-                .action_button
-                .in_state(has_matches)
-                .style_for(state);
-            Label::new(icon, style.text.clone())
-                .aligned()
-                .contained()
-                .with_style(style.container)
-        })
-        .on_click(MouseButton::Left, move |_, this, cx| {
-            this.select_all_matches(&SelectAllMatches, cx)
-        })
-        .with_cursor_style(cursor_style)
-        .with_tooltip::<ActionButton>(
-            action_type_id,
-            tooltip.to_string(),
-            Some(Box::new(SelectAllMatches)),
-            tooltip_style,
-            cx,
-        )
+
+        let theme = theme::current(cx);
+        let style = theme.search.action_button.clone();
+
+        gpui::elements::Component::element(SafeStylable::with_style(
+            theme::components::action_button::Button::action(SelectAllMatches)
+                .with_tooltip(tooltip, tooltip_style)
+                .with_contents(theme::components::svg::Svg::new(icon)),
+            style,
+        ))
         .into_any()
     }
 
@@ -688,6 +742,7 @@ impl BufferSearchBar {
         let (done_tx, done_rx) = oneshot::channel();
         let query = self.query(cx);
         self.pending_search.take();
+
         if let Some(active_searchable_item) = self.active_searchable_item.as_ref() {
             if query.is_empty() {
                 self.active_match_index.take();
@@ -695,7 +750,7 @@ impl BufferSearchBar {
                 let _ = done_tx.send(());
                 cx.notify();
             } else {
-                let query = if self.current_mode == SearchMode::Regex {
+                let query: Arc<_> = if self.current_mode == SearchMode::Regex {
                     match SearchQuery::regex(
                         query,
                         self.search_options.contains(SearchOptions::WHOLE_WORD),
@@ -703,7 +758,8 @@ impl BufferSearchBar {
                         Vec::new(),
                         Vec::new(),
                     ) {
-                        Ok(query) => query,
+                        Ok(query) => query
+                            .with_replacement(Some(self.replacement(cx)).filter(|s| !s.is_empty())),
                         Err(_) => {
                             self.query_contains_error = true;
                             cx.notify();
@@ -718,8 +774,10 @@ impl BufferSearchBar {
                         Vec::new(),
                         Vec::new(),
                     )
-                };
-
+                    .with_replacement(Some(self.replacement(cx)).filter(|s| !s.is_empty()))
+                }
+                .into();
+                self.active_search = Some(query.clone());
                 let query_text = query.as_str().to_string();
                 let matches = active_searchable_item.find_matches(query, cx);
 
@@ -810,6 +868,63 @@ impl BufferSearchBar {
             cx.propagate_action();
         }
     }
+    fn toggle_replace(&mut self, _: &ToggleReplace, _: &mut ViewContext<Self>) {
+        if let Some(_) = &self.active_searchable_item {
+            self.replace_is_active = !self.replace_is_active;
+        }
+    }
+    fn replace_next(&mut self, _: &ReplaceNext, cx: &mut ViewContext<Self>) {
+        if !self.dismissed && self.active_search.is_some() {
+            if let Some(searchable_item) = self.active_searchable_item.as_ref() {
+                if let Some(query) = self.active_search.as_ref() {
+                    if let Some(matches) = self
+                        .searchable_items_with_matches
+                        .get(&searchable_item.downgrade())
+                    {
+                        if let Some(active_index) = self.active_match_index {
+                            let query = query.as_ref().clone().with_replacement(
+                                Some(self.replacement(cx)).filter(|rep| !rep.is_empty()),
+                            );
+                            searchable_item.replace(&matches[active_index], &query, cx);
+                        }
+
+                        self.focus_editor(&FocusEditor, cx);
+                    }
+                }
+            }
+        }
+    }
+    fn replace_all(&mut self, _: &ReplaceAll, cx: &mut ViewContext<Self>) {
+        if !self.dismissed && self.active_search.is_some() {
+            if let Some(searchable_item) = self.active_searchable_item.as_ref() {
+                if let Some(query) = self.active_search.as_ref() {
+                    if let Some(matches) = self
+                        .searchable_items_with_matches
+                        .get(&searchable_item.downgrade())
+                    {
+                        let query = query.as_ref().clone().with_replacement(
+                            Some(self.replacement(cx)).filter(|rep| !rep.is_empty()),
+                        );
+                        for m in matches {
+                            searchable_item.replace(m, &query, cx);
+                        }
+
+                        self.focus_editor(&FocusEditor, cx);
+                    }
+                }
+            }
+        }
+    }
+    fn replace_next_on_pane(pane: &mut Pane, action: &ReplaceNext, cx: &mut ViewContext<Pane>) {
+        if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
+            search_bar.update(cx, |bar, cx| bar.replace_next(action, cx));
+        }
+    }
+    fn replace_all_on_pane(pane: &mut Pane, action: &ReplaceAll, cx: &mut ViewContext<Pane>) {
+        if let Some(search_bar) = pane.toolbar().read(cx).item_of_type::<BufferSearchBar>() {
+            search_bar.update(cx, |bar, cx| bar.replace_all(action, cx));
+        }
+    }
 }
 
 #[cfg(test)]
@@ -1539,4 +1654,109 @@ mod tests {
             assert_eq!(search_bar.search_options, SearchOptions::NONE);
         });
     }
+    #[gpui::test]
+    async fn test_replace_simple(cx: &mut TestAppContext) {
+        let (editor, search_bar) = init_test(cx);
+
+        search_bar
+            .update(cx, |search_bar, cx| {
+                search_bar.search("expression", None, cx)
+            })
+            .await
+            .unwrap();
+
+        search_bar.update(cx, |search_bar, cx| {
+            search_bar.replacement_editor.update(cx, |editor, cx| {
+                // We use $1 here as initially we should be in Text mode, where `$1` should be treated literally.
+                editor.set_text("expr$1", cx);
+            });
+            search_bar.replace_all(&ReplaceAll, cx)
+        });
+        assert_eq!(
+            editor.read_with(cx, |this, cx| { this.text(cx) }),
+            r#"
+        A regular expr$1 (shortened as regex or regexp;[1] also referred to as
+        rational expr$1[2][3]) is a sequence of characters that specifies a search
+        pattern in text. Usually such patterns are used by string-searching algorithms
+        for "find" or "find and replace" operations on strings, or for input validation.
+        "#
+            .unindent()
+        );
+
+        // Search for word boundaries and replace just a single one.
+        search_bar
+            .update(cx, |search_bar, cx| {
+                search_bar.search("or", Some(SearchOptions::WHOLE_WORD), cx)
+            })
+            .await
+            .unwrap();
+
+        search_bar.update(cx, |search_bar, cx| {
+            search_bar.replacement_editor.update(cx, |editor, cx| {
+                editor.set_text("banana", cx);
+            });
+            search_bar.replace_next(&ReplaceNext, cx)
+        });
+        // Notice how the first or in the text (shORtened) is not replaced. Neither are the remaining hits of `or` in the text.
+        assert_eq!(
+            editor.read_with(cx, |this, cx| { this.text(cx) }),
+            r#"
+        A regular expr$1 (shortened as regex banana regexp;[1] also referred to as
+        rational expr$1[2][3]) is a sequence of characters that specifies a search
+        pattern in text. Usually such patterns are used by string-searching algorithms
+        for "find" or "find and replace" operations on strings, or for input validation.
+        "#
+            .unindent()
+        );
+        // Let's turn on regex mode.
+        search_bar
+            .update(cx, |search_bar, cx| {
+                search_bar.activate_search_mode(SearchMode::Regex, cx);
+                search_bar.search("\\[([^\\]]+)\\]", None, cx)
+            })
+            .await
+            .unwrap();
+        search_bar.update(cx, |search_bar, cx| {
+            search_bar.replacement_editor.update(cx, |editor, cx| {
+                editor.set_text("${1}number", cx);
+            });
+            search_bar.replace_all(&ReplaceAll, cx)
+        });
+        assert_eq!(
+            editor.read_with(cx, |this, cx| { this.text(cx) }),
+            r#"
+        A regular expr$1 (shortened as regex banana regexp;1number also referred to as
+        rational expr$12number3number) is a sequence of characters that specifies a search
+        pattern in text. Usually such patterns are used by string-searching algorithms
+        for "find" or "find and replace" operations on strings, or for input validation.
+        "#
+            .unindent()
+        );
+        // Now with a whole-word twist.
+        search_bar
+            .update(cx, |search_bar, cx| {
+                search_bar.activate_search_mode(SearchMode::Regex, cx);
+                search_bar.search("a\\w+s", Some(SearchOptions::WHOLE_WORD), cx)
+            })
+            .await
+            .unwrap();
+        search_bar.update(cx, |search_bar, cx| {
+            search_bar.replacement_editor.update(cx, |editor, cx| {
+                editor.set_text("things", cx);
+            });
+            search_bar.replace_all(&ReplaceAll, cx)
+        });
+        // The only word affected by this edit should be `algorithms`, even though there's a bunch
+        // of words in this text that would match this regex if not for WHOLE_WORD.
+        assert_eq!(
+            editor.read_with(cx, |this, cx| { this.text(cx) }),
+            r#"
+        A regular expr$1 (shortened as regex banana regexp;1number also referred to as
+        rational expr$12number3number) is a sequence of characters that specifies a search
+        pattern in text. Usually such patterns are used by string-searching things
+        for "find" or "find and replace" operations on strings, or for input validation.
+        "#
+            .unindent()
+        );
+    }
 }
diff --git a/crates/search/src/search.rs b/crates/search/src/search.rs
index 47f7f485c486a86d3ff3725b5e05aedb52305b36..0135ed4eed69a6b0b1d5ad2f73a7521120c4cc8b 100644
--- a/crates/search/src/search.rs
+++ b/crates/search/src/search.rs
@@ -8,7 +8,9 @@ use gpui::{
 pub use mode::SearchMode;
 use project::search::SearchQuery;
 pub use project_search::{ProjectSearchBar, ProjectSearchView};
-use theme::components::{action_button::Button, svg::Svg, ComponentExt, ToggleIconButtonStyle};
+use theme::components::{
+    action_button::Button, svg::Svg, ComponentExt, IconButtonStyle, ToggleIconButtonStyle,
+};
 
 pub mod buffer_search;
 mod history;
@@ -27,6 +29,7 @@ actions!(
         CycleMode,
         ToggleWholeWord,
         ToggleCaseSensitive,
+        ToggleReplace,
         SelectNextMatch,
         SelectPrevMatch,
         SelectAllMatches,
@@ -34,7 +37,9 @@ actions!(
         PreviousHistoryQuery,
         ActivateTextMode,
         ActivateSemanticMode,
-        ActivateRegexMode
+        ActivateRegexMode,
+        ReplaceAll,
+        ReplaceNext
     ]
 );
 
@@ -98,3 +103,32 @@ impl SearchOptions {
             .into_any()
     }
 }
+
+fn toggle_replace_button<V: View>(
+    active: bool,
+    tooltip_style: TooltipStyle,
+    button_style: ToggleIconButtonStyle,
+) -> AnyElement<V> {
+    Button::dynamic_action(Box::new(ToggleReplace))
+        .with_tooltip("Toggle replace", tooltip_style)
+        .with_contents(theme::components::svg::Svg::new("icons/replace.svg"))
+        .toggleable(active)
+        .with_style(button_style)
+        .element()
+        .into_any()
+}
+
+fn replace_action<V: View>(
+    action: impl Action,
+    name: &'static str,
+    icon_path: &'static str,
+    tooltip_style: TooltipStyle,
+    button_style: IconButtonStyle,
+) -> AnyElement<V> {
+    Button::dynamic_action(Box::new(action))
+        .with_tooltip(name, tooltip_style)
+        .with_contents(theme::components::svg::Svg::new(icon_path))
+        .with_style(button_style)
+        .element()
+        .into_any()
+}
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index a12f9d3c3c0447b82fde8db18b28d022f1d0cf4c..b79f655f815a71b3985eb26450b2b5edf9837c26 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -18,7 +18,7 @@ use gpui::{
     ViewHandle, WeakViewHandle,
 };
 use language::Bias;
-use project::{LocalWorktree, Project};
+use project::{search::SearchQuery, LocalWorktree, Project};
 use serde::Deserialize;
 use smallvec::{smallvec, SmallVec};
 use smol::Timer;
@@ -26,6 +26,7 @@ use std::{
     borrow::Cow,
     ops::RangeInclusive,
     path::{Path, PathBuf},
+    sync::Arc,
     time::Duration,
 };
 use terminal::{
@@ -380,10 +381,10 @@ impl TerminalView {
 
     pub fn find_matches(
         &mut self,
-        query: project::search::SearchQuery,
+        query: Arc<project::search::SearchQuery>,
         cx: &mut ViewContext<Self>,
     ) -> Task<Vec<RangeInclusive<Point>>> {
-        let searcher = regex_search_for_query(query);
+        let searcher = regex_search_for_query(&query);
 
         if let Some(searcher) = searcher {
             self.terminal
@@ -486,7 +487,7 @@ fn possible_open_targets(
         .collect()
 }
 
-pub fn regex_search_for_query(query: project::search::SearchQuery) -> Option<RegexSearch> {
+pub fn regex_search_for_query(query: &project::search::SearchQuery) -> Option<RegexSearch> {
     let query = query.as_str();
     let searcher = RegexSearch::new(&query);
     searcher.ok()
@@ -798,6 +799,7 @@ impl SearchableItem for TerminalView {
             case: false,
             word: false,
             regex: false,
+            replacement: false,
         }
     }
 
@@ -851,10 +853,10 @@ impl SearchableItem for TerminalView {
     /// Get all of the matches for this query, should be done on the background
     fn find_matches(
         &mut self,
-        query: project::search::SearchQuery,
+        query: Arc<project::search::SearchQuery>,
         cx: &mut ViewContext<Self>,
     ) -> Task<Vec<Self::Match>> {
-        if let Some(searcher) = regex_search_for_query(query) {
+        if let Some(searcher) = regex_search_for_query(&query) {
             self.terminal()
                 .update(cx, |term, cx| term.find_matches(searcher, cx))
         } else {
@@ -898,6 +900,9 @@ impl SearchableItem for TerminalView {
 
         res
     }
+    fn replace(&mut self, _: &Self::Match, _: &SearchQuery, _: &mut ViewContext<Self>) {
+        // Replacement is not supported in terminal view, so this is a no-op.
+    }
 }
 
 ///Get's the working directory for the given workspace, respecting the user's settings.
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index cd983322db004b0ce5616146b0057b318032647e..cc90d96420068465908feb643fa304f01bd43e91 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -3,7 +3,9 @@ mod theme_registry;
 mod theme_settings;
 pub mod ui;
 
-use components::{action_button::ButtonStyle, disclosure::DisclosureStyle, ToggleIconButtonStyle};
+use components::{
+    action_button::ButtonStyle, disclosure::DisclosureStyle, IconButtonStyle, ToggleIconButtonStyle,
+};
 use gpui::{
     color::Color,
     elements::{Border, ContainerStyle, ImageStyle, LabelStyle, Shadow, SvgStyle, TooltipStyle},
@@ -439,9 +441,7 @@ pub struct Search {
     pub include_exclude_editor: FindEditor,
     pub invalid_include_exclude_editor: ContainerStyle,
     pub include_exclude_inputs: ContainedText,
-    pub option_button: Toggleable<Interactive<IconButton>>,
     pub option_button_component: ToggleIconButtonStyle,
-    pub action_button: Toggleable<Interactive<ContainedText>>,
     pub match_background: Color,
     pub match_index: ContainedText,
     pub major_results_status: TextStyle,
@@ -453,6 +453,10 @@ pub struct Search {
     pub search_row_spacing: f32,
     pub option_button_height: f32,
     pub modes_container: ContainerStyle,
+    pub replace_icon: IconStyle,
+    // Used for filters and replace
+    pub option_button: Toggleable<Interactive<IconButton>>,
+    pub action_button: IconButtonStyle,
 }
 
 #[derive(Clone, Deserialize, Default, JsonSchema)]
diff --git a/crates/workspace/src/searchable.rs b/crates/workspace/src/searchable.rs
index 7a470db7c926dd8d2a2aee171fd5d269b6eebab3..ddde5c35541bce265105d78b4d8125545bc38ff8 100644
--- a/crates/workspace/src/searchable.rs
+++ b/crates/workspace/src/searchable.rs
@@ -1,4 +1,4 @@
-use std::any::Any;
+use std::{any::Any, sync::Arc};
 
 use gpui::{
     AnyViewHandle, AnyWeakViewHandle, AppContext, Subscription, Task, ViewContext, ViewHandle,
@@ -25,6 +25,8 @@ pub struct SearchOptions {
     pub case: bool,
     pub word: bool,
     pub regex: bool,
+    /// Specifies whether the item supports search & replace.
+    pub replacement: bool,
 }
 
 pub trait SearchableItem: Item {
@@ -35,6 +37,7 @@ pub trait SearchableItem: Item {
             case: true,
             word: true,
             regex: true,
+            replacement: true,
         }
     }
     fn to_search_event(
@@ -52,6 +55,7 @@ pub trait SearchableItem: Item {
         cx: &mut ViewContext<Self>,
     );
     fn select_matches(&mut self, matches: Vec<Self::Match>, cx: &mut ViewContext<Self>);
+    fn replace(&mut self, _: &Self::Match, _: &SearchQuery, _: &mut ViewContext<Self>);
     fn match_index_for_direction(
         &mut self,
         matches: &Vec<Self::Match>,
@@ -74,7 +78,7 @@ pub trait SearchableItem: Item {
     }
     fn find_matches(
         &mut self,
-        query: SearchQuery,
+        query: Arc<SearchQuery>,
         cx: &mut ViewContext<Self>,
     ) -> Task<Vec<Self::Match>>;
     fn active_match_index(
@@ -103,6 +107,7 @@ pub trait SearchableItemHandle: ItemHandle {
         cx: &mut WindowContext,
     );
     fn select_matches(&self, matches: &Vec<Box<dyn Any + Send>>, cx: &mut WindowContext);
+    fn replace(&self, _: &Box<dyn Any + Send>, _: &SearchQuery, _: &mut WindowContext);
     fn match_index_for_direction(
         &self,
         matches: &Vec<Box<dyn Any + Send>>,
@@ -113,7 +118,7 @@ pub trait SearchableItemHandle: ItemHandle {
     ) -> usize;
     fn find_matches(
         &self,
-        query: SearchQuery,
+        query: Arc<SearchQuery>,
         cx: &mut WindowContext,
     ) -> Task<Vec<Box<dyn Any + Send>>>;
     fn active_match_index(
@@ -189,7 +194,7 @@ impl<T: SearchableItem> SearchableItemHandle for ViewHandle<T> {
     }
     fn find_matches(
         &self,
-        query: SearchQuery,
+        query: Arc<SearchQuery>,
         cx: &mut WindowContext,
     ) -> Task<Vec<Box<dyn Any + Send>>> {
         let matches = self.update(cx, |this, cx| this.find_matches(query, cx));
@@ -209,6 +214,11 @@ impl<T: SearchableItem> SearchableItemHandle for ViewHandle<T> {
         let matches = downcast_matches(matches);
         self.update(cx, |this, cx| this.active_match_index(matches, cx))
     }
+
+    fn replace(&self, matches: &Box<dyn Any + Send>, query: &SearchQuery, cx: &mut WindowContext) {
+        let matches = matches.downcast_ref().unwrap();
+        self.update(cx, |this, cx| this.replace(matches, query, cx))
+    }
 }
 
 fn downcast_matches<T: Any + Clone>(matches: &Vec<Box<dyn Any + Send>>) -> Vec<T> {
diff --git a/styles/src/style_tree/search.ts b/styles/src/style_tree/search.ts
index 8174690fde913787845912defe44616d0a49ac21..bc95b91819e875d757a5736dbd6fda6b8011aa49 100644
--- a/styles/src/style_tree/search.ts
+++ b/styles/src/style_tree/search.ts
@@ -30,9 +30,6 @@ export default function search(): any {
         selection: theme.players[0],
         text: text(theme.highest, "mono", "default"),
         border: border(theme.highest),
-        margin: {
-            right: SEARCH_ROW_SPACING,
-        },
         padding: {
             top: 4,
             bottom: 4,
@@ -125,7 +122,7 @@ export default function search(): any {
 
                     button_width: 32,
                     background: background(theme.highest, "on"),
-                    corner_radius: 2,
+                    corner_radius: 6,
                     margin: { right: 2 },
                     border: {
                         width: 1,
@@ -185,26 +182,6 @@ export default function search(): any {
                 },
             },
         }),
-        // Search tool buttons
-        // HACK: This is not how disabled elements should be created
-        // Disabled elements should use a disabled state of an interactive element, not a toggleable element with the inactive state being disabled
-        action_button: toggleable({
-            state: {
-                inactive: text_button({
-                    variant: "ghost",
-                    layer: theme.highest,
-                    disabled: true,
-                    margin: { right: SEARCH_ROW_SPACING },
-                    text_properties: { size: "sm" },
-                }),
-                active: text_button({
-                    variant: "ghost",
-                    layer: theme.highest,
-                    margin: { right: SEARCH_ROW_SPACING },
-                    text_properties: { size: "sm" },
-                }),
-            },
-        }),
         editor,
         invalid_editor: {
             ...editor,
@@ -218,6 +195,7 @@ export default function search(): any {
         match_index: {
             ...text(theme.highest, "mono", { size: "sm" }),
             padding: {
+                left: SEARCH_ROW_SPACING,
                 right: SEARCH_ROW_SPACING,
             },
         },
@@ -398,6 +376,59 @@ export default function search(): any {
         search_row_spacing: 8,
         option_button_height: 22,
         modes_container: {},
+        replace_icon: {
+            icon: {
+                color: foreground(theme.highest, "disabled"),
+                asset: "icons/replace.svg",
+                dimensions: {
+                    width: 14,
+                    height: 14,
+                },
+            },
+            container: {
+                margin: { right: 4 },
+                padding: { left: 1, right: 1 },
+            },
+        },
+        action_button: interactive({
+            base: {
+                icon_size: 14,
+                color: foreground(theme.highest, "variant"),
+
+                button_width: 32,
+                background: background(theme.highest, "on"),
+                corner_radius: 6,
+                margin: { right: 2 },
+                border: {
+                    width: 1,
+                    color: background(theme.highest, "on"),
+                },
+                padding: {
+                    left: 4,
+                    right: 4,
+                    top: 4,
+                    bottom: 4,
+                },
+            },
+            state: {
+                hovered: {
+                    ...text(theme.highest, "mono", "variant", "hovered"),
+                    background: background(theme.highest, "on", "hovered"),
+                    border: {
+                        width: 1,
+                        color: background(theme.highest, "on", "hovered"),
+                    },
+                },
+                clicked: {
+                    ...text(theme.highest, "mono", "variant", "pressed"),
+                    background: background(theme.highest, "on", "pressed"),
+                    border: {
+                        width: 1,
+                        color: background(theme.highest, "on", "pressed"),
+                    },
+                },
+            },
+        }),
         ...search_results(),
     }
 }

From b0facf8e1e84ec65efcb5e67fe0e9f9c1ef797e5 Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Tue, 12 Sep 2023 08:35:58 -0400
Subject: [PATCH 106/109] Use unbounded channel(s) for LSP binary status
 messaging

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
---
 crates/language/src/language.rs | 79 ++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 37 deletions(-)

diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 2193b5c07ed276f4b4f2030a94ffa95d70cca6a8..07bea434e0dffd8f93146720966212a176e87d19 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -13,7 +13,7 @@ use anyhow::{anyhow, Context, Result};
 use async_trait::async_trait;
 use collections::{HashMap, HashSet};
 use futures::{
-    channel::oneshot,
+    channel::{mpsc, oneshot},
     future::{BoxFuture, Shared},
     FutureExt, TryFutureExt as _,
 };
@@ -48,9 +48,6 @@ use unicase::UniCase;
 use util::{http::HttpClient, paths::PathExt};
 use util::{post_inc, ResultExt, TryFutureExt as _, UnwrapFuture};
 
-#[cfg(any(test, feature = "test-support"))]
-use futures::channel::mpsc;
-
 pub use buffer::Operation;
 pub use buffer::*;
 pub use diagnostic_set::DiagnosticEntry;
@@ -64,6 +61,27 @@ pub fn init(cx: &mut AppContext) {
     language_settings::init(cx);
 }
 
+#[derive(Clone, Default)]
+struct LspBinaryStatusSender {
+    txs: Arc<Mutex<Vec<mpsc::UnboundedSender<(Arc<Language>, LanguageServerBinaryStatus)>>>>,
+}
+
+impl LspBinaryStatusSender {
+    fn subscribe(&self) -> mpsc::UnboundedReceiver<(Arc<Language>, LanguageServerBinaryStatus)> {
+        let (tx, rx) = mpsc::unbounded();
+        self.txs.lock().push(tx);
+        rx
+    }
+
+    fn send(&self, language: Arc<Language>, status: LanguageServerBinaryStatus) {
+        let mut txs = self.txs.lock();
+        txs.retain(|tx| {
+            tx.unbounded_send((language.clone(), status.clone()))
+                .is_ok()
+        });
+    }
+}
+
 thread_local! {
     static PARSER: RefCell<Parser> = RefCell::new(Parser::new());
 }
@@ -594,14 +612,13 @@ struct AvailableLanguage {
 pub struct LanguageRegistry {
     state: RwLock<LanguageRegistryState>,
     language_server_download_dir: Option<Arc<Path>>,
-    lsp_binary_statuses_tx: async_broadcast::Sender<(Arc<Language>, LanguageServerBinaryStatus)>,
-    lsp_binary_statuses_rx: async_broadcast::Receiver<(Arc<Language>, LanguageServerBinaryStatus)>,
     login_shell_env_loaded: Shared<Task<()>>,
     #[allow(clippy::type_complexity)]
     lsp_binary_paths: Mutex<
         HashMap<LanguageServerName, Shared<Task<Result<LanguageServerBinary, Arc<anyhow::Error>>>>>,
     >,
     executor: Option<Arc<Background>>,
+    lsp_binary_status_tx: LspBinaryStatusSender,
 }
 
 struct LanguageRegistryState {
@@ -624,7 +641,6 @@ pub struct PendingLanguageServer {
 
 impl LanguageRegistry {
     pub fn new(login_shell_env_loaded: Task<()>) -> Self {
-        let (lsp_binary_statuses_tx, lsp_binary_statuses_rx) = async_broadcast::broadcast(16);
         Self {
             state: RwLock::new(LanguageRegistryState {
                 next_language_server_id: 0,
@@ -638,11 +654,10 @@ impl LanguageRegistry {
                 reload_count: 0,
             }),
             language_server_download_dir: None,
-            lsp_binary_statuses_tx,
-            lsp_binary_statuses_rx,
             login_shell_env_loaded: login_shell_env_loaded.shared(),
             lsp_binary_paths: Default::default(),
             executor: None,
+            lsp_binary_status_tx: Default::default(),
         }
     }
 
@@ -918,8 +933,8 @@ impl LanguageRegistry {
         let container_dir: Arc<Path> = Arc::from(download_dir.join(adapter.name.0.as_ref()));
         let root_path = root_path.clone();
         let adapter = adapter.clone();
-        let lsp_binary_statuses = self.lsp_binary_statuses_tx.clone();
         let login_shell_env_loaded = self.login_shell_env_loaded.clone();
+        let lsp_binary_statuses = self.lsp_binary_status_tx.clone();
 
         let task = {
             let container_dir = container_dir.clone();
@@ -976,8 +991,8 @@ impl LanguageRegistry {
 
     pub fn language_server_binary_statuses(
         &self,
-    ) -> async_broadcast::Receiver<(Arc<Language>, LanguageServerBinaryStatus)> {
-        self.lsp_binary_statuses_rx.clone()
+    ) -> mpsc::UnboundedReceiver<(Arc<Language>, LanguageServerBinaryStatus)> {
+        self.lsp_binary_status_tx.subscribe()
     }
 
     pub fn delete_server_container(
@@ -1054,7 +1069,7 @@ async fn get_binary(
     language: Arc<Language>,
     delegate: Arc<dyn LspAdapterDelegate>,
     container_dir: Arc<Path>,
-    statuses: async_broadcast::Sender<(Arc<Language>, LanguageServerBinaryStatus)>,
+    statuses: LspBinaryStatusSender,
     mut cx: AsyncAppContext,
 ) -> Result<LanguageServerBinary> {
     if !container_dir.exists() {
@@ -1081,19 +1096,15 @@ async fn get_binary(
             .cached_server_binary(container_dir.to_path_buf(), delegate.as_ref())
             .await
         {
-            statuses
-                .broadcast((language.clone(), LanguageServerBinaryStatus::Cached))
-                .await?;
+            statuses.send(language.clone(), LanguageServerBinaryStatus::Cached);
             return Ok(binary);
         } else {
-            statuses
-                .broadcast((
-                    language.clone(),
-                    LanguageServerBinaryStatus::Failed {
-                        error: format!("{:?}", error),
-                    },
-                ))
-                .await?;
+            statuses.send(
+                language.clone(),
+                LanguageServerBinaryStatus::Failed {
+                    error: format!("{:?}", error),
+                },
+            );
         }
     }
 
@@ -1105,27 +1116,21 @@ async fn fetch_latest_binary(
     language: Arc<Language>,
     delegate: &dyn LspAdapterDelegate,
     container_dir: &Path,
-    lsp_binary_statuses_tx: async_broadcast::Sender<(Arc<Language>, LanguageServerBinaryStatus)>,
+    lsp_binary_statuses_tx: LspBinaryStatusSender,
 ) -> Result<LanguageServerBinary> {
     let container_dir: Arc<Path> = container_dir.into();
-    lsp_binary_statuses_tx
-        .broadcast((
-            language.clone(),
-            LanguageServerBinaryStatus::CheckingForUpdate,
-        ))
-        .await?;
+    lsp_binary_statuses_tx.send(
+        language.clone(),
+        LanguageServerBinaryStatus::CheckingForUpdate,
+    );
 
     let version_info = adapter.fetch_latest_server_version(delegate).await?;
-    lsp_binary_statuses_tx
-        .broadcast((language.clone(), LanguageServerBinaryStatus::Downloading))
-        .await?;
+    lsp_binary_statuses_tx.send(language.clone(), LanguageServerBinaryStatus::Downloading);
 
     let binary = adapter
         .fetch_server_binary(version_info, container_dir.to_path_buf(), delegate)
         .await?;
-    lsp_binary_statuses_tx
-        .broadcast((language.clone(), LanguageServerBinaryStatus::Downloaded))
-        .await?;
+    lsp_binary_statuses_tx.send(language.clone(), LanguageServerBinaryStatus::Downloaded);
 
     Ok(binary)
 }

From 0958def770cc592042bd8b66530ed4f55cd907e4 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 12 Sep 2023 11:24:48 -0600
Subject: [PATCH 107/109] Remove another supported exemption

---
 crates/vim/src/normal.rs                      | 24 ++++++++++---------
 crates/vim/src/normal/delete.rs               | 24 ++++++++++++-------
 .../src/test/neovim_backed_test_context.rs    |  4 +---
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index 20344366944b382c42034ce39285f00fb78e6a31..c8d12f8ee33047c2148710b79360735d8ae9c114 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -356,7 +356,7 @@ mod test {
 
     use crate::{
         state::Mode::{self},
-        test::{ExemptionFeatures, NeovimBackedTestContext},
+        test::NeovimBackedTestContext,
     };
 
     #[gpui::test]
@@ -762,20 +762,22 @@ mod test {
 
     #[gpui::test]
     async fn test_dd(cx: &mut gpui::TestAppContext) {
-        let mut cx = NeovimBackedTestContext::new(cx).await.binding(["d", "d"]);
-        cx.assert("ˇ").await;
-        cx.assert("The ˇquick").await;
-        cx.assert_all(indoc! {"
-                The qˇuick
-                brown ˇfox
-                jumps ˇover"})
-            .await;
-        cx.assert_exempted(
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        cx.assert_neovim_compatible("ˇ", ["d", "d"]).await;
+        cx.assert_neovim_compatible("The ˇquick", ["d", "d"]).await;
+        for marked_text in cx.each_marked_position(indoc! {"
+            The qˇuick
+            brown ˇfox
+            jumps ˇover"})
+        {
+            cx.assert_neovim_compatible(&marked_text, ["d", "d"]).await;
+        }
+        cx.assert_neovim_compatible(
             indoc! {"
                 The quick
                 ˇ
                 brown fox"},
-            ExemptionFeatures::DeletionOnEmptyLine,
+            ["d", "d"],
         )
         .await;
     }
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index 19ea6af875f6508ccac20447ad9d4d102a238882..848e9f725d815f2b7b327e3757eb1b9445e65636 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -322,24 +322,31 @@ mod test {
         let mut cx = NeovimBackedTestContext::new(cx)
             .await
             .binding(["d", "g", "g"]);
-        cx.assert_neovim_compatible(indoc! {"
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brownˇ fox
             jumps over
-            the lazy"}, ["d", "g", "g"])
-            .await;
-        cx.assert_neovim_compatible(indoc! {"
+            the lazy"},
+            ["d", "g", "g"],
+        )
+        .await;
+        cx.assert_neovim_compatible(
+            indoc! {"
             The quick
             brown fox
             jumps over
-            the lˇazy"}, ["d", "g", "g"])
-            .await;
+            the lˇazy"},
+            ["d", "g", "g"],
+        )
+        .await;
         cx.assert_neovim_compatible(
             indoc! {"
             The qˇuick
             brown fox
             jumps over
-            the lazy"},["d", "g", "g"]
+            the lazy"},
+            ["d", "g", "g"],
         )
         .await;
         cx.assert_neovim_compatible(
@@ -347,7 +354,8 @@ mod test {
             ˇ
             brown fox
             jumps over
-            the lazy"},["d", "g", "g"]
+            the lazy"},
+            ["d", "g", "g"],
         )
         .await;
     }
diff --git a/crates/vim/src/test/neovim_backed_test_context.rs b/crates/vim/src/test/neovim_backed_test_context.rs
index 0df5c32136b2818bba631f8d2c64c104a274944f..e58f805a026f32473ab18b4dccc9eb662ae6e541 100644
--- a/crates/vim/src/test/neovim_backed_test_context.rs
+++ b/crates/vim/src/test/neovim_backed_test_context.rs
@@ -13,15 +13,13 @@ use util::test::{generate_marked_text, marked_text_offsets};
 use super::{neovim_connection::NeovimConnection, NeovimBackedBindingTestContext, VimTestContext};
 use crate::state::Mode;
 
-pub const SUPPORTED_FEATURES: &[ExemptionFeatures] = &[ExemptionFeatures::DeletionOnEmptyLine];
+pub const SUPPORTED_FEATURES: &[ExemptionFeatures] = &[];
 
 /// Enum representing features we have tests for but which don't work, yet. Used
 /// to add exemptions and automatically
 #[derive(PartialEq, Eq)]
 pub enum ExemptionFeatures {
     // MOTIONS
-    // Deletions on empty lines miss some newlines
-    DeletionOnEmptyLine,
     // When an operator completes at the end of the file, an extra newline is left
     OperatorLastNewlineRemains,
     // Deleting a word on an empty line doesn't remove the newline

From c6f293076efa72745de30ace1913279582696717 Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Tue, 12 Sep 2023 15:14:49 -0400
Subject: [PATCH 108/109] Avoid keeping stale LSP progress indicator state when
 server is removed

---
 crates/diagnostics/src/items.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/diagnostics/src/items.rs b/crates/diagnostics/src/items.rs
index 89b4469d42d0f795f27db338cb2e84eb224431d8..c3733018b67e0142115c3baac2d8a068d5f6e328 100644
--- a/crates/diagnostics/src/items.rs
+++ b/crates/diagnostics/src/items.rs
@@ -32,7 +32,8 @@ impl DiagnosticIndicator {
                 this.in_progress_checks.insert(*language_server_id);
                 cx.notify();
             }
-            project::Event::DiskBasedDiagnosticsFinished { language_server_id } => {
+            project::Event::DiskBasedDiagnosticsFinished { language_server_id }
+            | project::Event::LanguageServerRemoved(language_server_id) => {
                 this.summary = project.read(cx).diagnostic_summary(cx);
                 this.in_progress_checks.remove(language_server_id);
                 cx.notify();

From a63b78d5a0b25497646dbfd0144eeb068e49e025 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 12 Sep 2023 22:08:39 +0200
Subject: [PATCH 109/109] Replace in buffer adjustments (#2960)

This PR addresses feedback from @maxbrunsfeld on new replace in buffer.
It fixes:
- missing padding surrounding replace input.
- missing padding around replace buttons.
- missing `.notify` call which made the replace fields not show up
immediately sometimes.

Release Notes:
- N/A

---------

Co-authored-by: Max <max@zed.dev>
---
 assets/keymaps/default.json        |  9 ++++++++-
 crates/search/src/buffer_search.rs | 18 +++++++++++++++++-
 styles/src/style_tree/search.ts    |  8 ++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index fa62a74f3f7e27485cb0f36abd4c5ab5ab82ea38..dd5544f03483bb8f1551df9d3d06862dbf4c8edf 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -231,7 +231,14 @@
     }
   },
   {
-    "context": "BufferSearchBar > Editor",
+    "context": "BufferSearchBar && in_replace",
+    "bindings": {
+      "enter": "search::ReplaceNext",
+      "cmd-enter": "search::ReplaceAll"
+    }
+  },
+  {
+    "context": "BufferSearchBar && !in_replace > Editor",
     "bindings": {
       "up": "search::PreviousHistoryQuery",
       "down": "search::NextHistoryQuery"
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index 6a227812d17ef08bfe9f1153e378e34df333b4c7..9ae2b20f7af49626732697f7fdf418a9b4764fa7 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -101,6 +101,21 @@ impl View for BufferSearchBar {
         "BufferSearchBar"
     }
 
+    fn update_keymap_context(
+        &self,
+        keymap: &mut gpui::keymap_matcher::KeymapContext,
+        cx: &AppContext,
+    ) {
+        Self::reset_to_default_keymap_context(keymap);
+        let in_replace = self
+            .replacement_editor
+            .read_with(cx, |_, cx| cx.is_self_focused())
+            .unwrap_or(false);
+        if in_replace {
+            keymap.add_identifier("in_replace");
+        }
+    }
+
     fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
         if cx.is_self_focused() {
             cx.focus(&self.query_editor);
@@ -868,9 +883,10 @@ impl BufferSearchBar {
             cx.propagate_action();
         }
     }
-    fn toggle_replace(&mut self, _: &ToggleReplace, _: &mut ViewContext<Self>) {
+    fn toggle_replace(&mut self, _: &ToggleReplace, cx: &mut ViewContext<Self>) {
         if let Some(_) = &self.active_searchable_item {
             self.replace_is_active = !self.replace_is_active;
+            cx.notify();
         }
     }
     fn replace_next(&mut self, _: &ReplaceNext, cx: &mut ViewContext<Self>) {
diff --git a/styles/src/style_tree/search.ts b/styles/src/style_tree/search.ts
index bc95b91819e875d757a5736dbd6fda6b8011aa49..b0ac023c09c90b35804ad6544df83195c83498f1 100644
--- a/styles/src/style_tree/search.ts
+++ b/styles/src/style_tree/search.ts
@@ -36,6 +36,7 @@ export default function search(): any {
             left: 10,
             right: 4,
         },
+        margin: { right: SEARCH_ROW_SPACING }
     }
 
     const include_exclude_editor = {
@@ -201,7 +202,6 @@ export default function search(): any {
         },
         option_button_group: {
             padding: {
-                left: SEARCH_ROW_SPACING,
                 right: SEARCH_ROW_SPACING,
             },
         },
@@ -375,7 +375,11 @@ export default function search(): any {
         search_bar_row_height: 34,
         search_row_spacing: 8,
         option_button_height: 22,
-        modes_container: {},
+        modes_container: {
+            padding: {
+                right: SEARCH_ROW_SPACING,
+            }
+        },
         replace_icon: {
             icon: {
                 color: foreground(theme.highest, "disabled"),