From 7fbf0f6e73546a83b63157b72d093da47e3a5c6c Mon Sep 17 00:00:00 2001 From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com> Date: Wed, 26 Nov 2025 23:06:08 +0000 Subject: [PATCH] editor: Consider experimental theme overrides for colorized bracket invalidation (#43602) (cherry-pick to preview) (#43606) Cherry-pick of #43602 to preview ---- Release Notes: - Fixed a small issue where bracket colors would not be immediately updated if `experimental_theme_overrides.accents` was changed. Co-authored-by: Finn Evers --- crates/editor/src/editor.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index cd7a872f8c129c3b67b544ed2ba78d7fde104b48..7cdd587db48de1f03bf54949c3bfbe7870a07073 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -21565,12 +21565,22 @@ impl Editor { return Vec::new(); } - theme::ThemeSettings::get_global(cx) + let theme_settings = theme::ThemeSettings::get_global(cx); + + theme_settings .theme_overrides .get(cx.theme().name.as_ref()) .map(|theme_style| &theme_style.accents) .into_iter() .flatten() + .chain( + theme_settings + .experimental_theme_overrides + .as_ref() + .map(|overrides| &overrides.accents) + .into_iter() + .flatten(), + ) .flat_map(|accent| accent.0.clone()) .collect() }