Remove old `Theme` definition (#3195)

Marshall Bowers created

This PR removes the old `Theme` definition in favor of the new
`ThemeVariant`s.

The new `SyntaxStyles` have been reverted to the old `SyntaxTheme` that
operates by storing the syntax styles as a vector of
`gpui2::HighlightStyle`s.

This is necessary for the intended usage by `language2`, where we find
the longest key in the theme's syntax styles that matches the capture
name:

https://github.com/zed-industries/zed/blob/18431051d9d750d9e66284a71f7a55a1e31c1374/crates/language2/src/highlight_map.rs#L15-L41

Change summary

Cargo.lock                                            |  15 
Cargo.toml                                            |   1 
crates/language2/src/language2.rs                     |  10 
crates/storybook2/src/storybook2.rs                   |   4 
crates/theme2/src/colors.rs                           |   4 
crates/theme2/src/default_colors.rs                   | 642 ++----------
crates/theme2/src/default_theme.rs                    |  16 
crates/theme2/src/registry.rs                         |  63 
crates/theme2/src/settings.rs                         |  10 
crates/theme2/src/syntax.rs                           | 238 ----
crates/theme2/src/theme2.rs                           | 137 --
crates/theme2/src/themes/andromeda.rs                 | 130 --
crates/theme2/src/themes/atelier_cave_dark.rs         | 136 --
crates/theme2/src/themes/atelier_cave_light.rs        | 136 --
crates/theme2/src/themes/atelier_dune_dark.rs         | 136 --
crates/theme2/src/themes/atelier_dune_light.rs        | 136 --
crates/theme2/src/themes/atelier_estuary_dark.rs      | 136 --
crates/theme2/src/themes/atelier_estuary_light.rs     | 136 --
crates/theme2/src/themes/atelier_forest_dark.rs       | 136 --
crates/theme2/src/themes/atelier_forest_light.rs      | 136 --
crates/theme2/src/themes/atelier_heath_dark.rs        | 136 --
crates/theme2/src/themes/atelier_heath_light.rs       | 136 --
crates/theme2/src/themes/atelier_lakeside_dark.rs     | 136 --
crates/theme2/src/themes/atelier_lakeside_light.rs    | 136 --
crates/theme2/src/themes/atelier_plateau_dark.rs      | 136 --
crates/theme2/src/themes/atelier_plateau_light.rs     | 136 --
crates/theme2/src/themes/atelier_savanna_dark.rs      | 136 --
crates/theme2/src/themes/atelier_savanna_light.rs     | 136 --
crates/theme2/src/themes/atelier_seaside_dark.rs      | 136 --
crates/theme2/src/themes/atelier_seaside_light.rs     | 136 --
crates/theme2/src/themes/atelier_sulphurpool_dark.rs  | 136 --
crates/theme2/src/themes/atelier_sulphurpool_light.rs | 136 --
crates/theme2/src/themes/ayu_dark.rs                  | 130 --
crates/theme2/src/themes/ayu_light.rs                 | 130 --
crates/theme2/src/themes/ayu_mirage.rs                | 130 --
crates/theme2/src/themes/gruvbox_dark.rs              | 131 --
crates/theme2/src/themes/gruvbox_dark_hard.rs         | 131 --
crates/theme2/src/themes/gruvbox_dark_soft.rs         | 131 --
crates/theme2/src/themes/gruvbox_light.rs             | 131 --
crates/theme2/src/themes/gruvbox_light_hard.rs        | 131 --
crates/theme2/src/themes/gruvbox_light_soft.rs        | 131 --
crates/theme2/src/themes/mod.rs                       |  79 -
crates/theme2/src/themes/one_dark.rs                  | 131 --
crates/theme2/src/themes/one_light.rs                 | 131 --
crates/theme2/src/themes/rose_pine.rs                 | 132 --
crates/theme2/src/themes/rose_pine_dawn.rs            | 132 --
crates/theme2/src/themes/rose_pine_moon.rs            | 132 --
crates/theme2/src/themes/sandcastle.rs                | 130 --
crates/theme2/src/themes/solarized_dark.rs            | 130 --
crates/theme2/src/themes/solarized_light.rs           | 130 --
crates/theme2/src/themes/summercamp.rs                | 130 --
crates/theme_converter/Cargo.toml                     |  18 
crates/theme_converter/src/main.rs                    | 390 -------
crates/theme_converter/src/theme_printer.rs           | 174 ---
54 files changed, 173 insertions(+), 6,832 deletions(-)

Detailed changes

Cargo.lock 🔗

@@ -8769,21 +8769,6 @@ dependencies = [
  "util",
 ]
 
-[[package]]
-name = "theme_converter"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap 4.4.4",
- "convert_case 0.6.0",
- "gpui2",
- "log",
- "rust-embed",
- "serde",
- "simplelog",
- "theme2",
-]
-
 [[package]]
 name = "theme_selector"
 version = "0.1.0"

Cargo.toml 🔗

@@ -92,7 +92,6 @@ members = [
     "crates/text",
     "crates/theme",
     "crates/theme2",
-    "crates/theme_converter",
     "crates/theme_selector",
     "crates/ui2",
     "crates/util",

crates/language2/src/language2.rs 🔗

@@ -42,7 +42,7 @@ use std::{
     },
 };
 use syntax_map::SyntaxSnapshot;
-use theme2::{SyntaxTheme, Theme};
+use theme2::{SyntaxTheme, ThemeVariant};
 use tree_sitter::{self, Query};
 use unicase::UniCase;
 use util::{http::HttpClient, paths::PathExt};
@@ -642,7 +642,7 @@ struct LanguageRegistryState {
     next_available_language_id: AvailableLanguageId,
     loading_languages: HashMap<AvailableLanguageId, Vec<oneshot::Sender<Result<Arc<Language>>>>>,
     subscription: (watch::Sender<()>, watch::Receiver<()>),
-    theme: Option<Arc<Theme>>,
+    theme: Option<Arc<ThemeVariant>>,
     version: usize,
     reload_count: usize,
 }
@@ -743,11 +743,11 @@ impl LanguageRegistry {
         self.state.read().reload_count
     }
 
-    pub fn set_theme(&self, theme: Arc<Theme>) {
+    pub fn set_theme(&self, theme: Arc<ThemeVariant>) {
         let mut state = self.state.write();
         state.theme = Some(theme.clone());
         for language in &state.languages {
-            language.set_theme(&theme.syntax);
+            language.set_theme(&theme.syntax());
         }
     }
 
@@ -1048,7 +1048,7 @@ impl LanguageRegistryState {
 
     fn add(&mut self, language: Arc<Language>) {
         if let Some(theme) = self.theme.as_ref() {
-            language.set_theme(&theme.syntax);
+            language.set_theme(&theme.syntax());
         }
         self.languages.push(language);
         self.version += 1;

crates/storybook2/src/storybook2.rs 🔗

@@ -48,7 +48,7 @@ fn main() {
     let args = Args::parse();
 
     let story_selector = args.story.clone();
-    let theme_name = args.theme.unwrap_or("One Dark".to_string());
+    let theme_name = args.theme.unwrap_or("Zed Pro Moonlight".to_string());
 
     let asset_source = Arc::new(Assets);
     gpui2::App::production(asset_source).run(move |cx| {
@@ -68,7 +68,7 @@ fn main() {
         let theme_registry = cx.global::<ThemeRegistry>();
 
         let mut theme_settings = ThemeSettings::get_global(cx).clone();
-        theme_settings.old_active_theme = theme_registry.get(&theme_name).unwrap();
+        theme_settings.active_theme = theme_registry.get(&theme_name).unwrap();
         ThemeSettings::override_global(theme_settings, cx);
 
         ui::settings::init(cx);

crates/theme2/src/colors.rs 🔗

@@ -1,7 +1,7 @@
 use gpui2::Hsla;
 use refineable::Refineable;
 
-use crate::{generate_struct_with_overrides, SyntaxStyles};
+use crate::{generate_struct_with_overrides, SyntaxTheme};
 
 pub struct SystemColors {
     pub transparent: Hsla,
@@ -94,7 +94,7 @@ generate_struct_with_overrides! {
     status: StatusColors,
     git: GitStatusColors,
     player: PlayerColors,
-    syntax: SyntaxStyles
+    syntax: SyntaxTheme
 }
 
 #[cfg(test)]

crates/theme2/src/default_colors.rs 🔗

@@ -1,11 +1,9 @@
-use gpui2::{hsla, FontWeight, Rgba};
-use indexmap::IndexMap;
+use gpui2::{hsla, Rgba};
 
 use crate::{
     colors::{GitStatusColors, PlayerColor, PlayerColors, StatusColors, SystemColors, ThemeColors},
     scale::{ColorScaleSet, ColorScales},
-    syntax::{SyntaxStyleName, SyntaxStyles},
-    SyntaxStyle,
+    syntax::SyntaxTheme,
 };
 
 impl Default for SystemColors {
@@ -77,541 +75,115 @@ impl Default for PlayerColors {
     }
 }
 
-impl SyntaxStyles {
+impl SyntaxTheme {
     pub fn default_light() -> Self {
-        use SyntaxStyleName::*;
-
-        let neutral: ColorScaleSet = slate().into();
-
-        Self(IndexMap::from_iter([
-            (
-                Comment,
-                SyntaxStyle::builder().color(neutral.light(11)).build(),
-            ),
-            (
-                CommentDoc,
-                SyntaxStyle::builder().color(neutral.light(11)).build(),
-            ),
-            (
-                Primary,
-                SyntaxStyle::builder().color(neutral.light(12)).build(),
-            ),
-            (
-                Predictive,
-                SyntaxStyle::builder().color(neutral.light(10)).build(),
-            ),
-            (
-                Hint,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(cyan()).light(10))
-                    .build(),
-            ),
-            (
-                Emphasis,
-                SyntaxStyle::builder().weight(FontWeight(600.0)).build(),
-            ),
-            (
-                EmphasisStrong,
-                SyntaxStyle::builder().weight(FontWeight(800.0)).build(),
-            ),
-            (
-                Title,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                LinkUri,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(blue()).light(12))
-                    .build(),
-            ),
-            (
-                LinkText,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(orange()).light(12))
-                    .build(),
-            ),
-            (
-                TextLiteral,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(purple()).light(12))
-                    .build(),
-            ),
-            (
-                Punctuation,
-                SyntaxStyle::builder().color(neutral.light(10)).build(),
-            ),
-            (
-                PunctuationBracket,
-                SyntaxStyle::builder().color(neutral.light(10)).build(),
-            ),
-            (
-                PunctuationDelimiter,
-                SyntaxStyle::builder().color(neutral.light(10)).build(),
-            ),
-            (
-                PunctuationSpecial,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                PunctuationListMarker,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(blue()).light(12))
-                    .build(),
-            ),
-            (
-                String,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(green()).light(12))
-                    .build(),
-            ),
-            (
-                StringSpecial,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                StringSpecialSymbol,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                StringEscape,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(blue()).light(12))
-                    .build(),
-            ),
-            (
-                StringRegex,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(orange()).light(12))
-                    .build(),
-            ),
-            (
-                Constructor,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(purple()).light(12))
-                    .build(),
-            ),
-            // TODO: Continue assigning syntax colors from here
-            (
-                Variant,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Type,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                TypeBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Variable,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                VariableSpecial,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Label,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Tag,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Attribute,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Property,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Constant,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Keyword,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Enum,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Operator,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Number,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Boolean,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                ConstantBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Function,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                FunctionBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                FunctionDefinition,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                FunctionSpecialDefinition,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                FunctionMethod,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                FunctionMethodBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Preproc,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-            (
-                Embedded,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).light(12))
-                    .build(),
-            ),
-        ]))
+        Self {
+            highlights: vec![
+                (
+                    "string.special.symbol".into(),
+                    gpui2::rgba(0xad6e26ff).into(),
+                ),
+                ("hint".into(), gpui2::rgba(0x9294beff).into()),
+                ("link_uri".into(), gpui2::rgba(0x3882b7ff).into()),
+                ("type".into(), gpui2::rgba(0x3882b7ff).into()),
+                ("string.regex".into(), gpui2::rgba(0xad6e26ff).into()),
+                ("constant".into(), gpui2::rgba(0x669f59ff).into()),
+                ("function".into(), gpui2::rgba(0x5b79e3ff).into()),
+                ("string.special".into(), gpui2::rgba(0xad6e26ff).into()),
+                ("punctuation.bracket".into(), gpui2::rgba(0x4d4f52ff).into()),
+                ("variable".into(), gpui2::rgba(0x383a41ff).into()),
+                ("punctuation".into(), gpui2::rgba(0x383a41ff).into()),
+                ("property".into(), gpui2::rgba(0xd3604fff).into()),
+                ("string".into(), gpui2::rgba(0x649f57ff).into()),
+                ("predictive".into(), gpui2::rgba(0x9b9ec6ff).into()),
+                ("attribute".into(), gpui2::rgba(0x5c78e2ff).into()),
+                ("number".into(), gpui2::rgba(0xad6e25ff).into()),
+                ("constructor".into(), gpui2::rgba(0x5c78e2ff).into()),
+                ("embedded".into(), gpui2::rgba(0x383a41ff).into()),
+                ("title".into(), gpui2::rgba(0xd3604fff).into()),
+                ("tag".into(), gpui2::rgba(0x5c78e2ff).into()),
+                ("boolean".into(), gpui2::rgba(0xad6e25ff).into()),
+                (
+                    "punctuation.list_marker".into(),
+                    gpui2::rgba(0xd3604fff).into(),
+                ),
+                ("variant".into(), gpui2::rgba(0x5b79e3ff).into()),
+                ("emphasis".into(), gpui2::rgba(0x5c78e2ff).into()),
+                ("link_text".into(), gpui2::rgba(0x5b79e3ff).into()),
+                ("comment".into(), gpui2::rgba(0xa2a3a7ff).into()),
+                ("punctuation.special".into(), gpui2::rgba(0xb92b46ff).into()),
+                ("emphasis.strong".into(), gpui2::rgba(0xad6e25ff).into()),
+                ("primary".into(), gpui2::rgba(0x383a41ff).into()),
+                (
+                    "punctuation.delimiter".into(),
+                    gpui2::rgba(0x4d4f52ff).into(),
+                ),
+                ("label".into(), gpui2::rgba(0x5c78e2ff).into()),
+                ("keyword".into(), gpui2::rgba(0xa449abff).into()),
+                ("string.escape".into(), gpui2::rgba(0x7c7e86ff).into()),
+                ("text.literal".into(), gpui2::rgba(0x649f57ff).into()),
+                ("variable.special".into(), gpui2::rgba(0xad6e25ff).into()),
+                ("comment.doc".into(), gpui2::rgba(0x7c7e86ff).into()),
+                ("enum".into(), gpui2::rgba(0xd3604fff).into()),
+                ("operator".into(), gpui2::rgba(0x3882b7ff).into()),
+                ("preproc".into(), gpui2::rgba(0x383a41ff).into()),
+            ],
+        }
     }
 
     pub fn default_dark() -> Self {
-        use SyntaxStyleName::*;
-
-        let neutral: ColorScaleSet = slate().into();
-
-        Self(IndexMap::from_iter([
-            (
-                Comment,
-                SyntaxStyle::builder().color(neutral.dark(11)).build(),
-            ),
-            (
-                CommentDoc,
-                SyntaxStyle::builder().color(neutral.dark(11)).build(),
-            ),
-            (
-                Primary,
-                SyntaxStyle::builder().color(neutral.dark(12)).build(),
-            ),
-            (
-                Predictive,
-                SyntaxStyle::builder().color(neutral.dark(10)).build(),
-            ),
-            (
-                Hint,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(cyan()).dark(10))
-                    .build(),
-            ),
-            (
-                Emphasis,
-                SyntaxStyle::builder().weight(FontWeight(600.0)).build(),
-            ),
-            (
-                EmphasisStrong,
-                SyntaxStyle::builder().weight(FontWeight(800.0)).build(),
-            ),
-            (
-                Title,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                LinkUri,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(blue()).dark(12))
-                    .build(),
-            ),
-            (
-                LinkText,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(orange()).dark(12))
-                    .build(),
-            ),
-            (
-                TextLiteral,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(purple()).dark(12))
-                    .build(),
-            ),
-            (
-                Punctuation,
-                SyntaxStyle::builder().color(neutral.dark(10)).build(),
-            ),
-            (
-                PunctuationBracket,
-                SyntaxStyle::builder().color(neutral.dark(10)).build(),
-            ),
-            (
-                PunctuationDelimiter,
-                SyntaxStyle::builder().color(neutral.dark(10)).build(),
-            ),
-            (
-                PunctuationSpecial,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                PunctuationListMarker,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(blue()).dark(12))
-                    .build(),
-            ),
-            (
-                String,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(green()).dark(12))
-                    .build(),
-            ),
-            (
-                StringSpecial,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                StringSpecialSymbol,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                StringEscape,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(blue()).dark(12))
-                    .build(),
-            ),
-            (
-                StringRegex,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(orange()).dark(12))
-                    .build(),
-            ),
-            (
-                Constructor,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(purple()).dark(12))
-                    .build(),
-            ),
-            // TODO: Continue assigning syntax colors from here
-            (
-                Variant,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Type,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                TypeBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Variable,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                VariableSpecial,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Label,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Tag,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Attribute,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Property,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Constant,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Keyword,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Enum,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Operator,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Number,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Boolean,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                ConstantBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Function,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                FunctionBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                FunctionDefinition,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                FunctionSpecialDefinition,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                FunctionMethod,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                FunctionMethodBuiltin,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Preproc,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-            (
-                Embedded,
-                SyntaxStyle::builder()
-                    .color(ColorScaleSet::from(red()).dark(12))
-                    .build(),
-            ),
-        ]))
+        Self {
+            highlights: vec![
+                ("keyword".into(), gpui2::rgba(0xb477cfff).into()),
+                ("comment.doc".into(), gpui2::rgba(0x878e98ff).into()),
+                ("variant".into(), gpui2::rgba(0x73ade9ff).into()),
+                ("property".into(), gpui2::rgba(0xd07277ff).into()),
+                ("function".into(), gpui2::rgba(0x73ade9ff).into()),
+                ("type".into(), gpui2::rgba(0x6eb4bfff).into()),
+                ("tag".into(), gpui2::rgba(0x74ade8ff).into()),
+                ("string.escape".into(), gpui2::rgba(0x878e98ff).into()),
+                ("punctuation.bracket".into(), gpui2::rgba(0xb2b9c6ff).into()),
+                ("hint".into(), gpui2::rgba(0x5a6f89ff).into()),
+                ("punctuation".into(), gpui2::rgba(0xacb2beff).into()),
+                ("comment".into(), gpui2::rgba(0x5d636fff).into()),
+                ("emphasis".into(), gpui2::rgba(0x74ade8ff).into()),
+                ("punctuation.special".into(), gpui2::rgba(0xb1574bff).into()),
+                ("link_uri".into(), gpui2::rgba(0x6eb4bfff).into()),
+                ("string.regex".into(), gpui2::rgba(0xbf956aff).into()),
+                ("constructor".into(), gpui2::rgba(0x73ade9ff).into()),
+                ("operator".into(), gpui2::rgba(0x6eb4bfff).into()),
+                ("constant".into(), gpui2::rgba(0xdfc184ff).into()),
+                ("string.special".into(), gpui2::rgba(0xbf956aff).into()),
+                ("emphasis.strong".into(), gpui2::rgba(0xbf956aff).into()),
+                (
+                    "string.special.symbol".into(),
+                    gpui2::rgba(0xbf956aff).into(),
+                ),
+                ("primary".into(), gpui2::rgba(0xacb2beff).into()),
+                ("preproc".into(), gpui2::rgba(0xc8ccd4ff).into()),
+                ("string".into(), gpui2::rgba(0xa1c181ff).into()),
+                (
+                    "punctuation.delimiter".into(),
+                    gpui2::rgba(0xb2b9c6ff).into(),
+                ),
+                ("embedded".into(), gpui2::rgba(0xc8ccd4ff).into()),
+                ("enum".into(), gpui2::rgba(0xd07277ff).into()),
+                ("variable.special".into(), gpui2::rgba(0xbf956aff).into()),
+                ("text.literal".into(), gpui2::rgba(0xa1c181ff).into()),
+                ("attribute".into(), gpui2::rgba(0x74ade8ff).into()),
+                ("link_text".into(), gpui2::rgba(0x73ade9ff).into()),
+                ("title".into(), gpui2::rgba(0xd07277ff).into()),
+                ("predictive".into(), gpui2::rgba(0x5a6a87ff).into()),
+                ("number".into(), gpui2::rgba(0xbf956aff).into()),
+                ("label".into(), gpui2::rgba(0x74ade8ff).into()),
+                ("variable".into(), gpui2::rgba(0xc8ccd4ff).into()),
+                ("boolean".into(), gpui2::rgba(0xbf956aff).into()),
+                (
+                    "punctuation.list_marker".into(),
+                    gpui2::rgba(0xd07277ff).into(),
+                ),
+            ],
+        }
     }
 }
 

crates/theme2/src/default_theme.rs 🔗

