Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Autocomplete language names in `file_types` setting (#58595)
saberoueslatie80cdd2ff732
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rsindex a5dd8f4b07e..256deda2967 100644--- a/crates/language/src/buffer_tests.rs+++ b/crates/language/src/buffer_tests.rs@@ -277,7 +277,7 @@ async fn test_first_line_pattern(cx: &mut TestAppContext) {async fn test_language_for_file_with_custom_file_types(cx: &mut TestAppContext) {cx.update(|cx| {init_settings(cx, |settings| {- settings.file_types.get_or_insert_default().extend([+ settings.file_types.get_or_insert_default().0.extend([("TypeScript".into(), vec!["js".into()].into()),("JavaScript".into(),diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rsindex 26c73bb77f6..8729a7db2cb 100644--- a/crates/settings/src/settings_store.rs+++ b/crates/settings/src/settings_store.rs@@ -32,12 +32,12 @@ use util::{use crate::editorconfig_store::EditorconfigStore;use crate::{- ActiveSettingsProfileName, FontFamilyName, IconThemeName, LanguageSettingsContent,+ ActiveSettingsProfileName, FileTypeMap, FontFamilyName, IconThemeName, LanguageSettingsContent,LanguageToSettingsMap, LspSettings, LspSettingsMap, SemanticTokenRules, ThemeName,UserSettingsContentExt, VsCodeSettings, WorktreeId,settings_content::{- ExtensionsSettingsContent, ProfileBase, ProjectSettingsContent, RootUserSettings,- SettingsContent, UserSettingsContent, merge_from::MergeFrom,+ ExtendingVec, ExtensionsSettingsContent, ProfileBase, ProjectSettingsContent,+ RootUserSettings, SettingsContent, UserSettingsContent, merge_from::MergeFrom,},};@@ -1201,6 +1201,17 @@ impl SettingsStore {"properties": params.language_names.iter().map(|name| (name.clone(), language_settings_content_ref.clone())).collect::<serde_json::Map<_, _>>()})});++ let file_type_patterns_ref =+ generator.subschema_for::<ExtendingVec<String>>().to_value();+ replace_subschema::<FileTypeMap>(generator, || {+ json_schema!({+ "type": "object",+ "errorMessage": "No language with this name is installed.",+ "properties": params.language_names.iter().map(|name| (name.clone(), file_type_patterns_ref.clone())).collect::<serde_json::Map<_, _>>(),+ "additionalProperties": file_type_patterns_ref.clone()+ })+ });}generator.subschema_for::<LspSettings>();@@ -3166,6 +3177,42 @@ mod tests {);}+ #[gpui::test]+ fn test_file_types_schema_generation(cx: &mut App) {+ SettingsStore::test(cx);++ let schema = SettingsStore::json_schema(&SettingsJsonSchemaParams {+ language_names: &["Rust".to_string(), "TypeScript".to_string()],+ font_names: &["Zed Mono".to_string()],+ theme_names: &["One Dark".into()],+ icon_theme_names: &["Zed Icons".into()],+ lsp_adapter_names: &[],+ action_names: &[],+ action_documentation: &HashMap::default(),+ deprecations: &HashMap::default(),+ deprecation_messages: &HashMap::default(),+ });++ let file_type_map = schema+ .pointer("/$defs/FileTypeMap")+ .expect("schema should have a FileTypeMap definition");+ let properties = file_type_map+ .pointer("/properties")+ .expect("FileTypeMap should have properties")+ .as_object()+ .expect("FileTypeMap properties should be an object");++ let mut language_names = properties.keys().collect::<Vec<_>>();+ language_names.sort();+ assert_eq!(language_names, ["Rust", "TypeScript"]);++ let patterns_schema = file_type_map+ .pointer("/additionalProperties")+ .expect("FileTypeMap should validate values of unknown language names");+ assert_eq!(properties.get("Rust"), Some(patterns_schema));+ assert_eq!(properties.get("TypeScript"), Some(patterns_schema));+ }+#[gpui::test]fn test_project_json_schema_differs_from_user_schema(cx: &mut App) {SettingsStore::test(cx);diff --git a/crates/settings/src/vscode_import.rs b/crates/settings/src/vscode_import.rsindex 65fcb22c9bb..4c2d3d7f63d 100644--- a/crates/settings/src/vscode_import.rs+++ b/crates/settings/src/vscode_import.rs@@ -642,7 +642,7 @@ impl VsCodeSettings {}}- fn file_types(&self) -> Option<HashMap<Arc<str>, ExtendingVec<String>>> {+ fn file_types(&self) -> Option<FileTypeMap> {// vscodes file association map is inverted from ours, so we flip the mapping before merginglet mut associations: HashMap<Arc<str>, ExtendingVec<String>> = HashMap::default();let map = self.read_value("files.associations")?.as_object()?;@@ -650,7 +650,7 @@ impl VsCodeSettings {let Some(v) = v.as_str() else { continue };associations.entry(v.into()).or_default().0.push(k.clone());}- skip_default(associations)+ skip_default(FileTypeMap(associations))}fn edit_predictions_settings_content(&self) -> Option<EditPredictionSettingsContent> {diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rsindex 9c1c8f34f8c..ddbfe53b213 100644--- a/crates/settings_content/src/language.rs+++ b/crates/settings_content/src/language.rs@@ -44,7 +44,7 @@ pub struct AllLanguageSettingsContent {pub languages: LanguageToSettingsMap,/// Settings for associating file extensions and filenames/// with languages.- pub file_types: Option<HashMap<Arc<str>, ExtendingVec<String>>>,+ pub file_types: Option<FileTypeMap>,}impl merge_from::MergeFrom for AllLanguageSettingsContent {@@ -1144,6 +1144,20 @@ pub struct LanguageTaskSettingsContent {#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]pub struct LanguageToSettingsMap(pub HashMap<String, LanguageSettingsContent>);+/// Map from language name to file patterns.+#[with_fallible_options]+#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)]+pub struct FileTypeMap(pub HashMap<Arc<str>, ExtendingVec<String>>);++impl<'a> IntoIterator for &'a FileTypeMap {+ type Item = (&'a Arc<str>, &'a ExtendingVec<String>);+ type IntoIter = std::collections::hash_map::Iter<'a, Arc<str>, ExtendingVec<String>>;++ fn into_iter(self) -> Self::IntoIter {+ self.0.iter()+ }+}+/// Determines how indent guides are colored.#[derive(Default,