vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

gpui: Make refining a Style properly refine the TextStyle (#42852)

Browse source 
## Motivating problem
The gpui API currently has this counter intuitive behaviour

```rust
 div()
            .id("hallo")
            .cursor_pointer()
            .text_color(white())
            .font_weight(FontWeight::SEMIBOLD)
            .text_size(px(20.0))
            .child("hallo")
            .active(|this| this.text_color(red()))
```
By changing the text_color when the div is active, the current behaviour
is to overwrite all of the text styling rather than do a proper
refinement of the existing text styling leading to this odd result:
The button being active inadvertently changes the font size.


https://github.com/user-attachments/assets/1ff51169-0d76-4ee5-bbb0-004eb9ffdf2c



## Solution
Previously refining a Style would not recursively refine the TextStyle
inside of it, leading to this behaviour:
```rust
let mut style = Style::default();
style.refine(&StyleRefinement::default().text_size(px(20.0)));
style.refine(&StyleRefinement::default().font_weight(FontWeight::SEMIBOLD));

assert!(style.text_style().unwrap().font_size.is_none());
//assertion passes
```

(As best as I can tell) Style deliberately has `pub text:
TextStyleRefinement` storing the `TextStyleRefinement` rather than the
absolute `TextStyle` so that these refinements can be elsewhere used in
cascading text styles down to element's children. But a consequence of
that is that the refine macro was not properly recursively refining the
`text` field as it ought to.

I've modified the refine macro so that the `#[refineable]` attribute
works with `TextStyleRefinement` as well as the usual `TextStyle`.
(Perhaps a little bit haphazardly by simply checking whether the name
ends in Refinement - there may be a better solution there).

This PR resolves the motivating problem and triggers the assertion in
the above code as you'd expect. I've compiled zed under these changes
and all seems to be in order there.

Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Serophots 2025-12-15 13:30:13 +00:00 committed by GitHub
parent 63bfb6131f
commit a3ac595737
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 74 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/acp_tools/src/acp_tools.rs
View file

@ -371,13 +371,13 @@ impl AcpTools {
syntax: cx.theme().syntax().clone(), syntax: cx.theme().syntax().clone(),
code_block_overflow_x_scroll: true, code_block_overflow_x_scroll: true,
code_block: StyleRefinement { code_block: StyleRefinement {
text: Some(TextStyleRefinement { text: TextStyleRefinement {
font_family: Some( font_family: Some(
theme_settings.buffer_font.family.clone(), theme_settings.buffer_font.family.clone(),
), ),
font_size: Some((base_size * 0.8).into()), font_size: Some((base_size * 0.8).into()),
..Default::default() ..Default::default()
}), },
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()

4
crates/agent_ui/src/acp/thread_view.rs
View file

@ -6053,13 +6053,13 @@ fn default_markdown_style(
}, },
border_color: Some(colors.border_variant), border_color: Some(colors.border_variant),
background: Some(colors.editor_background.into()), background: Some(colors.editor_background.into()),
text: Some(TextStyleRefinement { text: TextStyleRefinement {
font_family: Some(theme_settings.buffer_font.family.clone()), font_family: Some(theme_settings.buffer_font.family.clone()),
font_fallbacks: theme_settings.buffer_font.fallbacks.clone(), font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
font_features: Some(theme_settings.buffer_font.features.clone()), font_features: Some(theme_settings.buffer_font.features.clone()),
font_size: Some(buffer_font_size.into()), font_size: Some(buffer_font_size.into()),
..Default::default() ..Default::default()
}), },
..Default::default() ..Default::default()
}, },
inline_code: TextStyleRefinement { inline_code: TextStyleRefinement {

4
crates/edit_prediction_ui/src/rate_prediction_modal.rs
View file

@ -510,13 +510,13 @@ impl RatePredictionsModal {
base_text_style: window.text_style(), base_text_style: window.text_style(),
syntax: cx.theme().syntax().clone(), syntax: cx.theme().syntax().clone(),
code_block: StyleRefinement { code_block: StyleRefinement {
text: Some(TextStyleRefinement { text: TextStyleRefinement {
font_family: Some( font_family: Some(
theme_settings.buffer_font.family.clone(), theme_settings.buffer_font.family.clone(),
), ),
font_size: Some(buffer_font_size.into()), font_size: Some(buffer_font_size.into()),
..Default::default() ..Default::default()
}), },
padding: EdgesRefinement { padding: EdgesRefinement {
top: Some(DefiniteLength::Absolute( top: Some(DefiniteLength::Absolute(
AbsoluteLength::Pixels(px(8.)), AbsoluteLength::Pixels(px(8.)),

18
crates/gpui/src/style.rs
View file

@ -252,6 +252,7 @@ pub struct Style {
pub box_shadow: Vec<BoxShadow>, pub box_shadow: Vec<BoxShadow>,
/// The text style of this element /// The text style of this element
#[refineable]
pub text: TextStyleRefinement, pub text: TextStyleRefinement,
/// The mouse cursor style shown when the mouse pointer is over an element. /// The mouse cursor style shown when the mouse pointer is over an element.
@ -1469,4 +1470,21 @@ mod tests {
] ]
); );
} }
#[perf]
fn test_text_style_refinement() {
let mut style = Style::default();
style.refine(&StyleRefinement::default().text_size(px(20.0)));
style.refine(&StyleRefinement::default().font_weight(FontWeight::SEMIBOLD));
assert_eq!(
Some(AbsoluteLength::from(px(20.0))),
style.text_style().unwrap().font_size
);
assert_eq!(
Some(FontWeight::SEMIBOLD),
style.text_style().unwrap().font_weight
);
}
} }

112
crates/gpui/src/styled.rs
View file

@ -64,43 +64,33 @@ pub trait Styled: Sized {
/// Sets the whitespace of the element to `normal`. /// Sets the whitespace of the element to `normal`.
/// [Docs](https://tailwindcss.com/docs/whitespace#normal) /// [Docs](https://tailwindcss.com/docs/whitespace#normal)
fn whitespace_normal(mut self) -> Self { fn whitespace_normal(mut self) -> Self {
self.text_style() self.text_style().white_space = Some(WhiteSpace::Normal);
.get_or_insert_with(Default::default)
.white_space = Some(WhiteSpace::Normal);
self self
} }
/// Sets the whitespace of the element to `nowrap`. /// Sets the whitespace of the element to `nowrap`.
/// [Docs](https://tailwindcss.com/docs/whitespace#nowrap) /// [Docs](https://tailwindcss.com/docs/whitespace#nowrap)
fn whitespace_nowrap(mut self) -> Self { fn whitespace_nowrap(mut self) -> Self {
self.text_style() self.text_style().white_space = Some(WhiteSpace::Nowrap);
.get_or_insert_with(Default::default)
.white_space = Some(WhiteSpace::Nowrap);
self self
} }
/// Sets the truncate overflowing text with an ellipsis (…) if needed. /// Sets the truncate overflowing text with an ellipsis (…) if needed.
/// [Docs](https://tailwindcss.com/docs/text-overflow#ellipsis) /// [Docs](https://tailwindcss.com/docs/text-overflow#ellipsis)
fn text_ellipsis(mut self) -> Self { fn text_ellipsis(mut self) -> Self {
self.text_style() self.text_style().text_overflow = Some(TextOverflow::Truncate(ELLIPSIS));
.get_or_insert_with(Default::default)
.text_overflow = Some(TextOverflow::Truncate(ELLIPSIS));
self self
} }
/// Sets the text overflow behavior of the element. /// Sets the text overflow behavior of the element.
fn text_overflow(mut self, overflow: TextOverflow) -> Self { fn text_overflow(mut self, overflow: TextOverflow) -> Self {
self.text_style() self.text_style().text_overflow = Some(overflow);
.get_or_insert_with(Default::default)
.text_overflow = Some(overflow);
self self
} }
/// Set the text alignment of the element. /// Set the text alignment of the element.
fn text_align(mut self, align: TextAlign) -> Self { fn text_align(mut self, align: TextAlign) -> Self {
self.text_style() self.text_style().text_align = Some(align);
.get_or_insert_with(Default::default)
.text_align = Some(align);
self self
} }
@ -128,7 +118,7 @@ pub trait Styled: Sized {
/// Sets number of lines to show before truncating the text. /// Sets number of lines to show before truncating the text.
/// [Docs](https://tailwindcss.com/docs/line-clamp) /// [Docs](https://tailwindcss.com/docs/line-clamp)
fn line_clamp(mut self, lines: usize) -> Self { fn line_clamp(mut self, lines: usize) -> Self {
let mut text_style = self.text_style().get_or_insert_with(Default::default); let mut text_style = self.text_style();
text_style.line_clamp = Some(lines); text_style.line_clamp = Some(lines);
self.overflow_hidden() self.overflow_hidden()
} }
@ -396,7 +386,7 @@ pub trait Styled: Sized {
} }
/// Returns a mutable reference to the text style that has been configured on this element. /// Returns a mutable reference to the text style that has been configured on this element.
fn text_style(&mut self) -> &mut Option<TextStyleRefinement> { fn text_style(&mut self) -> &mut TextStyleRefinement {
let style: &mut StyleRefinement = self.style(); let style: &mut StyleRefinement = self.style();
&mut style.text &mut style.text
} }
@ -405,7 +395,7 @@ pub trait Styled: Sized {
/// ///
/// This value cascades to its child elements. /// This value cascades to its child elements.
fn text_color(mut self, color: impl Into<Hsla>) -> Self { fn text_color(mut self, color: impl Into<Hsla>) -> Self {
self.text_style().get_or_insert_with(Default::default).color = Some(color.into()); self.text_style().color = Some(color.into());
self self
} }
@ -413,9 +403,7 @@ pub trait Styled: Sized {
/// ///
/// This value cascades to its child elements. /// This value cascades to its child elements.
fn font_weight(mut self, weight: FontWeight) -> Self { fn font_weight(mut self, weight: FontWeight) -> Self {
self.text_style() self.text_style().font_weight = Some(weight);
.get_or_insert_with(Default::default)
.font_weight = Some(weight);
self self
} }
@ -423,9 +411,7 @@ pub trait Styled: Sized {
/// ///
/// This value cascades to its child elements. /// This value cascades to its child elements.
fn text_bg(mut self, bg: impl Into<Hsla>) -> Self { fn text_bg(mut self, bg: impl Into<Hsla>) -> Self {
self.text_style() self.text_style().background_color = Some(bg.into());
.get_or_insert_with(Default::default)
.background_color = Some(bg.into());
self self
} }
@ -433,97 +419,77 @@ pub trait Styled: Sized {
/// ///
/// This value cascades to its child elements. /// This value cascades to its child elements.
fn text_size(mut self, size: impl Into<AbsoluteLength>) -> Self { fn text_size(mut self, size: impl Into<AbsoluteLength>) -> Self {
self.text_style() self.text_style().font_size = Some(size.into());
.get_or_insert_with(Default::default)
.font_size = Some(size.into());
self self
} }
/// Sets the text size to 'extra small'. /// Sets the text size to 'extra small'.
/// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size) /// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size)
fn text_xs(mut self) -> Self { fn text_xs(mut self) -> Self {
self.text_style() self.text_style().font_size = Some(rems(0.75).into());
.get_or_insert_with(Default::default)
.font_size = Some(rems(0.75).into());
self self
} }
/// Sets the text size to 'small'. /// Sets the text size to 'small'.
/// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size) /// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size)
fn text_sm(mut self) -> Self { fn text_sm(mut self) -> Self {
self.text_style() self.text_style().font_size = Some(rems(0.875).into());
.get_or_insert_with(Default::default)
.font_size = Some(rems(0.875).into());
self self
} }
/// Sets the text size to 'base'. /// Sets the text size to 'base'.
/// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size) /// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size)
fn text_base(mut self) -> Self { fn text_base(mut self) -> Self {
self.text_style() self.text_style().font_size = Some(rems(1.0).into());
.get_or_insert_with(Default::default)
.font_size = Some(rems(1.0).into());
self self
} }
/// Sets the text size to 'large'. /// Sets the text size to 'large'.
/// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size) /// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size)
fn text_lg(mut self) -> Self { fn text_lg(mut self) -> Self {
self.text_style() self.text_style().font_size = Some(rems(1.125).into());
.get_or_insert_with(Default::default)
.font_size = Some(rems(1.125).into());
self self
} }
/// Sets the text size to 'extra large'. /// Sets the text size to 'extra large'.
/// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size) /// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size)
fn text_xl(mut self) -> Self { fn text_xl(mut self) -> Self {
self.text_style() self.text_style().font_size = Some(rems(1.25).into());
.get_or_insert_with(Default::default)
.font_size = Some(rems(1.25).into());
self self
} }
/// Sets the text size to 'extra extra large'. /// Sets the text size to 'extra extra large'.
/// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size) /// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size)
fn text_2xl(mut self) -> Self { fn text_2xl(mut self) -> Self {
self.text_style() self.text_style().font_size = Some(rems(1.5).into());
.get_or_insert_with(Default::default)
.font_size = Some(rems(1.5).into());
self self
} }
/// Sets the text size to 'extra extra extra large'. /// Sets the text size to 'extra extra extra large'.
/// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size) /// [Docs](https://tailwindcss.com/docs/font-size#setting-the-font-size)
fn text_3xl(mut self) -> Self { fn text_3xl(mut self) -> Self {
self.text_style() self.text_style().font_size = Some(rems(1.875).into());
.get_or_insert_with(Default::default)
.font_size = Some(rems(1.875).into());
self self
} }
/// Sets the font style of the element to italic. /// Sets the font style of the element to italic.
/// [Docs](https://tailwindcss.com/docs/font-style#italicizing-text) /// [Docs](https://tailwindcss.com/docs/font-style#italicizing-text)
fn italic(mut self) -> Self { fn italic(mut self) -> Self {
self.text_style() self.text_style().font_style = Some(FontStyle::Italic);
.get_or_insert_with(Default::default)
.font_style = Some(FontStyle::Italic);
self self
} }
/// Sets the font style of the element to normal (not italic). /// Sets the font style of the element to normal (not italic).
/// [Docs](https://tailwindcss.com/docs/font-style#displaying-text-normally) /// [Docs](https://tailwindcss.com/docs/font-style#displaying-text-normally)
fn not_italic(mut self) -> Self { fn not_italic(mut self) -> Self {
self.text_style() self.text_style().font_style = Some(FontStyle::Normal);
.get_or_insert_with(Default::default)
.font_style = Some(FontStyle::Normal);
self self
} }
/// Sets the text decoration to underline. /// Sets the text decoration to underline.
/// [Docs](https://tailwindcss.com/docs/text-decoration-line#underling-text) /// [Docs](https://tailwindcss.com/docs/text-decoration-line#underling-text)
fn underline(mut self) -> Self { fn underline(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
style.underline = Some(UnderlineStyle { style.underline = Some(UnderlineStyle {
thickness: px(1.), thickness: px(1.),
..Default::default() ..Default::default()
@ -534,7 +500,7 @@ pub trait Styled: Sized {
/// Sets the decoration of the text to have a line through it. /// Sets the decoration of the text to have a line through it.
/// [Docs](https://tailwindcss.com/docs/text-decoration-line#adding-a-line-through-text) /// [Docs](https://tailwindcss.com/docs/text-decoration-line#adding-a-line-through-text)
fn line_through(mut self) -> Self { fn line_through(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
style.strikethrough = Some(StrikethroughStyle { style.strikethrough = Some(StrikethroughStyle {
thickness: px(1.), thickness: px(1.),
..Default::default() ..Default::default()
@ -546,15 +512,13 @@ pub trait Styled: Sized {
/// ///
/// This value cascades to its child elements. /// This value cascades to its child elements.
fn text_decoration_none(mut self) -> Self { fn text_decoration_none(mut self) -> Self {
self.text_style() self.text_style().underline = None;
.get_or_insert_with(Default::default)
.underline = None;
self self
} }
/// Sets the color for the underline on this element /// Sets the color for the underline on this element
fn text_decoration_color(mut self, color: impl Into<Hsla>) -> Self { fn text_decoration_color(mut self, color: impl Into<Hsla>) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.color = Some(color.into()); underline.color = Some(color.into());
self self
@ -563,7 +527,7 @@ pub trait Styled: Sized {
/// Sets the text decoration style to a solid line. /// Sets the text decoration style to a solid line.
/// [Docs](https://tailwindcss.com/docs/text-decoration-style) /// [Docs](https://tailwindcss.com/docs/text-decoration-style)
fn text_decoration_solid(mut self) -> Self { fn text_decoration_solid(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.wavy = false; underline.wavy = false;
self self
@ -572,7 +536,7 @@ pub trait Styled: Sized {
/// Sets the text decoration style to a wavy line. /// Sets the text decoration style to a wavy line.
/// [Docs](https://tailwindcss.com/docs/text-decoration-style) /// [Docs](https://tailwindcss.com/docs/text-decoration-style)
fn text_decoration_wavy(mut self) -> Self { fn text_decoration_wavy(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.wavy = true; underline.wavy = true;
self self
@ -581,7 +545,7 @@ pub trait Styled: Sized {
/// Sets the text decoration to be 0px thick. /// Sets the text decoration to be 0px thick.
/// [Docs](https://tailwindcss.com/docs/text-decoration-thickness) /// [Docs](https://tailwindcss.com/docs/text-decoration-thickness)
fn text_decoration_0(mut self) -> Self { fn text_decoration_0(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.thickness = px(0.); underline.thickness = px(0.);
self self
@ -590,7 +554,7 @@ pub trait Styled: Sized {
/// Sets the text decoration to be 1px thick. /// Sets the text decoration to be 1px thick.
/// [Docs](https://tailwindcss.com/docs/text-decoration-thickness) /// [Docs](https://tailwindcss.com/docs/text-decoration-thickness)
fn text_decoration_1(mut self) -> Self { fn text_decoration_1(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.thickness = px(1.); underline.thickness = px(1.);
self self
@ -599,7 +563,7 @@ pub trait Styled: Sized {
/// Sets the text decoration to be 2px thick. /// Sets the text decoration to be 2px thick.
/// [Docs](https://tailwindcss.com/docs/text-decoration-thickness) /// [Docs](https://tailwindcss.com/docs/text-decoration-thickness)
fn text_decoration_2(mut self) -> Self { fn text_decoration_2(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.thickness = px(2.); underline.thickness = px(2.);
self self
@ -608,7 +572,7 @@ pub trait Styled: Sized {
/// Sets the text decoration to be 4px thick. /// Sets the text decoration to be 4px thick.
/// [Docs](https://tailwindcss.com/docs/text-decoration-thickness) /// [Docs](https://tailwindcss.com/docs/text-decoration-thickness)
fn text_decoration_4(mut self) -> Self { fn text_decoration_4(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.thickness = px(4.); underline.thickness = px(4.);
self self
@ -617,7 +581,7 @@ pub trait Styled: Sized {
/// Sets the text decoration to be 8px thick. /// Sets the text decoration to be 8px thick.
/// [Docs](https://tailwindcss.com/docs/text-decoration-thickness) /// [Docs](https://tailwindcss.com/docs/text-decoration-thickness)
fn text_decoration_8(mut self) -> Self { fn text_decoration_8(mut self) -> Self {
let style = self.text_style().get_or_insert_with(Default::default); let style = self.text_style();
let underline = style.underline.get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default);
underline.thickness = px(8.); underline.thickness = px(8.);
self self
@ -625,17 +589,13 @@ pub trait Styled: Sized {
/// Sets the font family of this element and its children. /// Sets the font family of this element and its children.
fn font_family(mut self, family_name: impl Into<SharedString>) -> Self { fn font_family(mut self, family_name: impl Into<SharedString>) -> Self {
self.text_style() self.text_style().font_family = Some(family_name.into());
.get_or_insert_with(Default::default)
.font_family = Some(family_name.into());
self self
} }
/// Sets the font features of this element and its children. /// Sets the font features of this element and its children.
fn font_features(mut self, features: FontFeatures) -> Self { fn font_features(mut self, features: FontFeatures) -> Self {
self.text_style() self.text_style().font_features = Some(features);
.get_or_insert_with(Default::default)
.font_features = Some(features);
self self
} }
@ -649,7 +609,7 @@ pub trait Styled: Sized {
style, style,
} = font; } = font;
let text_style = self.text_style().get_or_insert_with(Default::default); let text_style = self.text_style();
text_style.font_family = Some(family); text_style.font_family = Some(family);
text_style.font_features = Some(features); text_style.font_features = Some(features);
text_style.font_weight = Some(weight); text_style.font_weight = Some(weight);
@ -661,9 +621,7 @@ pub trait Styled: Sized {
/// Sets the line height of this element and its children. /// Sets the line height of this element and its children.
fn line_height(mut self, line_height: impl Into<DefiniteLength>) -> Self { fn line_height(mut self, line_height: impl Into<DefiniteLength>) -> Self {
self.text_style() self.text_style().line_height = Some(line_height.into());
.get_or_insert_with(Default::default)
.line_height = Some(line_height.into());
self self
} }

4
crates/markdown/examples/markdown_as_child.rs
View file

@ -54,11 +54,11 @@ impl Render for HelloWorld {
..Default::default() ..Default::default()
}, },
code_block: StyleRefinement { code_block: StyleRefinement {
text: Some(gpui::TextStyleRefinement { text: gpui::TextStyleRefinement {
font_family: Some("Zed Mono".into()), font_family: Some("Zed Mono".into()),
background_color: Some(cx.theme().colors().editor_background), background_color: Some(cx.theme().colors().editor_background),
..Default::default() ..Default::default()
}), },
margin: gpui::EdgesRefinement { margin: gpui::EdgesRefinement {
top: Some(Length::Definite(rems(4.).into())), top: Some(Length::Definite(rems(4.).into())),
left: Some(Length::Definite(rems(4.).into())), left: Some(Length::Definite(rems(4.).into())),

14
crates/markdown/src/markdown.rs
View file

@ -838,8 +838,7 @@ impl Element for MarkdownElement {
heading.style().refine(&self.style.heading); heading.style().refine(&self.style.heading);
let text_style = let text_style = self.style.heading.text_style().clone();
self.style.heading.text_style().clone().unwrap_or_default();
builder.push_text_style(text_style); builder.push_text_style(text_style);
builder.push_div(heading, range, markdown_end); builder.push_div(heading, range, markdown_end);
@ -933,10 +932,7 @@ impl Element for MarkdownElement {
} }
}); });
if let Some(code_block_text_style) = &self.style.code_block.text builder.push_text_style(self.style.code_block.text.to_owned());
{
builder.push_text_style(code_block_text_style.to_owned());
}
builder.push_code_block(language); builder.push_code_block(language);
builder.push_div(code_block, range, markdown_end); builder.push_div(code_block, range, markdown_end);
} }
@ -1091,9 +1087,7 @@ impl Element for MarkdownElement {
builder.pop_div(); builder.pop_div();
builder.pop_code_block(); builder.pop_code_block();
if self.style.code_block.text.is_some() { builder.pop_text_style();
builder.pop_text_style();
}
if let CodeBlockRenderer::Default { if let CodeBlockRenderer::Default {
copy_button: true, .. copy_button: true, ..
@ -1346,7 +1340,7 @@ fn apply_heading_style(
}; };
if let Some(style) = style_opt { if let Some(style) = style_opt {
heading.style().text = Some(style.clone()); heading.style().text = style.clone();
} }
} }

7
crates/refineable/derive_refineable/src/derive_refineable.rs
View file

@ -528,7 +528,12 @@ fn get_wrapper_type(field: &Field, ty: &Type) -> syn::Type {
} else { } else {
panic!("Expected struct type for a refineable field"); panic!("Expected struct type for a refineable field");
}; };
let refinement_struct_name = format_ident!("{}Refinement", struct_name);
let refinement_struct_name = if struct_name.to_string().ends_with("Refinement") {
format_ident!("{}", struct_name)
} else {
format_ident!("{}Refinement", struct_name)
};
let generics = if let Type::Path(tp) = ty { let generics = if let Type::Path(tp) = ty {
&tp.path.segments.last().unwrap().arguments &tp.path.segments.last().unwrap().arguments
} else { } else {

2
crates/refineable/src/refineable.rs
View file

@ -13,7 +13,7 @@ pub use derive_refineable::Refineable;
/// wrapped appropriately: /// wrapped appropriately:
/// ///
/// - **Refineable fields** (marked with `#[refineable]`): Become the corresponding refinement type /// - **Refineable fields** (marked with `#[refineable]`): Become the corresponding refinement type
/// (e.g., `Bar` becomes `BarRefinement`) /// (e.g., `Bar` becomes `BarRefinement`, or `BarRefinement` remains `BarRefinement`)
/// - **Optional fields** (`Option<T>`): Remain as `Option<T>` /// - **Optional fields** (`Option<T>`): Remain as `Option<T>`
/// - **Regular fields**: Become `Option<T>` /// - **Regular fields**: Become `Option<T>`
/// ///

4
crates/ui/src/components/keybinding_hint.rs
View file

@ -234,9 +234,7 @@ impl RenderOnce for KeybindingHint {
let mut base = h_flex(); let mut base = h_flex();
base.text_style() base.text_style().font_style = Some(FontStyle::Italic);
.get_or_insert_with(Default::default)
.font_style = Some(FontStyle::Italic);
base.gap_1() base.gap_1()
.font_buffer(cx) .font_buffer(cx)

4
crates/ui/src/components/label/label_like.rs
View file

@ -223,9 +223,7 @@ impl RenderOnce for LabelLike {
}) })
.when(self.italic, |this| this.italic()) .when(self.italic, |this| this.italic())
.when(self.underline, |mut this| { .when(self.underline, |mut this| {
this.text_style() this.text_style().underline = Some(UnderlineStyle {
.get_or_insert_with(Default::default)
.underline = Some(UnderlineStyle {
thickness: px(1.), thickness: px(1.),
color: Some(cx.theme().colors().text_muted.opacity(0.4)), color: Some(cx.theme().colors().text_muted.opacity(0.4)),
wavy: false, wavy: false,