@@ -1,12 +1,12 @@
 use crate::{
     colors::{GitStatusColors, PlayerColors, StatusColors, SystemColors, ThemeColors, ThemeStyle},
-    default_color_scales, Appearance, SyntaxStyles, ThemeFamily, ThemeVariant,
+    default_color_scales, Appearance, SyntaxTheme, ThemeFamily, ThemeVariant,
 };
 
 fn zed_pro_daylight() -> ThemeVariant {
     ThemeVariant {
         id: "zed_pro_daylight".to_string(),
-        name: "Zed Pro Daylight".to_string(),
+        name: "Zed Pro Daylight".into(),
         appearance: Appearance::Light,
         styles: ThemeStyle {
             system: SystemColors::default(),
@@ -14,7 +14,7 @@ fn zed_pro_daylight() -> ThemeVariant {
             status: StatusColors::default(),
             git: GitStatusColors::default(),
             player: PlayerColors::default(),
-            syntax: SyntaxStyles::default_light(),
+            syntax: SyntaxTheme::default_light(),
         },
     }
 }
@@ -22,15 +22,15 @@ fn zed_pro_daylight() -> ThemeVariant {
 pub(crate) fn zed_pro_moonlight() -> ThemeVariant {
     ThemeVariant {
         id: "zed_pro_moonlight".to_string(),
-        name: "Zed Pro Moonlight".to_string(),
-        appearance: Appearance::Light,
+        name: "Zed Pro Moonlight".into(),
+        appearance: Appearance::Dark,
         styles: ThemeStyle {
             system: SystemColors::default(),
             colors: ThemeColors::default_dark(),
             status: StatusColors::default(),
             git: GitStatusColors::default(),
             player: PlayerColors::default(),
-            syntax: SyntaxStyles::default_dark(),
+            syntax: SyntaxTheme::default_dark(),
         },
     }
 }
@@ -38,8 +38,8 @@ pub(crate) fn zed_pro_moonlight() -> ThemeVariant {
 pub fn zed_pro_family() -> ThemeFamily {
     ThemeFamily {
         id: "zed_pro".to_string(),
-        name: "Zed Pro".to_string(),
-        author: "Zed Team".to_string(),
+        name: "Zed Pro".into(),
+        author: "Zed Team".into(),
         themes: vec![zed_pro_daylight(), zed_pro_moonlight()],
         scales: default_color_scales(),
     }

crates/theme2/src/registry.rs 🔗

@@ -1,17 +1,22 @@
-use crate::{themes, Theme, ThemeMetadata};
+use crate::{zed_pro_family, ThemeFamily, ThemeVariant};
 use anyhow::{anyhow, Result};
 use gpui2::SharedString;
 use std::{collections::HashMap, sync::Arc};
 
 pub struct ThemeRegistry {
-    themes: HashMap<SharedString, Arc<Theme>>,
+    themes: HashMap<SharedString, Arc<ThemeVariant>>,
 }
 
 impl ThemeRegistry {
-    fn insert_themes(&mut self, themes: impl IntoIterator<Item = Theme>) {
+    fn insert_theme_families(&mut self, families: impl IntoIterator<Item = ThemeFamily>) {
+        for family in families.into_iter() {
+            self.insert_themes(family.themes);
+        }
+    }
+
+    fn insert_themes(&mut self, themes: impl IntoIterator<Item = ThemeVariant>) {
         for theme in themes.into_iter() {
-            self.themes
-                .insert(theme.metadata.name.clone(), Arc::new(theme));
+            self.themes.insert(theme.name.clone(), Arc::new(theme));
         }
     }
 
@@ -19,11 +24,11 @@ impl ThemeRegistry {
         self.themes.keys().cloned()
     }
 
-    pub fn list(&self, _staff: bool) -> impl Iterator<Item = ThemeMetadata> + '_ {
-        self.themes.values().map(|theme| theme.metadata.clone())
+    pub fn list(&self, _staff: bool) -> impl Iterator<Item = SharedString> + '_ {
+        self.themes.values().map(|theme| theme.name.clone())
     }
 
-    pub fn get(&self, name: &str) -> Result<Arc<Theme>> {
+    pub fn get(&self, name: &str) -> Result<Arc<ThemeVariant>> {
         self.themes
             .get(name)
             .ok_or_else(|| anyhow!("theme not found: {}", name))
@@ -37,47 +42,7 @@ impl Default for ThemeRegistry {
             themes: HashMap::default(),
         };
 
-        this.insert_themes([
-            themes::andromeda(),
-            themes::atelier_cave_dark(),
-            themes::atelier_cave_light(),
-            themes::atelier_dune_dark(),
-            themes::atelier_dune_light(),
-            themes::atelier_estuary_dark(),
-            themes::atelier_estuary_light(),
-            themes::atelier_forest_dark(),
-            themes::atelier_forest_light(),
-            themes::atelier_heath_dark(),
-            themes::atelier_heath_light(),
-            themes::atelier_lakeside_dark(),
-            themes::atelier_lakeside_light(),
-            themes::atelier_plateau_dark(),
-            themes::atelier_plateau_light(),
-            themes::atelier_savanna_dark(),
-            themes::atelier_savanna_light(),
-            themes::atelier_seaside_dark(),
-            themes::atelier_seaside_light(),
-            themes::atelier_sulphurpool_dark(),
-            themes::atelier_sulphurpool_light(),
-            themes::ayu_dark(),
-            themes::ayu_light(),
-            themes::ayu_mirage(),
-            themes::gruvbox_dark(),
-            themes::gruvbox_dark_hard(),
-            themes::gruvbox_dark_soft(),
-            themes::gruvbox_light(),
-            themes::gruvbox_light_hard(),
-            themes::gruvbox_light_soft(),
-            themes::one_dark(),
-            themes::one_light(),
-            themes::rose_pine(),
-            themes::rose_pine_dawn(),
-            themes::rose_pine_moon(),
-            themes::sandcastle(),
-            themes::solarized_dark(),
-            themes::solarized_light(),
-            themes::summercamp(),
-        ]);
+        this.insert_theme_families([zed_pro_family()]);
 
         this
     }

crates/theme2/src/settings.rs 🔗

@@ -1,4 +1,4 @@
-use crate::{zed_pro_moonlight, Theme, ThemeRegistry, ThemeVariant};
+use crate::{ThemeRegistry, ThemeVariant};
 use anyhow::Result;
 use gpui2::{px, AppContext, Font, FontFeatures, FontStyle, FontWeight, Pixels};
 use schemars::{
@@ -21,7 +21,6 @@ pub struct ThemeSettings {
     pub buffer_font_size: Pixels,
     pub buffer_line_height: BufferLineHeight,
     pub active_theme: Arc<ThemeVariant>,
-    pub old_active_theme: Arc<Theme>,
 }
 
 #[derive(Default)]
@@ -124,8 +123,9 @@ impl settings2::Settings for ThemeSettings {
             },
             buffer_font_size: defaults.buffer_font_size.unwrap().into(),
             buffer_line_height: defaults.buffer_line_height.unwrap(),
-            active_theme: Arc::new(zed_pro_moonlight()),
-            old_active_theme: themes.get(defaults.theme.as_ref().unwrap()).unwrap(),
+            active_theme: themes.get("Zed Pro Moonlight").unwrap(),
+            // todo!(Read the theme name from the settings)
+            // active_theme: themes.get(defaults.theme.as_ref().unwrap()).unwrap(),
         };
 
         for value in user_values.into_iter().copied().cloned() {
@@ -138,7 +138,7 @@ impl settings2::Settings for ThemeSettings {
 
             if let Some(value) = &value.theme {
                 if let Some(theme) = themes.get(value).log_err() {
-                    this.old_active_theme = theme;
+                    this.active_theme = theme;
                 }
             }
 

crates/theme2/src/syntax.rs 🔗

@@ -1,227 +1,37 @@
-use gpui2::{FontWeight, Hsla, SharedString};
-use indexmap::IndexMap;
+use gpui2::{HighlightStyle, Hsla};
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum SyntaxStyleName {
-    Comment,
-    CommentDoc,
-    Primary,
-    Predictive,
-    Hint,
-    Emphasis,
-    EmphasisStrong,
-    Title,
-    LinkUri,
-    LinkText,
-    TextLiteral,
-    Punctuation,
-    PunctuationBracket,
-    PunctuationDelimiter,
-    PunctuationSpecial,
-    PunctuationListMarker,
-    String,
-    StringSpecial,
-    StringSpecialSymbol,
-    StringEscape,
-    StringRegex,
-    Constructor,
-    Variant,
-    Type,
-    TypeBuiltin,
-    Variable,
-    VariableSpecial,
-    Label,
-    Tag,
-    Attribute,
-    Property,
-    Constant,
-    Keyword,
-    Enum,
-    Operator,
-    Number,
-    Boolean,
-    ConstantBuiltin,
-    Function,
-    FunctionBuiltin,
-    FunctionDefinition,
-    FunctionSpecialDefinition,
-    FunctionMethod,
-    FunctionMethodBuiltin,
-    Preproc,
-    Embedded,
-    Custom(SharedString),
+#[derive(Clone)]
+pub struct SyntaxTheme {
+    pub highlights: Vec<(String, HighlightStyle)>,
 }
 
-impl std::str::FromStr for SyntaxStyleName {
-    type Err = ();
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(match s {
-            "attribute" => Self::Attribute,
-            "boolean" => Self::Boolean,
-            "comment" => Self::Comment,
-            "comment.doc" => Self::CommentDoc,
-            "constant" => Self::Constant,
-            "constructor" => Self::Constructor,
-            "embedded" => Self::Embedded,
-            "emphasis" => Self::Emphasis,
-            "emphasis.strong" => Self::EmphasisStrong,
-            "enum" => Self::Enum,
-            "function" => Self::Function,
-            "function.builtin" => Self::FunctionBuiltin,
-            "function.definition" => Self::FunctionDefinition,
-            "function.special_definition" => Self::FunctionSpecialDefinition,
-            "function.method" => Self::FunctionMethod,
-            "function.method_builtin" => Self::FunctionMethodBuiltin,
-            "hint" => Self::Hint,
-            "keyword" => Self::Keyword,
-            "label" => Self::Label,
-            "link_text" => Self::LinkText,
-            "link_uri" => Self::LinkUri,
-            "number" => Self::Number,
-            "operator" => Self::Operator,
-            "predictive" => Self::Predictive,
-            "preproc" => Self::Preproc,
-            "primary" => Self::Primary,
-            "property" => Self::Property,
-            "punctuation" => Self::Punctuation,
-            "punctuation.bracket" => Self::PunctuationBracket,
-            "punctuation.delimiter" => Self::PunctuationDelimiter,
-            "punctuation.list_marker" => Self::PunctuationListMarker,
-            "punctuation.special" => Self::PunctuationSpecial,
-            "string" => Self::String,
-            "string.escape" => Self::StringEscape,
-            "string.regex" => Self::StringRegex,
-            "string.special" => Self::StringSpecial,
-            "string.special.symbol" => Self::StringSpecialSymbol,
-            "tag" => Self::Tag,
-            "text.literal" => Self::TextLiteral,
-            "title" => Self::Title,
-            "type" => Self::Type,
-            "type.builtin" => Self::TypeBuiltin,
-            "variable" => Self::Variable,
-            "variable.special" => Self::VariableSpecial,
-            "constant.builtin" => Self::ConstantBuiltin,
-            "variant" => Self::Variant,
-            name => Self::Custom(name.to_string().into()),
-        })
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct SyntaxStyle {
-    pub color: Hsla,
-    pub weight: FontWeight,
-    pub underline: bool,
-    pub italic: bool,
-    // Nate: In the future I'd like to enable using background highlights for syntax highlighting
-    // pub highlight: Hsla,
-}
-
-impl SyntaxStyle {
-    pub fn builder() -> SyntaxStyleBuilder {
-        SyntaxStyleBuilder::new()
-    }
-}
-
-impl Default for SyntaxStyle {
-    fn default() -> Self {
-        Self {
-            color: gpui2::black(),
-            weight: FontWeight::default(),
-            italic: false,
-            underline: false,
-        }
-    }
-}
-
-pub struct SyntaxStyleBuilder {
-    pub color: Hsla,
-    pub weight: FontWeight,
-    pub underline: bool,
-    pub italic: bool,
-}
-
-impl SyntaxStyleBuilder {
-    pub fn new() -> Self {
-        SyntaxStyleBuilder {
-            color: gpui2::black(),
-            weight: FontWeight::default(),
-            underline: false,
-            italic: false,
-        }
-    }
-
-    pub fn color(mut self, color: Hsla) -> Self {
-        self.color = color;
-        self
-    }
-
-    pub fn weight(mut self, weight: FontWeight) -> Self {
-        self.weight = weight;
-        self
-    }
-
-    pub fn underline(mut self, underline: bool) -> Self {
-        self.underline = underline;
-        self
-    }
-
-    pub fn italic(mut self, italic: bool) -> Self {
-        self.italic = italic;
-        self
-    }
-
-    pub fn build(self) -> SyntaxStyle {
-        SyntaxStyle {
-            color: self.color,
-            weight: self.weight,
-            underline: self.underline,
-            italic: self.italic,
-        }
-    }
-}
-
-pub struct SyntaxStyles(pub IndexMap<SyntaxStyleName, SyntaxStyle>);
-
-impl SyntaxStyles {
+impl SyntaxTheme {
     // TOOD: Get this working with `#[cfg(test)]`. Why isn't it?
     pub fn new_test(colors: impl IntoIterator<Item = (&'static str, Hsla)>) -> Self {
-        Self(IndexMap::from_iter(colors.into_iter().map(
-            |(name, color)| {
-                (
-                    name.parse().unwrap(),
-                    SyntaxStyle::builder().color(color).build(),
-                )
-            },
-        )))
+        SyntaxTheme {
+            highlights: colors
+                .into_iter()
+                .map(|(key, color)| {
+                    (
+                        key.to_owned(),
+                        HighlightStyle {
+                            color: Some(color),
+                            ..Default::default()
+                        },
+                    )
+                })
+                .collect(),
+        }
     }
 
-    pub fn get(&self, name: &str) -> SyntaxStyle {
-        self.0
-            .get(&name.parse::<SyntaxStyleName>().unwrap())
-            .cloned()
+    pub fn get(&self, name: &str) -> HighlightStyle {
+        self.highlights
+            .iter()
+            .find_map(|entry| if entry.0 == name { Some(entry.1) } else { None })
             .unwrap_or_default()
     }
 
     pub fn color(&self, name: &str) -> Hsla {
-        self.get(name).color
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn parse_syntax_style_name() {
-        let name = "comment".parse::<SyntaxStyleName>().unwrap();
-        assert_eq!(name, SyntaxStyleName::Comment);
-    }
-
-    #[test]
-    fn create_custom_syntax_style_name() {
-        let name = "custom".parse::<SyntaxStyleName>().unwrap();
-        assert_eq!(name, SyntaxStyleName::Custom("custom".into()));
+        self.get(name).color.unwrap_or_default()
     }
 }

crates/theme2/src/theme2.rs 🔗

@@ -5,7 +5,6 @@ mod registry;
 mod scale;
 mod settings;
 mod syntax;
-mod themes;
 mod utils;
 
 pub use colors::*;
@@ -16,9 +15,7 @@ pub use scale::*;
 pub use settings::*;
 pub use syntax::*;
 
-use std::sync::Arc;
-
-use gpui2::{AppContext, HighlightStyle, Hsla, SharedString};
+use gpui2::{AppContext, Hsla, SharedString};
 use settings2::Settings;
 
 #[derive(Debug, Clone, PartialEq)]
@@ -45,8 +42,8 @@ impl ActiveTheme for AppContext {
 pub struct ThemeFamily {
     #[allow(dead_code)]
     pub(crate) id: String,
-    pub name: String,
-    pub author: String,
+    pub name: SharedString,
+    pub author: SharedString,
     pub themes: Vec<ThemeVariant>,
     pub scales: ColorScales,
 }
@@ -56,7 +53,7 @@ impl ThemeFamily {}
 pub struct ThemeVariant {
     #[allow(dead_code)]
     pub(crate) id: String,
-    pub name: String,
+    pub name: SharedString,
     pub appearance: Appearance,
     pub styles: ThemeStyle,
 }
@@ -68,9 +65,9 @@ impl ThemeVariant {
         &self.styles.colors
     }
 
-    /// Returns the [`SyntaxStyles`] for the theme.
+    /// Returns the [`SyntaxTheme`] for the theme.
     #[inline(always)]
-    pub fn syntax(&self) -> &SyntaxStyles {
+    pub fn syntax(&self) -> &SyntaxTheme {
         &self.styles.syntax
     }
 
@@ -80,125 +77,3 @@ impl ThemeVariant {
         self.syntax().color(name)
     }
 }
-
-pub struct Theme {
-    pub metadata: ThemeMetadata,
-
-    pub transparent: Hsla,
-    pub mac_os_traffic_light_red: Hsla,
-    pub mac_os_traffic_light_yellow: Hsla,
-    pub mac_os_traffic_light_green: Hsla,
-    pub border: Hsla,
-    pub border_variant: Hsla,
-    pub border_focused: Hsla,
-    pub border_transparent: Hsla,
-    /// The background color of an elevated surface, like a modal, tooltip or toast.
-    pub elevated_surface: Hsla,
-    pub surface: Hsla,
-    /// Window background color of the base app
-    pub background: Hsla,
-    /// Default background for elements like filled buttons,
-    /// text fields, checkboxes, radio buttons, etc.
-    /// - TODO: Map to step 3.
-    pub filled_element: Hsla,
-    /// The background color of a hovered element, like a button being hovered
-    /// with a mouse, or hovered on a touch screen.
-    /// - TODO: Map to step 4.
-    pub filled_element_hover: Hsla,
-    /// The background color of an active element, like a button being pressed,
-    /// or tapped on a touch screen.
-    /// - TODO: Map to step 5.
-    pub filled_element_active: Hsla,
-    /// The background color of a selected element, like a selected tab,
-    /// a button toggled on, or a checkbox that is checked.
-    pub filled_element_selected: Hsla,
-    pub filled_element_disabled: Hsla,
-    pub ghost_element: Hsla,
-    /// The background color of a hovered element with no default background,
-    /// like a ghost-style button or an interactable list item.
-    /// - TODO: Map to step 3.
-    pub ghost_element_hover: Hsla,
-    /// - TODO: Map to step 4.
-    pub ghost_element_active: Hsla,
-    pub ghost_element_selected: Hsla,
-    pub ghost_element_disabled: Hsla,
-    pub text: Hsla,
-    pub text_muted: Hsla,
-    pub text_placeholder: Hsla,
-    pub text_disabled: Hsla,
-    pub text_accent: Hsla,
-    pub icon_muted: Hsla,
-    pub syntax: SyntaxTheme,
-
-    pub status_bar: Hsla,
-    pub title_bar: Hsla,
-    pub toolbar: Hsla,
-    pub tab_bar: Hsla,
-    /// The background of the editor
-    pub editor: Hsla,
-    pub editor_subheader: Hsla,
-    pub editor_active_line: Hsla,
-    pub terminal: Hsla,
-    pub image_fallback_background: Hsla,
-
-    pub git_created: Hsla,
-    pub git_modified: Hsla,
-    pub git_deleted: Hsla,
-    pub git_conflict: Hsla,
-    pub git_ignored: Hsla,
-    pub git_renamed: Hsla,
-
-    pub players: [PlayerTheme; 8],
-}
-
-#[derive(Clone)]
-pub struct SyntaxTheme {
-    pub highlights: Vec<(String, HighlightStyle)>,
-}
-
-impl SyntaxTheme {
-    // TOOD: Get this working with `#[cfg(test)]`. Why isn't it?
-    pub fn new_test(colors: impl IntoIterator<Item = (&'static str, Hsla)>) -> Self {
-        SyntaxTheme {
-            highlights: colors
-                .into_iter()
-                .map(|(key, color)| {
-                    (
-                        key.to_owned(),
-                        HighlightStyle {
-                            color: Some(color),
-                            ..Default::default()
-                        },
-                    )
-                })
-                .collect(),
-        }
-    }
-
-    pub fn get(&self, name: &str) -> HighlightStyle {
-        self.highlights
-            .iter()
-            .find_map(|entry| if entry.0 == name { Some(entry.1) } else { None })
-            .unwrap_or_default()
-    }
-
-    pub fn color(&self, name: &str) -> Hsla {
-        self.get(name).color.unwrap_or_default()
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct PlayerTheme {
-    pub cursor: Hsla,
-    pub selection: Hsla,
-}
-
-#[derive(Clone)]
-pub struct ThemeMetadata {
-    pub name: SharedString,
-    pub is_light: bool,
-}
-
-pub struct Editor {
-    pub syntax: Arc<SyntaxTheme>,
-}

crates/theme2/src/themes/andromeda.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn andromeda() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Andromeda".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x2b2f38ff).into(),
-        border_variant: rgba(0x2b2f38ff).into(),
-        border_focused: rgba(0x183934ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x262933ff).into(),
-        surface: rgba(0x21242bff).into(),
-        background: rgba(0x262933ff).into(),
-        filled_element: rgba(0x262933ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x12231fff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x12231fff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf7f7f8ff).into(),
-        text_muted: rgba(0xaca8aeff).into(),
-        text_placeholder: rgba(0xf82871ff).into(),
-        text_disabled: rgba(0x6b6b73ff).into(),
-        text_accent: rgba(0x10a793ff).into(),
-        icon_muted: rgba(0xaca8aeff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("emphasis".into(), rgba(0x10a793ff).into()),
-                ("punctuation.bracket".into(), rgba(0xd8d5dbff).into()),
-                ("attribute".into(), rgba(0x10a793ff).into()),
-                ("variable".into(), rgba(0xf7f7f8ff).into()),
-                ("predictive".into(), rgba(0x315f70ff).into()),
-                ("property".into(), rgba(0x10a793ff).into()),
-                ("variant".into(), rgba(0x10a793ff).into()),
-                ("embedded".into(), rgba(0xf7f7f8ff).into()),
-                ("string.special".into(), rgba(0xf29c14ff).into()),
-                ("keyword".into(), rgba(0x10a793ff).into()),
-                ("tag".into(), rgba(0x10a793ff).into()),
-                ("enum".into(), rgba(0xf29c14ff).into()),
-                ("link_text".into(), rgba(0xf29c14ff).into()),
-                ("primary".into(), rgba(0xf7f7f8ff).into()),
-                ("punctuation".into(), rgba(0xd8d5dbff).into()),
-                ("punctuation.special".into(), rgba(0xd8d5dbff).into()),
-                ("function".into(), rgba(0xfee56cff).into()),
-                ("number".into(), rgba(0x96df71ff).into()),
-                ("preproc".into(), rgba(0xf7f7f8ff).into()),
-                ("operator".into(), rgba(0xf29c14ff).into()),
-                ("constructor".into(), rgba(0x10a793ff).into()),
-                ("string.escape".into(), rgba(0xafabb1ff).into()),
-                ("string.special.symbol".into(), rgba(0xf29c14ff).into()),
-                ("string".into(), rgba(0xf29c14ff).into()),
-                ("comment".into(), rgba(0xafabb1ff).into()),
-                ("hint".into(), rgba(0x618399ff).into()),
-                ("type".into(), rgba(0x08e7c5ff).into()),
-                ("label".into(), rgba(0x10a793ff).into()),
-                ("comment.doc".into(), rgba(0xafabb1ff).into()),
-                ("text.literal".into(), rgba(0xf29c14ff).into()),
-                ("constant".into(), rgba(0x96df71ff).into()),
-                ("string.regex".into(), rgba(0xf29c14ff).into()),
-                ("emphasis.strong".into(), rgba(0x10a793ff).into()),
-                ("title".into(), rgba(0xf7f7f8ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xd8d5dbff).into()),
-                ("link_uri".into(), rgba(0x96df71ff).into()),
-                ("boolean".into(), rgba(0x96df71ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xd8d5dbff).into()),
-            ],
-        },
-        status_bar: rgba(0x262933ff).into(),
-        title_bar: rgba(0x262933ff).into(),
-        toolbar: rgba(0x1e2025ff).into(),
-        tab_bar: rgba(0x21242bff).into(),
-        editor: rgba(0x1e2025ff).into(),
-        editor_subheader: rgba(0x21242bff).into(),
-        editor_active_line: rgba(0x21242bff).into(),
-        terminal: rgba(0x1e2025ff).into(),
-        image_fallback_background: rgba(0x262933ff).into(),
-        git_created: rgba(0x96df71ff).into(),
-        git_modified: rgba(0x10a793ff).into(),
-        git_deleted: rgba(0xf82871ff).into(),
-        git_conflict: rgba(0xfee56cff).into(),
-        git_ignored: rgba(0x6b6b73ff).into(),
-        git_renamed: rgba(0xfee56cff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x10a793ff).into(),
-                selection: rgba(0x10a7933d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x96df71ff).into(),
-                selection: rgba(0x96df713d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc74cecff).into(),
-                selection: rgba(0xc74cec3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf29c14ff).into(),
-                selection: rgba(0xf29c143d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x893ea6ff).into(),
-                selection: rgba(0x893ea63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x08e7c5ff).into(),
-                selection: rgba(0x08e7c53d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf82871ff).into(),
-                selection: rgba(0xf828713d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfee56cff).into(),
-                selection: rgba(0xfee56c3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_cave_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_cave_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Cave Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x56505eff).into(),
-        border_variant: rgba(0x56505eff).into(),
-        border_focused: rgba(0x222953ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x3a353fff).into(),
-        surface: rgba(0x221f26ff).into(),
-        background: rgba(0x3a353fff).into(),
-        filled_element: rgba(0x3a353fff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x161a35ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x161a35ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xefecf4ff).into(),
-        text_muted: rgba(0x898591ff).into(),
-        text_placeholder: rgba(0xbe4677ff).into(),
-        text_disabled: rgba(0x756f7eff).into(),
-        text_accent: rgba(0x566ddaff).into(),
-        icon_muted: rgba(0x898591ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("comment.doc".into(), rgba(0x8b8792ff).into()),
-                ("tag".into(), rgba(0x566ddaff).into()),
-                ("link_text".into(), rgba(0xaa563bff).into()),
-                ("constructor".into(), rgba(0x566ddaff).into()),
-                ("punctuation".into(), rgba(0xe2dfe7ff).into()),
-                ("punctuation.special".into(), rgba(0xbf3fbfff).into()),
-                ("string.special.symbol".into(), rgba(0x299292ff).into()),
-                ("string.escape".into(), rgba(0x8b8792ff).into()),
-                ("emphasis".into(), rgba(0x566ddaff).into()),
-                ("type".into(), rgba(0xa06d3aff).into()),
-                ("punctuation.delimiter".into(), rgba(0x8b8792ff).into()),
-                ("variant".into(), rgba(0xa06d3aff).into()),
-                ("variable.special".into(), rgba(0x9559e7ff).into()),
-                ("text.literal".into(), rgba(0xaa563bff).into()),
-                ("punctuation.list_marker".into(), rgba(0xe2dfe7ff).into()),
-                ("comment".into(), rgba(0x655f6dff).into()),
-                ("function.method".into(), rgba(0x576cdbff).into()),
-                ("property".into(), rgba(0xbe4677ff).into()),
-                ("operator".into(), rgba(0x8b8792ff).into()),
-                ("emphasis.strong".into(), rgba(0x566ddaff).into()),
-                ("label".into(), rgba(0x566ddaff).into()),
-                ("enum".into(), rgba(0xaa563bff).into()),
-                ("number".into(), rgba(0xaa563bff).into()),
-                ("primary".into(), rgba(0xe2dfe7ff).into()),
-                ("keyword".into(), rgba(0x9559e7ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa06d3aff).into(),
-                ),
-                ("punctuation.bracket".into(), rgba(0x8b8792ff).into()),
-                ("constant".into(), rgba(0x2b9292ff).into()),
-                ("string.special".into(), rgba(0xbf3fbfff).into()),
-                ("title".into(), rgba(0xefecf4ff).into()),
-                ("preproc".into(), rgba(0xefecf4ff).into()),
-                ("link_uri".into(), rgba(0x2b9292ff).into()),
-                ("string".into(), rgba(0x299292ff).into()),
-                ("embedded".into(), rgba(0xefecf4ff).into()),
-                ("hint".into(), rgba(0x706897ff).into()),
-                ("boolean".into(), rgba(0x2b9292ff).into()),
-                ("variable".into(), rgba(0xe2dfe7ff).into()),
-                ("predictive".into(), rgba(0x615787ff).into()),
-                ("string.regex".into(), rgba(0x388bc6ff).into()),
-                ("function".into(), rgba(0x576cdbff).into()),
-                ("attribute".into(), rgba(0x566ddaff).into()),
-            ],
-        },
-        status_bar: rgba(0x3a353fff).into(),
-        title_bar: rgba(0x3a353fff).into(),
-        toolbar: rgba(0x19171cff).into(),
-        tab_bar: rgba(0x221f26ff).into(),
-        editor: rgba(0x19171cff).into(),
-        editor_subheader: rgba(0x221f26ff).into(),
-        editor_active_line: rgba(0x221f26ff).into(),
-        terminal: rgba(0x19171cff).into(),
-        image_fallback_background: rgba(0x3a353fff).into(),
-        git_created: rgba(0x2b9292ff).into(),
-        git_modified: rgba(0x566ddaff).into(),
-        git_deleted: rgba(0xbe4677ff).into(),
-        git_conflict: rgba(0xa06d3aff).into(),
-        git_ignored: rgba(0x756f7eff).into(),
-        git_renamed: rgba(0xa06d3aff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x566ddaff).into(),
-                selection: rgba(0x566dda3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2b9292ff).into(),
-                selection: rgba(0x2b92923d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbf41bfff).into(),
-                selection: rgba(0xbf41bf3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xaa563bff).into(),
-                selection: rgba(0xaa563b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x955ae6ff).into(),
-                selection: rgba(0x955ae63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x3a8bc6ff).into(),
-                selection: rgba(0x3a8bc63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbe4677ff).into(),
-                selection: rgba(0xbe46773d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa06d3aff).into(),
-                selection: rgba(0xa06d3a3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_cave_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_cave_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Cave Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x8f8b96ff).into(),
-        border_variant: rgba(0x8f8b96ff).into(),
-        border_focused: rgba(0xc8c7f2ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xbfbcc5ff).into(),
-        surface: rgba(0xe6e3ebff).into(),
-        background: rgba(0xbfbcc5ff).into(),
-        filled_element: rgba(0xbfbcc5ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xe1e0f9ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xe1e0f9ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x19171cff).into(),
-        text_muted: rgba(0x5a5462ff).into(),
-        text_placeholder: rgba(0xbd4677ff).into(),
-        text_disabled: rgba(0x6e6876ff).into(),
-        text_accent: rgba(0x586cdaff).into(),
-        icon_muted: rgba(0x5a5462ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("link_text".into(), rgba(0xaa573cff).into()),
-                ("string".into(), rgba(0x299292ff).into()),
-                ("emphasis".into(), rgba(0x586cdaff).into()),
-                ("label".into(), rgba(0x586cdaff).into()),
-                ("property".into(), rgba(0xbe4677ff).into()),
-                ("emphasis.strong".into(), rgba(0x586cdaff).into()),
-                ("constant".into(), rgba(0x2b9292ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa06d3aff).into(),
-                ),
-                ("embedded".into(), rgba(0x19171cff).into()),
-                ("punctuation.special".into(), rgba(0xbf3fbfff).into()),
-                ("function".into(), rgba(0x576cdbff).into()),
-                ("tag".into(), rgba(0x586cdaff).into()),
-                ("number".into(), rgba(0xaa563bff).into()),
-                ("primary".into(), rgba(0x26232aff).into()),
-                ("text.literal".into(), rgba(0xaa573cff).into()),
-                ("variant".into(), rgba(0xa06d3aff).into()),
-                ("type".into(), rgba(0xa06d3aff).into()),
-                ("punctuation".into(), rgba(0x26232aff).into()),
-                ("string.escape".into(), rgba(0x585260ff).into()),
-                ("keyword".into(), rgba(0x9559e7ff).into()),
-                ("title".into(), rgba(0x19171cff).into()),
-                ("constructor".into(), rgba(0x586cdaff).into()),
-                ("punctuation.list_marker".into(), rgba(0x26232aff).into()),
-                ("string.special".into(), rgba(0xbf3fbfff).into()),
-                ("operator".into(), rgba(0x585260ff).into()),
-                ("function.method".into(), rgba(0x576cdbff).into()),
-                ("link_uri".into(), rgba(0x2b9292ff).into()),
-                ("variable.special".into(), rgba(0x9559e7ff).into()),
-                ("hint".into(), rgba(0x776d9dff).into()),
-                ("punctuation.bracket".into(), rgba(0x585260ff).into()),
-                ("string.special.symbol".into(), rgba(0x299292ff).into()),
-                ("predictive".into(), rgba(0x887fafff).into()),
-                ("attribute".into(), rgba(0x586cdaff).into()),
-                ("enum".into(), rgba(0xaa573cff).into()),
-                ("preproc".into(), rgba(0x19171cff).into()),
-                ("boolean".into(), rgba(0x2b9292ff).into()),
-                ("variable".into(), rgba(0x26232aff).into()),
-                ("comment.doc".into(), rgba(0x585260ff).into()),
-                ("string.regex".into(), rgba(0x388bc6ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x585260ff).into()),
-                ("comment".into(), rgba(0x7d7787ff).into()),
-            ],
-        },
-        status_bar: rgba(0xbfbcc5ff).into(),
-        title_bar: rgba(0xbfbcc5ff).into(),
-        toolbar: rgba(0xefecf4ff).into(),
-        tab_bar: rgba(0xe6e3ebff).into(),
-        editor: rgba(0xefecf4ff).into(),
-        editor_subheader: rgba(0xe6e3ebff).into(),
-        editor_active_line: rgba(0xe6e3ebff).into(),
-        terminal: rgba(0xefecf4ff).into(),
-        image_fallback_background: rgba(0xbfbcc5ff).into(),
-        git_created: rgba(0x2b9292ff).into(),
-        git_modified: rgba(0x586cdaff).into(),
-        git_deleted: rgba(0xbd4677ff).into(),
-        git_conflict: rgba(0xa06e3bff).into(),
-        git_ignored: rgba(0x6e6876ff).into(),
-        git_renamed: rgba(0xa06e3bff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x586cdaff).into(),
-                selection: rgba(0x586cda3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2b9292ff).into(),
-                selection: rgba(0x2b92923d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbf41bfff).into(),
-                selection: rgba(0xbf41bf3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xaa573cff).into(),
-                selection: rgba(0xaa573c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x955ae6ff).into(),
-                selection: rgba(0x955ae63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x3a8bc6ff).into(),
-                selection: rgba(0x3a8bc63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbd4677ff).into(),
-                selection: rgba(0xbd46773d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa06e3bff).into(),
-                selection: rgba(0xa06e3b3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_dune_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_dune_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Dune Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x6c695cff).into(),
-        border_variant: rgba(0x6c695cff).into(),
-        border_focused: rgba(0x262f56ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x45433bff).into(),
-        surface: rgba(0x262622ff).into(),
-        background: rgba(0x45433bff).into(),
-        filled_element: rgba(0x45433bff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x171e38ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x171e38ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xfefbecff).into(),
-        text_muted: rgba(0xa4a08bff).into(),
-        text_placeholder: rgba(0xd73837ff).into(),
-        text_disabled: rgba(0x8f8b77ff).into(),
-        text_accent: rgba(0x6684e0ff).into(),
-        icon_muted: rgba(0xa4a08bff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("constructor".into(), rgba(0x6684e0ff).into()),
-                ("punctuation".into(), rgba(0xe8e4cfff).into()),
-                ("punctuation.delimiter".into(), rgba(0xa6a28cff).into()),
-                ("string.special".into(), rgba(0xd43451ff).into()),
-                ("string.escape".into(), rgba(0xa6a28cff).into()),
-                ("comment".into(), rgba(0x7d7a68ff).into()),
-                ("enum".into(), rgba(0xb65611ff).into()),
-                ("variable.special".into(), rgba(0xb854d4ff).into()),
-                ("primary".into(), rgba(0xe8e4cfff).into()),
-                ("comment.doc".into(), rgba(0xa6a28cff).into()),
-                ("label".into(), rgba(0x6684e0ff).into()),
-                ("operator".into(), rgba(0xa6a28cff).into()),
-                ("string".into(), rgba(0x5fac38ff).into()),
-                ("variant".into(), rgba(0xae9512ff).into()),
-                ("variable".into(), rgba(0xe8e4cfff).into()),
-                ("function.method".into(), rgba(0x6583e1ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xae9512ff).into(),
-                ),
-                ("string.regex".into(), rgba(0x1ead82ff).into()),
-                ("emphasis.strong".into(), rgba(0x6684e0ff).into()),
-                ("punctuation.special".into(), rgba(0xd43451ff).into()),
-                ("punctuation.bracket".into(), rgba(0xa6a28cff).into()),
-                ("link_text".into(), rgba(0xb65611ff).into()),
-                ("link_uri".into(), rgba(0x5fac39ff).into()),
-                ("boolean".into(), rgba(0x5fac39ff).into()),
-                ("hint".into(), rgba(0xb17272ff).into()),
-                ("tag".into(), rgba(0x6684e0ff).into()),
-                ("function".into(), rgba(0x6583e1ff).into()),
-                ("title".into(), rgba(0xfefbecff).into()),
-                ("property".into(), rgba(0xd73737ff).into()),
-                ("type".into(), rgba(0xae9512ff).into()),
-                ("constant".into(), rgba(0x5fac39ff).into()),
-                ("attribute".into(), rgba(0x6684e0ff).into()),
-                ("predictive".into(), rgba(0x9c6262ff).into()),
-                ("string.special.symbol".into(), rgba(0x5fac38ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xe8e4cfff).into()),
-                ("emphasis".into(), rgba(0x6684e0ff).into()),
-                ("keyword".into(), rgba(0xb854d4ff).into()),
-                ("text.literal".into(), rgba(0xb65611ff).into()),
-                ("number".into(), rgba(0xb65610ff).into()),
-                ("preproc".into(), rgba(0xfefbecff).into()),
-                ("embedded".into(), rgba(0xfefbecff).into()),
-            ],
-        },
-        status_bar: rgba(0x45433bff).into(),
-        title_bar: rgba(0x45433bff).into(),
-        toolbar: rgba(0x20201dff).into(),
-        tab_bar: rgba(0x262622ff).into(),
-        editor: rgba(0x20201dff).into(),
-        editor_subheader: rgba(0x262622ff).into(),
-        editor_active_line: rgba(0x262622ff).into(),
-        terminal: rgba(0x20201dff).into(),
-        image_fallback_background: rgba(0x45433bff).into(),
-        git_created: rgba(0x5fac39ff).into(),
-        git_modified: rgba(0x6684e0ff).into(),
-        git_deleted: rgba(0xd73837ff).into(),
-        git_conflict: rgba(0xae9414ff).into(),
-        git_ignored: rgba(0x8f8b77ff).into(),
-        git_renamed: rgba(0xae9414ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x6684e0ff).into(),
-                selection: rgba(0x6684e03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5fac39ff).into(),
-                selection: rgba(0x5fac393d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd43651ff).into(),
-                selection: rgba(0xd436513d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb65611ff).into(),
-                selection: rgba(0xb656113d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb854d3ff).into(),
-                selection: rgba(0xb854d33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x20ad83ff).into(),
-                selection: rgba(0x20ad833d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd73837ff).into(),
-                selection: rgba(0xd738373d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xae9414ff).into(),
-                selection: rgba(0xae94143d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_dune_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_dune_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Dune Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xa8a48eff).into(),
-        border_variant: rgba(0xa8a48eff).into(),
-        border_focused: rgba(0xcdd1f5ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xcecab4ff).into(),
-        surface: rgba(0xeeebd7ff).into(),
-        background: rgba(0xcecab4ff).into(),
-        filled_element: rgba(0xcecab4ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xe3e5faff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xe3e5faff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x20201dff).into(),
-        text_muted: rgba(0x706d5fff).into(),
-        text_placeholder: rgba(0xd73737ff).into(),
-        text_disabled: rgba(0x878471ff).into(),
-        text_accent: rgba(0x6684dfff).into(),
-        icon_muted: rgba(0x706d5fff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("primary".into(), rgba(0x292824ff).into()),
-                ("comment".into(), rgba(0x999580ff).into()),
-                ("type".into(), rgba(0xae9512ff).into()),
-                ("variant".into(), rgba(0xae9512ff).into()),
-                ("label".into(), rgba(0x6684dfff).into()),
-                ("function.method".into(), rgba(0x6583e1ff).into()),
-                ("variable.special".into(), rgba(0xb854d4ff).into()),
-                ("string.regex".into(), rgba(0x1ead82ff).into()),
-                ("property".into(), rgba(0xd73737ff).into()),
-                ("keyword".into(), rgba(0xb854d4ff).into()),
-                ("number".into(), rgba(0xb65610ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x292824ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xae9512ff).into(),
-                ),
-                ("punctuation.special".into(), rgba(0xd43451ff).into()),
-                ("punctuation".into(), rgba(0x292824ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x6e6b5eff).into()),
-                ("tag".into(), rgba(0x6684dfff).into()),
-                ("link_text".into(), rgba(0xb65712ff).into()),
-                ("boolean".into(), rgba(0x61ac39ff).into()),
-                ("hint".into(), rgba(0xb37979ff).into()),
-                ("operator".into(), rgba(0x6e6b5eff).into()),
-                ("constant".into(), rgba(0x61ac39ff).into()),
-                ("function".into(), rgba(0x6583e1ff).into()),
-                ("text.literal".into(), rgba(0xb65712ff).into()),
-                ("string.special.symbol".into(), rgba(0x5fac38ff).into()),
-                ("attribute".into(), rgba(0x6684dfff).into()),
-                ("emphasis".into(), rgba(0x6684dfff).into()),
-                ("preproc".into(), rgba(0x20201dff).into()),
-                ("comment.doc".into(), rgba(0x6e6b5eff).into()),
-                ("punctuation.bracket".into(), rgba(0x6e6b5eff).into()),
-                ("string".into(), rgba(0x5fac38ff).into()),
-                ("enum".into(), rgba(0xb65712ff).into()),
-                ("variable".into(), rgba(0x292824ff).into()),
-                ("string.special".into(), rgba(0xd43451ff).into()),
-                ("embedded".into(), rgba(0x20201dff).into()),
-                ("emphasis.strong".into(), rgba(0x6684dfff).into()),
-                ("predictive".into(), rgba(0xc88a8aff).into()),
-                ("title".into(), rgba(0x20201dff).into()),
-                ("constructor".into(), rgba(0x6684dfff).into()),
-                ("link_uri".into(), rgba(0x61ac39ff).into()),
-                ("string.escape".into(), rgba(0x6e6b5eff).into()),
-            ],
-        },
-        status_bar: rgba(0xcecab4ff).into(),
-        title_bar: rgba(0xcecab4ff).into(),
-        toolbar: rgba(0xfefbecff).into(),
-        tab_bar: rgba(0xeeebd7ff).into(),
-        editor: rgba(0xfefbecff).into(),
-        editor_subheader: rgba(0xeeebd7ff).into(),
-        editor_active_line: rgba(0xeeebd7ff).into(),
-        terminal: rgba(0xfefbecff).into(),
-        image_fallback_background: rgba(0xcecab4ff).into(),
-        git_created: rgba(0x61ac39ff).into(),
-        git_modified: rgba(0x6684dfff).into(),
-        git_deleted: rgba(0xd73737ff).into(),
-        git_conflict: rgba(0xae9414ff).into(),
-        git_ignored: rgba(0x878471ff).into(),
-        git_renamed: rgba(0xae9414ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x6684dfff).into(),
-                selection: rgba(0x6684df3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x61ac39ff).into(),
-                selection: rgba(0x61ac393d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd43652ff).into(),
-                selection: rgba(0xd436523d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb65712ff).into(),
-                selection: rgba(0xb657123d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb755d3ff).into(),
-                selection: rgba(0xb755d33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x21ad82ff).into(),
-                selection: rgba(0x21ad823d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd73737ff).into(),
-                selection: rgba(0xd737373d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xae9414ff).into(),
-                selection: rgba(0xae94143d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_estuary_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_estuary_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Estuary Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x5d5c4cff).into(),
-        border_variant: rgba(0x5d5c4cff).into(),
-        border_focused: rgba(0x1c3927ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x424136ff).into(),
-        surface: rgba(0x2c2b23ff).into(),
-        background: rgba(0x424136ff).into(),
-        filled_element: rgba(0x424136ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x142319ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x142319ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf4f3ecff).into(),
-        text_muted: rgba(0x91907fff).into(),
-        text_placeholder: rgba(0xba6136ff).into(),
-        text_disabled: rgba(0x7d7c6aff).into(),
-        text_accent: rgba(0x36a165ff).into(),
-        icon_muted: rgba(0x91907fff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("string.special.symbol".into(), rgba(0x7c9725ff).into()),
-                ("comment".into(), rgba(0x6c6b5aff).into()),
-                ("operator".into(), rgba(0x929181ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x929181ff).into()),
-                ("keyword".into(), rgba(0x5f9182ff).into()),
-                ("punctuation.special".into(), rgba(0x9d6b7bff).into()),
-                ("preproc".into(), rgba(0xf4f3ecff).into()),
-                ("title".into(), rgba(0xf4f3ecff).into()),
-                ("string.escape".into(), rgba(0x929181ff).into()),
-                ("boolean".into(), rgba(0x7d9726ff).into()),
-                ("punctuation.bracket".into(), rgba(0x929181ff).into()),
-                ("emphasis.strong".into(), rgba(0x36a165ff).into()),
-                ("string".into(), rgba(0x7c9725ff).into()),
-                ("constant".into(), rgba(0x7d9726ff).into()),
-                ("link_text".into(), rgba(0xae7214ff).into()),
-                ("tag".into(), rgba(0x36a165ff).into()),
-                ("hint".into(), rgba(0x6f815aff).into()),
-                ("punctuation".into(), rgba(0xe7e6dfff).into()),
-                ("string.regex".into(), rgba(0x5a9d47ff).into()),
-                ("variant".into(), rgba(0xa5980cff).into()),
-                ("type".into(), rgba(0xa5980cff).into()),
-                ("attribute".into(), rgba(0x36a165ff).into()),
-                ("emphasis".into(), rgba(0x36a165ff).into()),
-                ("enum".into(), rgba(0xae7214ff).into()),
-                ("number".into(), rgba(0xae7312ff).into()),
-                ("property".into(), rgba(0xba6135ff).into()),
-                ("predictive".into(), rgba(0x5f724cff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa5980cff).into(),
-                ),
-                ("link_uri".into(), rgba(0x7d9726ff).into()),
-                ("variable.special".into(), rgba(0x5f9182ff).into()),
-                ("text.literal".into(), rgba(0xae7214ff).into()),
-                ("label".into(), rgba(0x36a165ff).into()),
-                ("primary".into(), rgba(0xe7e6dfff).into()),
-                ("variable".into(), rgba(0xe7e6dfff).into()),
-                ("embedded".into(), rgba(0xf4f3ecff).into()),
-                ("function.method".into(), rgba(0x35a166ff).into()),
-                ("comment.doc".into(), rgba(0x929181ff).into()),
-                ("string.special".into(), rgba(0x9d6b7bff).into()),
-                ("constructor".into(), rgba(0x36a165ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xe7e6dfff).into()),
-                ("function".into(), rgba(0x35a166ff).into()),
-            ],
-        },
-        status_bar: rgba(0x424136ff).into(),
-        title_bar: rgba(0x424136ff).into(),
-        toolbar: rgba(0x22221bff).into(),
-        tab_bar: rgba(0x2c2b23ff).into(),
-        editor: rgba(0x22221bff).into(),
-        editor_subheader: rgba(0x2c2b23ff).into(),
-        editor_active_line: rgba(0x2c2b23ff).into(),
-        terminal: rgba(0x22221bff).into(),
-        image_fallback_background: rgba(0x424136ff).into(),
-        git_created: rgba(0x7d9726ff).into(),
-        git_modified: rgba(0x36a165ff).into(),
-        git_deleted: rgba(0xba6136ff).into(),
-        git_conflict: rgba(0xa5980fff).into(),
-        git_ignored: rgba(0x7d7c6aff).into(),
-        git_renamed: rgba(0xa5980fff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x36a165ff).into(),
-                selection: rgba(0x36a1653d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7d9726ff).into(),
-                selection: rgba(0x7d97263d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9d6b7bff).into(),
-                selection: rgba(0x9d6b7b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xae7214ff).into(),
-                selection: rgba(0xae72143d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5f9182ff).into(),
-                selection: rgba(0x5f91823d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5a9d47ff).into(),
-                selection: rgba(0x5a9d473d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xba6136ff).into(),
-                selection: rgba(0xba61363d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa5980fff).into(),
-                selection: rgba(0xa5980f3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_estuary_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_estuary_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Estuary Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x969585ff).into(),
-        border_variant: rgba(0x969585ff).into(),
-        border_focused: rgba(0xbbddc6ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xc5c4b9ff).into(),
-        surface: rgba(0xebeae3ff).into(),
-        background: rgba(0xc5c4b9ff).into(),
-        filled_element: rgba(0xc5c4b9ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xd9ecdfff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xd9ecdfff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x22221bff).into(),
-        text_muted: rgba(0x61604fff).into(),
-        text_placeholder: rgba(0xba6336ff).into(),
-        text_disabled: rgba(0x767463ff).into(),
-        text_accent: rgba(0x37a165ff).into(),
-        icon_muted: rgba(0x61604fff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("string.special".into(), rgba(0x9d6b7bff).into()),
-                ("link_text".into(), rgba(0xae7214ff).into()),
-                ("emphasis.strong".into(), rgba(0x37a165ff).into()),
-                ("tag".into(), rgba(0x37a165ff).into()),
-                ("primary".into(), rgba(0x302f27ff).into()),
-                ("emphasis".into(), rgba(0x37a165ff).into()),
-                ("hint".into(), rgba(0x758961ff).into()),
-                ("title".into(), rgba(0x22221bff).into()),
-                ("string.regex".into(), rgba(0x5a9d47ff).into()),
-                ("attribute".into(), rgba(0x37a165ff).into()),
-                ("string.escape".into(), rgba(0x5f5e4eff).into()),
-                ("embedded".into(), rgba(0x22221bff).into()),
-                ("punctuation.bracket".into(), rgba(0x5f5e4eff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa5980cff).into(),
-                ),
-                ("operator".into(), rgba(0x5f5e4eff).into()),
-                ("constant".into(), rgba(0x7c9728ff).into()),
-                ("comment.doc".into(), rgba(0x5f5e4eff).into()),
-                ("label".into(), rgba(0x37a165ff).into()),
-                ("variable".into(), rgba(0x302f27ff).into()),
-                ("punctuation".into(), rgba(0x302f27ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x5f5e4eff).into()),
-                ("comment".into(), rgba(0x878573ff).into()),
-                ("punctuation.special".into(), rgba(0x9d6b7bff).into()),
-                ("string.special.symbol".into(), rgba(0x7c9725ff).into()),
-                ("enum".into(), rgba(0xae7214ff).into()),
-                ("variable.special".into(), rgba(0x5f9182ff).into()),
-                ("link_uri".into(), rgba(0x7c9728ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x302f27ff).into()),
-                ("number".into(), rgba(0xae7312ff).into()),
-                ("function".into(), rgba(0x35a166ff).into()),
-                ("text.literal".into(), rgba(0xae7214ff).into()),
-                ("boolean".into(), rgba(0x7c9728ff).into()),
-                ("predictive".into(), rgba(0x879a72ff).into()),
-                ("type".into(), rgba(0xa5980cff).into()),
-                ("constructor".into(), rgba(0x37a165ff).into()),
-                ("property".into(), rgba(0xba6135ff).into()),
-                ("keyword".into(), rgba(0x5f9182ff).into()),
-                ("function.method".into(), rgba(0x35a166ff).into()),
-                ("variant".into(), rgba(0xa5980cff).into()),
-                ("string".into(), rgba(0x7c9725ff).into()),
-                ("preproc".into(), rgba(0x22221bff).into()),
-            ],
-        },
-        status_bar: rgba(0xc5c4b9ff).into(),
-        title_bar: rgba(0xc5c4b9ff).into(),
-        toolbar: rgba(0xf4f3ecff).into(),
-        tab_bar: rgba(0xebeae3ff).into(),
-        editor: rgba(0xf4f3ecff).into(),
-        editor_subheader: rgba(0xebeae3ff).into(),
-        editor_active_line: rgba(0xebeae3ff).into(),
-        terminal: rgba(0xf4f3ecff).into(),
-        image_fallback_background: rgba(0xc5c4b9ff).into(),
-        git_created: rgba(0x7c9728ff).into(),
-        git_modified: rgba(0x37a165ff).into(),
-        git_deleted: rgba(0xba6336ff).into(),
-        git_conflict: rgba(0xa5980fff).into(),
-        git_ignored: rgba(0x767463ff).into(),
-        git_renamed: rgba(0xa5980fff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x37a165ff).into(),
-                selection: rgba(0x37a1653d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7c9728ff).into(),
-                selection: rgba(0x7c97283d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9d6b7bff).into(),
-                selection: rgba(0x9d6b7b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xae7214ff).into(),
-                selection: rgba(0xae72143d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5f9182ff).into(),
-                selection: rgba(0x5f91823d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5c9d49ff).into(),
-                selection: rgba(0x5c9d493d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xba6336ff).into(),
-                selection: rgba(0xba63363d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa5980fff).into(),
-                selection: rgba(0xa5980f3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_forest_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_forest_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Forest Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x665f5cff).into(),
-        border_variant: rgba(0x665f5cff).into(),
-        border_focused: rgba(0x182d5bff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x443c39ff).into(),
-        surface: rgba(0x27211eff).into(),
-        background: rgba(0x443c39ff).into(),
-        filled_element: rgba(0x443c39ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x0f1c3dff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x0f1c3dff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf0eeedff).into(),
-        text_muted: rgba(0xa79f9dff).into(),
-        text_placeholder: rgba(0xf22c3fff).into(),
-        text_disabled: rgba(0x8e8683ff).into(),
-        text_accent: rgba(0x407ee6ff).into(),
-        icon_muted: rgba(0xa79f9dff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("link_uri".into(), rgba(0x7a9726ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xe6e2e0ff).into()),
-                ("type".into(), rgba(0xc38417ff).into()),
-                ("punctuation.bracket".into(), rgba(0xa8a19fff).into()),
-                ("punctuation".into(), rgba(0xe6e2e0ff).into()),
-                ("preproc".into(), rgba(0xf0eeedff).into()),
-                ("punctuation.special".into(), rgba(0xc33ff3ff).into()),
-                ("variable.special".into(), rgba(0x6666eaff).into()),
-                ("tag".into(), rgba(0x407ee6ff).into()),
-                ("constructor".into(), rgba(0x407ee6ff).into()),
-                ("title".into(), rgba(0xf0eeedff).into()),
-                ("hint".into(), rgba(0xa77087ff).into()),
-                ("constant".into(), rgba(0x7a9726ff).into()),
-                ("number".into(), rgba(0xdf521fff).into()),
-                ("emphasis.strong".into(), rgba(0x407ee6ff).into()),
-                ("boolean".into(), rgba(0x7a9726ff).into()),
-                ("comment".into(), rgba(0x766e6bff).into()),
-                ("string.special".into(), rgba(0xc33ff3ff).into()),
-                ("text.literal".into(), rgba(0xdf5321ff).into()),
-                ("string.regex".into(), rgba(0x3c96b8ff).into()),
-                ("enum".into(), rgba(0xdf5321ff).into()),
-                ("operator".into(), rgba(0xa8a19fff).into()),
-                ("embedded".into(), rgba(0xf0eeedff).into()),
-                ("string.special.symbol".into(), rgba(0x7a9725ff).into()),
-                ("predictive".into(), rgba(0x8f5b70ff).into()),
-                ("comment.doc".into(), rgba(0xa8a19fff).into()),
-                ("variant".into(), rgba(0xc38417ff).into()),
-                ("label".into(), rgba(0x407ee6ff).into()),
-                ("property".into(), rgba(0xf22c40ff).into()),
-                ("keyword".into(), rgba(0x6666eaff).into()),
-                ("function".into(), rgba(0x3f7ee7ff).into()),
-                ("string.escape".into(), rgba(0xa8a19fff).into()),
-                ("string".into(), rgba(0x7a9725ff).into()),
-                ("primary".into(), rgba(0xe6e2e0ff).into()),
-                ("function.method".into(), rgba(0x3f7ee7ff).into()),
-                ("link_text".into(), rgba(0xdf5321ff).into()),
-                ("attribute".into(), rgba(0x407ee6ff).into()),
-                ("emphasis".into(), rgba(0x407ee6ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xc38417ff).into(),
-                ),
-                ("variable".into(), rgba(0xe6e2e0ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xa8a19fff).into()),
-            ],
-        },
-        status_bar: rgba(0x443c39ff).into(),
-        title_bar: rgba(0x443c39ff).into(),
-        toolbar: rgba(0x1b1918ff).into(),
-        tab_bar: rgba(0x27211eff).into(),
-        editor: rgba(0x1b1918ff).into(),
-        editor_subheader: rgba(0x27211eff).into(),
-        editor_active_line: rgba(0x27211eff).into(),
-        terminal: rgba(0x1b1918ff).into(),
-        image_fallback_background: rgba(0x443c39ff).into(),
-        git_created: rgba(0x7a9726ff).into(),
-        git_modified: rgba(0x407ee6ff).into(),
-        git_deleted: rgba(0xf22c3fff).into(),
-        git_conflict: rgba(0xc38418ff).into(),
-        git_ignored: rgba(0x8e8683ff).into(),
-        git_renamed: rgba(0xc38418ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x407ee6ff).into(),
-                selection: rgba(0x407ee63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7a9726ff).into(),
-                selection: rgba(0x7a97263d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc340f2ff).into(),
-                selection: rgba(0xc340f23d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xdf5321ff).into(),
-                selection: rgba(0xdf53213d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6565e9ff).into(),
-                selection: rgba(0x6565e93d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x3d97b8ff).into(),
-                selection: rgba(0x3d97b83d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf22c3fff).into(),
-                selection: rgba(0xf22c3f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc38418ff).into(),
-                selection: rgba(0xc384183d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_forest_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_forest_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Forest Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xaaa3a1ff).into(),
-        border_variant: rgba(0xaaa3a1ff).into(),
-        border_focused: rgba(0xc6cef7ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xccc7c5ff).into(),
-        surface: rgba(0xe9e6e4ff).into(),
-        background: rgba(0xccc7c5ff).into(),
-        filled_element: rgba(0xccc7c5ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xdfe3fbff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xdfe3fbff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x1b1918ff).into(),
-        text_muted: rgba(0x6a6360ff).into(),
-        text_placeholder: rgba(0xf22e40ff).into(),
-        text_disabled: rgba(0x837b78ff).into(),
-        text_accent: rgba(0x407ee6ff).into(),
-        icon_muted: rgba(0x6a6360ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("punctuation.special".into(), rgba(0xc33ff3ff).into()),
-                ("text.literal".into(), rgba(0xdf5421ff).into()),
-                ("string.escape".into(), rgba(0x68615eff).into()),
-                ("string.regex".into(), rgba(0x3c96b8ff).into()),
-                ("number".into(), rgba(0xdf521fff).into()),
-                ("preproc".into(), rgba(0x1b1918ff).into()),
-                ("keyword".into(), rgba(0x6666eaff).into()),
-                ("variable.special".into(), rgba(0x6666eaff).into()),
-                ("punctuation.delimiter".into(), rgba(0x68615eff).into()),
-                ("emphasis.strong".into(), rgba(0x407ee6ff).into()),
-                ("boolean".into(), rgba(0x7a9728ff).into()),
-                ("variant".into(), rgba(0xc38417ff).into()),
-                ("predictive".into(), rgba(0xbe899eff).into()),
-                ("tag".into(), rgba(0x407ee6ff).into()),
-                ("property".into(), rgba(0xf22c40ff).into()),
-                ("enum".into(), rgba(0xdf5421ff).into()),
-                ("attribute".into(), rgba(0x407ee6ff).into()),
-                ("function.method".into(), rgba(0x3f7ee7ff).into()),
-                ("function".into(), rgba(0x3f7ee7ff).into()),
-                ("emphasis".into(), rgba(0x407ee6ff).into()),
-                ("primary".into(), rgba(0x2c2421ff).into()),
-                ("variable".into(), rgba(0x2c2421ff).into()),
-                ("constant".into(), rgba(0x7a9728ff).into()),
-                ("title".into(), rgba(0x1b1918ff).into()),
-                ("comment.doc".into(), rgba(0x68615eff).into()),
-                ("constructor".into(), rgba(0x407ee6ff).into()),
-                ("type".into(), rgba(0xc38417ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x2c2421ff).into()),
-                ("punctuation".into(), rgba(0x2c2421ff).into()),
-                ("string".into(), rgba(0x7a9725ff).into()),
-                ("label".into(), rgba(0x407ee6ff).into()),
-                ("string.special".into(), rgba(0xc33ff3ff).into()),
-                ("embedded".into(), rgba(0x1b1918ff).into()),
-                ("link_text".into(), rgba(0xdf5421ff).into()),
-                ("punctuation.bracket".into(), rgba(0x68615eff).into()),
-                ("comment".into(), rgba(0x9c9491ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xc38417ff).into(),
-                ),
-                ("link_uri".into(), rgba(0x7a9728ff).into()),
-                ("operator".into(), rgba(0x68615eff).into()),
-                ("hint".into(), rgba(0xa67287ff).into()),
-                ("string.special.symbol".into(), rgba(0x7a9725ff).into()),
-            ],
-        },
-        status_bar: rgba(0xccc7c5ff).into(),
-        title_bar: rgba(0xccc7c5ff).into(),
-        toolbar: rgba(0xf0eeedff).into(),
-        tab_bar: rgba(0xe9e6e4ff).into(),
-        editor: rgba(0xf0eeedff).into(),
-        editor_subheader: rgba(0xe9e6e4ff).into(),
-        editor_active_line: rgba(0xe9e6e4ff).into(),
-        terminal: rgba(0xf0eeedff).into(),
-        image_fallback_background: rgba(0xccc7c5ff).into(),
-        git_created: rgba(0x7a9728ff).into(),
-        git_modified: rgba(0x407ee6ff).into(),
-        git_deleted: rgba(0xf22e40ff).into(),
-        git_conflict: rgba(0xc38419ff).into(),
-        git_ignored: rgba(0x837b78ff).into(),
-        git_renamed: rgba(0xc38419ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x407ee6ff).into(),
-                selection: rgba(0x407ee63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7a9728ff).into(),
-                selection: rgba(0x7a97283d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc340f2ff).into(),
-                selection: rgba(0xc340f23d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xdf5421ff).into(),
-                selection: rgba(0xdf54213d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6765e9ff).into(),
-                selection: rgba(0x6765e93d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x3e96b8ff).into(),
-                selection: rgba(0x3e96b83d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf22e40ff).into(),
-                selection: rgba(0xf22e403d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc38419ff).into(),
-                selection: rgba(0xc384193d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_heath_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_heath_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Heath Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x675b67ff).into(),
-        border_variant: rgba(0x675b67ff).into(),
-        border_focused: rgba(0x192961ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x433a43ff).into(),
-        surface: rgba(0x252025ff).into(),
-        background: rgba(0x433a43ff).into(),
-        filled_element: rgba(0x433a43ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x0d1a43ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x0d1a43ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf7f3f7ff).into(),
-        text_muted: rgba(0xa899a8ff).into(),
-        text_placeholder: rgba(0xca3f2bff).into(),
-        text_disabled: rgba(0x908190ff).into(),
-        text_accent: rgba(0x5169ebff).into(),
-        icon_muted: rgba(0xa899a8ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("preproc".into(), rgba(0xf7f3f7ff).into()),
-                ("number".into(), rgba(0xa65825ff).into()),
-                ("boolean".into(), rgba(0x918b3aff).into()),
-                ("embedded".into(), rgba(0xf7f3f7ff).into()),
-                ("variable.special".into(), rgba(0x7b58bfff).into()),
-                ("operator".into(), rgba(0xab9babff).into()),
-                ("punctuation.delimiter".into(), rgba(0xab9babff).into()),
-                ("primary".into(), rgba(0xd8cad8ff).into()),
-                ("punctuation.bracket".into(), rgba(0xab9babff).into()),
-                ("comment.doc".into(), rgba(0xab9babff).into()),
-                ("variant".into(), rgba(0xbb8a34ff).into()),
-                ("attribute".into(), rgba(0x5169ebff).into()),
-                ("property".into(), rgba(0xca3f2aff).into()),
-                ("keyword".into(), rgba(0x7b58bfff).into()),
-                ("hint".into(), rgba(0x8d70a8ff).into()),
-                ("string.special.symbol".into(), rgba(0x918b3aff).into()),
-                ("punctuation.special".into(), rgba(0xcc32ccff).into()),
-                ("link_uri".into(), rgba(0x918b3aff).into()),
-                ("link_text".into(), rgba(0xa65827ff).into()),
-                ("enum".into(), rgba(0xa65827ff).into()),
-                ("function".into(), rgba(0x506aecff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xbb8a34ff).into(),
-                ),
-                ("constant".into(), rgba(0x918b3aff).into()),
-                ("title".into(), rgba(0xf7f3f7ff).into()),
-                ("string.regex".into(), rgba(0x149393ff).into()),
-                ("variable".into(), rgba(0xd8cad8ff).into()),
-                ("comment".into(), rgba(0x776977ff).into()),
-                ("predictive".into(), rgba(0x75588fff).into()),
-                ("function.method".into(), rgba(0x506aecff).into()),
-                ("type".into(), rgba(0xbb8a34ff).into()),
-                ("punctuation".into(), rgba(0xd8cad8ff).into()),
-                ("emphasis".into(), rgba(0x5169ebff).into()),
-                ("emphasis.strong".into(), rgba(0x5169ebff).into()),
-                ("tag".into(), rgba(0x5169ebff).into()),
-                ("text.literal".into(), rgba(0xa65827ff).into()),
-                ("string".into(), rgba(0x918b3aff).into()),
-                ("string.escape".into(), rgba(0xab9babff).into()),
-                ("constructor".into(), rgba(0x5169ebff).into()),
-                ("label".into(), rgba(0x5169ebff).into()),
-                ("punctuation.list_marker".into(), rgba(0xd8cad8ff).into()),
-                ("string.special".into(), rgba(0xcc32ccff).into()),
-            ],
-        },
-        status_bar: rgba(0x433a43ff).into(),
-        title_bar: rgba(0x433a43ff).into(),
-        toolbar: rgba(0x1b181bff).into(),
-        tab_bar: rgba(0x252025ff).into(),
-        editor: rgba(0x1b181bff).into(),
-        editor_subheader: rgba(0x252025ff).into(),
-        editor_active_line: rgba(0x252025ff).into(),
-        terminal: rgba(0x1b181bff).into(),
-        image_fallback_background: rgba(0x433a43ff).into(),
-        git_created: rgba(0x918b3aff).into(),
-        git_modified: rgba(0x5169ebff).into(),
-        git_deleted: rgba(0xca3f2bff).into(),
-        git_conflict: rgba(0xbb8a35ff).into(),
-        git_ignored: rgba(0x908190ff).into(),
-        git_renamed: rgba(0xbb8a35ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x5169ebff).into(),
-                selection: rgba(0x5169eb3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x918b3aff).into(),
-                selection: rgba(0x918b3a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xcc34ccff).into(),
-                selection: rgba(0xcc34cc3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa65827ff).into(),
-                selection: rgba(0xa658273d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7b58bfff).into(),
-                selection: rgba(0x7b58bf3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x189393ff).into(),
-                selection: rgba(0x1893933d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xca3f2bff).into(),
-                selection: rgba(0xca3f2b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbb8a35ff).into(),
-                selection: rgba(0xbb8a353d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_heath_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_heath_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Heath Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xad9dadff).into(),
-        border_variant: rgba(0xad9dadff).into(),
-        border_focused: rgba(0xcac7faff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xc6b8c6ff).into(),
-        surface: rgba(0xe0d5e0ff).into(),
-        background: rgba(0xc6b8c6ff).into(),
-        filled_element: rgba(0xc6b8c6ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xe2dffcff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xe2dffcff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x1b181bff).into(),
-        text_muted: rgba(0x6b5e6bff).into(),
-        text_placeholder: rgba(0xca402bff).into(),
-        text_disabled: rgba(0x857785ff).into(),
-        text_accent: rgba(0x5169ebff).into(),
-        icon_muted: rgba(0x6b5e6bff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("enum".into(), rgba(0xa65927ff).into()),
-                ("string.escape".into(), rgba(0x695d69ff).into()),
-                ("link_uri".into(), rgba(0x918b3bff).into()),
-                ("function.method".into(), rgba(0x506aecff).into()),
-                ("comment.doc".into(), rgba(0x695d69ff).into()),
-                ("property".into(), rgba(0xca3f2aff).into()),
-                ("string.special".into(), rgba(0xcc32ccff).into()),
-                ("tag".into(), rgba(0x5169ebff).into()),
-                ("embedded".into(), rgba(0x1b181bff).into()),
-                ("primary".into(), rgba(0x292329ff).into()),
-                ("punctuation".into(), rgba(0x292329ff).into()),
-                ("punctuation.special".into(), rgba(0xcc32ccff).into()),
-                ("type".into(), rgba(0xbb8a34ff).into()),
-                ("number".into(), rgba(0xa65825ff).into()),
-                ("function".into(), rgba(0x506aecff).into()),
-                ("preproc".into(), rgba(0x1b181bff).into()),
-                ("punctuation.bracket".into(), rgba(0x695d69ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x695d69ff).into()),
-                ("variable".into(), rgba(0x292329ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xbb8a34ff).into(),
-                ),
-                ("label".into(), rgba(0x5169ebff).into()),
-                ("constructor".into(), rgba(0x5169ebff).into()),
-                ("emphasis.strong".into(), rgba(0x5169ebff).into()),
-                ("constant".into(), rgba(0x918b3bff).into()),
-                ("keyword".into(), rgba(0x7b58bfff).into()),
-                ("variable.special".into(), rgba(0x7b58bfff).into()),
-                ("variant".into(), rgba(0xbb8a34ff).into()),
-                ("title".into(), rgba(0x1b181bff).into()),
-                ("attribute".into(), rgba(0x5169ebff).into()),
-                ("comment".into(), rgba(0x9e8f9eff).into()),
-                ("string.special.symbol".into(), rgba(0x918b3aff).into()),
-                ("predictive".into(), rgba(0xa487bfff).into()),
-                ("link_text".into(), rgba(0xa65927ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x292329ff).into()),
-                ("boolean".into(), rgba(0x918b3bff).into()),
-                ("text.literal".into(), rgba(0xa65927ff).into()),
-                ("emphasis".into(), rgba(0x5169ebff).into()),
-                ("string.regex".into(), rgba(0x149393ff).into()),
-                ("hint".into(), rgba(0x8c70a6ff).into()),
-                ("string".into(), rgba(0x918b3aff).into()),
-                ("operator".into(), rgba(0x695d69ff).into()),
-            ],
-        },
-        status_bar: rgba(0xc6b8c6ff).into(),
-        title_bar: rgba(0xc6b8c6ff).into(),
-        toolbar: rgba(0xf7f3f7ff).into(),
-        tab_bar: rgba(0xe0d5e0ff).into(),
-        editor: rgba(0xf7f3f7ff).into(),
-        editor_subheader: rgba(0xe0d5e0ff).into(),
-        editor_active_line: rgba(0xe0d5e0ff).into(),
-        terminal: rgba(0xf7f3f7ff).into(),
-        image_fallback_background: rgba(0xc6b8c6ff).into(),
-        git_created: rgba(0x918b3bff).into(),
-        git_modified: rgba(0x5169ebff).into(),
-        git_deleted: rgba(0xca402bff).into(),
-        git_conflict: rgba(0xbb8a35ff).into(),
-        git_ignored: rgba(0x857785ff).into(),
-        git_renamed: rgba(0xbb8a35ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x5169ebff).into(),
-                selection: rgba(0x5169eb3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x918b3bff).into(),
-                selection: rgba(0x918b3b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xcc34ccff).into(),
-                selection: rgba(0xcc34cc3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa65927ff).into(),
-                selection: rgba(0xa659273d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7a5ac0ff).into(),
-                selection: rgba(0x7a5ac03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x189393ff).into(),
-                selection: rgba(0x1893933d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xca402bff).into(),
-                selection: rgba(0xca402b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbb8a35ff).into(),
-                selection: rgba(0xbb8a353d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_lakeside_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_lakeside_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Lakeside Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x4f6a78ff).into(),
-        border_variant: rgba(0x4f6a78ff).into(),
-        border_focused: rgba(0x1a2f3cff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x33444dff).into(),
-        surface: rgba(0x1c2529ff).into(),
-        background: rgba(0x33444dff).into(),
-        filled_element: rgba(0x33444dff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x121c24ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x121c24ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xebf8ffff).into(),
-        text_muted: rgba(0x7c9fb3ff).into(),
-        text_placeholder: rgba(0xd22e72ff).into(),
-        text_disabled: rgba(0x688c9dff).into(),
-        text_accent: rgba(0x267eadff).into(),
-        icon_muted: rgba(0x7c9fb3ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("punctuation.bracket".into(), rgba(0x7ea2b4ff).into()),
-                ("punctuation.special".into(), rgba(0xb72cd2ff).into()),
-                ("property".into(), rgba(0xd22c72ff).into()),
-                ("function.method".into(), rgba(0x247eadff).into()),
-                ("comment".into(), rgba(0x5a7b8cff).into()),
-                ("constructor".into(), rgba(0x267eadff).into()),
-                ("boolean".into(), rgba(0x558c3aff).into()),
-                ("hint".into(), rgba(0x52809aff).into()),
-                ("label".into(), rgba(0x267eadff).into()),
-                ("string.special".into(), rgba(0xb72cd2ff).into()),
-                ("title".into(), rgba(0xebf8ffff).into()),
-                ("punctuation.list_marker".into(), rgba(0xc1e4f6ff).into()),
-                ("emphasis.strong".into(), rgba(0x267eadff).into()),
-                ("enum".into(), rgba(0x935b25ff).into()),
-                ("type".into(), rgba(0x8a8a0eff).into()),
-                ("tag".into(), rgba(0x267eadff).into()),
-                ("punctuation.delimiter".into(), rgba(0x7ea2b4ff).into()),
-                ("primary".into(), rgba(0xc1e4f6ff).into()),
-                ("link_text".into(), rgba(0x935b25ff).into()),
-                ("variable".into(), rgba(0xc1e4f6ff).into()),
-                ("variable.special".into(), rgba(0x6a6ab7ff).into()),
-                ("string.special.symbol".into(), rgba(0x558c3aff).into()),
-                ("link_uri".into(), rgba(0x558c3aff).into()),
-                ("function".into(), rgba(0x247eadff).into()),
-                ("predictive".into(), rgba(0x426f88ff).into()),
-                ("punctuation".into(), rgba(0xc1e4f6ff).into()),
-                ("string.escape".into(), rgba(0x7ea2b4ff).into()),
-                ("keyword".into(), rgba(0x6a6ab7ff).into()),
-                ("attribute".into(), rgba(0x267eadff).into()),
-                ("string.regex".into(), rgba(0x2c8f6eff).into()),
-                ("embedded".into(), rgba(0xebf8ffff).into()),
-                ("emphasis".into(), rgba(0x267eadff).into()),
-                ("string".into(), rgba(0x558c3aff).into()),
-                ("operator".into(), rgba(0x7ea2b4ff).into()),
-                ("text.literal".into(), rgba(0x935b25ff).into()),
-                ("constant".into(), rgba(0x558c3aff).into()),
-                ("comment.doc".into(), rgba(0x7ea2b4ff).into()),
-                ("number".into(), rgba(0x935c24ff).into()),
-                ("preproc".into(), rgba(0xebf8ffff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0x8a8a0eff).into(),
-                ),
-                ("variant".into(), rgba(0x8a8a0eff).into()),
-            ],
-        },
-        status_bar: rgba(0x33444dff).into(),
-        title_bar: rgba(0x33444dff).into(),
-        toolbar: rgba(0x161b1dff).into(),
-        tab_bar: rgba(0x1c2529ff).into(),
-        editor: rgba(0x161b1dff).into(),
-        editor_subheader: rgba(0x1c2529ff).into(),
-        editor_active_line: rgba(0x1c2529ff).into(),
-        terminal: rgba(0x161b1dff).into(),
-        image_fallback_background: rgba(0x33444dff).into(),
-        git_created: rgba(0x558c3aff).into(),
-        git_modified: rgba(0x267eadff).into(),
-        git_deleted: rgba(0xd22e72ff).into(),
-        git_conflict: rgba(0x8a8a10ff).into(),
-        git_ignored: rgba(0x688c9dff).into(),
-        git_renamed: rgba(0x8a8a10ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x267eadff).into(),
-                selection: rgba(0x267ead3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x558c3aff).into(),
-                selection: rgba(0x558c3a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb72ed2ff).into(),
-                selection: rgba(0xb72ed23d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x935b25ff).into(),
-                selection: rgba(0x935b253d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6a6ab7ff).into(),
-                selection: rgba(0x6a6ab73d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2d8f6fff).into(),
-                selection: rgba(0x2d8f6f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd22e72ff).into(),
-                selection: rgba(0xd22e723d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8a8a10ff).into(),
-                selection: rgba(0x8a8a103d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_lakeside_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_lakeside_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Lakeside Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x80a4b6ff).into(),
-        border_variant: rgba(0x80a4b6ff).into(),
-        border_focused: rgba(0xb9cee0ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xa6cadcff).into(),
-        surface: rgba(0xcdeaf9ff).into(),
-        background: rgba(0xa6cadcff).into(),
-        filled_element: rgba(0xa6cadcff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xd8e4eeff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xd8e4eeff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x161b1dff).into(),
-        text_muted: rgba(0x526f7dff).into(),
-        text_placeholder: rgba(0xd22e71ff).into(),
-        text_disabled: rgba(0x628496ff).into(),
-        text_accent: rgba(0x267eadff).into(),
-        icon_muted: rgba(0x526f7dff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("emphasis".into(), rgba(0x267eadff).into()),
-                ("number".into(), rgba(0x935c24ff).into()),
-                ("embedded".into(), rgba(0x161b1dff).into()),
-                ("link_text".into(), rgba(0x935c25ff).into()),
-                ("string".into(), rgba(0x558c3aff).into()),
-                ("constructor".into(), rgba(0x267eadff).into()),
-                ("punctuation.list_marker".into(), rgba(0x1f292eff).into()),
-                ("string.special".into(), rgba(0xb72cd2ff).into()),
-                ("title".into(), rgba(0x161b1dff).into()),
-                ("variant".into(), rgba(0x8a8a0eff).into()),
-                ("tag".into(), rgba(0x267eadff).into()),
-                ("attribute".into(), rgba(0x267eadff).into()),
-                ("keyword".into(), rgba(0x6a6ab7ff).into()),
-                ("enum".into(), rgba(0x935c25ff).into()),
-                ("function".into(), rgba(0x247eadff).into()),
-                ("string.escape".into(), rgba(0x516d7bff).into()),
-                ("operator".into(), rgba(0x516d7bff).into()),
-                ("function.method".into(), rgba(0x247eadff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0x8a8a0eff).into(),
-                ),
-                ("punctuation.delimiter".into(), rgba(0x516d7bff).into()),
-                ("comment".into(), rgba(0x7094a7ff).into()),
-                ("primary".into(), rgba(0x1f292eff).into()),
-                ("punctuation.bracket".into(), rgba(0x516d7bff).into()),
-                ("variable".into(), rgba(0x1f292eff).into()),
-                ("emphasis.strong".into(), rgba(0x267eadff).into()),
-                ("predictive".into(), rgba(0x6a97b2ff).into()),
-                ("punctuation.special".into(), rgba(0xb72cd2ff).into()),
-                ("hint".into(), rgba(0x5a87a0ff).into()),
-                ("text.literal".into(), rgba(0x935c25ff).into()),
-                ("string.special.symbol".into(), rgba(0x558c3aff).into()),
-                ("comment.doc".into(), rgba(0x516d7bff).into()),
-                ("constant".into(), rgba(0x568c3bff).into()),
-                ("boolean".into(), rgba(0x568c3bff).into()),
-                ("preproc".into(), rgba(0x161b1dff).into()),
-                ("variable.special".into(), rgba(0x6a6ab7ff).into()),
-                ("link_uri".into(), rgba(0x568c3bff).into()),
-                ("string.regex".into(), rgba(0x2c8f6eff).into()),
-                ("punctuation".into(), rgba(0x1f292eff).into()),
-                ("property".into(), rgba(0xd22c72ff).into()),
-                ("label".into(), rgba(0x267eadff).into()),
-                ("type".into(), rgba(0x8a8a0eff).into()),
-            ],
-        },
-        status_bar: rgba(0xa6cadcff).into(),
-        title_bar: rgba(0xa6cadcff).into(),
-        toolbar: rgba(0xebf8ffff).into(),
-        tab_bar: rgba(0xcdeaf9ff).into(),
-        editor: rgba(0xebf8ffff).into(),
-        editor_subheader: rgba(0xcdeaf9ff).into(),
-        editor_active_line: rgba(0xcdeaf9ff).into(),
-        terminal: rgba(0xebf8ffff).into(),
-        image_fallback_background: rgba(0xa6cadcff).into(),
-        git_created: rgba(0x568c3bff).into(),
-        git_modified: rgba(0x267eadff).into(),
-        git_deleted: rgba(0xd22e71ff).into(),
-        git_conflict: rgba(0x8a8a10ff).into(),
-        git_ignored: rgba(0x628496ff).into(),
-        git_renamed: rgba(0x8a8a10ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x267eadff).into(),
-                selection: rgba(0x267ead3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x568c3bff).into(),
-                selection: rgba(0x568c3b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb72ed2ff).into(),
-                selection: rgba(0xb72ed23d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x935c25ff).into(),
-                selection: rgba(0x935c253d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6c6ab7ff).into(),
-                selection: rgba(0x6c6ab73d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2e8f6eff).into(),
-                selection: rgba(0x2e8f6e3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd22e71ff).into(),
-                selection: rgba(0xd22e713d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8a8a10ff).into(),
-                selection: rgba(0x8a8a103d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_plateau_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_plateau_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Plateau Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x564e4eff).into(),
-        border_variant: rgba(0x564e4eff).into(),
-        border_focused: rgba(0x2c2b45ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x3b3535ff).into(),
-        surface: rgba(0x252020ff).into(),
-        background: rgba(0x3b3535ff).into(),
-        filled_element: rgba(0x3b3535ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x1c1b29ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x1c1b29ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf4ececff).into(),
-        text_muted: rgba(0x898383ff).into(),
-        text_placeholder: rgba(0xca4848ff).into(),
-        text_disabled: rgba(0x756e6eff).into(),
-        text_accent: rgba(0x7272caff).into(),
-        icon_muted: rgba(0x898383ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("variant".into(), rgba(0xa06d3aff).into()),
-                ("label".into(), rgba(0x7272caff).into()),
-                ("punctuation.delimiter".into(), rgba(0x8a8585ff).into()),
-                ("string.regex".into(), rgba(0x5485b6ff).into()),
-                ("variable.special".into(), rgba(0x8464c4ff).into()),
-                ("string".into(), rgba(0x4b8b8bff).into()),
-                ("property".into(), rgba(0xca4848ff).into()),
-                ("hint".into(), rgba(0x8a647aff).into()),
-                ("comment.doc".into(), rgba(0x8a8585ff).into()),
-                ("attribute".into(), rgba(0x7272caff).into()),
-                ("tag".into(), rgba(0x7272caff).into()),
-                ("constructor".into(), rgba(0x7272caff).into()),
-                ("boolean".into(), rgba(0x4b8b8bff).into()),
-                ("preproc".into(), rgba(0xf4ececff).into()),
-                ("constant".into(), rgba(0x4b8b8bff).into()),
-                ("punctuation.special".into(), rgba(0xbd5187ff).into()),
-                ("function.method".into(), rgba(0x7272caff).into()),
-                ("comment".into(), rgba(0x655d5dff).into()),
-                ("variable".into(), rgba(0xe7dfdfff).into()),
-                ("primary".into(), rgba(0xe7dfdfff).into()),
-                ("title".into(), rgba(0xf4ececff).into()),
-                ("emphasis".into(), rgba(0x7272caff).into()),
-                ("emphasis.strong".into(), rgba(0x7272caff).into()),
-                ("function".into(), rgba(0x7272caff).into()),
-                ("type".into(), rgba(0xa06d3aff).into()),
-                ("operator".into(), rgba(0x8a8585ff).into()),
-                ("embedded".into(), rgba(0xf4ececff).into()),
-                ("predictive".into(), rgba(0x795369ff).into()),
-                ("punctuation".into(), rgba(0xe7dfdfff).into()),
-                ("link_text".into(), rgba(0xb4593bff).into()),
-                ("enum".into(), rgba(0xb4593bff).into()),
-                ("string.special".into(), rgba(0xbd5187ff).into()),
-                ("text.literal".into(), rgba(0xb4593bff).into()),
-                ("string.escape".into(), rgba(0x8a8585ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa06d3aff).into(),
-                ),
-                ("keyword".into(), rgba(0x8464c4ff).into()),
-                ("link_uri".into(), rgba(0x4b8b8bff).into()),
-                ("number".into(), rgba(0xb4593bff).into()),
-                ("punctuation.bracket".into(), rgba(0x8a8585ff).into()),
-                ("string.special.symbol".into(), rgba(0x4b8b8bff).into()),
-                ("punctuation.list_marker".into(), rgba(0xe7dfdfff).into()),
-            ],
-        },
-        status_bar: rgba(0x3b3535ff).into(),
-        title_bar: rgba(0x3b3535ff).into(),
-        toolbar: rgba(0x1b1818ff).into(),
-        tab_bar: rgba(0x252020ff).into(),
-        editor: rgba(0x1b1818ff).into(),
-        editor_subheader: rgba(0x252020ff).into(),
-        editor_active_line: rgba(0x252020ff).into(),
-        terminal: rgba(0x1b1818ff).into(),
-        image_fallback_background: rgba(0x3b3535ff).into(),
-        git_created: rgba(0x4b8b8bff).into(),
-        git_modified: rgba(0x7272caff).into(),
-        git_deleted: rgba(0xca4848ff).into(),
-        git_conflict: rgba(0xa06d3aff).into(),
-        git_ignored: rgba(0x756e6eff).into(),
-        git_renamed: rgba(0xa06d3aff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x7272caff).into(),
-                selection: rgba(0x7272ca3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x4b8b8bff).into(),
-                selection: rgba(0x4b8b8b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbd5187ff).into(),
-                selection: rgba(0xbd51873d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb4593bff).into(),
-                selection: rgba(0xb4593b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8464c4ff).into(),
-                selection: rgba(0x8464c43d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5485b6ff).into(),
-                selection: rgba(0x5485b63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xca4848ff).into(),
-                selection: rgba(0xca48483d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa06d3aff).into(),
-                selection: rgba(0xa06d3a3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_plateau_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_plateau_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Plateau Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x8e8989ff).into(),
-        border_variant: rgba(0x8e8989ff).into(),
-        border_focused: rgba(0xcecaecff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xc1bbbbff).into(),
-        surface: rgba(0xebe3e3ff).into(),
-        background: rgba(0xc1bbbbff).into(),
-        filled_element: rgba(0xc1bbbbff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xe4e1f5ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xe4e1f5ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x1b1818ff).into(),
-        text_muted: rgba(0x5a5252ff).into(),
-        text_placeholder: rgba(0xca4a4aff).into(),
-        text_disabled: rgba(0x6e6666ff).into(),
-        text_accent: rgba(0x7272caff).into(),
-        icon_muted: rgba(0x5a5252ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("text.literal".into(), rgba(0xb45a3cff).into()),
-                ("punctuation.special".into(), rgba(0xbd5187ff).into()),
-                ("variant".into(), rgba(0xa06d3aff).into()),
-                ("punctuation".into(), rgba(0x292424ff).into()),
-                ("string.escape".into(), rgba(0x585050ff).into()),
-                ("emphasis".into(), rgba(0x7272caff).into()),
-                ("title".into(), rgba(0x1b1818ff).into()),
-                ("constructor".into(), rgba(0x7272caff).into()),
-                ("variable".into(), rgba(0x292424ff).into()),
-                ("predictive".into(), rgba(0xa27a91ff).into()),
-                ("label".into(), rgba(0x7272caff).into()),
-                ("function.method".into(), rgba(0x7272caff).into()),
-                ("link_uri".into(), rgba(0x4c8b8bff).into()),
-                ("punctuation.delimiter".into(), rgba(0x585050ff).into()),
-                ("link_text".into(), rgba(0xb45a3cff).into()),
-                ("hint".into(), rgba(0x91697fff).into()),
-                ("emphasis.strong".into(), rgba(0x7272caff).into()),
-                ("attribute".into(), rgba(0x7272caff).into()),
-                ("boolean".into(), rgba(0x4c8b8bff).into()),
-                ("string.special.symbol".into(), rgba(0x4b8b8bff).into()),
-                ("string".into(), rgba(0x4b8b8bff).into()),
-                ("type".into(), rgba(0xa06d3aff).into()),
-                ("string.regex".into(), rgba(0x5485b6ff).into()),
-                ("comment.doc".into(), rgba(0x585050ff).into()),
-                ("string.special".into(), rgba(0xbd5187ff).into()),
-                ("property".into(), rgba(0xca4848ff).into()),
-                ("preproc".into(), rgba(0x1b1818ff).into()),
-                ("embedded".into(), rgba(0x1b1818ff).into()),
-                ("comment".into(), rgba(0x7e7777ff).into()),
-                ("primary".into(), rgba(0x292424ff).into()),
-                ("number".into(), rgba(0xb4593bff).into()),
-                ("function".into(), rgba(0x7272caff).into()),
-                ("punctuation.bracket".into(), rgba(0x585050ff).into()),
-                ("tag".into(), rgba(0x7272caff).into()),
-                ("punctuation.list_marker".into(), rgba(0x292424ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa06d3aff).into(),
-                ),
-                ("enum".into(), rgba(0xb45a3cff).into()),
-                ("keyword".into(), rgba(0x8464c4ff).into()),
-                ("operator".into(), rgba(0x585050ff).into()),
-                ("variable.special".into(), rgba(0x8464c4ff).into()),
-                ("constant".into(), rgba(0x4c8b8bff).into()),
-            ],
-        },
-        status_bar: rgba(0xc1bbbbff).into(),
-        title_bar: rgba(0xc1bbbbff).into(),
-        toolbar: rgba(0xf4ececff).into(),
-        tab_bar: rgba(0xebe3e3ff).into(),
-        editor: rgba(0xf4ececff).into(),
-        editor_subheader: rgba(0xebe3e3ff).into(),
-        editor_active_line: rgba(0xebe3e3ff).into(),
-        terminal: rgba(0xf4ececff).into(),
-        image_fallback_background: rgba(0xc1bbbbff).into(),
-        git_created: rgba(0x4c8b8bff).into(),
-        git_modified: rgba(0x7272caff).into(),
-        git_deleted: rgba(0xca4a4aff).into(),
-        git_conflict: rgba(0xa06e3bff).into(),
-        git_ignored: rgba(0x6e6666ff).into(),
-        git_renamed: rgba(0xa06e3bff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x7272caff).into(),
-                selection: rgba(0x7272ca3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x4c8b8bff).into(),
-                selection: rgba(0x4c8b8b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbd5186ff).into(),
-                selection: rgba(0xbd51863d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb45a3cff).into(),
-                selection: rgba(0xb45a3c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8464c4ff).into(),
-                selection: rgba(0x8464c43d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5485b5ff).into(),
-                selection: rgba(0x5485b53d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xca4a4aff).into(),
-                selection: rgba(0xca4a4a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa06e3bff).into(),
-                selection: rgba(0xa06e3b3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_savanna_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_savanna_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Savanna Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x505e55ff).into(),
-        border_variant: rgba(0x505e55ff).into(),
-        border_focused: rgba(0x1f3233ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x353f39ff).into(),
-        surface: rgba(0x1f2621ff).into(),
-        background: rgba(0x353f39ff).into(),
-        filled_element: rgba(0x353f39ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x151e20ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x151e20ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xecf4eeff).into(),
-        text_muted: rgba(0x859188ff).into(),
-        text_placeholder: rgba(0xb16038ff).into(),
-        text_disabled: rgba(0x6f7e74ff).into(),
-        text_accent: rgba(0x468b8fff).into(),
-        icon_muted: rgba(0x859188ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("function.method".into(), rgba(0x468b8fff).into()),
-                ("title".into(), rgba(0xecf4eeff).into()),
-                ("label".into(), rgba(0x468b8fff).into()),
-                ("text.literal".into(), rgba(0x9f703bff).into()),
-                ("boolean".into(), rgba(0x479962ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xdfe7e2ff).into()),
-                ("string.escape".into(), rgba(0x87928aff).into()),
-                ("string.special".into(), rgba(0x857368ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x87928aff).into()),
-                ("tag".into(), rgba(0x468b8fff).into()),
-                ("property".into(), rgba(0xb16038ff).into()),
-                ("preproc".into(), rgba(0xecf4eeff).into()),
-                ("primary".into(), rgba(0xdfe7e2ff).into()),
-                ("link_uri".into(), rgba(0x479962ff).into()),
-                ("comment".into(), rgba(0x5f6d64ff).into()),
-                ("type".into(), rgba(0xa07d3aff).into()),
-                ("hint".into(), rgba(0x607e76ff).into()),
-                ("punctuation".into(), rgba(0xdfe7e2ff).into()),
-                ("string.special.symbol".into(), rgba(0x479962ff).into()),
-                ("emphasis.strong".into(), rgba(0x468b8fff).into()),
-                ("keyword".into(), rgba(0x55859bff).into()),
-                ("comment.doc".into(), rgba(0x87928aff).into()),
-                ("punctuation.bracket".into(), rgba(0x87928aff).into()),
-                ("constant".into(), rgba(0x479962ff).into()),
-                ("link_text".into(), rgba(0x9f703bff).into()),
-                ("number".into(), rgba(0x9f703bff).into()),
-                ("function".into(), rgba(0x468b8fff).into()),
-                ("variable".into(), rgba(0xdfe7e2ff).into()),
-                ("emphasis".into(), rgba(0x468b8fff).into()),
-                ("punctuation.special".into(), rgba(0x857368ff).into()),
-                ("constructor".into(), rgba(0x468b8fff).into()),
-                ("variable.special".into(), rgba(0x55859bff).into()),
-                ("operator".into(), rgba(0x87928aff).into()),
-                ("enum".into(), rgba(0x9f703bff).into()),
-                ("string.regex".into(), rgba(0x1b9aa0ff).into()),
-                ("attribute".into(), rgba(0x468b8fff).into()),
-                ("predictive".into(), rgba(0x506d66ff).into()),
-                ("string".into(), rgba(0x479962ff).into()),
-                ("embedded".into(), rgba(0xecf4eeff).into()),
-                ("variant".into(), rgba(0xa07d3aff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa07d3aff).into(),
-                ),
-            ],
-        },
-        status_bar: rgba(0x353f39ff).into(),
-        title_bar: rgba(0x353f39ff).into(),
-        toolbar: rgba(0x171c19ff).into(),
-        tab_bar: rgba(0x1f2621ff).into(),
-        editor: rgba(0x171c19ff).into(),
-        editor_subheader: rgba(0x1f2621ff).into(),
-        editor_active_line: rgba(0x1f2621ff).into(),
-        terminal: rgba(0x171c19ff).into(),
-        image_fallback_background: rgba(0x353f39ff).into(),
-        git_created: rgba(0x479962ff).into(),
-        git_modified: rgba(0x468b8fff).into(),
-        git_deleted: rgba(0xb16038ff).into(),
-        git_conflict: rgba(0xa07d3aff).into(),
-        git_ignored: rgba(0x6f7e74ff).into(),
-        git_renamed: rgba(0xa07d3aff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x468b8fff).into(),
-                selection: rgba(0x468b8f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x479962ff).into(),
-                selection: rgba(0x4799623d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x857368ff).into(),
-                selection: rgba(0x8573683d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9f703bff).into(),
-                selection: rgba(0x9f703b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x55859bff).into(),
-                selection: rgba(0x55859b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x1d9aa0ff).into(),
-                selection: rgba(0x1d9aa03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb16038ff).into(),
-                selection: rgba(0xb160383d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa07d3aff).into(),
-                selection: rgba(0xa07d3a3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_savanna_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_savanna_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Savanna Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x8b968eff).into(),
-        border_variant: rgba(0x8b968eff).into(),
-        border_focused: rgba(0xbed4d6ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xbcc5bfff).into(),
-        surface: rgba(0xe3ebe6ff).into(),
-        background: rgba(0xbcc5bfff).into(),
-        filled_element: rgba(0xbcc5bfff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xdae7e8ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xdae7e8ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x171c19ff).into(),
-        text_muted: rgba(0x546259ff).into(),
-        text_placeholder: rgba(0xb16139ff).into(),
-        text_disabled: rgba(0x68766dff).into(),
-        text_accent: rgba(0x488b90ff).into(),
-        icon_muted: rgba(0x546259ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("text.literal".into(), rgba(0x9f713cff).into()),
-                ("string".into(), rgba(0x479962ff).into()),
-                ("punctuation.special".into(), rgba(0x857368ff).into()),
-                ("type".into(), rgba(0xa07d3aff).into()),
-                ("enum".into(), rgba(0x9f713cff).into()),
-                ("title".into(), rgba(0x171c19ff).into()),
-                ("comment".into(), rgba(0x77877cff).into()),
-                ("predictive".into(), rgba(0x75958bff).into()),
-                ("punctuation.list_marker".into(), rgba(0x232a25ff).into()),
-                ("string.special.symbol".into(), rgba(0x479962ff).into()),
-                ("constructor".into(), rgba(0x488b90ff).into()),
-                ("variable".into(), rgba(0x232a25ff).into()),
-                ("label".into(), rgba(0x488b90ff).into()),
-                ("attribute".into(), rgba(0x488b90ff).into()),
-                ("constant".into(), rgba(0x499963ff).into()),
-                ("function".into(), rgba(0x468b8fff).into()),
-                ("variable.special".into(), rgba(0x55859bff).into()),
-                ("keyword".into(), rgba(0x55859bff).into()),
-                ("number".into(), rgba(0x9f703bff).into()),
-                ("boolean".into(), rgba(0x499963ff).into()),
-                ("embedded".into(), rgba(0x171c19ff).into()),
-                ("string.special".into(), rgba(0x857368ff).into()),
-                ("emphasis.strong".into(), rgba(0x488b90ff).into()),
-                ("string.regex".into(), rgba(0x1b9aa0ff).into()),
-                ("hint".into(), rgba(0x66847cff).into()),
-                ("preproc".into(), rgba(0x171c19ff).into()),
-                ("link_uri".into(), rgba(0x499963ff).into()),
-                ("variant".into(), rgba(0xa07d3aff).into()),
-                ("function.method".into(), rgba(0x468b8fff).into()),
-                ("punctuation.bracket".into(), rgba(0x526057ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x526057ff).into()),
-                ("punctuation".into(), rgba(0x232a25ff).into()),
-                ("primary".into(), rgba(0x232a25ff).into()),
-                ("string.escape".into(), rgba(0x526057ff).into()),
-                ("property".into(), rgba(0xb16038ff).into()),
-                ("operator".into(), rgba(0x526057ff).into()),
-                ("comment.doc".into(), rgba(0x526057ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xa07d3aff).into(),
-                ),
-                ("link_text".into(), rgba(0x9f713cff).into()),
-                ("tag".into(), rgba(0x488b90ff).into()),
-                ("emphasis".into(), rgba(0x488b90ff).into()),
-            ],
-        },
-        status_bar: rgba(0xbcc5bfff).into(),
-        title_bar: rgba(0xbcc5bfff).into(),
-        toolbar: rgba(0xecf4eeff).into(),
-        tab_bar: rgba(0xe3ebe6ff).into(),
-        editor: rgba(0xecf4eeff).into(),
-        editor_subheader: rgba(0xe3ebe6ff).into(),
-        editor_active_line: rgba(0xe3ebe6ff).into(),
-        terminal: rgba(0xecf4eeff).into(),
-        image_fallback_background: rgba(0xbcc5bfff).into(),
-        git_created: rgba(0x499963ff).into(),
-        git_modified: rgba(0x488b90ff).into(),
-        git_deleted: rgba(0xb16139ff).into(),
-        git_conflict: rgba(0xa07d3bff).into(),
-        git_ignored: rgba(0x68766dff).into(),
-        git_renamed: rgba(0xa07d3bff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x488b90ff).into(),
-                selection: rgba(0x488b903d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x499963ff).into(),
-                selection: rgba(0x4999633d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x857368ff).into(),
-                selection: rgba(0x8573683d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9f713cff).into(),
-                selection: rgba(0x9f713c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x55859bff).into(),
-                selection: rgba(0x55859b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x1e9aa0ff).into(),
-                selection: rgba(0x1e9aa03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb16139ff).into(),
-                selection: rgba(0xb161393d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa07d3bff).into(),
-                selection: rgba(0xa07d3b3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_seaside_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_seaside_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Seaside Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x5c6c5cff).into(),
-        border_variant: rgba(0x5c6c5cff).into(),
-        border_focused: rgba(0x102667ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x3b453bff).into(),
-        surface: rgba(0x1f231fff).into(),
-        background: rgba(0x3b453bff).into(),
-        filled_element: rgba(0x3b453bff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x051949ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x051949ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf3faf3ff).into(),
-        text_muted: rgba(0x8ba48bff).into(),
-        text_placeholder: rgba(0xe61c3bff).into(),
-        text_disabled: rgba(0x778f77ff).into(),
-        text_accent: rgba(0x3e62f4ff).into(),
-        icon_muted: rgba(0x8ba48bff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("comment".into(), rgba(0x687d68ff).into()),
-                ("predictive".into(), rgba(0x00788bff).into()),
-                ("string.special".into(), rgba(0xe618c3ff).into()),
-                ("string.regex".into(), rgba(0x1899b3ff).into()),
-                ("boolean".into(), rgba(0x2aa329ff).into()),
-                ("string".into(), rgba(0x28a328ff).into()),
-                ("operator".into(), rgba(0x8ca68cff).into()),
-                ("primary".into(), rgba(0xcfe8cfff).into()),
-                ("number".into(), rgba(0x87711cff).into()),
-                ("punctuation.special".into(), rgba(0xe618c3ff).into()),
-                ("link_text".into(), rgba(0x87711dff).into()),
-                ("title".into(), rgba(0xf3faf3ff).into()),
-                ("comment.doc".into(), rgba(0x8ca68cff).into()),
-                ("label".into(), rgba(0x3e62f4ff).into()),
-                ("preproc".into(), rgba(0xf3faf3ff).into()),
-                ("punctuation.bracket".into(), rgba(0x8ca68cff).into()),
-                ("punctuation.delimiter".into(), rgba(0x8ca68cff).into()),
-                ("function.method".into(), rgba(0x3d62f5ff).into()),
-                ("tag".into(), rgba(0x3e62f4ff).into()),
-                ("embedded".into(), rgba(0xf3faf3ff).into()),
-                ("text.literal".into(), rgba(0x87711dff).into()),
-                ("punctuation".into(), rgba(0xcfe8cfff).into()),
-                ("string.special.symbol".into(), rgba(0x28a328ff).into()),
-                ("link_uri".into(), rgba(0x2aa329ff).into()),
-                ("keyword".into(), rgba(0xac2aeeff).into()),
-                ("function".into(), rgba(0x3d62f5ff).into()),
-                ("string.escape".into(), rgba(0x8ca68cff).into()),
-                ("variant".into(), rgba(0x98981bff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0x98981bff).into(),
-                ),
-                ("constructor".into(), rgba(0x3e62f4ff).into()),
-                ("constant".into(), rgba(0x2aa329ff).into()),
-                ("hint".into(), rgba(0x008b9fff).into()),
-                ("type".into(), rgba(0x98981bff).into()),
-                ("emphasis".into(), rgba(0x3e62f4ff).into()),
-                ("variable".into(), rgba(0xcfe8cfff).into()),
-                ("emphasis.strong".into(), rgba(0x3e62f4ff).into()),
-                ("attribute".into(), rgba(0x3e62f4ff).into()),
-                ("enum".into(), rgba(0x87711dff).into()),
-                ("property".into(), rgba(0xe6183bff).into()),
-                ("punctuation.list_marker".into(), rgba(0xcfe8cfff).into()),
-                ("variable.special".into(), rgba(0xac2aeeff).into()),
-            ],
-        },
-        status_bar: rgba(0x3b453bff).into(),
-        title_bar: rgba(0x3b453bff).into(),
-        toolbar: rgba(0x131513ff).into(),
-        tab_bar: rgba(0x1f231fff).into(),
-        editor: rgba(0x131513ff).into(),
-        editor_subheader: rgba(0x1f231fff).into(),
-        editor_active_line: rgba(0x1f231fff).into(),
-        terminal: rgba(0x131513ff).into(),
-        image_fallback_background: rgba(0x3b453bff).into(),
-        git_created: rgba(0x2aa329ff).into(),
-        git_modified: rgba(0x3e62f4ff).into(),
-        git_deleted: rgba(0xe61c3bff).into(),
-        git_conflict: rgba(0x98981bff).into(),
-        git_ignored: rgba(0x778f77ff).into(),
-        git_renamed: rgba(0x98981bff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x3e62f4ff).into(),
-                selection: rgba(0x3e62f43d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2aa329ff).into(),
-                selection: rgba(0x2aa3293d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xe61cc3ff).into(),
-                selection: rgba(0xe61cc33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x87711dff).into(),
-                selection: rgba(0x87711d3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xac2dedff).into(),
-                selection: rgba(0xac2ded3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x1b99b3ff).into(),
-                selection: rgba(0x1b99b33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xe61c3bff).into(),
-                selection: rgba(0xe61c3b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x98981bff).into(),
-                selection: rgba(0x98981b3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_seaside_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_seaside_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Seaside Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x8ea88eff).into(),
-        border_variant: rgba(0x8ea88eff).into(),
-        border_focused: rgba(0xc9c4fdff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xb4ceb4ff).into(),
-        surface: rgba(0xdaeedaff).into(),
-        background: rgba(0xb4ceb4ff).into(),
-        filled_element: rgba(0xb4ceb4ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xe1ddfeff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xe1ddfeff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x131513ff).into(),
-        text_muted: rgba(0x5f705fff).into(),
-        text_placeholder: rgba(0xe61c3dff).into(),
-        text_disabled: rgba(0x718771ff).into(),
-        text_accent: rgba(0x3e61f4ff).into(),
-        icon_muted: rgba(0x5f705fff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("string.escape".into(), rgba(0x5e6e5eff).into()),
-                ("boolean".into(), rgba(0x2aa32aff).into()),
-                ("string.special".into(), rgba(0xe618c3ff).into()),
-                ("comment".into(), rgba(0x809980ff).into()),
-                ("number".into(), rgba(0x87711cff).into()),
-                ("comment.doc".into(), rgba(0x5e6e5eff).into()),
-                ("tag".into(), rgba(0x3e61f4ff).into()),
-                ("string.special.symbol".into(), rgba(0x28a328ff).into()),
-                ("primary".into(), rgba(0x242924ff).into()),
-                ("string".into(), rgba(0x28a328ff).into()),
-                ("enum".into(), rgba(0x87711fff).into()),
-                ("operator".into(), rgba(0x5e6e5eff).into()),
-                ("string.regex".into(), rgba(0x1899b3ff).into()),
-                ("keyword".into(), rgba(0xac2aeeff).into()),
-                ("emphasis".into(), rgba(0x3e61f4ff).into()),
-                ("link_uri".into(), rgba(0x2aa32aff).into()),
-                ("constant".into(), rgba(0x2aa32aff).into()),
-                ("constructor".into(), rgba(0x3e61f4ff).into()),
-                ("link_text".into(), rgba(0x87711fff).into()),
-                ("emphasis.strong".into(), rgba(0x3e61f4ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x242924ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x5e6e5eff).into()),
-                ("punctuation.special".into(), rgba(0xe618c3ff).into()),
-                ("variant".into(), rgba(0x98981bff).into()),
-                ("predictive".into(), rgba(0x00a2b5ff).into()),
-                ("attribute".into(), rgba(0x3e61f4ff).into()),
-                ("preproc".into(), rgba(0x131513ff).into()),
-                ("embedded".into(), rgba(0x131513ff).into()),
-                ("punctuation".into(), rgba(0x242924ff).into()),
-                ("label".into(), rgba(0x3e61f4ff).into()),
-                ("function.method".into(), rgba(0x3d62f5ff).into()),
-                ("property".into(), rgba(0xe6183bff).into()),
-                ("title".into(), rgba(0x131513ff).into()),
-                ("variable".into(), rgba(0x242924ff).into()),
-                ("function".into(), rgba(0x3d62f5ff).into()),
-                ("variable.special".into(), rgba(0xac2aeeff).into()),
-                ("type".into(), rgba(0x98981bff).into()),
-                ("text.literal".into(), rgba(0x87711fff).into()),
-                ("hint".into(), rgba(0x008fa1ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0x98981bff).into(),
-                ),
-                ("punctuation.bracket".into(), rgba(0x5e6e5eff).into()),
-            ],
-        },
-        status_bar: rgba(0xb4ceb4ff).into(),
-        title_bar: rgba(0xb4ceb4ff).into(),
-        toolbar: rgba(0xf3faf3ff).into(),
-        tab_bar: rgba(0xdaeedaff).into(),
-        editor: rgba(0xf3faf3ff).into(),
-        editor_subheader: rgba(0xdaeedaff).into(),
-        editor_active_line: rgba(0xdaeedaff).into(),
-        terminal: rgba(0xf3faf3ff).into(),
-        image_fallback_background: rgba(0xb4ceb4ff).into(),
-        git_created: rgba(0x2aa32aff).into(),
-        git_modified: rgba(0x3e61f4ff).into(),
-        git_deleted: rgba(0xe61c3dff).into(),
-        git_conflict: rgba(0x98981cff).into(),
-        git_ignored: rgba(0x718771ff).into(),
-        git_renamed: rgba(0x98981cff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x3e61f4ff).into(),
-                selection: rgba(0x3e61f43d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2aa32aff).into(),
-                selection: rgba(0x2aa32a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xe61cc2ff).into(),
-                selection: rgba(0xe61cc23d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x87711fff).into(),
-                selection: rgba(0x87711f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xac2dedff).into(),
-                selection: rgba(0xac2ded3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x1c99b3ff).into(),
-                selection: rgba(0x1c99b33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xe61c3dff).into(),
-                selection: rgba(0xe61c3d3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x98981cff).into(),
-                selection: rgba(0x98981c3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_sulphurpool_dark.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_sulphurpool_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Sulphurpool Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x5b6385ff).into(),
-        border_variant: rgba(0x5b6385ff).into(),
-        border_focused: rgba(0x203348ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x3e4769ff).into(),
-        surface: rgba(0x262f51ff).into(),
-        background: rgba(0x3e4769ff).into(),
-        filled_element: rgba(0x3e4769ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x161f2bff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x161f2bff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf5f7ffff).into(),
-        text_muted: rgba(0x959bb2ff).into(),
-        text_placeholder: rgba(0xc94922ff).into(),
-        text_disabled: rgba(0x7e849eff).into(),
-        text_accent: rgba(0x3e8ed0ff).into(),
-        icon_muted: rgba(0x959bb2ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("title".into(), rgba(0xf5f7ffff).into()),
-                ("constructor".into(), rgba(0x3e8ed0ff).into()),
-                ("type".into(), rgba(0xc08b2fff).into()),
-                ("punctuation.list_marker".into(), rgba(0xdfe2f1ff).into()),
-                ("property".into(), rgba(0xc94821ff).into()),
-                ("link_uri".into(), rgba(0xac9739ff).into()),
-                ("string.escape".into(), rgba(0x979db4ff).into()),
-                ("constant".into(), rgba(0xac9739ff).into()),
-                ("embedded".into(), rgba(0xf5f7ffff).into()),
-                ("punctuation.special".into(), rgba(0x9b6279ff).into()),
-                ("punctuation.bracket".into(), rgba(0x979db4ff).into()),
-                ("preproc".into(), rgba(0xf5f7ffff).into()),
-                ("emphasis.strong".into(), rgba(0x3e8ed0ff).into()),
-                ("emphasis".into(), rgba(0x3e8ed0ff).into()),
-                ("enum".into(), rgba(0xc76a29ff).into()),
-                ("boolean".into(), rgba(0xac9739ff).into()),
-                ("primary".into(), rgba(0xdfe2f1ff).into()),
-                ("function.method".into(), rgba(0x3d8fd1ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xc08b2fff).into(),
-                ),
-                ("comment.doc".into(), rgba(0x979db4ff).into()),
-                ("string".into(), rgba(0xac9738ff).into()),
-                ("text.literal".into(), rgba(0xc76a29ff).into()),
-                ("operator".into(), rgba(0x979db4ff).into()),
-                ("number".into(), rgba(0xc76a28ff).into()),
-                ("string.special".into(), rgba(0x9b6279ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x979db4ff).into()),
-                ("tag".into(), rgba(0x3e8ed0ff).into()),
-                ("string.special.symbol".into(), rgba(0xac9738ff).into()),
-                ("variable".into(), rgba(0xdfe2f1ff).into()),
-                ("attribute".into(), rgba(0x3e8ed0ff).into()),
-                ("punctuation".into(), rgba(0xdfe2f1ff).into()),
-                ("string.regex".into(), rgba(0x21a2c9ff).into()),
-                ("keyword".into(), rgba(0x6679ccff).into()),
-                ("label".into(), rgba(0x3e8ed0ff).into()),
-                ("hint".into(), rgba(0x6c81a5ff).into()),
-                ("function".into(), rgba(0x3d8fd1ff).into()),
-                ("link_text".into(), rgba(0xc76a29ff).into()),
-                ("variant".into(), rgba(0xc08b2fff).into()),
-                ("variable.special".into(), rgba(0x6679ccff).into()),
-                ("predictive".into(), rgba(0x58709aff).into()),
-                ("comment".into(), rgba(0x6a7293ff).into()),
-            ],
-        },
-        status_bar: rgba(0x3e4769ff).into(),
-        title_bar: rgba(0x3e4769ff).into(),
-        toolbar: rgba(0x202646ff).into(),
-        tab_bar: rgba(0x262f51ff).into(),
-        editor: rgba(0x202646ff).into(),
-        editor_subheader: rgba(0x262f51ff).into(),
-        editor_active_line: rgba(0x262f51ff).into(),
-        terminal: rgba(0x202646ff).into(),
-        image_fallback_background: rgba(0x3e4769ff).into(),
-        git_created: rgba(0xac9739ff).into(),
-        git_modified: rgba(0x3e8ed0ff).into(),
-        git_deleted: rgba(0xc94922ff).into(),
-        git_conflict: rgba(0xc08b30ff).into(),
-        git_ignored: rgba(0x7e849eff).into(),
-        git_renamed: rgba(0xc08b30ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x3e8ed0ff).into(),
-                selection: rgba(0x3e8ed03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xac9739ff).into(),
-                selection: rgba(0xac97393d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9b6279ff).into(),
-                selection: rgba(0x9b62793d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc76a29ff).into(),
-                selection: rgba(0xc76a293d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6679ccff).into(),
-                selection: rgba(0x6679cc3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x24a1c9ff).into(),
-                selection: rgba(0x24a1c93d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc94922ff).into(),
-                selection: rgba(0xc949223d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc08b30ff).into(),
-                selection: rgba(0xc08b303d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/atelier_sulphurpool_light.rs 🔗

@@ -1,136 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn atelier_sulphurpool_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Atelier Sulphurpool Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x9a9fb6ff).into(),
-        border_variant: rgba(0x9a9fb6ff).into(),
-        border_focused: rgba(0xc2d5efff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xc1c5d8ff).into(),
-        surface: rgba(0xe5e8f5ff).into(),
-        background: rgba(0xc1c5d8ff).into(),
-        filled_element: rgba(0xc1c5d8ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xdde7f6ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xdde7f6ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x202646ff).into(),
-        text_muted: rgba(0x5f6789ff).into(),
-        text_placeholder: rgba(0xc94922ff).into(),
-        text_disabled: rgba(0x767d9aff).into(),
-        text_accent: rgba(0x3e8fd0ff).into(),
-        icon_muted: rgba(0x5f6789ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("string.special".into(), rgba(0x9b6279ff).into()),
-                ("string.regex".into(), rgba(0x21a2c9ff).into()),
-                ("embedded".into(), rgba(0x202646ff).into()),
-                ("string".into(), rgba(0xac9738ff).into()),
-                (
-                    "function.special.definition".into(),
-                    rgba(0xc08b2fff).into(),
-                ),
-                ("hint".into(), rgba(0x7087b2ff).into()),
-                ("function.method".into(), rgba(0x3d8fd1ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x293256ff).into()),
-                ("punctuation".into(), rgba(0x293256ff).into()),
-                ("constant".into(), rgba(0xac9739ff).into()),
-                ("label".into(), rgba(0x3e8fd0ff).into()),
-                ("comment.doc".into(), rgba(0x5d6587ff).into()),
-                ("property".into(), rgba(0xc94821ff).into()),
-                ("punctuation.bracket".into(), rgba(0x5d6587ff).into()),
-                ("constructor".into(), rgba(0x3e8fd0ff).into()),
-                ("variable.special".into(), rgba(0x6679ccff).into()),
-                ("emphasis".into(), rgba(0x3e8fd0ff).into()),
-                ("link_text".into(), rgba(0xc76a29ff).into()),
-                ("keyword".into(), rgba(0x6679ccff).into()),
-                ("primary".into(), rgba(0x293256ff).into()),
-                ("comment".into(), rgba(0x898ea4ff).into()),
-                ("title".into(), rgba(0x202646ff).into()),
-                ("link_uri".into(), rgba(0xac9739ff).into()),
-                ("text.literal".into(), rgba(0xc76a29ff).into()),
-                ("operator".into(), rgba(0x5d6587ff).into()),
-                ("number".into(), rgba(0xc76a28ff).into()),
-                ("preproc".into(), rgba(0x202646ff).into()),
-                ("attribute".into(), rgba(0x3e8fd0ff).into()),
-                ("emphasis.strong".into(), rgba(0x3e8fd0ff).into()),
-                ("string.escape".into(), rgba(0x5d6587ff).into()),
-                ("tag".into(), rgba(0x3e8fd0ff).into()),
-                ("variable".into(), rgba(0x293256ff).into()),
-                ("predictive".into(), rgba(0x8599beff).into()),
-                ("enum".into(), rgba(0xc76a29ff).into()),
-                ("string.special.symbol".into(), rgba(0xac9738ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x5d6587ff).into()),
-                ("function".into(), rgba(0x3d8fd1ff).into()),
-                ("type".into(), rgba(0xc08b2fff).into()),
-                ("punctuation.special".into(), rgba(0x9b6279ff).into()),
-                ("variant".into(), rgba(0xc08b2fff).into()),
-                ("boolean".into(), rgba(0xac9739ff).into()),
-            ],
-        },
-        status_bar: rgba(0xc1c5d8ff).into(),
-        title_bar: rgba(0xc1c5d8ff).into(),
-        toolbar: rgba(0xf5f7ffff).into(),
-        tab_bar: rgba(0xe5e8f5ff).into(),
-        editor: rgba(0xf5f7ffff).into(),
-        editor_subheader: rgba(0xe5e8f5ff).into(),
-        editor_active_line: rgba(0xe5e8f5ff).into(),
-        terminal: rgba(0xf5f7ffff).into(),
-        image_fallback_background: rgba(0xc1c5d8ff).into(),
-        git_created: rgba(0xac9739ff).into(),
-        git_modified: rgba(0x3e8fd0ff).into(),
-        git_deleted: rgba(0xc94922ff).into(),
-        git_conflict: rgba(0xc08b30ff).into(),
-        git_ignored: rgba(0x767d9aff).into(),
-        git_renamed: rgba(0xc08b30ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x3e8fd0ff).into(),
-                selection: rgba(0x3e8fd03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xac9739ff).into(),
-                selection: rgba(0xac97393d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9b6279ff).into(),
-                selection: rgba(0x9b62793d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc76a29ff).into(),
-                selection: rgba(0xc76a293d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6679cbff).into(),
-                selection: rgba(0x6679cb3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x24a1c9ff).into(),
-                selection: rgba(0x24a1c93d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc94922ff).into(),
-                selection: rgba(0xc949223d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc08b30ff).into(),
-                selection: rgba(0xc08b303d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/ayu_dark.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn ayu_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Ayu Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x3f4043ff).into(),
-        border_variant: rgba(0x3f4043ff).into(),
-        border_focused: rgba(0x1b4a6eff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x313337ff).into(),
-        surface: rgba(0x1f2127ff).into(),
-        background: rgba(0x313337ff).into(),
-        filled_element: rgba(0x313337ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x0d2f4eff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x0d2f4eff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xbfbdb6ff).into(),
-        text_muted: rgba(0x8a8986ff).into(),
-        text_placeholder: rgba(0xef7177ff).into(),
-        text_disabled: rgba(0x696a6aff).into(),
-        text_accent: rgba(0x5ac1feff).into(),
-        icon_muted: rgba(0x8a8986ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("emphasis".into(), rgba(0x5ac1feff).into()),
-                ("punctuation.bracket".into(), rgba(0xa6a5a0ff).into()),
-                ("constructor".into(), rgba(0x5ac1feff).into()),
-                ("predictive".into(), rgba(0x5a728bff).into()),
-                ("emphasis.strong".into(), rgba(0x5ac1feff).into()),
-                ("string.regex".into(), rgba(0x95e6cbff).into()),
-                ("tag".into(), rgba(0x5ac1feff).into()),
-                ("punctuation".into(), rgba(0xa6a5a0ff).into()),
-                ("number".into(), rgba(0xd2a6ffff).into()),
-                ("punctuation.special".into(), rgba(0xd2a6ffff).into()),
-                ("primary".into(), rgba(0xbfbdb6ff).into()),
-                ("boolean".into(), rgba(0xd2a6ffff).into()),
-                ("variant".into(), rgba(0x5ac1feff).into()),
-                ("link_uri".into(), rgba(0xaad84cff).into()),
-                ("comment.doc".into(), rgba(0x8c8b88ff).into()),
-                ("title".into(), rgba(0xbfbdb6ff).into()),
-                ("text.literal".into(), rgba(0xfe8f40ff).into()),
-                ("link_text".into(), rgba(0xfe8f40ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xa6a5a0ff).into()),
-                ("string.escape".into(), rgba(0x8c8b88ff).into()),
-                ("hint".into(), rgba(0x628b80ff).into()),
-                ("type".into(), rgba(0x59c2ffff).into()),
-                ("variable".into(), rgba(0xbfbdb6ff).into()),
-                ("label".into(), rgba(0x5ac1feff).into()),
-                ("enum".into(), rgba(0xfe8f40ff).into()),
-                ("operator".into(), rgba(0xf29668ff).into()),
-                ("function".into(), rgba(0xffb353ff).into()),
-                ("preproc".into(), rgba(0xbfbdb6ff).into()),
-                ("embedded".into(), rgba(0xbfbdb6ff).into()),
-                ("string".into(), rgba(0xa9d94bff).into()),
-                ("attribute".into(), rgba(0x5ac1feff).into()),
-                ("keyword".into(), rgba(0xff8f3fff).into()),
-                ("string.special.symbol".into(), rgba(0xfe8f40ff).into()),
-                ("comment".into(), rgba(0xabb5be8c).into()),
-                ("property".into(), rgba(0x5ac1feff).into()),
-                ("punctuation.list_marker".into(), rgba(0xa6a5a0ff).into()),
-                ("constant".into(), rgba(0xd2a6ffff).into()),
-                ("string.special".into(), rgba(0xe5b572ff).into()),
-            ],
-        },
-        status_bar: rgba(0x313337ff).into(),
-        title_bar: rgba(0x313337ff).into(),
-        toolbar: rgba(0x0d1016ff).into(),
-        tab_bar: rgba(0x1f2127ff).into(),
-        editor: rgba(0x0d1016ff).into(),
-        editor_subheader: rgba(0x1f2127ff).into(),
-        editor_active_line: rgba(0x1f2127ff).into(),
-        terminal: rgba(0x0d1016ff).into(),
-        image_fallback_background: rgba(0x313337ff).into(),
-        git_created: rgba(0xaad84cff).into(),
-        git_modified: rgba(0x5ac1feff).into(),
-        git_deleted: rgba(0xef7177ff).into(),
-        git_conflict: rgba(0xfeb454ff).into(),
-        git_ignored: rgba(0x696a6aff).into(),
-        git_renamed: rgba(0xfeb454ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x5ac1feff).into(),
-                selection: rgba(0x5ac1fe3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xaad84cff).into(),
-                selection: rgba(0xaad84c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x39bae5ff).into(),
-                selection: rgba(0x39bae53d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfe8f40ff).into(),
-                selection: rgba(0xfe8f403d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd2a6feff).into(),
-                selection: rgba(0xd2a6fe3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x95e5cbff).into(),
-                selection: rgba(0x95e5cb3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xef7177ff).into(),
-                selection: rgba(0xef71773d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfeb454ff).into(),
-                selection: rgba(0xfeb4543d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/ayu_light.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn ayu_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Ayu Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xcfd1d2ff).into(),
-        border_variant: rgba(0xcfd1d2ff).into(),
-        border_focused: rgba(0xc4daf6ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xdcdddeff).into(),
-        surface: rgba(0xececedff).into(),
-        background: rgba(0xdcdddeff).into(),
-        filled_element: rgba(0xdcdddeff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xdeebfaff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xdeebfaff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x5c6166ff).into(),
-        text_muted: rgba(0x8b8e92ff).into(),
-        text_placeholder: rgba(0xef7271ff).into(),
-        text_disabled: rgba(0xa9acaeff).into(),
-        text_accent: rgba(0x3b9ee5ff).into(),
-        icon_muted: rgba(0x8b8e92ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("string".into(), rgba(0x86b300ff).into()),
-                ("enum".into(), rgba(0xf98d3fff).into()),
-                ("comment".into(), rgba(0x787b8099).into()),
-                ("comment.doc".into(), rgba(0x898d90ff).into()),
-                ("emphasis".into(), rgba(0x3b9ee5ff).into()),
-                ("keyword".into(), rgba(0xfa8d3eff).into()),
-                ("string.regex".into(), rgba(0x4bbf98ff).into()),
-                ("text.literal".into(), rgba(0xf98d3fff).into()),
-                ("string.escape".into(), rgba(0x898d90ff).into()),
-                ("link_text".into(), rgba(0xf98d3fff).into()),
-                ("punctuation".into(), rgba(0x73777bff).into()),
-                ("constructor".into(), rgba(0x3b9ee5ff).into()),
-                ("constant".into(), rgba(0xa37accff).into()),
-                ("variable".into(), rgba(0x5c6166ff).into()),
-                ("primary".into(), rgba(0x5c6166ff).into()),
-                ("emphasis.strong".into(), rgba(0x3b9ee5ff).into()),
-                ("string.special".into(), rgba(0xe6ba7eff).into()),
-                ("number".into(), rgba(0xa37accff).into()),
-                ("preproc".into(), rgba(0x5c6166ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x73777bff).into()),
-                ("string.special.symbol".into(), rgba(0xf98d3fff).into()),
-                ("boolean".into(), rgba(0xa37accff).into()),
-                ("property".into(), rgba(0x3b9ee5ff).into()),
-                ("title".into(), rgba(0x5c6166ff).into()),
-                ("hint".into(), rgba(0x8ca7c2ff).into()),
-                ("predictive".into(), rgba(0x9eb9d3ff).into()),
-                ("operator".into(), rgba(0xed9365ff).into()),
-                ("type".into(), rgba(0x389ee6ff).into()),
-                ("function".into(), rgba(0xf2ad48ff).into()),
-                ("variant".into(), rgba(0x3b9ee5ff).into()),
-                ("label".into(), rgba(0x3b9ee5ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x73777bff).into()),
-                ("punctuation.bracket".into(), rgba(0x73777bff).into()),
-                ("embedded".into(), rgba(0x5c6166ff).into()),
-                ("punctuation.special".into(), rgba(0xa37accff).into()),
-                ("attribute".into(), rgba(0x3b9ee5ff).into()),
-                ("tag".into(), rgba(0x3b9ee5ff).into()),
-                ("link_uri".into(), rgba(0x85b304ff).into()),
-            ],
-        },
-        status_bar: rgba(0xdcdddeff).into(),
-        title_bar: rgba(0xdcdddeff).into(),
-        toolbar: rgba(0xfcfcfcff).into(),
-        tab_bar: rgba(0xececedff).into(),
-        editor: rgba(0xfcfcfcff).into(),
-        editor_subheader: rgba(0xececedff).into(),
-        editor_active_line: rgba(0xececedff).into(),
-        terminal: rgba(0xfcfcfcff).into(),
-        image_fallback_background: rgba(0xdcdddeff).into(),
-        git_created: rgba(0x85b304ff).into(),
-        git_modified: rgba(0x3b9ee5ff).into(),
-        git_deleted: rgba(0xef7271ff).into(),
-        git_conflict: rgba(0xf1ad49ff).into(),
-        git_ignored: rgba(0xa9acaeff).into(),
-        git_renamed: rgba(0xf1ad49ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x3b9ee5ff).into(),
-                selection: rgba(0x3b9ee53d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x85b304ff).into(),
-                selection: rgba(0x85b3043d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x55b4d3ff).into(),
-                selection: rgba(0x55b4d33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf98d3fff).into(),
-                selection: rgba(0xf98d3f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa37accff).into(),
-                selection: rgba(0xa37acc3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x4dbf99ff).into(),
-                selection: rgba(0x4dbf993d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xef7271ff).into(),
-                selection: rgba(0xef72713d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf1ad49ff).into(),
-                selection: rgba(0xf1ad493d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/ayu_mirage.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn ayu_mirage() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Ayu Mirage".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x53565dff).into(),
-        border_variant: rgba(0x53565dff).into(),
-        border_focused: rgba(0x24556fff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x464a52ff).into(),
-        surface: rgba(0x353944ff).into(),
-        background: rgba(0x464a52ff).into(),
-        filled_element: rgba(0x464a52ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x123950ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x123950ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xcccac2ff).into(),
-        text_muted: rgba(0x9a9a98ff).into(),
-        text_placeholder: rgba(0xf18779ff).into(),
-        text_disabled: rgba(0x7b7d7fff).into(),
-        text_accent: rgba(0x72cffeff).into(),
-        icon_muted: rgba(0x9a9a98ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("text.literal".into(), rgba(0xfead66ff).into()),
-                ("link_text".into(), rgba(0xfead66ff).into()),
-                ("function".into(), rgba(0xffd173ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xb4b3aeff).into()),
-                ("property".into(), rgba(0x72cffeff).into()),
-                ("title".into(), rgba(0xcccac2ff).into()),
-                ("boolean".into(), rgba(0xdfbfffff).into()),
-                ("link_uri".into(), rgba(0xd5fe80ff).into()),
-                ("label".into(), rgba(0x72cffeff).into()),
-                ("primary".into(), rgba(0xcccac2ff).into()),
-                ("number".into(), rgba(0xdfbfffff).into()),
-                ("variant".into(), rgba(0x72cffeff).into()),
-                ("enum".into(), rgba(0xfead66ff).into()),
-                ("string.special.symbol".into(), rgba(0xfead66ff).into()),
-                ("operator".into(), rgba(0xf29e74ff).into()),
-                ("punctuation.special".into(), rgba(0xdfbfffff).into()),
-                ("constructor".into(), rgba(0x72cffeff).into()),
-                ("type".into(), rgba(0x73cfffff).into()),
-                ("emphasis.strong".into(), rgba(0x72cffeff).into()),
-                ("embedded".into(), rgba(0xcccac2ff).into()),
-                ("comment".into(), rgba(0xb8cfe680).into()),
-                ("tag".into(), rgba(0x72cffeff).into()),
-                ("keyword".into(), rgba(0xffad65ff).into()),
-                ("punctuation".into(), rgba(0xb4b3aeff).into()),
-                ("preproc".into(), rgba(0xcccac2ff).into()),
-                ("hint".into(), rgba(0x7399a3ff).into()),
-                ("string.special".into(), rgba(0xffdfb3ff).into()),
-                ("attribute".into(), rgba(0x72cffeff).into()),
-                ("string.regex".into(), rgba(0x95e6cbff).into()),
-                ("predictive".into(), rgba(0x6d839bff).into()),
-                ("comment.doc".into(), rgba(0x9b9b99ff).into()),
-                ("emphasis".into(), rgba(0x72cffeff).into()),
-                ("string".into(), rgba(0xd4fe7fff).into()),
-                ("constant".into(), rgba(0xdfbfffff).into()),
-                ("string.escape".into(), rgba(0x9b9b99ff).into()),
-                ("variable".into(), rgba(0xcccac2ff).into()),
-                ("punctuation.bracket".into(), rgba(0xb4b3aeff).into()),
-                ("punctuation.list_marker".into(), rgba(0xb4b3aeff).into()),
-            ],
-        },
-        status_bar: rgba(0x464a52ff).into(),
-        title_bar: rgba(0x464a52ff).into(),
-        toolbar: rgba(0x242835ff).into(),
-        tab_bar: rgba(0x353944ff).into(),
-        editor: rgba(0x242835ff).into(),
-        editor_subheader: rgba(0x353944ff).into(),
-        editor_active_line: rgba(0x353944ff).into(),
-        terminal: rgba(0x242835ff).into(),
-        image_fallback_background: rgba(0x464a52ff).into(),
-        git_created: rgba(0xd5fe80ff).into(),
-        git_modified: rgba(0x72cffeff).into(),
-        git_deleted: rgba(0xf18779ff).into(),
-        git_conflict: rgba(0xfecf72ff).into(),
-        git_ignored: rgba(0x7b7d7fff).into(),
-        git_renamed: rgba(0xfecf72ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x72cffeff).into(),
-                selection: rgba(0x72cffe3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd5fe80ff).into(),
-                selection: rgba(0xd5fe803d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5bcde5ff).into(),
-                selection: rgba(0x5bcde53d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfead66ff).into(),
-                selection: rgba(0xfead663d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xdebffeff).into(),
-                selection: rgba(0xdebffe3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x95e5cbff).into(),
-                selection: rgba(0x95e5cb3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf18779ff).into(),
-                selection: rgba(0xf187793d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfecf72ff).into(),
-                selection: rgba(0xfecf723d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/gruvbox_dark.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn gruvbox_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Gruvbox Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x5b534dff).into(),
-        border_variant: rgba(0x5b534dff).into(),
-        border_focused: rgba(0x303a36ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x4c4642ff).into(),
-        surface: rgba(0x3a3735ff).into(),
-        background: rgba(0x4c4642ff).into(),
-        filled_element: rgba(0x4c4642ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x1e2321ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x1e2321ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xfbf1c7ff).into(),
-        text_muted: rgba(0xc5b597ff).into(),
-        text_placeholder: rgba(0xfb4a35ff).into(),
-        text_disabled: rgba(0x998b78ff).into(),
-        text_accent: rgba(0x83a598ff).into(),
-        icon_muted: rgba(0xc5b597ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("operator".into(), rgba(0x8ec07cff).into()),
-                ("string.special.symbol".into(), rgba(0x8ec07cff).into()),
-                ("emphasis.strong".into(), rgba(0x83a598ff).into()),
-                ("attribute".into(), rgba(0x83a598ff).into()),
-                ("property".into(), rgba(0xebdbb2ff).into()),
-                ("comment.doc".into(), rgba(0xc6b697ff).into()),
-                ("emphasis".into(), rgba(0x83a598ff).into()),
-                ("variant".into(), rgba(0x83a598ff).into()),
-                ("text.literal".into(), rgba(0x83a598ff).into()),
-                ("keyword".into(), rgba(0xfb4833ff).into()),
-                ("primary".into(), rgba(0xebdbb2ff).into()),
-                ("variable".into(), rgba(0x83a598ff).into()),
-                ("enum".into(), rgba(0xfe7f18ff).into()),
-                ("constructor".into(), rgba(0x83a598ff).into()),
-                ("punctuation".into(), rgba(0xd5c4a1ff).into()),
-                ("link_uri".into(), rgba(0xd3869bff).into()),
-                ("hint".into(), rgba(0x8c957dff).into()),
-                ("string.regex".into(), rgba(0xfe7f18ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xe5d5adff).into()),
-                ("string".into(), rgba(0xb8bb25ff).into()),
-                ("punctuation.special".into(), rgba(0xe5d5adff).into()),
-                ("link_text".into(), rgba(0x8ec07cff).into()),
-                ("tag".into(), rgba(0x8ec07cff).into()),
-                ("string.escape".into(), rgba(0xc6b697ff).into()),
-                ("label".into(), rgba(0x83a598ff).into()),
-                ("constant".into(), rgba(0xfabd2eff).into()),
-                ("type".into(), rgba(0xfabd2eff).into()),
-                ("number".into(), rgba(0xd3869bff).into()),
-                ("string.special".into(), rgba(0xd3869bff).into()),
-                ("function.builtin".into(), rgba(0xfb4833ff).into()),
-                ("boolean".into(), rgba(0xd3869bff).into()),
-                ("embedded".into(), rgba(0x8ec07cff).into()),
-                ("title".into(), rgba(0xb8bb25ff).into()),
-                ("function".into(), rgba(0xb8bb25ff).into()),
-                ("punctuation.bracket".into(), rgba(0xa89984ff).into()),
-                ("comment".into(), rgba(0xa89984ff).into()),
-                ("preproc".into(), rgba(0xfbf1c7ff).into()),
-                ("predictive".into(), rgba(0x717363ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xebdbb2ff).into()),
-            ],
-        },
-        status_bar: rgba(0x4c4642ff).into(),
-        title_bar: rgba(0x4c4642ff).into(),
-        toolbar: rgba(0x282828ff).into(),
-        tab_bar: rgba(0x3a3735ff).into(),
-        editor: rgba(0x282828ff).into(),
-        editor_subheader: rgba(0x3a3735ff).into(),
-        editor_active_line: rgba(0x3a3735ff).into(),
-        terminal: rgba(0x282828ff).into(),
-        image_fallback_background: rgba(0x4c4642ff).into(),
-        git_created: rgba(0xb7bb26ff).into(),
-        git_modified: rgba(0x83a598ff).into(),
-        git_deleted: rgba(0xfb4a35ff).into(),
-        git_conflict: rgba(0xf9bd2fff).into(),
-        git_ignored: rgba(0x998b78ff).into(),
-        git_renamed: rgba(0xf9bd2fff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x83a598ff).into(),
-                selection: rgba(0x83a5983d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb7bb26ff).into(),
-                selection: rgba(0xb7bb263d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa89984ff).into(),
-                selection: rgba(0xa899843d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfd801bff).into(),
-                selection: rgba(0xfd801b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd3869bff).into(),
-                selection: rgba(0xd3869b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8ec07cff).into(),
-                selection: rgba(0x8ec07c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfb4a35ff).into(),
-                selection: rgba(0xfb4a353d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf9bd2fff).into(),
-                selection: rgba(0xf9bd2f3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/gruvbox_dark_hard.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn gruvbox_dark_hard() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Gruvbox Dark Hard".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x5b534dff).into(),
-        border_variant: rgba(0x5b534dff).into(),
-        border_focused: rgba(0x303a36ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x4c4642ff).into(),
-        surface: rgba(0x393634ff).into(),
-        background: rgba(0x4c4642ff).into(),
-        filled_element: rgba(0x4c4642ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x1e2321ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x1e2321ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xfbf1c7ff).into(),
-        text_muted: rgba(0xc5b597ff).into(),
-        text_placeholder: rgba(0xfb4a35ff).into(),
-        text_disabled: rgba(0x998b78ff).into(),
-        text_accent: rgba(0x83a598ff).into(),
-        icon_muted: rgba(0xc5b597ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("primary".into(), rgba(0xebdbb2ff).into()),
-                ("label".into(), rgba(0x83a598ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xe5d5adff).into()),
-                ("variant".into(), rgba(0x83a598ff).into()),
-                ("type".into(), rgba(0xfabd2eff).into()),
-                ("string.regex".into(), rgba(0xfe7f18ff).into()),
-                ("function.builtin".into(), rgba(0xfb4833ff).into()),
-                ("title".into(), rgba(0xb8bb25ff).into()),
-                ("string".into(), rgba(0xb8bb25ff).into()),
-                ("operator".into(), rgba(0x8ec07cff).into()),
-                ("embedded".into(), rgba(0x8ec07cff).into()),
-                ("punctuation.bracket".into(), rgba(0xa89984ff).into()),
-                ("string.special".into(), rgba(0xd3869bff).into()),
-                ("attribute".into(), rgba(0x83a598ff).into()),
-                ("comment".into(), rgba(0xa89984ff).into()),
-                ("link_text".into(), rgba(0x8ec07cff).into()),
-                ("punctuation.special".into(), rgba(0xe5d5adff).into()),
-                ("punctuation.list_marker".into(), rgba(0xebdbb2ff).into()),
-                ("comment.doc".into(), rgba(0xc6b697ff).into()),
-                ("preproc".into(), rgba(0xfbf1c7ff).into()),
-                ("text.literal".into(), rgba(0x83a598ff).into()),
-                ("function".into(), rgba(0xb8bb25ff).into()),
-                ("predictive".into(), rgba(0x717363ff).into()),
-                ("emphasis.strong".into(), rgba(0x83a598ff).into()),
-                ("punctuation".into(), rgba(0xd5c4a1ff).into()),
-                ("string.special.symbol".into(), rgba(0x8ec07cff).into()),
-                ("property".into(), rgba(0xebdbb2ff).into()),
-                ("keyword".into(), rgba(0xfb4833ff).into()),
-                ("constructor".into(), rgba(0x83a598ff).into()),
-                ("tag".into(), rgba(0x8ec07cff).into()),
-                ("variable".into(), rgba(0x83a598ff).into()),
-                ("enum".into(), rgba(0xfe7f18ff).into()),
-                ("hint".into(), rgba(0x8c957dff).into()),
-                ("number".into(), rgba(0xd3869bff).into()),
-                ("constant".into(), rgba(0xfabd2eff).into()),
-                ("boolean".into(), rgba(0xd3869bff).into()),
-                ("link_uri".into(), rgba(0xd3869bff).into()),
-                ("string.escape".into(), rgba(0xc6b697ff).into()),
-                ("emphasis".into(), rgba(0x83a598ff).into()),
-            ],
-        },
-        status_bar: rgba(0x4c4642ff).into(),
-        title_bar: rgba(0x4c4642ff).into(),
-        toolbar: rgba(0x1d2021ff).into(),
-        tab_bar: rgba(0x393634ff).into(),
-        editor: rgba(0x1d2021ff).into(),
-        editor_subheader: rgba(0x393634ff).into(),
-        editor_active_line: rgba(0x393634ff).into(),
-        terminal: rgba(0x1d2021ff).into(),
-        image_fallback_background: rgba(0x4c4642ff).into(),
-        git_created: rgba(0xb7bb26ff).into(),
-        git_modified: rgba(0x83a598ff).into(),
-        git_deleted: rgba(0xfb4a35ff).into(),
-        git_conflict: rgba(0xf9bd2fff).into(),
-        git_ignored: rgba(0x998b78ff).into(),
-        git_renamed: rgba(0xf9bd2fff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x83a598ff).into(),
-                selection: rgba(0x83a5983d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb7bb26ff).into(),
-                selection: rgba(0xb7bb263d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa89984ff).into(),
-                selection: rgba(0xa899843d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfd801bff).into(),
-                selection: rgba(0xfd801b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd3869bff).into(),
-                selection: rgba(0xd3869b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8ec07cff).into(),
-                selection: rgba(0x8ec07c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfb4a35ff).into(),
-                selection: rgba(0xfb4a353d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf9bd2fff).into(),
-                selection: rgba(0xf9bd2f3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/gruvbox_dark_soft.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn gruvbox_dark_soft() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Gruvbox Dark Soft".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x5b534dff).into(),
-        border_variant: rgba(0x5b534dff).into(),
-        border_focused: rgba(0x303a36ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x4c4642ff).into(),
-        surface: rgba(0x3b3735ff).into(),
-        background: rgba(0x4c4642ff).into(),
-        filled_element: rgba(0x4c4642ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x1e2321ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x1e2321ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xfbf1c7ff).into(),
-        text_muted: rgba(0xc5b597ff).into(),
-        text_placeholder: rgba(0xfb4a35ff).into(),
-        text_disabled: rgba(0x998b78ff).into(),
-        text_accent: rgba(0x83a598ff).into(),
-        icon_muted: rgba(0xc5b597ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("punctuation.special".into(), rgba(0xe5d5adff).into()),
-                ("attribute".into(), rgba(0x83a598ff).into()),
-                ("preproc".into(), rgba(0xfbf1c7ff).into()),
-                ("keyword".into(), rgba(0xfb4833ff).into()),
-                ("emphasis".into(), rgba(0x83a598ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xe5d5adff).into()),
-                ("punctuation.bracket".into(), rgba(0xa89984ff).into()),
-                ("comment".into(), rgba(0xa89984ff).into()),
-                ("text.literal".into(), rgba(0x83a598ff).into()),
-                ("predictive".into(), rgba(0x717363ff).into()),
-                ("link_text".into(), rgba(0x8ec07cff).into()),
-                ("variant".into(), rgba(0x83a598ff).into()),
-                ("label".into(), rgba(0x83a598ff).into()),
-                ("function".into(), rgba(0xb8bb25ff).into()),
-                ("string.regex".into(), rgba(0xfe7f18ff).into()),
-                ("boolean".into(), rgba(0xd3869bff).into()),
-                ("number".into(), rgba(0xd3869bff).into()),
-                ("string.escape".into(), rgba(0xc6b697ff).into()),
-                ("constructor".into(), rgba(0x83a598ff).into()),
-                ("link_uri".into(), rgba(0xd3869bff).into()),
-                ("string.special.symbol".into(), rgba(0x8ec07cff).into()),
-                ("type".into(), rgba(0xfabd2eff).into()),
-                ("function.builtin".into(), rgba(0xfb4833ff).into()),
-                ("title".into(), rgba(0xb8bb25ff).into()),
-                ("primary".into(), rgba(0xebdbb2ff).into()),
-                ("tag".into(), rgba(0x8ec07cff).into()),
-                ("constant".into(), rgba(0xfabd2eff).into()),
-                ("emphasis.strong".into(), rgba(0x83a598ff).into()),
-                ("string.special".into(), rgba(0xd3869bff).into()),
-                ("hint".into(), rgba(0x8c957dff).into()),
-                ("comment.doc".into(), rgba(0xc6b697ff).into()),
-                ("property".into(), rgba(0xebdbb2ff).into()),
-                ("embedded".into(), rgba(0x8ec07cff).into()),
-                ("operator".into(), rgba(0x8ec07cff).into()),
-                ("punctuation".into(), rgba(0xd5c4a1ff).into()),
-                ("variable".into(), rgba(0x83a598ff).into()),
-                ("enum".into(), rgba(0xfe7f18ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xebdbb2ff).into()),
-                ("string".into(), rgba(0xb8bb25ff).into()),
-            ],
-        },
-        status_bar: rgba(0x4c4642ff).into(),
-        title_bar: rgba(0x4c4642ff).into(),
-        toolbar: rgba(0x32302fff).into(),
-        tab_bar: rgba(0x3b3735ff).into(),
-        editor: rgba(0x32302fff).into(),
-        editor_subheader: rgba(0x3b3735ff).into(),
-        editor_active_line: rgba(0x3b3735ff).into(),
-        terminal: rgba(0x32302fff).into(),
-        image_fallback_background: rgba(0x4c4642ff).into(),
-        git_created: rgba(0xb7bb26ff).into(),
-        git_modified: rgba(0x83a598ff).into(),
-        git_deleted: rgba(0xfb4a35ff).into(),
-        git_conflict: rgba(0xf9bd2fff).into(),
-        git_ignored: rgba(0x998b78ff).into(),
-        git_renamed: rgba(0xf9bd2fff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x83a598ff).into(),
-                selection: rgba(0x83a5983d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb7bb26ff).into(),
-                selection: rgba(0xb7bb263d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa89984ff).into(),
-                selection: rgba(0xa899843d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfd801bff).into(),
-                selection: rgba(0xfd801b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd3869bff).into(),
-                selection: rgba(0xd3869b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8ec07cff).into(),
-                selection: rgba(0x8ec07c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfb4a35ff).into(),
-                selection: rgba(0xfb4a353d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf9bd2fff).into(),
-                selection: rgba(0xf9bd2f3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/gruvbox_light.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn gruvbox_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Gruvbox Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xc8b899ff).into(),
-        border_variant: rgba(0xc8b899ff).into(),
-        border_focused: rgba(0xadc5ccff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xd9c8a4ff).into(),
-        surface: rgba(0xecddb4ff).into(),
-        background: rgba(0xd9c8a4ff).into(),
-        filled_element: rgba(0xd9c8a4ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xd2dee2ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xd2dee2ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x282828ff).into(),
-        text_muted: rgba(0x5f5650ff).into(),
-        text_placeholder: rgba(0x9d0308ff).into(),
-        text_disabled: rgba(0x897b6eff).into(),
-        text_accent: rgba(0x0b6678ff).into(),
-        icon_muted: rgba(0x5f5650ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("number".into(), rgba(0x8f3e71ff).into()),
-                ("link_text".into(), rgba(0x427b58ff).into()),
-                ("string.special".into(), rgba(0x8f3e71ff).into()),
-                ("string.special.symbol".into(), rgba(0x427b58ff).into()),
-                ("function".into(), rgba(0x79740eff).into()),
-                ("title".into(), rgba(0x79740eff).into()),
-                ("emphasis".into(), rgba(0x0b6678ff).into()),
-                ("punctuation".into(), rgba(0x3c3836ff).into()),
-                ("string.escape".into(), rgba(0x5d544eff).into()),
-                ("type".into(), rgba(0xb57613ff).into()),
-                ("string".into(), rgba(0x79740eff).into()),
-                ("keyword".into(), rgba(0x9d0006ff).into()),
-                ("tag".into(), rgba(0x427b58ff).into()),
-                ("primary".into(), rgba(0x282828ff).into()),
-                ("link_uri".into(), rgba(0x8f3e71ff).into()),
-                ("comment.doc".into(), rgba(0x5d544eff).into()),
-                ("boolean".into(), rgba(0x8f3e71ff).into()),
-                ("embedded".into(), rgba(0x427b58ff).into()),
-                ("hint".into(), rgba(0x677562ff).into()),
-                ("emphasis.strong".into(), rgba(0x0b6678ff).into()),
-                ("operator".into(), rgba(0x427b58ff).into()),
-                ("label".into(), rgba(0x0b6678ff).into()),
-                ("comment".into(), rgba(0x7c6f64ff).into()),
-                ("function.builtin".into(), rgba(0x9d0006ff).into()),
-                ("punctuation.bracket".into(), rgba(0x665c54ff).into()),
-                ("text.literal".into(), rgba(0x066578ff).into()),
-                ("string.regex".into(), rgba(0xaf3a02ff).into()),
-                ("property".into(), rgba(0x282828ff).into()),
-                ("attribute".into(), rgba(0x0b6678ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x413d3aff).into()),
-                ("constructor".into(), rgba(0x0b6678ff).into()),
-                ("variable".into(), rgba(0x066578ff).into()),
-                ("constant".into(), rgba(0xb57613ff).into()),
-                ("preproc".into(), rgba(0x282828ff).into()),
-                ("punctuation.special".into(), rgba(0x413d3aff).into()),
-                ("punctuation.list_marker".into(), rgba(0x282828ff).into()),
-                ("variant".into(), rgba(0x0b6678ff).into()),
-                ("predictive".into(), rgba(0x7c9780ff).into()),
-                ("enum".into(), rgba(0xaf3a02ff).into()),
-            ],
-        },
-        status_bar: rgba(0xd9c8a4ff).into(),
-        title_bar: rgba(0xd9c8a4ff).into(),
-        toolbar: rgba(0xfbf1c7ff).into(),
-        tab_bar: rgba(0xecddb4ff).into(),
-        editor: rgba(0xfbf1c7ff).into(),
-        editor_subheader: rgba(0xecddb4ff).into(),
-        editor_active_line: rgba(0xecddb4ff).into(),
-        terminal: rgba(0xfbf1c7ff).into(),
-        image_fallback_background: rgba(0xd9c8a4ff).into(),
-        git_created: rgba(0x797410ff).into(),
-        git_modified: rgba(0x0b6678ff).into(),
-        git_deleted: rgba(0x9d0308ff).into(),
-        git_conflict: rgba(0xb57615ff).into(),
-        git_ignored: rgba(0x897b6eff).into(),
-        git_renamed: rgba(0xb57615ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x0b6678ff).into(),
-                selection: rgba(0x0b66783d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x797410ff).into(),
-                selection: rgba(0x7974103d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7c6f64ff).into(),
-                selection: rgba(0x7c6f643d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xaf3a04ff).into(),
-                selection: rgba(0xaf3a043d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8f3f70ff).into(),
-                selection: rgba(0x8f3f703d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x437b59ff).into(),
-                selection: rgba(0x437b593d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9d0308ff).into(),
-                selection: rgba(0x9d03083d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb57615ff).into(),
-                selection: rgba(0xb576153d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/gruvbox_light_hard.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn gruvbox_light_hard() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Gruvbox Light Hard".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xc8b899ff).into(),
-        border_variant: rgba(0xc8b899ff).into(),
-        border_focused: rgba(0xadc5ccff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xd9c8a4ff).into(),
-        surface: rgba(0xecddb5ff).into(),
-        background: rgba(0xd9c8a4ff).into(),
-        filled_element: rgba(0xd9c8a4ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xd2dee2ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xd2dee2ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x282828ff).into(),
-        text_muted: rgba(0x5f5650ff).into(),
-        text_placeholder: rgba(0x9d0308ff).into(),
-        text_disabled: rgba(0x897b6eff).into(),
-        text_accent: rgba(0x0b6678ff).into(),
-        icon_muted: rgba(0x5f5650ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("label".into(), rgba(0x0b6678ff).into()),
-                ("hint".into(), rgba(0x677562ff).into()),
-                ("boolean".into(), rgba(0x8f3e71ff).into()),
-                ("function.builtin".into(), rgba(0x9d0006ff).into()),
-                ("constant".into(), rgba(0xb57613ff).into()),
-                ("preproc".into(), rgba(0x282828ff).into()),
-                ("predictive".into(), rgba(0x7c9780ff).into()),
-                ("string".into(), rgba(0x79740eff).into()),
-                ("comment.doc".into(), rgba(0x5d544eff).into()),
-                ("function".into(), rgba(0x79740eff).into()),
-                ("title".into(), rgba(0x79740eff).into()),
-                ("text.literal".into(), rgba(0x066578ff).into()),
-                ("punctuation.bracket".into(), rgba(0x665c54ff).into()),
-                ("string.escape".into(), rgba(0x5d544eff).into()),
-                ("punctuation.delimiter".into(), rgba(0x413d3aff).into()),
-                ("string.special.symbol".into(), rgba(0x427b58ff).into()),
-                ("type".into(), rgba(0xb57613ff).into()),
-                ("constructor".into(), rgba(0x0b6678ff).into()),
-                ("property".into(), rgba(0x282828ff).into()),
-                ("comment".into(), rgba(0x7c6f64ff).into()),
-                ("enum".into(), rgba(0xaf3a02ff).into()),
-                ("emphasis".into(), rgba(0x0b6678ff).into()),
-                ("embedded".into(), rgba(0x427b58ff).into()),
-                ("operator".into(), rgba(0x427b58ff).into()),
-                ("attribute".into(), rgba(0x0b6678ff).into()),
-                ("emphasis.strong".into(), rgba(0x0b6678ff).into()),
-                ("link_text".into(), rgba(0x427b58ff).into()),
-                ("punctuation.special".into(), rgba(0x413d3aff).into()),
-                ("punctuation.list_marker".into(), rgba(0x282828ff).into()),
-                ("variant".into(), rgba(0x0b6678ff).into()),
-                ("primary".into(), rgba(0x282828ff).into()),
-                ("number".into(), rgba(0x8f3e71ff).into()),
-                ("tag".into(), rgba(0x427b58ff).into()),
-                ("keyword".into(), rgba(0x9d0006ff).into()),
-                ("link_uri".into(), rgba(0x8f3e71ff).into()),
-                ("string.regex".into(), rgba(0xaf3a02ff).into()),
-                ("variable".into(), rgba(0x066578ff).into()),
-                ("string.special".into(), rgba(0x8f3e71ff).into()),
-                ("punctuation".into(), rgba(0x3c3836ff).into()),
-            ],
-        },
-        status_bar: rgba(0xd9c8a4ff).into(),
-        title_bar: rgba(0xd9c8a4ff).into(),
-        toolbar: rgba(0xf9f5d7ff).into(),
-        tab_bar: rgba(0xecddb5ff).into(),
-        editor: rgba(0xf9f5d7ff).into(),
-        editor_subheader: rgba(0xecddb5ff).into(),
-        editor_active_line: rgba(0xecddb5ff).into(),
-        terminal: rgba(0xf9f5d7ff).into(),
-        image_fallback_background: rgba(0xd9c8a4ff).into(),
-        git_created: rgba(0x797410ff).into(),
-        git_modified: rgba(0x0b6678ff).into(),
-        git_deleted: rgba(0x9d0308ff).into(),
-        git_conflict: rgba(0xb57615ff).into(),
-        git_ignored: rgba(0x897b6eff).into(),
-        git_renamed: rgba(0xb57615ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x0b6678ff).into(),
-                selection: rgba(0x0b66783d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x797410ff).into(),
-                selection: rgba(0x7974103d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7c6f64ff).into(),
-                selection: rgba(0x7c6f643d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xaf3a04ff).into(),
-                selection: rgba(0xaf3a043d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8f3f70ff).into(),
-                selection: rgba(0x8f3f703d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x437b59ff).into(),
-                selection: rgba(0x437b593d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9d0308ff).into(),
-                selection: rgba(0x9d03083d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb57615ff).into(),
-                selection: rgba(0xb576153d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/gruvbox_light_soft.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn gruvbox_light_soft() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Gruvbox Light Soft".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xc8b899ff).into(),
-        border_variant: rgba(0xc8b899ff).into(),
-        border_focused: rgba(0xadc5ccff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xd9c8a4ff).into(),
-        surface: rgba(0xecdcb3ff).into(),
-        background: rgba(0xd9c8a4ff).into(),
-        filled_element: rgba(0xd9c8a4ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xd2dee2ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xd2dee2ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x282828ff).into(),
-        text_muted: rgba(0x5f5650ff).into(),
-        text_placeholder: rgba(0x9d0308ff).into(),
-        text_disabled: rgba(0x897b6eff).into(),
-        text_accent: rgba(0x0b6678ff).into(),
-        icon_muted: rgba(0x5f5650ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("preproc".into(), rgba(0x282828ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x282828ff).into()),
-                ("string".into(), rgba(0x79740eff).into()),
-                ("constant".into(), rgba(0xb57613ff).into()),
-                ("keyword".into(), rgba(0x9d0006ff).into()),
-                ("string.special.symbol".into(), rgba(0x427b58ff).into()),
-                ("comment.doc".into(), rgba(0x5d544eff).into()),
-                ("hint".into(), rgba(0x677562ff).into()),
-                ("number".into(), rgba(0x8f3e71ff).into()),
-                ("enum".into(), rgba(0xaf3a02ff).into()),
-                ("emphasis".into(), rgba(0x0b6678ff).into()),
-                ("operator".into(), rgba(0x427b58ff).into()),
-                ("comment".into(), rgba(0x7c6f64ff).into()),
-                ("embedded".into(), rgba(0x427b58ff).into()),
-                ("type".into(), rgba(0xb57613ff).into()),
-                ("title".into(), rgba(0x79740eff).into()),
-                ("constructor".into(), rgba(0x0b6678ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x413d3aff).into()),
-                ("function".into(), rgba(0x79740eff).into()),
-                ("link_uri".into(), rgba(0x8f3e71ff).into()),
-                ("emphasis.strong".into(), rgba(0x0b6678ff).into()),
-                ("boolean".into(), rgba(0x8f3e71ff).into()),
-                ("function.builtin".into(), rgba(0x9d0006ff).into()),
-                ("predictive".into(), rgba(0x7c9780ff).into()),
-                ("string.regex".into(), rgba(0xaf3a02ff).into()),
-                ("tag".into(), rgba(0x427b58ff).into()),
-                ("text.literal".into(), rgba(0x066578ff).into()),
-                ("punctuation".into(), rgba(0x3c3836ff).into()),
-                ("punctuation.bracket".into(), rgba(0x665c54ff).into()),
-                ("variable".into(), rgba(0x066578ff).into()),
-                ("attribute".into(), rgba(0x0b6678ff).into()),
-                ("string.special".into(), rgba(0x8f3e71ff).into()),
-                ("label".into(), rgba(0x0b6678ff).into()),
-                ("string.escape".into(), rgba(0x5d544eff).into()),
-                ("link_text".into(), rgba(0x427b58ff).into()),
-                ("punctuation.special".into(), rgba(0x413d3aff).into()),
-                ("property".into(), rgba(0x282828ff).into()),
-                ("variant".into(), rgba(0x0b6678ff).into()),
-                ("primary".into(), rgba(0x282828ff).into()),
-            ],
-        },
-        status_bar: rgba(0xd9c8a4ff).into(),
-        title_bar: rgba(0xd9c8a4ff).into(),
-        toolbar: rgba(0xf2e5bcff).into(),
-        tab_bar: rgba(0xecdcb3ff).into(),
-        editor: rgba(0xf2e5bcff).into(),
-        editor_subheader: rgba(0xecdcb3ff).into(),
-        editor_active_line: rgba(0xecdcb3ff).into(),
-        terminal: rgba(0xf2e5bcff).into(),
-        image_fallback_background: rgba(0xd9c8a4ff).into(),
-        git_created: rgba(0x797410ff).into(),
-        git_modified: rgba(0x0b6678ff).into(),
-        git_deleted: rgba(0x9d0308ff).into(),
-        git_conflict: rgba(0xb57615ff).into(),
-        git_ignored: rgba(0x897b6eff).into(),
-        git_renamed: rgba(0xb57615ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x0b6678ff).into(),
-                selection: rgba(0x0b66783d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x797410ff).into(),
-                selection: rgba(0x7974103d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7c6f64ff).into(),
-                selection: rgba(0x7c6f643d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xaf3a04ff).into(),
-                selection: rgba(0xaf3a043d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x8f3f70ff).into(),
-                selection: rgba(0x8f3f703d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x437b59ff).into(),
-                selection: rgba(0x437b593d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9d0308ff).into(),
-                selection: rgba(0x9d03083d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb57615ff).into(),
-                selection: rgba(0xb576153d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/mod.rs 🔗

@@ -1,79 +0,0 @@
-mod andromeda;
-mod atelier_cave_dark;
-mod atelier_cave_light;
-mod atelier_dune_dark;
-mod atelier_dune_light;
-mod atelier_estuary_dark;
-mod atelier_estuary_light;
-mod atelier_forest_dark;
-mod atelier_forest_light;
-mod atelier_heath_dark;
-mod atelier_heath_light;
-mod atelier_lakeside_dark;
-mod atelier_lakeside_light;
-mod atelier_plateau_dark;
-mod atelier_plateau_light;
-mod atelier_savanna_dark;
-mod atelier_savanna_light;
-mod atelier_seaside_dark;
-mod atelier_seaside_light;
-mod atelier_sulphurpool_dark;
-mod atelier_sulphurpool_light;
-mod ayu_dark;
-mod ayu_light;
-mod ayu_mirage;
-mod gruvbox_dark;
-mod gruvbox_dark_hard;
-mod gruvbox_dark_soft;
-mod gruvbox_light;
-mod gruvbox_light_hard;
-mod gruvbox_light_soft;
-mod one_dark;
-mod one_light;
-mod rose_pine;
-mod rose_pine_dawn;
-mod rose_pine_moon;
-mod sandcastle;
-mod solarized_dark;
-mod solarized_light;
-mod summercamp;
-
-pub use andromeda::*;
-pub use atelier_cave_dark::*;
-pub use atelier_cave_light::*;
-pub use atelier_dune_dark::*;
-pub use atelier_dune_light::*;
-pub use atelier_estuary_dark::*;
-pub use atelier_estuary_light::*;
-pub use atelier_forest_dark::*;
-pub use atelier_forest_light::*;
-pub use atelier_heath_dark::*;
-pub use atelier_heath_light::*;
-pub use atelier_lakeside_dark::*;
-pub use atelier_lakeside_light::*;
-pub use atelier_plateau_dark::*;
-pub use atelier_plateau_light::*;
-pub use atelier_savanna_dark::*;
-pub use atelier_savanna_light::*;
-pub use atelier_seaside_dark::*;
-pub use atelier_seaside_light::*;
-pub use atelier_sulphurpool_dark::*;
-pub use atelier_sulphurpool_light::*;
-pub use ayu_dark::*;
-pub use ayu_light::*;
-pub use ayu_mirage::*;
-pub use gruvbox_dark::*;
-pub use gruvbox_dark_hard::*;
-pub use gruvbox_dark_soft::*;
-pub use gruvbox_light::*;
-pub use gruvbox_light_hard::*;
-pub use gruvbox_light_soft::*;
-pub use one_dark::*;
-pub use one_light::*;
-pub use rose_pine::*;
-pub use rose_pine_dawn::*;
-pub use rose_pine_moon::*;
-pub use sandcastle::*;
-pub use solarized_dark::*;
-pub use solarized_light::*;
-pub use summercamp::*;

crates/theme2/src/themes/one_dark.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn one_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "One Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x464b57ff).into(),
-        border_variant: rgba(0x464b57ff).into(),
-        border_focused: rgba(0x293b5bff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x3b414dff).into(),
-        surface: rgba(0x2f343eff).into(),
-        background: rgba(0x3b414dff).into(),
-        filled_element: rgba(0x3b414dff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x18243dff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x18243dff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xc8ccd4ff).into(),
-        text_muted: rgba(0x838994ff).into(),
-        text_placeholder: rgba(0xd07277ff).into(),
-        text_disabled: rgba(0x555a63ff).into(),
-        text_accent: rgba(0x74ade8ff).into(),
-        icon_muted: rgba(0x838994ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("keyword".into(), rgba(0xb477cfff).into()),
-                ("comment.doc".into(), rgba(0x878e98ff).into()),
-                ("variant".into(), rgba(0x73ade9ff).into()),
-                ("property".into(), rgba(0xd07277ff).into()),
-                ("function".into(), rgba(0x73ade9ff).into()),
-                ("type".into(), rgba(0x6eb4bfff).into()),
-                ("tag".into(), rgba(0x74ade8ff).into()),
-                ("string.escape".into(), rgba(0x878e98ff).into()),
-                ("punctuation.bracket".into(), rgba(0xb2b9c6ff).into()),
-                ("hint".into(), rgba(0x5a6f89ff).into()),
-                ("punctuation".into(), rgba(0xacb2beff).into()),
-                ("comment".into(), rgba(0x5d636fff).into()),
-                ("emphasis".into(), rgba(0x74ade8ff).into()),
-                ("punctuation.special".into(), rgba(0xb1574bff).into()),
-                ("link_uri".into(), rgba(0x6eb4bfff).into()),
-                ("string.regex".into(), rgba(0xbf956aff).into()),
-                ("constructor".into(), rgba(0x73ade9ff).into()),
-                ("operator".into(), rgba(0x6eb4bfff).into()),
-                ("constant".into(), rgba(0xdfc184ff).into()),
-                ("string.special".into(), rgba(0xbf956aff).into()),
-                ("emphasis.strong".into(), rgba(0xbf956aff).into()),
-                ("string.special.symbol".into(), rgba(0xbf956aff).into()),
-                ("primary".into(), rgba(0xacb2beff).into()),
-                ("preproc".into(), rgba(0xc8ccd4ff).into()),
-                ("string".into(), rgba(0xa1c181ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xb2b9c6ff).into()),
-                ("embedded".into(), rgba(0xc8ccd4ff).into()),
-                ("enum".into(), rgba(0xd07277ff).into()),
-                ("variable.special".into(), rgba(0xbf956aff).into()),
-                ("text.literal".into(), rgba(0xa1c181ff).into()),
-                ("attribute".into(), rgba(0x74ade8ff).into()),
-                ("link_text".into(), rgba(0x73ade9ff).into()),
-                ("title".into(), rgba(0xd07277ff).into()),
-                ("predictive".into(), rgba(0x5a6a87ff).into()),
-                ("number".into(), rgba(0xbf956aff).into()),
-                ("label".into(), rgba(0x74ade8ff).into()),
-                ("variable".into(), rgba(0xc8ccd4ff).into()),
-                ("boolean".into(), rgba(0xbf956aff).into()),
-                ("punctuation.list_marker".into(), rgba(0xd07277ff).into()),
-            ],
-        },
-        status_bar: rgba(0x3b414dff).into(),
-        title_bar: rgba(0x3b414dff).into(),
-        toolbar: rgba(0x282c33ff).into(),
-        tab_bar: rgba(0x2f343eff).into(),
-        editor: rgba(0x282c33ff).into(),
-        editor_subheader: rgba(0x2f343eff).into(),
-        editor_active_line: rgba(0x2f343eff).into(),
-        terminal: rgba(0x282c33ff).into(),
-        image_fallback_background: rgba(0x3b414dff).into(),
-        git_created: rgba(0xa1c181ff).into(),
-        git_modified: rgba(0x74ade8ff).into(),
-        git_deleted: rgba(0xd07277ff).into(),
-        git_conflict: rgba(0xdec184ff).into(),
-        git_ignored: rgba(0x555a63ff).into(),
-        git_renamed: rgba(0xdec184ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x74ade8ff).into(),
-                selection: rgba(0x74ade83d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa1c181ff).into(),
-                selection: rgba(0xa1c1813d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbe5046ff).into(),
-                selection: rgba(0xbe50463d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xbf956aff).into(),
-                selection: rgba(0xbf956a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb477cfff).into(),
-                selection: rgba(0xb477cf3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6eb4bfff).into(),
-                selection: rgba(0x6eb4bf3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd07277ff).into(),
-                selection: rgba(0xd072773d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xdec184ff).into(),
-                selection: rgba(0xdec1843d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/one_light.rs 🔗

@@ -1,131 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn one_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "One Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xc9c9caff).into(),
-        border_variant: rgba(0xc9c9caff).into(),
-        border_focused: rgba(0xcbcdf6ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xdcdcddff).into(),
-        surface: rgba(0xebebecff).into(),
-        background: rgba(0xdcdcddff).into(),
-        filled_element: rgba(0xdcdcddff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xe2e2faff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xe2e2faff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x383a41ff).into(),
-        text_muted: rgba(0x7e8087ff).into(),
-        text_placeholder: rgba(0xd36151ff).into(),
-        text_disabled: rgba(0xa1a1a3ff).into(),
-        text_accent: rgba(0x5c78e2ff).into(),
-        icon_muted: rgba(0x7e8087ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("string.special.symbol".into(), rgba(0xad6e26ff).into()),
-                ("hint".into(), rgba(0x9294beff).into()),
-                ("link_uri".into(), rgba(0x3882b7ff).into()),
-                ("type".into(), rgba(0x3882b7ff).into()),
-                ("string.regex".into(), rgba(0xad6e26ff).into()),
-                ("constant".into(), rgba(0x669f59ff).into()),
-                ("function".into(), rgba(0x5b79e3ff).into()),
-                ("string.special".into(), rgba(0xad6e26ff).into()),
-                ("punctuation.bracket".into(), rgba(0x4d4f52ff).into()),
-                ("variable".into(), rgba(0x383a41ff).into()),
-                ("punctuation".into(), rgba(0x383a41ff).into()),
-                ("property".into(), rgba(0xd3604fff).into()),
-                ("string".into(), rgba(0x649f57ff).into()),
-                ("predictive".into(), rgba(0x9b9ec6ff).into()),
-                ("attribute".into(), rgba(0x5c78e2ff).into()),
-                ("number".into(), rgba(0xad6e25ff).into()),
-                ("constructor".into(), rgba(0x5c78e2ff).into()),
-                ("embedded".into(), rgba(0x383a41ff).into()),
-                ("title".into(), rgba(0xd3604fff).into()),
-                ("tag".into(), rgba(0x5c78e2ff).into()),
-                ("boolean".into(), rgba(0xad6e25ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xd3604fff).into()),
-                ("variant".into(), rgba(0x5b79e3ff).into()),
-                ("emphasis".into(), rgba(0x5c78e2ff).into()),
-                ("link_text".into(), rgba(0x5b79e3ff).into()),
-                ("comment".into(), rgba(0xa2a3a7ff).into()),
-                ("punctuation.special".into(), rgba(0xb92b46ff).into()),
-                ("emphasis.strong".into(), rgba(0xad6e25ff).into()),
-                ("primary".into(), rgba(0x383a41ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x4d4f52ff).into()),
-                ("label".into(), rgba(0x5c78e2ff).into()),
-                ("keyword".into(), rgba(0xa449abff).into()),
-                ("string.escape".into(), rgba(0x7c7e86ff).into()),
-                ("text.literal".into(), rgba(0x649f57ff).into()),
-                ("variable.special".into(), rgba(0xad6e25ff).into()),
-                ("comment.doc".into(), rgba(0x7c7e86ff).into()),
-                ("enum".into(), rgba(0xd3604fff).into()),
-                ("operator".into(), rgba(0x3882b7ff).into()),
-                ("preproc".into(), rgba(0x383a41ff).into()),
-            ],
-        },
-        status_bar: rgba(0xdcdcddff).into(),
-        title_bar: rgba(0xdcdcddff).into(),
-        toolbar: rgba(0xfafafaff).into(),
-        tab_bar: rgba(0xebebecff).into(),
-        editor: rgba(0xfafafaff).into(),
-        editor_subheader: rgba(0xebebecff).into(),
-        editor_active_line: rgba(0xebebecff).into(),
-        terminal: rgba(0xfafafaff).into(),
-        image_fallback_background: rgba(0xdcdcddff).into(),
-        git_created: rgba(0x669f59ff).into(),
-        git_modified: rgba(0x5c78e2ff).into(),
-        git_deleted: rgba(0xd36151ff).into(),
-        git_conflict: rgba(0xdec184ff).into(),
-        git_ignored: rgba(0xa1a1a3ff).into(),
-        git_renamed: rgba(0xdec184ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x5c78e2ff).into(),
-                selection: rgba(0x5c78e23d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x669f59ff).into(),
-                selection: rgba(0x669f593d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x984ea5ff).into(),
-                selection: rgba(0x984ea53d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xad6e26ff).into(),
-                selection: rgba(0xad6e263d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa349abff).into(),
-                selection: rgba(0xa349ab3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x3a82b7ff).into(),
-                selection: rgba(0x3a82b73d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd36151ff).into(),
-                selection: rgba(0xd361513d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xdec184ff).into(),
-                selection: rgba(0xdec1843d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/rose_pine.rs 🔗

@@ -1,132 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn rose_pine() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Rosé Pine".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x423f55ff).into(),
-        border_variant: rgba(0x423f55ff).into(),
-        border_focused: rgba(0x435255ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x292738ff).into(),
-        surface: rgba(0x1c1b2aff).into(),
-        background: rgba(0x292738ff).into(),
-        filled_element: rgba(0x292738ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x2f3639ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x2f3639ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xe0def4ff).into(),
-        text_muted: rgba(0x74708dff).into(),
-        text_placeholder: rgba(0xea6e92ff).into(),
-        text_disabled: rgba(0x2f2b43ff).into(),
-        text_accent: rgba(0x9bced6ff).into(),
-        icon_muted: rgba(0x74708dff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("punctuation.delimiter".into(), rgba(0x9d99b6ff).into()),
-                ("number".into(), rgba(0x5cc1a3ff).into()),
-                ("punctuation.special".into(), rgba(0x9d99b6ff).into()),
-                ("string.escape".into(), rgba(0x76728fff).into()),
-                ("title".into(), rgba(0xf5c177ff).into()),
-                ("constant".into(), rgba(0x5cc1a3ff).into()),
-                ("string.regex".into(), rgba(0xc4a7e6ff).into()),
-                ("type.builtin".into(), rgba(0x9ccfd8ff).into()),
-                ("comment.doc".into(), rgba(0x76728fff).into()),
-                ("primary".into(), rgba(0xe0def4ff).into()),
-                ("string.special".into(), rgba(0xc4a7e6ff).into()),
-                ("punctuation".into(), rgba(0x908caaff).into()),
-                ("string.special.symbol".into(), rgba(0xc4a7e6ff).into()),
-                ("variant".into(), rgba(0x9bced6ff).into()),
-                ("function.method".into(), rgba(0xebbcbaff).into()),
-                ("comment".into(), rgba(0x6e6a86ff).into()),
-                ("boolean".into(), rgba(0xebbcbaff).into()),
-                ("preproc".into(), rgba(0xe0def4ff).into()),
-                ("link_uri".into(), rgba(0xebbcbaff).into()),
-                ("hint".into(), rgba(0x5e768cff).into()),
-                ("attribute".into(), rgba(0x9bced6ff).into()),
-                ("text.literal".into(), rgba(0xc4a7e6ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x9d99b6ff).into()),
-                ("operator".into(), rgba(0x30738fff).into()),
-                ("emphasis.strong".into(), rgba(0x9bced6ff).into()),
-                ("keyword".into(), rgba(0x30738fff).into()),
-                ("enum".into(), rgba(0xc4a7e6ff).into()),
-                ("tag".into(), rgba(0x9ccfd8ff).into()),
-                ("constructor".into(), rgba(0x9bced6ff).into()),
-                ("function".into(), rgba(0xebbcbaff).into()),
-                ("string".into(), rgba(0xf5c177ff).into()),
-                ("type".into(), rgba(0x9ccfd8ff).into()),
-                ("emphasis".into(), rgba(0x9bced6ff).into()),
-                ("link_text".into(), rgba(0x9ccfd8ff).into()),
-                ("property".into(), rgba(0x9bced6ff).into()),
-                ("predictive".into(), rgba(0x556b81ff).into()),
-                ("punctuation.bracket".into(), rgba(0x9d99b6ff).into()),
-                ("embedded".into(), rgba(0xe0def4ff).into()),
-                ("variable".into(), rgba(0xe0def4ff).into()),
-                ("label".into(), rgba(0x9bced6ff).into()),
-            ],
-        },
-        status_bar: rgba(0x292738ff).into(),
-        title_bar: rgba(0x292738ff).into(),
-        toolbar: rgba(0x191724ff).into(),
-        tab_bar: rgba(0x1c1b2aff).into(),
-        editor: rgba(0x191724ff).into(),
-        editor_subheader: rgba(0x1c1b2aff).into(),
-        editor_active_line: rgba(0x1c1b2aff).into(),
-        terminal: rgba(0x191724ff).into(),
-        image_fallback_background: rgba(0x292738ff).into(),
-        git_created: rgba(0x5cc1a3ff).into(),
-        git_modified: rgba(0x9bced6ff).into(),
-        git_deleted: rgba(0xea6e92ff).into(),
-        git_conflict: rgba(0xf5c177ff).into(),
-        git_ignored: rgba(0x2f2b43ff).into(),
-        git_renamed: rgba(0xf5c177ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x9bced6ff).into(),
-                selection: rgba(0x9bced63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5cc1a3ff).into(),
-                selection: rgba(0x5cc1a33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9d7591ff).into(),
-                selection: rgba(0x9d75913d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc4a7e6ff).into(),
-                selection: rgba(0xc4a7e63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc4a7e6ff).into(),
-                selection: rgba(0xc4a7e63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x31738fff).into(),
-                selection: rgba(0x31738f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xea6e92ff).into(),
-                selection: rgba(0xea6e923d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf5c177ff).into(),
-                selection: rgba(0xf5c1773d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/rose_pine_dawn.rs 🔗

@@ -1,132 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn rose_pine_dawn() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Rosé Pine Dawn".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0xdcd6d5ff).into(),
-        border_variant: rgba(0xdcd6d5ff).into(),
-        border_focused: rgba(0xc3d7dbff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xdcd8d8ff).into(),
-        surface: rgba(0xfef9f2ff).into(),
-        background: rgba(0xdcd8d8ff).into(),
-        filled_element: rgba(0xdcd8d8ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xdde9ebff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xdde9ebff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x575279ff).into(),
-        text_muted: rgba(0x706c8cff).into(),
-        text_placeholder: rgba(0xb4647aff).into(),
-        text_disabled: rgba(0x938fa3ff).into(),
-        text_accent: rgba(0x57949fff).into(),
-        icon_muted: rgba(0x706c8cff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("primary".into(), rgba(0x575279ff).into()),
-                ("attribute".into(), rgba(0x57949fff).into()),
-                ("operator".into(), rgba(0x276983ff).into()),
-                ("boolean".into(), rgba(0xd7827dff).into()),
-                ("tag".into(), rgba(0x55949fff).into()),
-                ("enum".into(), rgba(0x9079a9ff).into()),
-                ("embedded".into(), rgba(0x575279ff).into()),
-                ("label".into(), rgba(0x57949fff).into()),
-                ("function.method".into(), rgba(0xd7827dff).into()),
-                ("punctuation.list_marker".into(), rgba(0x635e82ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x635e82ff).into()),
-                ("string".into(), rgba(0xea9d34ff).into()),
-                ("type".into(), rgba(0x55949fff).into()),
-                ("string.regex".into(), rgba(0x9079a9ff).into()),
-                ("variable".into(), rgba(0x575279ff).into()),
-                ("constructor".into(), rgba(0x57949fff).into()),
-                ("punctuation.bracket".into(), rgba(0x635e82ff).into()),
-                ("emphasis".into(), rgba(0x57949fff).into()),
-                ("comment.doc".into(), rgba(0x6e6a8bff).into()),
-                ("comment".into(), rgba(0x9893a5ff).into()),
-                ("keyword".into(), rgba(0x276983ff).into()),
-                ("preproc".into(), rgba(0x575279ff).into()),
-                ("string.special".into(), rgba(0x9079a9ff).into()),
-                ("string.escape".into(), rgba(0x6e6a8bff).into()),
-                ("constant".into(), rgba(0x3daa8eff).into()),
-                ("property".into(), rgba(0x57949fff).into()),
-                ("punctuation.special".into(), rgba(0x635e82ff).into()),
-                ("text.literal".into(), rgba(0x9079a9ff).into()),
-                ("type.builtin".into(), rgba(0x55949fff).into()),
-                ("string.special.symbol".into(), rgba(0x9079a9ff).into()),
-                ("link_uri".into(), rgba(0xd7827dff).into()),
-                ("number".into(), rgba(0x3daa8eff).into()),
-                ("emphasis.strong".into(), rgba(0x57949fff).into()),
-                ("function".into(), rgba(0xd7827dff).into()),
-                ("title".into(), rgba(0xea9d34ff).into()),
-                ("punctuation".into(), rgba(0x797593ff).into()),
-                ("link_text".into(), rgba(0x55949fff).into()),
-                ("variant".into(), rgba(0x57949fff).into()),
-                ("predictive".into(), rgba(0xa2acbeff).into()),
-                ("hint".into(), rgba(0x7a92aaff).into()),
-            ],
-        },
-        status_bar: rgba(0xdcd8d8ff).into(),
-        title_bar: rgba(0xdcd8d8ff).into(),
-        toolbar: rgba(0xfaf4edff).into(),
-        tab_bar: rgba(0xfef9f2ff).into(),
-        editor: rgba(0xfaf4edff).into(),
-        editor_subheader: rgba(0xfef9f2ff).into(),
-        editor_active_line: rgba(0xfef9f2ff).into(),
-        terminal: rgba(0xfaf4edff).into(),
-        image_fallback_background: rgba(0xdcd8d8ff).into(),
-        git_created: rgba(0x3daa8eff).into(),
-        git_modified: rgba(0x57949fff).into(),
-        git_deleted: rgba(0xb4647aff).into(),
-        git_conflict: rgba(0xe99d35ff).into(),
-        git_ignored: rgba(0x938fa3ff).into(),
-        git_renamed: rgba(0xe99d35ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x57949fff).into(),
-                selection: rgba(0x57949f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x3daa8eff).into(),
-                selection: rgba(0x3daa8e3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x7c697fff).into(),
-                selection: rgba(0x7c697f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9079a9ff).into(),
-                selection: rgba(0x9079a93d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x9079a9ff).into(),
-                selection: rgba(0x9079a93d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x296983ff).into(),
-                selection: rgba(0x2969833d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb4647aff).into(),
-                selection: rgba(0xb4647a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xe99d35ff).into(),
-                selection: rgba(0xe99d353d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/rose_pine_moon.rs 🔗

@@ -1,132 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn rose_pine_moon() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Rosé Pine Moon".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x504c68ff).into(),
-        border_variant: rgba(0x504c68ff).into(),
-        border_focused: rgba(0x435255ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x38354eff).into(),
-        surface: rgba(0x28253cff).into(),
-        background: rgba(0x38354eff).into(),
-        filled_element: rgba(0x38354eff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x2f3639ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x2f3639ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xe0def4ff).into(),
-        text_muted: rgba(0x85819eff).into(),
-        text_placeholder: rgba(0xea6e92ff).into(),
-        text_disabled: rgba(0x605d7aff).into(),
-        text_accent: rgba(0x9bced6ff).into(),
-        icon_muted: rgba(0x85819eff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("type.builtin".into(), rgba(0x9ccfd8ff).into()),
-                ("variable".into(), rgba(0xe0def4ff).into()),
-                ("punctuation".into(), rgba(0x908caaff).into()),
-                ("number".into(), rgba(0x5cc1a3ff).into()),
-                ("comment".into(), rgba(0x6e6a86ff).into()),
-                ("string.special".into(), rgba(0xc4a7e6ff).into()),
-                ("string.escape".into(), rgba(0x8682a0ff).into()),
-                ("function.method".into(), rgba(0xea9a97ff).into()),
-                ("predictive".into(), rgba(0x516b83ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xaeabc6ff).into()),
-                ("primary".into(), rgba(0xe0def4ff).into()),
-                ("link_text".into(), rgba(0x9ccfd8ff).into()),
-                ("string.regex".into(), rgba(0xc4a7e6ff).into()),
-                ("constructor".into(), rgba(0x9bced6ff).into()),
-                ("constant".into(), rgba(0x5cc1a3ff).into()),
-                ("emphasis.strong".into(), rgba(0x9bced6ff).into()),
-                ("function".into(), rgba(0xea9a97ff).into()),
-                ("hint".into(), rgba(0x728aa2ff).into()),
-                ("preproc".into(), rgba(0xe0def4ff).into()),
-                ("property".into(), rgba(0x9bced6ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xaeabc6ff).into()),
-                ("emphasis".into(), rgba(0x9bced6ff).into()),
-                ("attribute".into(), rgba(0x9bced6ff).into()),
-                ("title".into(), rgba(0xf5c177ff).into()),
-                ("keyword".into(), rgba(0x3d8fb0ff).into()),
-                ("string".into(), rgba(0xf5c177ff).into()),
-                ("text.literal".into(), rgba(0xc4a7e6ff).into()),
-                ("embedded".into(), rgba(0xe0def4ff).into()),
-                ("comment.doc".into(), rgba(0x8682a0ff).into()),
-                ("variant".into(), rgba(0x9bced6ff).into()),
-                ("label".into(), rgba(0x9bced6ff).into()),
-                ("punctuation.special".into(), rgba(0xaeabc6ff).into()),
-                ("string.special.symbol".into(), rgba(0xc4a7e6ff).into()),
-                ("tag".into(), rgba(0x9ccfd8ff).into()),
-                ("enum".into(), rgba(0xc4a7e6ff).into()),
-                ("boolean".into(), rgba(0xea9a97ff).into()),
-                ("punctuation.bracket".into(), rgba(0xaeabc6ff).into()),
-                ("operator".into(), rgba(0x3d8fb0ff).into()),
-                ("type".into(), rgba(0x9ccfd8ff).into()),
-                ("link_uri".into(), rgba(0xea9a97ff).into()),
-            ],
-        },
-        status_bar: rgba(0x38354eff).into(),
-        title_bar: rgba(0x38354eff).into(),
-        toolbar: rgba(0x232136ff).into(),
-        tab_bar: rgba(0x28253cff).into(),
-        editor: rgba(0x232136ff).into(),
-        editor_subheader: rgba(0x28253cff).into(),
-        editor_active_line: rgba(0x28253cff).into(),
-        terminal: rgba(0x232136ff).into(),
-        image_fallback_background: rgba(0x38354eff).into(),
-        git_created: rgba(0x5cc1a3ff).into(),
-        git_modified: rgba(0x9bced6ff).into(),
-        git_deleted: rgba(0xea6e92ff).into(),
-        git_conflict: rgba(0xf5c177ff).into(),
-        git_ignored: rgba(0x605d7aff).into(),
-        git_renamed: rgba(0xf5c177ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x9bced6ff).into(),
-                selection: rgba(0x9bced63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5cc1a3ff).into(),
-                selection: rgba(0x5cc1a33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa683a0ff).into(),
-                selection: rgba(0xa683a03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc4a7e6ff).into(),
-                selection: rgba(0xc4a7e63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xc4a7e6ff).into(),
-                selection: rgba(0xc4a7e63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x3e8fb0ff).into(),
-                selection: rgba(0x3e8fb03d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xea6e92ff).into(),
-                selection: rgba(0xea6e923d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf5c177ff).into(),
-                selection: rgba(0xf5c1773d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/sandcastle.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn sandcastle() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Sandcastle".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x3d4350ff).into(),
-        border_variant: rgba(0x3d4350ff).into(),
-        border_focused: rgba(0x223131ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x333944ff).into(),
-        surface: rgba(0x2b3038ff).into(),
-        background: rgba(0x333944ff).into(),
-        filled_element: rgba(0x333944ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x171e1eff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x171e1eff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xfdf4c1ff).into(),
-        text_muted: rgba(0xa69782ff).into(),
-        text_placeholder: rgba(0xb3627aff).into(),
-        text_disabled: rgba(0x827568ff).into(),
-        text_accent: rgba(0x518b8bff).into(),
-        icon_muted: rgba(0xa69782ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("comment".into(), rgba(0xa89984ff).into()),
-                ("type".into(), rgba(0x83a598ff).into()),
-                ("preproc".into(), rgba(0xfdf4c1ff).into()),
-                ("punctuation.bracket".into(), rgba(0xd5c5a1ff).into()),
-                ("hint".into(), rgba(0x727d68ff).into()),
-                ("link_uri".into(), rgba(0x83a598ff).into()),
-                ("text.literal".into(), rgba(0xa07d3aff).into()),
-                ("enum".into(), rgba(0xa07d3aff).into()),
-                ("string.special".into(), rgba(0xa07d3aff).into()),
-                ("string".into(), rgba(0xa07d3aff).into()),
-                ("punctuation.special".into(), rgba(0xd5c5a1ff).into()),
-                ("keyword".into(), rgba(0x518b8bff).into()),
-                ("constructor".into(), rgba(0x518b8bff).into()),
-                ("predictive".into(), rgba(0x5c6152ff).into()),
-                ("title".into(), rgba(0xfdf4c1ff).into()),
-                ("variable".into(), rgba(0xfdf4c1ff).into()),
-                ("emphasis.strong".into(), rgba(0x518b8bff).into()),
-                ("primary".into(), rgba(0xfdf4c1ff).into()),
-                ("emphasis".into(), rgba(0x518b8bff).into()),
-                ("punctuation".into(), rgba(0xd5c5a1ff).into()),
-                ("constant".into(), rgba(0x83a598ff).into()),
-                ("link_text".into(), rgba(0xa07d3aff).into()),
-                ("punctuation.delimiter".into(), rgba(0xd5c5a1ff).into()),
-                ("embedded".into(), rgba(0xfdf4c1ff).into()),
-                ("string.special.symbol".into(), rgba(0xa07d3aff).into()),
-                ("tag".into(), rgba(0x518b8bff).into()),
-                ("punctuation.list_marker".into(), rgba(0xd5c5a1ff).into()),
-                ("operator".into(), rgba(0xa07d3aff).into()),
-                ("boolean".into(), rgba(0x83a598ff).into()),
-                ("function".into(), rgba(0xa07d3aff).into()),
-                ("attribute".into(), rgba(0x518b8bff).into()),
-                ("number".into(), rgba(0x83a598ff).into()),
-                ("string.escape".into(), rgba(0xa89984ff).into()),
-                ("comment.doc".into(), rgba(0xa89984ff).into()),
-                ("label".into(), rgba(0x518b8bff).into()),
-                ("string.regex".into(), rgba(0xa07d3aff).into()),
-                ("property".into(), rgba(0x518b8bff).into()),
-                ("variant".into(), rgba(0x518b8bff).into()),
-            ],
-        },
-        status_bar: rgba(0x333944ff).into(),
-        title_bar: rgba(0x333944ff).into(),
-        toolbar: rgba(0x282c33ff).into(),
-        tab_bar: rgba(0x2b3038ff).into(),
-        editor: rgba(0x282c33ff).into(),
-        editor_subheader: rgba(0x2b3038ff).into(),
-        editor_active_line: rgba(0x2b3038ff).into(),
-        terminal: rgba(0x282c33ff).into(),
-        image_fallback_background: rgba(0x333944ff).into(),
-        git_created: rgba(0x83a598ff).into(),
-        git_modified: rgba(0x518b8bff).into(),
-        git_deleted: rgba(0xb3627aff).into(),
-        git_conflict: rgba(0xa07d3aff).into(),
-        git_ignored: rgba(0x827568ff).into(),
-        git_renamed: rgba(0xa07d3aff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x518b8bff).into(),
-                selection: rgba(0x518b8b3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x83a598ff).into(),
-                selection: rgba(0x83a5983d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa87222ff).into(),
-                selection: rgba(0xa872223d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa07d3aff).into(),
-                selection: rgba(0xa07d3a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd75f5fff).into(),
-                selection: rgba(0xd75f5f3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x83a598ff).into(),
-                selection: rgba(0x83a5983d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb3627aff).into(),
-                selection: rgba(0xb3627a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xa07d3aff).into(),
-                selection: rgba(0xa07d3a3d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/solarized_dark.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn solarized_dark() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Solarized Dark".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x2b4e58ff).into(),
-        border_variant: rgba(0x2b4e58ff).into(),
-        border_focused: rgba(0x1b3149ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x073743ff).into(),
-        surface: rgba(0x04313bff).into(),
-        background: rgba(0x073743ff).into(),
-        filled_element: rgba(0x073743ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x141f2cff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x141f2cff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xfdf6e3ff).into(),
-        text_muted: rgba(0x93a1a1ff).into(),
-        text_placeholder: rgba(0xdc3330ff).into(),
-        text_disabled: rgba(0x6f8389ff).into(),
-        text_accent: rgba(0x278ad1ff).into(),
-        icon_muted: rgba(0x93a1a1ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("punctuation.special".into(), rgba(0xefe9d6ff).into()),
-                ("string".into(), rgba(0xcb4b16ff).into()),
-                ("variant".into(), rgba(0x278ad1ff).into()),
-                ("variable".into(), rgba(0xfdf6e3ff).into()),
-                ("string.special.symbol".into(), rgba(0xcb4b16ff).into()),
-                ("primary".into(), rgba(0xfdf6e3ff).into()),
-                ("type".into(), rgba(0x2ba198ff).into()),
-                ("boolean".into(), rgba(0x849903ff).into()),
-                ("string.special".into(), rgba(0xcb4b16ff).into()),
-                ("label".into(), rgba(0x278ad1ff).into()),
-                ("link_uri".into(), rgba(0x849903ff).into()),
-                ("constructor".into(), rgba(0x278ad1ff).into()),
-                ("hint".into(), rgba(0x4f8297ff).into()),
-                ("preproc".into(), rgba(0xfdf6e3ff).into()),
-                ("text.literal".into(), rgba(0xcb4b16ff).into()),
-                ("string.escape".into(), rgba(0x99a5a4ff).into()),
-                ("link_text".into(), rgba(0xcb4b16ff).into()),
-                ("comment".into(), rgba(0x99a5a4ff).into()),
-                ("enum".into(), rgba(0xcb4b16ff).into()),
-                ("constant".into(), rgba(0x849903ff).into()),
-                ("comment.doc".into(), rgba(0x99a5a4ff).into()),
-                ("emphasis".into(), rgba(0x278ad1ff).into()),
-                ("predictive".into(), rgba(0x3f718bff).into()),
-                ("attribute".into(), rgba(0x278ad1ff).into()),
-                ("punctuation.delimiter".into(), rgba(0xefe9d6ff).into()),
-                ("function".into(), rgba(0xb58902ff).into()),
-                ("emphasis.strong".into(), rgba(0x278ad1ff).into()),
-                ("tag".into(), rgba(0x278ad1ff).into()),
-                ("string.regex".into(), rgba(0xcb4b16ff).into()),
-                ("property".into(), rgba(0x278ad1ff).into()),
-                ("keyword".into(), rgba(0x278ad1ff).into()),
-                ("number".into(), rgba(0x849903ff).into()),
-                ("embedded".into(), rgba(0xfdf6e3ff).into()),
-                ("operator".into(), rgba(0xcb4b16ff).into()),
-                ("punctuation".into(), rgba(0xefe9d6ff).into()),
-                ("punctuation.bracket".into(), rgba(0xefe9d6ff).into()),
-                ("title".into(), rgba(0xfdf6e3ff).into()),
-                ("punctuation.list_marker".into(), rgba(0xefe9d6ff).into()),
-            ],
-        },
-        status_bar: rgba(0x073743ff).into(),
-        title_bar: rgba(0x073743ff).into(),
-        toolbar: rgba(0x002a35ff).into(),
-        tab_bar: rgba(0x04313bff).into(),
-        editor: rgba(0x002a35ff).into(),
-        editor_subheader: rgba(0x04313bff).into(),
-        editor_active_line: rgba(0x04313bff).into(),
-        terminal: rgba(0x002a35ff).into(),
-        image_fallback_background: rgba(0x073743ff).into(),
-        git_created: rgba(0x849903ff).into(),
-        git_modified: rgba(0x278ad1ff).into(),
-        git_deleted: rgba(0xdc3330ff).into(),
-        git_conflict: rgba(0xb58902ff).into(),
-        git_ignored: rgba(0x6f8389ff).into(),
-        git_renamed: rgba(0xb58902ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x278ad1ff).into(),
-                selection: rgba(0x278ad13d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x849903ff).into(),
-                selection: rgba(0x8499033d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd33781ff).into(),
-                selection: rgba(0xd337813d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xcb4b16ff).into(),
-                selection: rgba(0xcb4b163d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6c71c4ff).into(),
-                selection: rgba(0x6c71c43d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2ba198ff).into(),
-                selection: rgba(0x2ba1983d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xdc3330ff).into(),
-                selection: rgba(0xdc33303d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb58902ff).into(),
-                selection: rgba(0xb589023d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/solarized_light.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn solarized_light() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Solarized Light".into(),
-            is_light: true,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x9faaa8ff).into(),
-        border_variant: rgba(0x9faaa8ff).into(),
-        border_focused: rgba(0xbfd3efff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0xcfd0c4ff).into(),
-        surface: rgba(0xf3eddaff).into(),
-        background: rgba(0xcfd0c4ff).into(),
-        filled_element: rgba(0xcfd0c4ff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0xdbe6f6ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0xdbe6f6ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0x002a35ff).into(),
-        text_muted: rgba(0x34555eff).into(),
-        text_placeholder: rgba(0xdc3330ff).into(),
-        text_disabled: rgba(0x6a7f86ff).into(),
-        text_accent: rgba(0x288bd1ff).into(),
-        icon_muted: rgba(0x34555eff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("string.escape".into(), rgba(0x30525bff).into()),
-                ("boolean".into(), rgba(0x849903ff).into()),
-                ("comment.doc".into(), rgba(0x30525bff).into()),
-                ("string.special".into(), rgba(0xcb4b17ff).into()),
-                ("punctuation".into(), rgba(0x04333eff).into()),
-                ("emphasis".into(), rgba(0x288bd1ff).into()),
-                ("type".into(), rgba(0x2ba198ff).into()),
-                ("preproc".into(), rgba(0x002a35ff).into()),
-                ("emphasis.strong".into(), rgba(0x288bd1ff).into()),
-                ("constant".into(), rgba(0x849903ff).into()),
-                ("title".into(), rgba(0x002a35ff).into()),
-                ("operator".into(), rgba(0xcb4b17ff).into()),
-                ("punctuation.bracket".into(), rgba(0x04333eff).into()),
-                ("link_uri".into(), rgba(0x849903ff).into()),
-                ("label".into(), rgba(0x288bd1ff).into()),
-                ("enum".into(), rgba(0xcb4b17ff).into()),
-                ("property".into(), rgba(0x288bd1ff).into()),
-                ("predictive".into(), rgba(0x679aafff).into()),
-                ("punctuation.special".into(), rgba(0x04333eff).into()),
-                ("text.literal".into(), rgba(0xcb4b17ff).into()),
-                ("string".into(), rgba(0xcb4b17ff).into()),
-                ("string.regex".into(), rgba(0xcb4b17ff).into()),
-                ("variable".into(), rgba(0x002a35ff).into()),
-                ("tag".into(), rgba(0x288bd1ff).into()),
-                ("string.special.symbol".into(), rgba(0xcb4b17ff).into()),
-                ("link_text".into(), rgba(0xcb4b17ff).into()),
-                ("punctuation.list_marker".into(), rgba(0x04333eff).into()),
-                ("keyword".into(), rgba(0x288bd1ff).into()),
-                ("constructor".into(), rgba(0x288bd1ff).into()),
-                ("attribute".into(), rgba(0x288bd1ff).into()),
-                ("variant".into(), rgba(0x288bd1ff).into()),
-                ("function".into(), rgba(0xb58903ff).into()),
-                ("primary".into(), rgba(0x002a35ff).into()),
-                ("hint".into(), rgba(0x5789a3ff).into()),
-                ("comment".into(), rgba(0x30525bff).into()),
-                ("number".into(), rgba(0x849903ff).into()),
-                ("punctuation.delimiter".into(), rgba(0x04333eff).into()),
-                ("embedded".into(), rgba(0x002a35ff).into()),
-            ],
-        },
-        status_bar: rgba(0xcfd0c4ff).into(),
-        title_bar: rgba(0xcfd0c4ff).into(),
-        toolbar: rgba(0xfdf6e3ff).into(),
-        tab_bar: rgba(0xf3eddaff).into(),
-        editor: rgba(0xfdf6e3ff).into(),
-        editor_subheader: rgba(0xf3eddaff).into(),
-        editor_active_line: rgba(0xf3eddaff).into(),
-        terminal: rgba(0xfdf6e3ff).into(),
-        image_fallback_background: rgba(0xcfd0c4ff).into(),
-        git_created: rgba(0x849903ff).into(),
-        git_modified: rgba(0x288bd1ff).into(),
-        git_deleted: rgba(0xdc3330ff).into(),
-        git_conflict: rgba(0xb58903ff).into(),
-        git_ignored: rgba(0x6a7f86ff).into(),
-        git_renamed: rgba(0xb58903ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x288bd1ff).into(),
-                selection: rgba(0x288bd13d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x849903ff).into(),
-                selection: rgba(0x8499033d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xd33781ff).into(),
-                selection: rgba(0xd337813d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xcb4b17ff).into(),
-                selection: rgba(0xcb4b173d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x6c71c3ff).into(),
-                selection: rgba(0x6c71c33d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x2ba198ff).into(),
-                selection: rgba(0x2ba1983d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xdc3330ff).into(),
-                selection: rgba(0xdc33303d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xb58903ff).into(),
-                selection: rgba(0xb589033d).into(),
-            },
-        ],
-    }
-}

