Merge pull request #2347 from zed-industries/disable-yaml-key-ordering

Antonio Scandurra created 2 years ago

Disable key ordering diagnostic for YAML

Change summary

crates/lsp/src/lsp.rs            | 1 +
crates/zed/src/languages/yaml.rs | 3 +++
2 files changed, 4 insertions(+)

Detailed changes

crates/lsp/src/lsp.rs

@@ -335,6 +335,7 @@ impl LanguageServer {
                     did_change_configuration: Some(DynamicRegistrationClientCapabilities {
                         dynamic_registration: Some(true),
                     }),
+                    workspace_folders: Some(true),
                     ..Default::default()
                 }),
                 text_document: Some(TextDocumentClientCapabilities {

crates/zed/src/languages/yaml.rs

@@ -112,6 +112,9 @@ impl LspAdapter for YamlLspAdapter {
         let settings = cx.global::<Settings>();
         Some(
             future::ready(serde_json::json!({
+                "yaml": {
+                    "keyOrdering": false
+                },
                 "[yaml]": {
                     "editor.tabSize": settings.tab_size(Some("YAML"))
                 }