Don't override top-level settings with language defaults

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-06-23 16:40:57 +02:00
parent f2f9cad375
commit 2cb8a3ccfb
6 changed files with 152 additions and 108 deletions
@@ -6673,7 +6673,7 @@ mod tests {
            cx.update_global(|settings: &mut Settings, _| {
                settings.language_overrides.insert(
                    Arc::from("Rust"),
-                    settings::LanguageOverride {
+                    settings::LanguageSettings {
                        enable_language_server: Some(false),
                        ..Default::default()
                    },
@@ -6690,14 +6690,14 @@ mod tests {
            cx.update_global(|settings: &mut Settings, _| {
                settings.language_overrides.insert(
                    Arc::from("Rust"),
-                    settings::LanguageOverride {
+                    settings::LanguageSettings {
                        enable_language_server: Some(true),
                        ..Default::default()
                    },
                );
                settings.language_overrides.insert(
                    Arc::from("JavaScript"),
-                    settings::LanguageOverride {
+                    settings::LanguageSettings {
                        enable_language_server: Some(false),
                        ..Default::default()
                    },