crates/theme2/src/themes/summercamp.rs 🔗

@@ -1,130 +0,0 @@
-use gpui2::rgba;
-
-use crate::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub fn summercamp() -> Theme {
-    Theme {
-        metadata: ThemeMetadata {
-            name: "Summercamp".into(),
-            is_light: false,
-        },
-        transparent: rgba(0x00000000).into(),
-        mac_os_traffic_light_red: rgba(0xec695eff).into(),
-        mac_os_traffic_light_yellow: rgba(0xf4bf4eff).into(),
-        mac_os_traffic_light_green: rgba(0x61c553ff).into(),
-        border: rgba(0x302c21ff).into(),
-        border_variant: rgba(0x302c21ff).into(),
-        border_focused: rgba(0x193760ff).into(),
-        border_transparent: rgba(0x00000000).into(),
-        elevated_surface: rgba(0x2a261cff).into(),
-        surface: rgba(0x231f16ff).into(),
-        background: rgba(0x2a261cff).into(),
-        filled_element: rgba(0x2a261cff).into(),
-        filled_element_hover: rgba(0xffffff1e).into(),
-        filled_element_active: rgba(0xffffff28).into(),
-        filled_element_selected: rgba(0x0e2242ff).into(),
-        filled_element_disabled: rgba(0x00000000).into(),
-        ghost_element: rgba(0x00000000).into(),
-        ghost_element_hover: rgba(0xffffff14).into(),
-        ghost_element_active: rgba(0xffffff1e).into(),
-        ghost_element_selected: rgba(0x0e2242ff).into(),
-        ghost_element_disabled: rgba(0x00000000).into(),
-        text: rgba(0xf8f5deff).into(),
-        text_muted: rgba(0x736e55ff).into(),
-        text_placeholder: rgba(0xe35041ff).into(),
-        text_disabled: rgba(0x4c4735ff).into(),
-        text_accent: rgba(0x499befff).into(),
-        icon_muted: rgba(0x736e55ff).into(),
-        syntax: SyntaxTheme {
-            highlights: vec![
-                ("predictive".into(), rgba(0x78434aff).into()),
-                ("title".into(), rgba(0xf8f5deff).into()),
-                ("primary".into(), rgba(0xf8f5deff).into()),
-                ("punctuation.special".into(), rgba(0xbfbb9bff).into()),
-                ("constant".into(), rgba(0x5dea5aff).into()),
-                ("string.regex".into(), rgba(0xfaa11cff).into()),
-                ("tag".into(), rgba(0x499befff).into()),
-                ("preproc".into(), rgba(0xf8f5deff).into()),
-                ("comment".into(), rgba(0x777159ff).into()),
-                ("punctuation.bracket".into(), rgba(0xbfbb9bff).into()),
-                ("constructor".into(), rgba(0x499befff).into()),
-                ("type".into(), rgba(0x5aeabbff).into()),
-                ("variable".into(), rgba(0xf8f5deff).into()),
-                ("operator".into(), rgba(0xfaa11cff).into()),
-                ("boolean".into(), rgba(0x5dea5aff).into()),
-                ("attribute".into(), rgba(0x499befff).into()),
-                ("link_text".into(), rgba(0xfaa11cff).into()),
-                ("string.escape".into(), rgba(0x777159ff).into()),
-                ("string.special".into(), rgba(0xfaa11cff).into()),
-                ("string.special.symbol".into(), rgba(0xfaa11cff).into()),
-                ("hint".into(), rgba(0x246e61ff).into()),
-                ("link_uri".into(), rgba(0x5dea5aff).into()),
-                ("comment.doc".into(), rgba(0x777159ff).into()),
-                ("emphasis".into(), rgba(0x499befff).into()),
-                ("punctuation".into(), rgba(0xbfbb9bff).into()),
-                ("text.literal".into(), rgba(0xfaa11cff).into()),
-                ("number".into(), rgba(0x5dea5aff).into()),
-                ("punctuation.delimiter".into(), rgba(0xbfbb9bff).into()),
-                ("label".into(), rgba(0x499befff).into()),
-                ("function".into(), rgba(0xf1fe28ff).into()),
-                ("property".into(), rgba(0x499befff).into()),
-                ("keyword".into(), rgba(0x499befff).into()),
-                ("embedded".into(), rgba(0xf8f5deff).into()),
-                ("string".into(), rgba(0xfaa11cff).into()),
-                ("punctuation.list_marker".into(), rgba(0xbfbb9bff).into()),
-                ("enum".into(), rgba(0xfaa11cff).into()),
-                ("emphasis.strong".into(), rgba(0x499befff).into()),
-                ("variant".into(), rgba(0x499befff).into()),
-            ],
-        },
-        status_bar: rgba(0x2a261cff).into(),
-        title_bar: rgba(0x2a261cff).into(),
-        toolbar: rgba(0x1b1810ff).into(),
-        tab_bar: rgba(0x231f16ff).into(),
-        editor: rgba(0x1b1810ff).into(),
-        editor_subheader: rgba(0x231f16ff).into(),
-        editor_active_line: rgba(0x231f16ff).into(),
-        terminal: rgba(0x1b1810ff).into(),
-        image_fallback_background: rgba(0x2a261cff).into(),
-        git_created: rgba(0x5dea5aff).into(),
-        git_modified: rgba(0x499befff).into(),
-        git_deleted: rgba(0xe35041ff).into(),
-        git_conflict: rgba(0xf1fe28ff).into(),
-        git_ignored: rgba(0x4c4735ff).into(),
-        git_renamed: rgba(0xf1fe28ff).into(),
-        players: [
-            PlayerTheme {
-                cursor: rgba(0x499befff).into(),
-                selection: rgba(0x499bef3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5dea5aff).into(),
-                selection: rgba(0x5dea5a3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf59be6ff).into(),
-                selection: rgba(0xf59be63d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfaa11cff).into(),
-                selection: rgba(0xfaa11c3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xfe8080ff).into(),
-                selection: rgba(0xfe80803d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0x5aeabbff).into(),
-                selection: rgba(0x5aeabb3d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xe35041ff).into(),
-                selection: rgba(0xe350413d).into(),
-            },
-            PlayerTheme {
-                cursor: rgba(0xf1fe28ff).into(),
-                selection: rgba(0xf1fe283d).into(),
-            },
-        ],
-    }
-}

