Merge branch 'main' into search-query-suggestion-fixes

crates/theme2/src/user_theme.rs

@@ -1,4 +1,5 @@
-use crate::{Appearance, ThemeColors, ThemeColorsRefinement};
+use crate::{Appearance, StatusColors, StatusColorsRefinement, ThemeColors, ThemeColorsRefinement};
+use gpui::{FontStyle, FontWeight, Hsla};
 use refineable::Refineable;
 use serde::Deserialize;
 
@@ -21,4 +22,72 @@ pub struct UserTheme {
 pub struct UserThemeStyles {
     #[refineable]
     pub colors: ThemeColors,
+    #[refineable]
+    pub status: StatusColors,
+    pub syntax: UserSyntaxTheme,
+}
+
+#[derive(Clone, Default, Deserialize)]
+pub struct UserSyntaxTheme {
+    pub highlights: Vec<(String, UserHighlightStyle)>,
+}
+
+#[derive(Clone, Default, Deserialize)]
+pub struct UserHighlightStyle {
+    pub color: Option<Hsla>,
+    pub font_style: Option<UserFontStyle>,
+    pub font_weight: Option<UserFontWeight>,
+}
+
+#[derive(Clone, Copy, Default, Deserialize)]
+pub struct UserFontWeight(pub f32);
+
+impl UserFontWeight {
+    /// Thin weight (100), the thinnest value.
+    pub const THIN: Self = Self(FontWeight::THIN.0);
+    /// Extra light weight (200).
+    pub const EXTRA_LIGHT: Self = Self(FontWeight::EXTRA_LIGHT.0);
+    /// Light weight (300).
+    pub const LIGHT: Self = Self(FontWeight::LIGHT.0);
+    /// Normal (400).
+    pub const NORMAL: Self = Self(FontWeight::NORMAL.0);
+    /// Medium weight (500, higher than normal).
+    pub const MEDIUM: Self = Self(FontWeight::MEDIUM.0);
+    /// Semibold weight (600).
+    pub const SEMIBOLD: Self = Self(FontWeight::SEMIBOLD.0);
+    /// Bold weight (700).
+    pub const BOLD: Self = Self(FontWeight::BOLD.0);
+    /// Extra-bold weight (800).
+    pub const EXTRA_BOLD: Self = Self(FontWeight::EXTRA_BOLD.0);
+    /// Black weight (900), the thickest value.
+    pub const BLACK: Self = Self(FontWeight::BLACK.0);
+}
+
+impl From<UserFontWeight> for FontWeight {
+    fn from(value: UserFontWeight) -> Self {
+        Self(value.0)
+    }
+}
+
+#[derive(Debug, Clone, Copy, Deserialize)]
+pub enum UserFontStyle {
+    Normal,
+    Italic,
+    Oblique,
+}
+
+impl From<UserFontStyle> for FontStyle {
+    fn from(value: UserFontStyle) -> Self {
+        match value {
+            UserFontStyle::Normal => FontStyle::Normal,
+            UserFontStyle::Italic => FontStyle::Italic,
+            UserFontStyle::Oblique => FontStyle::Oblique,
+        }
+    }
+}
+
+impl UserHighlightStyle {
+    pub fn is_empty(&self) -> bool {
+        self.color.is_none() && self.font_style.is_none() && self.font_weight.is_none()
+    }
 }