From 613f8e64381abd4fb6eeb4283d8fbae31d1cb3fc Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 4 Apr 2023 10:00:48 +0200
Subject: [PATCH] Merge pull request #2347 from
 zed-industries/disable-yaml-key-ordering

Disable key ordering diagnostic for YAML
---
 crates/lsp/src/lsp.rs            | 1 +
 crates/zed/src/languages/yaml.rs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 514648cfa3494b015fa844ec1020b2f563806369..1e37c9765bef0b59a3bd98d0fc3b096edc8f07a0 100644
--- a/crates/lsp/src/lsp.rs
+++ b/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 {
diff --git a/crates/zed/src/languages/yaml.rs b/crates/zed/src/languages/yaml.rs
index 7339512f1a31233a94962b0aad00a497f2566013..f327726b48fbcf2908dd96b6c9d69ca034a89fe4 100644
--- a/crates/zed/src/languages/yaml.rs
+++ b/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"))
                 }