From 0814ab46f7e3f57cab4708fb07d5eb0df964e313 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 6 Jun 2018 16:26:25 +0200
Subject: [PATCH] Suggestion: tsconfig.*.json should be detected as `jsonc`.
 Fixes #50974

---
 extensions/json/package.json              |  4 +---
 extensions/typescript-basics/package.json | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/extensions/json/package.json b/extensions/json/package.json
index f89b2bdda72..dc538346a3c 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -56,9 +56,7 @@
           "settings.json",
           "launch.json",
           "tasks.json",
-          "keybindings.json",
-          "tsconfig.json",
-          "jsconfig.json"
+          "keybindings.json"
         ],
         "configuration": "./language-configuration.json"
       }
diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json
index 94bec747159..2976499201d 100644
--- a/extensions/typescript-basics/package.json
+++ b/extensions/typescript-basics/package.json
@@ -36,6 +36,17 @@
           ".tsx"
         ],
         "configuration": "./language-configuration.json"
+      },
+      {
+        "id": "jsonc",
+        "filenames": [
+          "tsconfig.json",
+          "jsconfig.json"
+        ],
+        "filenamePatterns": [
+          "tsconfig.*.json",
+          "tsconfig-*.json"
+        ]
       }
     ],
     "grammars": [
@@ -91,6 +102,14 @@
         "fileMatch": "tsconfig.*.json",
         "url": "https://schemastore.azurewebsites.net/schemas/json/tsconfig.json"
       },
+      {
+        "fileMatch": "tsconfig-*.json",
+        "url": "./schemas/tsconfig.schema.json"
+      },
+      {
+        "fileMatch": "tsconfig-*.json",
+        "url": "https://schemastore.azurewebsites.net/schemas/json/tsconfig.json"
+      },
       {
         "fileMatch": "tsconfig.*.json",
         "url": "./schemas/tsconfig.schema.json"