crates/theme_converter/Cargo.toml 🔗

@@ -1,18 +0,0 @@
-[package]
-name = "theme_converter"
-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]
-anyhow.workspace = true
-clap = { version = "4.4", features = ["derive", "string"] }
-convert_case = "0.6.0"
-gpui2 = { path = "../gpui2" }
-log.workspace = true
-rust-embed.workspace = true
-serde.workspace = true
-simplelog = "0.9"
-theme2 = { path = "../theme2" }

crates/theme_converter/src/main.rs 🔗

@@ -1,390 +0,0 @@
-mod theme_printer;
-
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::fmt::{self, Debug};
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-use std::str::FromStr;
-
-use anyhow::{anyhow, Context, Result};
-use clap::Parser;
-use convert_case::{Case, Casing};
-use gpui2::{hsla, rgb, serde_json, AssetSource, Hsla, SharedString};
-use log::LevelFilter;
-use rust_embed::RustEmbed;
-use serde::de::Visitor;
-use serde::{Deserialize, Deserializer};
-use simplelog::SimpleLogger;
-use theme2::{PlayerTheme, SyntaxTheme};
-
-use crate::theme_printer::ThemePrinter;
-
-#[derive(Parser)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-    /// The name of the theme to convert.
-    theme: String,
-}
-
-fn main() -> Result<()> {
-    SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
-
-    // let args = Args::parse();
-
-    let themes_path = PathBuf::from_str("crates/theme2/src/themes")?;
-
-    let mut theme_modules = Vec::new();
-
-    for theme_path in Assets.list("themes/")? {
-        let (_, theme_name) = theme_path.split_once("themes/").unwrap();
-
-        if theme_name == ".gitkeep" {
-            continue;
-        }
-
-        let (json_theme, legacy_theme) = load_theme(&theme_path)?;
-
-        let theme = convert_theme(json_theme, legacy_theme)?;
-
-        let theme_slug = theme
-            .metadata
-            .name
-            .as_ref()
-            .replace("é", "e")
-            .to_case(Case::Snake);
-
-        let mut output_file = File::create(themes_path.join(format!("{theme_slug}.rs")))?;
-
-        let theme_module = format!(
-            r#"
-                use gpui2::rgba;
-
-                use crate::{{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata}};
-
-                pub fn {theme_slug}() -> Theme {{
-                    {theme_definition}
-                }}
-            "#,
-            theme_definition = format!("{:#?}", ThemePrinter::new(theme))
-        );
-
-        output_file.write_all(theme_module.as_bytes())?;
-
-        theme_modules.push(theme_slug);
-    }
-
-    let mut mod_rs_file = File::create(themes_path.join(format!("mod.rs")))?;
-
-    let mod_rs_contents = format!(
-        r#"
-        {mod_statements}
-
-        {use_statements}
-        "#,
-        mod_statements = theme_modules
-            .iter()
-            .map(|module| format!("mod {module};"))
-            .collect::<Vec<_>>()
-            .join("\n"),
-        use_statements = theme_modules
-            .iter()
-            .map(|module| format!("pub use {module}::*;"))
-            .collect::<Vec<_>>()
-            .join("\n")
-    );
-
-    mod_rs_file.write_all(mod_rs_contents.as_bytes())?;
-
-    Ok(())
-}
-
-#[derive(RustEmbed)]
-#[folder = "../../assets"]
-#[include = "fonts/**/*"]
-#[include = "icons/**/*"]
-#[include = "themes/**/*"]
-#[include = "sounds/**/*"]
-#[include = "*.md"]
-#[exclude = "*.DS_Store"]
-pub struct Assets;
-
-impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<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) -> Result<Vec<SharedString>> {
-        Ok(Self::iter()
-            .filter(|p| p.starts_with(path))
-            .map(SharedString::from)
-            .collect())
-    }
-}
-
-#[derive(Clone, Copy)]
-pub struct PlayerThemeColors {
-    pub cursor: Hsla,
-    pub selection: Hsla,
-}
-
-impl PlayerThemeColors {
-    pub fn new(theme: &LegacyTheme, ix: usize) -> Self {
-        if ix < theme.players.len() {
-            Self {
-                cursor: theme.players[ix].cursor,
-                selection: theme.players[ix].selection,
-            }
-        } else {
-            Self {
-                cursor: rgb::<Hsla>(0xff00ff),
-                selection: rgb::<Hsla>(0xff00ff),
-            }
-        }
-    }
-}
-
-impl From<PlayerThemeColors> for PlayerTheme {
-    fn from(value: PlayerThemeColors) -> Self {
-        Self {
-            cursor: value.cursor,
-            selection: value.selection,
-        }
-    }
-}
-
-fn convert_theme(json_theme: JsonTheme, legacy_theme: LegacyTheme) -> Result<theme2::Theme> {
-    let transparent = hsla(0.0, 0.0, 0.0, 0.0);
-
-    let players: [PlayerTheme; 8] = [
-        PlayerThemeColors::new(&legacy_theme, 0).into(),
-        PlayerThemeColors::new(&legacy_theme, 1).into(),
-        PlayerThemeColors::new(&legacy_theme, 2).into(),
-        PlayerThemeColors::new(&legacy_theme, 3).into(),
-        PlayerThemeColors::new(&legacy_theme, 4).into(),
-        PlayerThemeColors::new(&legacy_theme, 5).into(),
-        PlayerThemeColors::new(&legacy_theme, 6).into(),
-        PlayerThemeColors::new(&legacy_theme, 7).into(),
-    ];
-
-    let theme = theme2::Theme {
-        metadata: theme2::ThemeMetadata {
-            name: legacy_theme.name.clone().into(),
-            is_light: legacy_theme.is_light,
-        },
-        transparent,
-        mac_os_traffic_light_red: rgb::<Hsla>(0xEC695E),
-        mac_os_traffic_light_yellow: rgb::<Hsla>(0xF4BF4F),
-        mac_os_traffic_light_green: rgb::<Hsla>(0x62C554),
-        border: legacy_theme.lowest.base.default.border,
-        border_variant: legacy_theme.lowest.variant.default.border,
-        border_focused: legacy_theme.lowest.accent.default.border,
-        border_transparent: transparent,
-        elevated_surface: legacy_theme.lowest.base.default.background,
-        surface: legacy_theme.middle.base.default.background,
-        background: legacy_theme.lowest.base.default.background,
-        filled_element: legacy_theme.lowest.base.default.background,
-        filled_element_hover: hsla(0.0, 0.0, 100.0, 0.12),
-        filled_element_active: hsla(0.0, 0.0, 100.0, 0.16),
-        filled_element_selected: legacy_theme.lowest.accent.default.background,
-        filled_element_disabled: transparent,
-        ghost_element: transparent,
-        ghost_element_hover: hsla(0.0, 0.0, 100.0, 0.08),
-        ghost_element_active: hsla(0.0, 0.0, 100.0, 0.12),
-        ghost_element_selected: legacy_theme.lowest.accent.default.background,
-        ghost_element_disabled: transparent,
-        text: legacy_theme.lowest.base.default.foreground,
-        text_muted: legacy_theme.lowest.variant.default.foreground,
-        /// TODO: map this to a real value
-        text_placeholder: legacy_theme.lowest.negative.default.foreground,
-        text_disabled: legacy_theme.lowest.base.disabled.foreground,
-        text_accent: legacy_theme.lowest.accent.default.foreground,
-        icon_muted: legacy_theme.lowest.variant.default.foreground,
-        syntax: SyntaxTheme {
-            highlights: json_theme
-                .editor
-                .syntax
-                .iter()
-                .map(|(token, style)| (token.clone(), style.color.clone().into()))
-                .collect(),
-        },
-        status_bar: legacy_theme.lowest.base.default.background,
-        title_bar: legacy_theme.lowest.base.default.background,
-        toolbar: legacy_theme.highest.base.default.background,
-        tab_bar: legacy_theme.middle.base.default.background,
-        editor: legacy_theme.highest.base.default.background,
-        editor_subheader: legacy_theme.middle.base.default.background,
-        terminal: legacy_theme.highest.base.default.background,
-        editor_active_line: legacy_theme.highest.on.default.background,
-        image_fallback_background: legacy_theme.lowest.base.default.background,
-
-        git_created: legacy_theme.lowest.positive.default.foreground,
-        git_modified: legacy_theme.lowest.accent.default.foreground,
-        git_deleted: legacy_theme.lowest.negative.default.foreground,
-        git_conflict: legacy_theme.lowest.warning.default.foreground,
-        git_ignored: legacy_theme.lowest.base.disabled.foreground,
-        git_renamed: legacy_theme.lowest.warning.default.foreground,
-
-        players,
-    };
-
-    Ok(theme)
-}
-
-#[derive(Deserialize)]
-struct JsonTheme {
-    pub editor: JsonEditorTheme,
-    pub base_theme: serde_json::Value,
-}
-
-#[derive(Deserialize)]
-struct JsonEditorTheme {
-    pub syntax: HashMap<String, JsonSyntaxStyle>,
-}
-
-#[derive(Deserialize)]
-struct JsonSyntaxStyle {
-    pub color: Hsla,
-}
-
-/// Loads the [`Theme`] with the given name.
-fn load_theme(theme_path: &str) -> Result<(JsonTheme, LegacyTheme)> {
-    let theme_contents =
-        Assets::get(theme_path).with_context(|| format!("theme file not found: '{theme_path}'"))?;
-
-    let json_theme: JsonTheme = serde_json::from_str(std::str::from_utf8(&theme_contents.data)?)
-        .context("failed to parse legacy theme")?;
-
-    let legacy_theme: LegacyTheme = serde_json::from_value(json_theme.base_theme.clone())
-        .context("failed to parse `base_theme`")?;
-
-    Ok((json_theme, legacy_theme))
-}
-
-#[derive(Deserialize, Clone, Default, Debug)]
-pub struct LegacyTheme {
-    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>,
-}
-
-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)
-}

