diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index 0d90f38cfb..3718e8550a 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -200,7 +200,7 @@ pub struct AllLanguageSettingsContent { #[serde(flatten)] pub defaults: LanguageSettingsContent, /// The settings for individual languages. - #[serde(default, alias = "language_overrides")] + #[serde(default)] pub languages: HashMap, LanguageSettingsContent>, /// Settings for associating file extensions and filenames /// with languages. @@ -754,17 +754,10 @@ impl settings::Settings for AllLanguageSettings { .as_mut() .unwrap() .properties - .extend([ - ( - "languages".to_owned(), - Schema::new_ref("#/definitions/Languages".into()), - ), - // For backward compatibility - ( - "language_overrides".to_owned(), - Schema::new_ref("#/definitions/Languages".into()), - ), - ]); + .extend([( + "languages".to_owned(), + Schema::new_ref("#/definitions/Languages".into()), + )]); root_schema } diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs index 1384f8ddb6..3d7e4cfe5b 100644 --- a/crates/settings/src/settings_store.rs +++ b/crates/settings/src/settings_store.rs @@ -866,9 +866,6 @@ fn replace_value_in_json_text( tab_size: usize, new_value: &serde_json::Value, ) -> (Range, String) { - const LANGUAGE_OVERRIDES: &str = "language_overrides"; - const LANGUAGES: &str = "languages"; - lazy_static! { static ref PAIR_QUERY: tree_sitter::Query = tree_sitter::Query::new( &tree_sitter_json::language(), @@ -883,8 +880,6 @@ fn replace_value_in_json_text( let mut cursor = tree_sitter::QueryCursor::new(); - let has_language_overrides = text.contains(LANGUAGE_OVERRIDES); - let mut depth = 0; let mut last_value_range = 0..0; let mut first_key_start = None; @@ -914,13 +909,7 @@ fn replace_value_in_json_text( let found_key = text .get(key_range.clone()) - .map(|key_text| { - if key_path[depth] == LANGUAGES && has_language_overrides { - key_text == format!("\"{}\"", LANGUAGE_OVERRIDES) - } else { - key_text == format!("\"{}\"", key_path[depth]) - } - }) + .map(|key_text| key_text == format!("\"{}\"", key_path[depth])) .unwrap_or(false); if found_key { @@ -943,20 +932,12 @@ fn replace_value_in_json_text( (existing_value_range, new_val) } else { // We have key paths, construct the sub objects - let new_key = if has_language_overrides && key_path[depth] == LANGUAGES { - LANGUAGE_OVERRIDES - } else { - key_path[depth] - }; + let new_key = key_path[depth]; // We don't have the key, construct the nested objects let mut new_value = serde_json::to_value(new_value).unwrap(); for key in key_path[(depth + 1)..].iter().rev() { - if has_language_overrides && key == &LANGUAGES { - new_value = serde_json::json!({ LANGUAGE_OVERRIDES.to_string(): new_value }); - } else { - new_value = serde_json::json!({ key.to_string(): new_value }); - } + new_value = serde_json::json!({ key.to_string(): new_value }); } if let Some(first_key_start) = first_key_start {