Merge remote-tracking branch 'origin/main' into save-conversations

2023-06-23 09:09:42 +02:00 · 2023-06-23 09:09:42 +02:00 · 6f0efec146
commit 6f0efec146
parent ff07d0c2ed a305d93567
112 changed files with 4161 additions and 1653 deletions
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@ -8,6 +8,7 @@ use gpui::{
    fonts::{HighlightStyle, TextStyle},
    platform, AppContext, AssetSource, Border, MouseState,
 };
+use schemars::JsonSchema;
 use serde::{de::DeserializeOwned, Deserialize};
 use serde_json::Value;
 use settings::SettingsStore;
@ -36,7 +37,7 @@ pub fn init(source: impl AssetSource, cx: &mut AppContext) {
    .detach();
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct Theme {
    #[serde(default)]
    pub meta: ThemeMeta,
@ -67,7 +68,7 @@ pub struct Theme {
    pub color_scheme: ColorScheme,
 }

-#[derive(Deserialize, Default, Clone)]
+#[derive(Deserialize, Default, Clone, JsonSchema)]
 pub struct ThemeMeta {
    #[serde(skip_deserializing)]
    pub id: usize,
@ -75,7 +76,7 @@ pub struct ThemeMeta {
    pub is_light: bool,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct Workspace {
    pub background: Color,
    pub blank_pane: BlankPaneStyle,
@ -102,7 +103,7 @@ pub struct Workspace {
    pub drop_target_overlay_color: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct BlankPaneStyle {
    pub logo: SvgStyle,
    pub logo_shadow: SvgStyle,
@ -112,7 +113,7 @@ pub struct BlankPaneStyle {
    pub keyboard_hint_width: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Titlebar {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -128,16 +129,16 @@ pub struct Titlebar {
    pub leader_avatar: AvatarStyle,
    pub follower_avatar: AvatarStyle,
    pub inactive_avatar_grayscale: bool,
-    pub sign_in_prompt: Interactive<ContainedText>,
+    pub sign_in_prompt: Toggleable<Interactive<ContainedText>>,
    pub outdated_warning: ContainedText,
-    pub share_button: Interactive<ContainedText>,
+    pub share_button: Toggleable<Interactive<ContainedText>>,
    pub call_control: Interactive<IconButton>,
-    pub toggle_contacts_button: Interactive<IconButton>,
-    pub user_menu_button: Interactive<IconButton>,
+    pub toggle_contacts_button: Toggleable<Interactive<IconButton>>,
+    pub user_menu_button: Toggleable<Interactive<IconButton>>,
    pub toggle_contacts_badge: ContainerStyle,
 }

-#[derive(Copy, Clone, Deserialize, Default)]
+#[derive(Copy, Clone, Deserialize, Default, JsonSchema)]
 pub struct AvatarStyle {
    #[serde(flatten)]
    pub image: ImageStyle,
@ -145,14 +146,14 @@ pub struct AvatarStyle {
    pub outer_corner_radius: f32,
 }

-#[derive(Deserialize, Default, Clone)]
+#[derive(Deserialize, Default, Clone, JsonSchema)]
 pub struct Copilot {
    pub out_link_icon: Interactive<IconStyle>,
    pub modal: ModalStyle,
    pub auth: CopilotAuth,
 }

-#[derive(Deserialize, Default, Clone)]
+#[derive(Deserialize, Default, Clone, JsonSchema)]
 pub struct CopilotAuth {
    pub content_width: f32,
    pub prompting: CopilotAuthPrompting,
@ -162,14 +163,14 @@ pub struct CopilotAuth {
    pub header: IconStyle,
 }

-#[derive(Deserialize, Default, Clone)]
+#[derive(Deserialize, Default, Clone, JsonSchema)]
 pub struct CopilotAuthPrompting {
    pub subheading: ContainedText,
    pub hint: ContainedText,
    pub device_code: DeviceCode,
 }

-#[derive(Deserialize, Default, Clone)]
+#[derive(Deserialize, Default, Clone, JsonSchema)]
 pub struct DeviceCode {
    pub text: TextStyle,
    pub cta: ButtonStyle,
@ -179,19 +180,19 @@ pub struct DeviceCode {
    pub right_container: Interactive<ContainerStyle>,
 }

-#[derive(Deserialize, Default, Clone)]
+#[derive(Deserialize, Default, Clone, JsonSchema)]
 pub struct CopilotAuthNotAuthorized {
    pub subheading: ContainedText,
    pub warning: ContainedText,
 }

-#[derive(Deserialize, Default, Clone)]
+#[derive(Deserialize, Default, Clone, JsonSchema)]
 pub struct CopilotAuthAuthorized {
    pub subheading: ContainedText,
    pub hint: ContainedText,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ContactsPopover {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -199,17 +200,17 @@ pub struct ContactsPopover {
    pub width: f32,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ContactList {
    pub user_query_editor: FieldEditor,
    pub user_query_editor_height: f32,
    pub add_contact_button: IconButton,
-    pub header_row: Interactive<ContainedText>,
+    pub header_row: Toggleable<Interactive<ContainedText>>,
    pub leave_call: Interactive<ContainedText>,
-    pub contact_row: Interactive<ContainerStyle>,
+    pub contact_row: Toggleable<Interactive<ContainerStyle>>,
    pub row_height: f32,
-    pub project_row: Interactive<ProjectRow>,
-    pub tree_branch: Interactive<TreeBranch>,
+    pub project_row: Toggleable<Interactive<ProjectRow>>,
+    pub tree_branch: Toggleable<Interactive<TreeBranch>>,
    pub contact_avatar: ImageStyle,
    pub contact_status_free: ContainerStyle,
    pub contact_status_busy: ContainerStyle,
@ -221,7 +222,7 @@ pub struct ContactList {
    pub calling_indicator: ContainedText,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ProjectRow {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -229,13 +230,13 @@ pub struct ProjectRow {
    pub name: ContainedText,
 }

-#[derive(Deserialize, Default, Clone, Copy)]
+#[derive(Deserialize, Default, Clone, Copy, JsonSchema)]
 pub struct TreeBranch {
    pub width: f32,
    pub color: Color,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ContactFinder {
    pub picker: Picker,
    pub row_height: f32,
@ -245,17 +246,17 @@ pub struct ContactFinder {
    pub disabled_contact_button: IconButton,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct DropdownMenu {
    #[serde(flatten)]
    pub container: ContainerStyle,
    pub header: Interactive<DropdownMenuItem>,
    pub section_header: ContainedText,
-    pub item: Interactive<DropdownMenuItem>,
+    pub item: Toggleable<Interactive<DropdownMenuItem>>,
    pub row_height: f32,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct DropdownMenuItem {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -266,11 +267,11 @@ pub struct DropdownMenuItem {
    pub secondary_text_spacing: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct TabBar {
    #[serde(flatten)]
    pub container: ContainerStyle,
-    pub pane_button: Interactive<IconButton>,
+    pub pane_button: Toggleable<Interactive<IconButton>>,
    pub pane_button_container: ContainerStyle,
    pub active_pane: TabStyles,
    pub inactive_pane: TabStyles,
@ -294,13 +295,13 @@ impl TabBar {
    }
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct TabStyles {
    pub active_tab: Tab,
    pub inactive_tab: Tab,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct AvatarRibbon {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -308,7 +309,7 @@ pub struct AvatarRibbon {
    pub height: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct OfflineIcon {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -316,7 +317,7 @@ pub struct OfflineIcon {
    pub color: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Tab {
    pub height: f32,
    #[serde(flatten)]
@ -333,7 +334,7 @@ pub struct Tab {
    pub icon_conflict: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Toolbar {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -342,14 +343,14 @@ pub struct Toolbar {
    pub nav_button: Interactive<IconButton>,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Notifications {
    #[serde(flatten)]
    pub container: ContainerStyle,
    pub width: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Search {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -359,14 +360,14 @@ pub struct Search {
    pub include_exclude_editor: FindEditor,
    pub invalid_include_exclude_editor: ContainerStyle,
    pub include_exclude_inputs: ContainedText,
-    pub option_button: Interactive<ContainedText>,
+    pub option_button: Toggleable<Interactive<ContainedText>>,
    pub match_background: Color,
    pub match_index: ContainedText,
    pub results_status: TextStyle,
    pub dismiss_button: Interactive<IconButton>,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct FindEditor {
    #[serde(flatten)]
    pub input: FieldEditor,
@ -374,7 +375,7 @@ pub struct FindEditor {
    pub max_width: f32,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct StatusBar {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -390,15 +391,15 @@ pub struct StatusBar {
    pub diagnostic_message: Interactive<ContainedText>,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct StatusBarPanelButtons {
    pub group_left: ContainerStyle,
    pub group_bottom: ContainerStyle,
    pub group_right: ContainerStyle,
-    pub button: Interactive<PanelButton>,
+    pub button: Toggleable<Interactive<PanelButton>>,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct StatusBarDiagnosticSummary {
    pub container_ok: ContainerStyle,
    pub container_warning: ContainerStyle,
@ -413,7 +414,7 @@ pub struct StatusBarDiagnosticSummary {
    pub summary_spacing: f32,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct StatusBarLspStatus {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -424,14 +425,14 @@ pub struct StatusBarLspStatus {
    pub message: TextStyle,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct Dock {
    pub left: ContainerStyle,
    pub bottom: ContainerStyle,
    pub right: ContainerStyle,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct PanelButton {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -440,20 +441,20 @@ pub struct PanelButton {
    pub label: ContainedText,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ProjectPanel {
    #[serde(flatten)]
    pub container: ContainerStyle,
-    pub entry: Interactive<ProjectPanelEntry>,
+    pub entry: Toggleable<Interactive<ProjectPanelEntry>>,
    pub dragged_entry: ProjectPanelEntry,
-    pub ignored_entry: Interactive<ProjectPanelEntry>,
-    pub cut_entry: Interactive<ProjectPanelEntry>,
+    pub ignored_entry: Toggleable<Interactive<ProjectPanelEntry>>,
+    pub cut_entry: Toggleable<Interactive<ProjectPanelEntry>>,
    pub filename_editor: FieldEditor,
    pub indent_width: f32,
    pub open_project_button: Interactive<ContainedText>,
 }

-#[derive(Clone, Debug, Deserialize, Default)]
+#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
 pub struct ProjectPanelEntry {
    pub height: f32,
    #[serde(flatten)]
@ -465,28 +466,28 @@ pub struct ProjectPanelEntry {
    pub status: EntryStatus,
 }

-#[derive(Clone, Debug, Deserialize, Default)]
+#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
 pub struct EntryStatus {
    pub git: GitProjectStatus,
 }

-#[derive(Clone, Debug, Deserialize, Default)]
+#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
 pub struct GitProjectStatus {
    pub modified: Color,
    pub inserted: Color,
    pub conflict: Color,
 }

-#[derive(Clone, Debug, Deserialize, Default)]
+#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
 pub struct ContextMenu {
    #[serde(flatten)]
    pub container: ContainerStyle,
-    pub item: Interactive<ContextMenuItem>,
+    pub item: Toggleable<Interactive<ContextMenuItem>>,
    pub keystroke_margin: f32,
    pub separator: ContainerStyle,
 }

-#[derive(Clone, Debug, Deserialize, Default)]
+#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
 pub struct ContextMenuItem {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -496,13 +497,13 @@ pub struct ContextMenuItem {
    pub icon_spacing: f32,
 }

-#[derive(Debug, Deserialize, Default)]
+#[derive(Debug, Deserialize, Default, JsonSchema)]
 pub struct CommandPalette {
-    pub key: Interactive<ContainedLabel>,
+    pub key: Toggleable<ContainedLabel>,
    pub keystroke_spacing: f32,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct InviteLink {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -511,7 +512,7 @@ pub struct InviteLink {
    pub icon: Icon,
 }

-#[derive(Deserialize, Clone, Copy, Default)]
+#[derive(Deserialize, Clone, Copy, Default, JsonSchema)]
 pub struct Icon {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -519,7 +520,7 @@ pub struct Icon {
    pub width: f32,
 }

-#[derive(Deserialize, Clone, Copy, Default)]
+#[derive(Deserialize, Clone, Copy, Default, JsonSchema)]
 pub struct IconButton {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -528,7 +529,7 @@ pub struct IconButton {
    pub button_width: f32,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ChatMessage {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -537,7 +538,7 @@ pub struct ChatMessage {
    pub timestamp: ContainedText,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ChannelSelect {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -549,7 +550,7 @@ pub struct ChannelSelect {
    pub menu: ContainerStyle,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ChannelName {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -557,7 +558,7 @@ pub struct ChannelName {
    pub name: TextStyle,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Picker {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -565,10 +566,10 @@ pub struct Picker {
    pub input_editor: FieldEditor,
    pub empty_input_editor: FieldEditor,
    pub no_matches: ContainedLabel,
-    pub item: Interactive<ContainedLabel>,
+    pub item: Toggleable<Interactive<ContainedLabel>>,
 }

-#[derive(Clone, Debug, Deserialize, Default)]
+#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
 pub struct ContainedText {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -576,7 +577,7 @@ pub struct ContainedText {
    pub text: TextStyle,
 }

-#[derive(Clone, Debug, Deserialize, Default)]
+#[derive(Clone, Debug, Deserialize, Default, JsonSchema)]
 pub struct ContainedLabel {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -584,7 +585,7 @@ pub struct ContainedLabel {
    pub label: LabelStyle,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct ProjectDiagnostics {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -594,7 +595,7 @@ pub struct ProjectDiagnostics {
    pub tab_summary_spacing: f32,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ContactNotification {
    pub header_avatar: ImageStyle,
    pub header_message: ContainedText,
@ -604,21 +605,21 @@ pub struct ContactNotification {
    pub dismiss_button: Interactive<IconButton>,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct UpdateNotification {
    pub message: ContainedText,
    pub action_message: Interactive<ContainedText>,
    pub dismiss_button: Interactive<IconButton>,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct MessageNotification {
    pub message: ContainedText,
    pub action_message: Interactive<ContainedText>,
    pub dismiss_button: Interactive<IconButton>,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct ProjectSharedNotification {
    pub window_height: f32,
    pub window_width: f32,
@ -635,7 +636,7 @@ pub struct ProjectSharedNotification {
    pub dismiss_button: ContainedText,
 }

-#[derive(Deserialize, Default)]
+#[derive(Deserialize, Default, JsonSchema)]
 pub struct IncomingCallNotification {
    pub window_height: f32,
    pub window_width: f32,
@ -652,7 +653,7 @@ pub struct IncomingCallNotification {
    pub decline_button: ContainedText,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Editor {
    pub text_color: Color,
    #[serde(default)]
@ -693,7 +694,7 @@ pub struct Editor {
    pub whitespace: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Scrollbar {
    pub track: ContainerStyle,
    pub thumb: ContainerStyle,
@ -702,14 +703,14 @@ pub struct Scrollbar {
    pub git: GitDiffColors,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct GitDiffColors {
    pub inserted: Color,
    pub modified: Color,
    pub deleted: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct DiagnosticPathHeader {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -718,7 +719,7 @@ pub struct DiagnosticPathHeader {
    pub text_scale_factor: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct DiagnosticHeader {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -729,7 +730,7 @@ pub struct DiagnosticHeader {
    pub icon_width_factor: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct DiagnosticStyle {
    pub message: LabelStyle,
    #[serde(default)]
@ -737,7 +738,7 @@ pub struct DiagnosticStyle {
    pub text_scale_factor: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct AutocompleteStyle {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -747,13 +748,13 @@ pub struct AutocompleteStyle {
    pub match_highlight: HighlightStyle,
 }

-#[derive(Clone, Copy, Default, Deserialize)]
+#[derive(Clone, Copy, Default, Deserialize, JsonSchema)]
 pub struct SelectionStyle {
    pub cursor: Color,
    pub selection: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct FieldEditor {
    #[serde(flatten)]
    pub container: ContainerStyle,
@ -763,21 +764,21 @@ pub struct FieldEditor {
    pub selection: SelectionStyle,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct InteractiveColor {
    pub color: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct CodeActions {
    #[serde(default)]
-    pub indicator: Interactive<InteractiveColor>,
+    pub indicator: Toggleable<Interactive<InteractiveColor>>,
    pub vertical_scale: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Folds {
-    pub indicator: Interactive<InteractiveColor>,
+    pub indicator: Toggleable<Interactive<InteractiveColor>>,
    pub ellipses: FoldEllipses,
    pub fold_background: Color,
    pub icon_margin_scale: f32,
@ -785,14 +786,14 @@ pub struct Folds {
    pub foldable_icon: String,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct FoldEllipses {
    pub text_color: Color,
    pub background: Interactive<InteractiveColor>,
    pub corner_radius_factor: f32,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct DiffStyle {
    pub inserted: Color,
    pub modified: Color,
@ -802,41 +803,49 @@ pub struct DiffStyle {
    pub corner_radius: f32,
 }

-#[derive(Debug, Default, Clone, Copy)]
+#[derive(Debug, Default, Clone, Copy, JsonSchema)]
 pub struct Interactive<T> {
    pub default: T,
-    pub hover: Option<T>,
-    pub hover_and_active: Option<T>,
+    pub hovered: Option<T>,
    pub clicked: Option<T>,
-    pub click_and_active: Option<T>,
-    pub active: Option<T>,
    pub disabled: Option<T>,
 }

-impl<T> Interactive<T> {
-    pub fn style_for(&self, state: &mut MouseState, active: bool) -> &T {
+#[derive(Clone, Copy, Debug, Default, Deserialize, JsonSchema)]
+pub struct Toggleable<T> {
+    active: T,
+    inactive: T,
+}
+
+impl<T> Toggleable<T> {
+    pub fn new(active: T, inactive: T) -> Self {
+        Self { active, inactive }
+    }
+    pub fn in_state(&self, active: bool) -> &T {
        if active {
-            if state.hovered() {
-                self.hover_and_active
-                    .as_ref()
-                    .unwrap_or(self.active.as_ref().unwrap_or(&self.default))
-            } else if state.clicked() == Some(platform::MouseButton::Left) && self.clicked.is_some()
-            {
-                self.click_and_active
-                    .as_ref()
-                    .unwrap_or(self.active.as_ref().unwrap_or(&self.default))
-            } else {
-                self.active.as_ref().unwrap_or(&self.default)
-            }
-        } else if state.clicked() == Some(platform::MouseButton::Left) && self.clicked.is_some() {
+            &self.active
+        } else {
+            &self.inactive
+        }
+    }
+    pub fn active_state(&self) -> &T {
+        self.in_state(true)
+    }
+    pub fn inactive_state(&self) -> &T {
+        self.in_state(false)
+    }
+}
+
+impl<T> Interactive<T> {
+    pub fn style_for(&self, state: &mut MouseState) -> &T {
+        if state.clicked() == Some(platform::MouseButton::Left) && self.clicked.is_some() {
            self.clicked.as_ref().unwrap()
        } else if state.hovered() {
-            self.hover.as_ref().unwrap_or(&self.default)
+            self.hovered.as_ref().unwrap_or(&self.default)
        } else {
            &self.default
        }
    }
-
    pub fn disabled_style(&self) -> &T {
        self.disabled.as_ref().unwrap_or(&self.default)
    }
@ -849,13 +858,9 @@ impl<'de, T: DeserializeOwned> Deserialize<'de> for Interactive<T> {
    {
        #[derive(Deserialize)]
        struct Helper {
-            #[serde(flatten)]
            default: Value,
-            hover: Option<Value>,
-            hover_and_active: Option<Value>,
+            hovered: Option<Value>,
            clicked: Option<Value>,
-            click_and_active: Option<Value>,
-            active: Option<Value>,
            disabled: Option<Value>,
        }

@ -880,21 +885,15 @@ impl<'de, T: DeserializeOwned> Deserialize<'de> for Interactive<T> {
            }
        };

-        let hover = deserialize_state(json.hover)?;
-        let hover_and_active = deserialize_state(json.hover_and_active)?;
+        let hovered = deserialize_state(json.hovered)?;
        let clicked = deserialize_state(json.clicked)?;
-        let click_and_active = deserialize_state(json.click_and_active)?;
-        let active = deserialize_state(json.active)?;
        let disabled = deserialize_state(json.disabled)?;
        let default = serde_json::from_value(json.default).map_err(serde::de::Error::custom)?;

        Ok(Interactive {
            default,
-            hover,
-            hover_and_active,
+            hovered,
            clicked,
-            click_and_active,
-            active,
            disabled,
        })
    }
@ -911,7 +910,7 @@ impl Editor {
    }
 }

-#[derive(Default)]
+#[derive(Default, JsonSchema)]
 pub struct SyntaxTheme {
    pub highlights: Vec<(String, HighlightStyle)>,
 }
@ -945,7 +944,7 @@ impl<'de> Deserialize<'de> for SyntaxTheme {
    }
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct HoverPopover {
    pub container: ContainerStyle,
    pub info_container: ContainerStyle,
@ -957,7 +956,7 @@ pub struct HoverPopover {
    pub highlight: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct TerminalStyle {
    pub black: Color,
    pub red: Color,
@ -991,7 +990,7 @@ pub struct TerminalStyle {
    pub dim_foreground: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct AssistantStyle {
    pub container: ContainerStyle,
    pub hamburger_button: IconStyle,
@ -1014,15 +1013,14 @@ pub struct AssistantStyle {
    pub saved_conversation: SavedConversation,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct SavedConversation {
-    #[serde(flatten)]
    pub container: Interactive<ContainerStyle>,
    pub saved_at: ContainedText,
    pub title: ContainedText,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct FeedbackStyle {
    pub submit_button: Interactive<ContainedText>,
    pub button_margin: f32,
@ -1031,7 +1029,7 @@ pub struct FeedbackStyle {
    pub link_text_hover: ContainedText,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct WelcomeStyle {
    pub page_width: f32,
    pub logo: SvgStyle,
@ -1045,7 +1043,7 @@ pub struct WelcomeStyle {
    pub checkbox_group: ContainerStyle,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct ColorScheme {
    pub name: String,
    pub is_light: bool,
@ -1060,13 +1058,13 @@ pub struct ColorScheme {
    pub players: Vec<Player>,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Player {
    pub cursor: Color,
    pub selection: Color,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct RampSet {
    pub neutral: Vec<Color>,
    pub red: Vec<Color>,
@ -1079,7 +1077,7 @@ pub struct RampSet {
    pub magenta: Vec<Color>,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Layer {
    pub base: StyleSet,
    pub variant: StyleSet,
@ -1090,7 +1088,7 @@ pub struct Layer {
    pub negative: StyleSet,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct StyleSet {
    pub default: Style,
    pub active: Style,
@ -1100,7 +1098,7 @@ pub struct StyleSet {
    pub inverted: Style,
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct Style {
    pub background: Color,
    pub border: Color,
--- a/crates/theme/src/theme_settings.rs
+++ b/crates/theme/src/theme_settings.rs
@ -14,12 +14,13 @@ use util::ResultExt as _;

 const MIN_FONT_SIZE: f32 = 6.0;

-#[derive(Clone)]
+#[derive(Clone, JsonSchema)]
 pub struct ThemeSettings {
    pub buffer_font_family_name: String,
    pub buffer_font_features: fonts::Features,
    pub buffer_font_family: FamilyId,
    pub(crate) buffer_font_size: f32,
+    #[serde(skip)]
    pub theme: Arc<Theme>,
 }

--- a/crates/theme/src/ui.rs
+++ b/crates/theme/src/ui.rs
@ -12,11 +12,12 @@ use gpui::{
    scene::MouseClick,
    Action, Element, EventContext, MouseState, View, ViewContext,
 };
+use schemars::JsonSchema;
 use serde::Deserialize;

 use crate::{ContainedText, Interactive};

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct CheckboxStyle {
    pub icon: SvgStyle,
    pub label: ContainedText,
@ -100,7 +101,7 @@ pub fn svg<V: View>(style: &SvgStyle) -> ConstrainedBox<V> {
        .with_height(style.dimensions.height)
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct IconStyle {
    pub icon: SvgStyle,
    pub container: ContainerStyle,
@ -150,7 +151,7 @@ where
    F: Fn(MouseClick, &mut V, &mut EventContext<V>) + 'static,
 {
    MouseEventHandler::<Tag, V>::new(0, cx, |state, _| {
-        let style = style.style_for(state, false);
+        let style = style.style_for(state);
        Label::new(label, style.text.to_owned())
            .aligned()
            .contained()
@ -162,7 +163,7 @@ where
    .with_cursor_style(platform::CursorStyle::PointingHand)
 }

-#[derive(Clone, Deserialize, Default)]
+#[derive(Clone, Deserialize, Default, JsonSchema)]
 pub struct ModalStyle {
    close_icon: Interactive<IconStyle>,
    container: ContainerStyle,
@ -200,13 +201,13 @@ where
                    title,
                    style
                        .title_text
-                        .style_for(&mut MouseState::default(), false)
+                        .style_for(&mut MouseState::default())
                        .clone(),
                ))
                .with_child(
                    // FIXME: Get a better tag type
                    MouseEventHandler::<Tag, V>::new(999999, cx, |state, _cx| {
-                        let style = style.close_icon.style_for(state, false);
+                        let style = style.close_icon.style_for(state);
                        icon(style)
                    })
                    .on_click(platform::MouseButton::Left, move |_, _, cx| {