From 66c1b6d64c9082db5aefb7ab72a84b74e864775e Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 6 Jun 2018 16:37:32 +0200
Subject: [PATCH] move jsonc associations to configuration-editing

---
 extensions/configuration-editing/package.json | 19 +++++++++++++++++++
 extensions/json/package.json                  | 11 -----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
index 7a6798f8eba..e66a313c9f6 100644
--- a/extensions/configuration-editing/package.json
+++ b/extensions/configuration-editing/package.json
@@ -21,6 +21,25 @@
     "vscode-nls": "^3.2.1"
   },
   "contributes": {
+    "languages": [
+      {
+        "id": "jsonc",
+        "extensions": [
+          ".code-workspace",
+          "language-configuration.json",
+          "icon-theme.json",
+          "color-theme.json",
+          ".code-snippets"
+        ],
+        "filenames": [
+          "settings.json",
+          "launch.json",
+          "tasks.json",
+          "keybindings.json",
+          "extensions.json"
+        ]
+      }
+    ],
     "jsonValidation": [
       {
         "fileMatch": "vscode://defaultsettings/keybindings.json",
diff --git a/extensions/json/package.json b/extensions/json/package.json
index dc538346a3c..9ef7b078963 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -45,19 +45,8 @@
           "JSON with Comments"
         ],
         "extensions": [
-          ".code-workspace",
-          "language-configuration.json",
-          "icon-theme.json",
-          "color-theme.json",
-          ".code-snippets",
           ".jsonc"
         ],
-        "filenames": [
-          "settings.json",
-          "launch.json",
-          "tasks.json",
-          "keybindings.json"
-        ],
         "configuration": "./language-configuration.json"
       }
     ],