From 5e3d85c023b4aaad85d3b171121fc33b9fee0ef3 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:16:09 +0200
Subject: [PATCH] json: Fix tsconfig.json schema overriding other schemas (such
 as keymap) (#12600)

@mrnugget spotted that tsconfig.json schema is getting applied on
current Nightly. I've tracked it down to a misconfiguration of JSON
language server. Mea culpa.

No release note as that change has not went out to the public yet.

Release Notes:

- N/A
---
 crates/languages/src/json.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/crates/languages/src/json.rs b/crates/languages/src/json.rs
index a62e474204..34853da7a6 100644
--- a/crates/languages/src/json.rs
+++ b/crates/languages/src/json.rs
@@ -84,6 +84,10 @@ impl JsonLspAdapter {
                     "enable": true,
                 },
                 "schemas": [
+                    {
+                        "fileMatch": ["tsconfig.json"],
+                        "schema":tsconfig_schema
+                    },
                     {
                         "fileMatch": [
                             schema_file_match(&paths::SETTINGS),
@@ -101,11 +105,8 @@ impl JsonLspAdapter {
                             &*paths::LOCAL_TASKS_RELATIVE_PATH,
                         ],
                         "schema": tasks_schema,
-                    },
-                    {
-                        "fileMatch": "*/tsconfig.json",
-                        "schema":tsconfig_schema
                     }
+
                 ]
             }
         })