Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix default.json profile and os settings not applying on startup (#54635)
Kirill Bulatov833437439812
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rsindex 9215a53760b..0eb6a32465b 100644--- a/crates/settings/src/settings_store.rs+++ b/crates/settings/src/settings_store.rs@@ -286,13 +286,8 @@ pub struct SettingsJsonSchemaParams<'a> {impl SettingsStore {pub fn new(cx: &mut App, default_settings: &str) -> Self {- Self::new_with_semantic_tokens(cx, default_settings)- }-- pub fn new_with_semantic_tokens(cx: &mut App, default_settings: &str) -> Self {let (setting_file_updates_tx, mut setting_file_updates_rx) = mpsc::unbounded();- let default_settings: SettingsContent =- SettingsContent::parse_json_with_comments(default_settings).unwrap();+ let default_settings = Self::parse_default_settings(default_settings).unwrap();if !cx.has_global::<DefaultSemanticTokenRules>() {cx.set_global::<DefaultSemanticTokenRules>(crate::parse_json_with_comments::<SemanticTokenRules>(@@ -897,12 +892,25 @@ impl SettingsStore {default_settings_content: &str,cx: &mut App,) -> Result<()> {- self.default_settings =- SettingsContent::parse_json_with_comments(default_settings_content)?.into();+ self.default_settings = Self::parse_default_settings(default_settings_content)?.into();self.recompute_values(None, cx);Ok(())}+ /// Parses the default settings JSON and folds any `dev`/`nightly`/`preview`/`stable`+ /// release-channel overrides and `macos`/`linux`/`windows` platform overrides into+ /// the returned [`SettingsContent`].+ ///+ /// Unlike user settings, default settings are used directly as the base for all+ /// merges, so overrides must be resolved up front.+ fn parse_default_settings(default_settings: &str) -> Result<SettingsContent> {+ let parsed = UserSettingsContent::parse_json_with_comments(default_settings)?;+ let mut merged = (*parsed.content).clone();+ merged.merge_from_option(parsed.for_release_channel());+ merged.merge_from_option(parsed.for_os());+ Ok(merged)+ }+/// Sets the user settings via a JSON string.#[must_use]pub fn set_user_settings(@@ -1776,6 +1784,33 @@ mod tests {);}+ #[gpui::test]+ fn test_default_settings_release_channel_overrides(cx: &mut App) {+ assert_eq!(+ *release_channel::RELEASE_CHANNEL,+ release_channel::ReleaseChannel::Dev,+ "tests expect the dev release channel",+ );++ let mut defaults: serde_json::Value =+ crate::parse_json_with_comments(&default_settings()).unwrap();+ let root = defaults+ .as_object_mut()+ .expect("default settings must be a JSON object");+ root.insert("dev".into(), serde_json::json!({ "auto_update": false }));+ root.insert("stable".into(), serde_json::json!({ "auto_update": true }));+ let defaults_with_overrides = serde_json::to_string(&defaults).unwrap();++ let mut store = SettingsStore::new(cx, &defaults_with_overrides);+ store.register_setting::<AutoUpdateSetting>();++ assert_eq!(+ store.get::<AutoUpdateSetting>(None),+ &AutoUpdateSetting { auto_update: false },+ "dev override from default settings should apply",+ );+ }+#[gpui::test]fn test_settings_store_basic(cx: &mut App) {let mut store = SettingsStore::new(cx, &default_settings());