diff --git a/crates/settings/src/settings_content/theme.rs b/crates/settings/src/settings_content/theme.rs index a7469ec2893e05482ce16b16e71e192c81181c74..d46cf76d1103ef7f0524e5abb1a734f07547d578 100644 --- a/crates/settings/src/settings_content/theme.rs +++ b/crates/settings/src/settings_content/theme.rs @@ -276,7 +276,7 @@ pub struct ThemeName(pub Arc); inventory::submit! { ParameterizedJsonSchema { - add_and_get_ref: |generator, _params, cx| { + add_and_get_ref: |_generator, _params, _cx| { todo!() // replace_subschema::(generator, || json_schema!({ // "type": "string", @@ -294,7 +294,7 @@ pub struct IconThemeName(pub Arc); inventory::submit! { ParameterizedJsonSchema { - add_and_get_ref: |generator, _params, cx| { + add_and_get_ref: |_generator, _params, _cx| { todo!() // replace_subschema::(generator, || json_schema!({ // "type": "string", diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs index 53821ecc847253e1bc6cc2e13caf6e92772fb927..b687df1b062f99080c7fc95faddcf1be5189a280 100644 --- a/crates/settings/src/settings_store.rs +++ b/crates/settings/src/settings_store.rs @@ -616,9 +616,7 @@ impl SettingsStore { ) -> Vec<(Range, String)> { let old_content: UserSettingsContent = serde_json::from_str(text).unwrap_or_default(); let mut new_content = old_content.clone(); - dbg!(&new_content.content.title_bar); update(&mut new_content.content); - dbg!(&new_content.content.title_bar); let old_value = serde_json::to_value(&old_content).unwrap(); let new_value = serde_json::to_value(new_content).unwrap(); @@ -1047,12 +1045,10 @@ impl Debug for SettingsStore { impl AnySettingValue for SettingValue { fn from_file(&self, s: &SettingsContent, cx: &mut App) -> Option> { - (type_name::(), TypeId::of::()); T::from_file(s, cx).map(|result| Box::new(result) as _) } fn refine(&self, value: &mut dyn Any, refinements: &[&SettingsContent], cx: &mut App) { - (type_name::(), TypeId::of::()); let value = value.downcast_mut::().unwrap(); for refinement in refinements { value.refine(refinement, cx) @@ -1116,15 +1112,11 @@ impl AnySettingValue for SettingValue { #[cfg(test)] mod tests { use crate::{ - TitleBarSettingsContent, TitleBarVisibilityContent, VsCodeSettingsSource, default_settings, + TitleBarSettingsContent, TitleBarVisibilityContent, default_settings, settings_content::LanguageSettingsContent, test_settings, }; use super::*; - // This is so the SettingsUi macro can still work properly - use crate as settings; - use serde::Deserialize; - use settings_ui_macros::{SettingsKey, SettingsUi}; use unindent::Unindent; use util::MergeFrom; diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs index b3b846d91d5ac3a7e3d88983787d23fe9f0adece..15f0e91e75ba866e64dc082f7a7bc10b10dfb15c 100644 --- a/crates/theme_importer/src/vscode/converter.rs +++ b/crates/theme_importer/src/vscode/converter.rs @@ -1,10 +1,10 @@ -use anyhow::Result; -use indexmap::IndexMap; -use strum::IntoEnumIterator; -use theme::{ +use ::{ FontStyleContent, FontWeightContent, HighlightStyleContent, StatusColorsContent, ThemeColorsContent, ThemeContent, ThemeStyleContent, }; +use anyhow::Result; +use indexmap::IndexMap; +use strum::IntoEnumIterator; use crate::ThemeMetadata; use crate::vscode::{VsCodeTheme, VsCodeTokenScope};