diff --git a/assets/settings/default.json b/assets/settings/default.json index e7c35460edc5c6c122f6bc49f6509a3c10af0234..101b53c4a74e507cc8ff2853513cb6ea2f109b6a 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1,4 +1,5 @@ { + "$schema": "zed://schemas/settings", /// The displayed name of this project. If not set or empty, the root directory name /// will be displayed. "project_name": "", @@ -2051,7 +2052,7 @@ // } // } // } - "profiles": [], + "profiles": {}, // A map of log scopes to the desired log level. // Useful for filtering out noisy logs or enabling more verbose logging. diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs index 28fdce8885ce5c9cf3f91b46b7ef1098a6d6fbfa..1790313dcad43994359c07637ff3b8b534293970 100644 --- a/crates/project/src/project_settings.rs +++ b/crates/project/src/project_settings.rs @@ -215,6 +215,7 @@ impl From for DiagnosticSeverity { settings::DiagnosticSeverityContent::Warning => DiagnosticSeverity::Warning, settings::DiagnosticSeverityContent::Info => DiagnosticSeverity::Info, settings::DiagnosticSeverityContent::Hint => DiagnosticSeverity::Hint, + settings::DiagnosticSeverityContent::All => DiagnosticSeverity::Hint, } } } diff --git a/crates/settings/src/settings_content/project.rs b/crates/settings/src/settings_content/project.rs index b35a939e07f1072f07c580405d6721a5d72cc596..88d9f9803e1579a77d7140e826961ad01f5eedac 100644 --- a/crates/settings/src/settings_content/project.rs +++ b/crates/settings/src/settings_content/project.rs @@ -470,8 +470,8 @@ pub enum DiagnosticSeverityContent { Error, Warning, Info, - #[serde(alias = "all")] Hint, + All, } /// A custom Git hosting provider.