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] 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