json: Fix tsconfig.json schema overriding other schemas (such as keymap) (#12600)

Piotr Osiewicz created 2 years ago

@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

Change summary

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

Detailed changes

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
                     }
+
                 ]
             }
         })