crates/theme_converter/src/theme_printer.rs 🔗

@@ -1,174 +0,0 @@
-use std::fmt::{self, Debug};
-
-use gpui2::{Hsla, Rgba};
-use theme2::{PlayerTheme, SyntaxTheme, Theme, ThemeMetadata};
-
-pub struct ThemePrinter(Theme);
-
-impl ThemePrinter {
-    pub fn new(theme: Theme) -> Self {
-        Self(theme)
-    }
-}
-
-struct HslaPrinter(Hsla);
-
-impl Debug for HslaPrinter {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", IntoPrinter(&Rgba::from(self.0)))
-    }
-}
-
-struct IntoPrinter<'a, D: Debug>(&'a D);
-
-impl<'a, D: Debug> Debug for IntoPrinter<'a, D> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}.into()", self.0)
-    }
-}
-
-impl Debug for ThemePrinter {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Theme")
-            .field("metadata", &ThemeMetadataPrinter(self.0.metadata.clone()))
-            .field("transparent", &HslaPrinter(self.0.transparent))
-            .field(
-                "mac_os_traffic_light_red",
-                &HslaPrinter(self.0.mac_os_traffic_light_red),
-            )
-            .field(
-                "mac_os_traffic_light_yellow",
-                &HslaPrinter(self.0.mac_os_traffic_light_yellow),
-            )
-            .field(
-                "mac_os_traffic_light_green",
-                &HslaPrinter(self.0.mac_os_traffic_light_green),
-            )
-            .field("border", &HslaPrinter(self.0.border))
-            .field("border_variant", &HslaPrinter(self.0.border_variant))
-            .field("border_focused", &HslaPrinter(self.0.border_focused))
-            .field(
-                "border_transparent",
-                &HslaPrinter(self.0.border_transparent),
-            )
-            .field("elevated_surface", &HslaPrinter(self.0.elevated_surface))
-            .field("surface", &HslaPrinter(self.0.surface))
-            .field("background", &HslaPrinter(self.0.background))
-            .field("filled_element", &HslaPrinter(self.0.filled_element))
-            .field(
-                "filled_element_hover",
-                &HslaPrinter(self.0.filled_element_hover),
-            )
-            .field(
-                "filled_element_active",
-                &HslaPrinter(self.0.filled_element_active),
-            )
-            .field(
-                "filled_element_selected",
-                &HslaPrinter(self.0.filled_element_selected),
-            )
-            .field(
-                "filled_element_disabled",
-                &HslaPrinter(self.0.filled_element_disabled),
-            )
-            .field("ghost_element", &HslaPrinter(self.0.ghost_element))
-            .field(
-                "ghost_element_hover",
-                &HslaPrinter(self.0.ghost_element_hover),
-            )
-            .field(
-                "ghost_element_active",
-                &HslaPrinter(self.0.ghost_element_active),
-            )
-            .field(
-                "ghost_element_selected",
-                &HslaPrinter(self.0.ghost_element_selected),
-            )
-            .field(
-                "ghost_element_disabled",
-                &HslaPrinter(self.0.ghost_element_disabled),
-            )
-            .field("text", &HslaPrinter(self.0.text))
-            .field("text_muted", &HslaPrinter(self.0.text_muted))
-            .field("text_placeholder", &HslaPrinter(self.0.text_placeholder))
-            .field("text_disabled", &HslaPrinter(self.0.text_disabled))
-            .field("text_accent", &HslaPrinter(self.0.text_accent))
-            .field("icon_muted", &HslaPrinter(self.0.icon_muted))
-            .field("syntax", &SyntaxThemePrinter(self.0.syntax.clone()))
-            .field("status_bar", &HslaPrinter(self.0.status_bar))
-            .field("title_bar", &HslaPrinter(self.0.title_bar))
-            .field("toolbar", &HslaPrinter(self.0.toolbar))
-            .field("tab_bar", &HslaPrinter(self.0.tab_bar))
-            .field("editor", &HslaPrinter(self.0.editor))
-            .field("editor_subheader", &HslaPrinter(self.0.editor_subheader))
-            .field(
-                "editor_active_line",
-                &HslaPrinter(self.0.editor_active_line),
-            )
-            .field("terminal", &HslaPrinter(self.0.terminal))
-            .field(
-                "image_fallback_background",
-                &HslaPrinter(self.0.image_fallback_background),
-            )
-            .field("git_created", &HslaPrinter(self.0.git_created))
-            .field("git_modified", &HslaPrinter(self.0.git_modified))
-            .field("git_deleted", &HslaPrinter(self.0.git_deleted))
-            .field("git_conflict", &HslaPrinter(self.0.git_conflict))
-            .field("git_ignored", &HslaPrinter(self.0.git_ignored))
-            .field("git_renamed", &HslaPrinter(self.0.git_renamed))
-            .field("players", &self.0.players.map(PlayerThemePrinter))
-            .finish()
-    }
-}
-
-pub struct ThemeMetadataPrinter(ThemeMetadata);
-
-impl Debug for ThemeMetadataPrinter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("ThemeMetadata")
-            .field("name", &IntoPrinter(&self.0.name))
-            .field("is_light", &self.0.is_light)
-            .finish()
-    }
-}
-
-pub struct SyntaxThemePrinter(SyntaxTheme);
-
-impl Debug for SyntaxThemePrinter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("SyntaxTheme")
-            .field(
-                "highlights",
-                &VecPrinter(
-                    &self
-                        .0
-                        .highlights
-                        .iter()
-                        .map(|(token, highlight)| {
-                            (IntoPrinter(token), HslaPrinter(highlight.color.unwrap()))
-                        })
-                        .collect(),
-                ),
-            )
-            .finish()
-    }
-}
-
-pub struct VecPrinter<'a, T>(&'a Vec<T>);
-
-impl<'a, T: Debug> Debug for VecPrinter<'a, T> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "vec!{:?}", &self.0)
-    }
-}
-
-pub struct PlayerThemePrinter(PlayerTheme);
-
-impl Debug for PlayerThemePrinter {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("PlayerTheme")
-            .field("cursor", &HslaPrinter(self.0.cursor))
-            .field("selection", &HslaPrinter(self.0.selection))
-            .finish()
-    }
-}