From cafb03777bb1683ca4a65a0155df80f6932f7c8a Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 4 Jul 2025 15:17:55 +0800 Subject: [PATCH] chore: Remove `shadow_xs`, now GPUI has this method. (#1043) https://github.com/zed-industries/zed/pull/33361 --- Cargo.lock | 29 ++++++++++++++-------------- crates/ui/src/input/hover_popover.rs | 2 +- crates/ui/src/input/otp_input.rs | 2 +- crates/ui/src/styled.rs | 15 ++------------ 4 files changed, 19 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44ddf818..c39e915d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -724,7 +724,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.10.5", "lazy_static", "lazycell", "log", @@ -747,7 +747,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.10.5", "log", "prettyplease", "proc-macro2", @@ -1417,7 +1417,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "indexmap 2.9.0", "rustc-hash 2.1.0", @@ -1952,7 +1952,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "proc-macro2", "quote", @@ -3098,7 +3098,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -3280,7 +3280,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3550,7 +3550,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "anyhow", "bytes", @@ -3567,7 +3567,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "rustls", "rustls-platform-verifier", @@ -4393,7 +4393,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "anyhow", "bindgen 0.71.1", @@ -6270,7 +6270,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "derive_refineable", "workspace-hack", @@ -6425,7 +6425,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "anyhow", "bytes", @@ -6957,7 +6957,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "anyhow", "serde", @@ -7539,7 +7539,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "arrayvec", "log", @@ -8741,7 +8741,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#6cd4dbdea11bd124241fd6de106535ac8e73df55" +source = "git+https://github.com/zed-industries/zed.git#5253702200f4fb491b6608ac0a0c6df89b224b0f" dependencies = [ "anyhow", "async-fs 2.1.2", @@ -8759,6 +8759,7 @@ dependencies = [ "nix 0.29.0", "regex", "rust-embed", + "schemars", "serde", "serde_json", "serde_json_lenient", diff --git a/crates/ui/src/input/hover_popover.rs b/crates/ui/src/input/hover_popover.rs index edda16ba..f7daa82e 100644 --- a/crates/ui/src/input/hover_popover.rs +++ b/crates/ui/src/input/hover_popover.rs @@ -9,7 +9,7 @@ use crate::{ highlighter::LanguageRegistry, input::{InputState, Marker}, text::TextView, - ActiveTheme as _, StyledExt as _, + ActiveTheme as _, }; pub struct DiagnosticPopover { diff --git a/crates/ui/src/input/otp_input.rs b/crates/ui/src/input/otp_input.rs index 021800d0..09082689 100644 --- a/crates/ui/src/input/otp_input.rs +++ b/crates/ui/src/input/otp_input.rs @@ -6,7 +6,7 @@ use gpui::{ }; use super::{blink_cursor::BlinkCursor, InputEvent}; -use crate::{h_flex, v_flex, ActiveTheme, Icon, IconName, Sizable, Size, StyledExt as _}; +use crate::{h_flex, v_flex, ActiveTheme, Icon, IconName, Sizable, Size}; pub struct OtpState { focus_handle: FocusHandle, diff --git a/crates/ui/src/styled.rs b/crates/ui/src/styled.rs index 4f350324..4ff99a52 100644 --- a/crates/ui/src/styled.rs +++ b/crates/ui/src/styled.rs @@ -5,8 +5,8 @@ use crate::{ ActiveTheme, }; use gpui::{ - div, hsla, point, px, App, Axis, BoxShadow, DefiniteLength, Div, Edges, Element, ElementId, - FocusHandle, Pixels, Refineable, StyleRefinement, Styled, Window, + div, px, App, Axis, DefiniteLength, Div, Edges, Element, ElementId, FocusHandle, Pixels, + Refineable, StyleRefinement, Styled, Window, }; use serde::{Deserialize, Serialize}; @@ -170,17 +170,6 @@ pub trait StyledExt: Styled + Sized { .shadow_lg() .rounded(cx.theme().radius) } - - /// TODO: Remove this after PR is merged - /// https://github.com/zed-industries/zed/pull/33361 - fn shadow_xs(self) -> Self { - self.shadow(vec![BoxShadow { - color: hsla(0., 0., 0., 0.05), - offset: point(px(0.), px(1.)), - blur_radius: px(2.), - spread_radius: px(0.), - }]) - } } impl StyledExt for E {}