Merge VS Code 1.23.1 (#1520)

extensions/json/package.json

@@ -1,24 +1,13 @@
 {
   "name": "json",
   "displayName": "%displayName%",
-	"description": "%description%",
+  "description": "%description%",
   "version": "1.0.0",
   "publisher": "vscode",
-  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "engines": {
     "vscode": "0.10.x"
   },
-  "icon": "icons/json.png",
-  "activationEvents": [
-    "onLanguage:json",
-    "onLanguage:jsonc"
-  ],
-  "enableProposedApi": true,
-  "main": "./client/out/jsonMain",
   "scripts": {
-    "compile": "gulp compile-extension:json-client && gulp compile-extension:json-server",
-    "postinstall": "cd server && yarn install",
-    "install-client-next": "yarn add vscode-languageclient@next",
     "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-JSON.tmLanguage JSON.tmLanguage ./syntaxes/JSON.tmLanguage.json"
   },
   "contributes": {
@@ -88,93 +77,6 @@
         "fileMatch": "*.schema.json",
         "url": "http://json-schema.org/draft-04/schema#"
       }
-    ],
-    "configuration": {
-      "id": "json",
-      "order": 20,
-      "type": "object",
-      "title": "JSON",
-      "properties": {
-        "json.schemas": {
-          "type": "array",
-          "scope": "resource",
-          "description": "%json.schemas.desc%",
-          "items": {
-            "type": "object",
-            "default": {
-              "fileMatch": [
-                "/myfile"
-              ],
-              "url": "schemaURL"
-            },
-            "properties": {
-              "url": {
-                "type": "string",
-                "default": "/user.schema.json",
-                "description": "%json.schemas.url.desc%"
-              },
-              "fileMatch": {
-                "type": "array",
-                "items": {
-                  "type": "string",
-                  "default": "MyFile.json",
-                  "description": "%json.schemas.fileMatch.item.desc%"
-                },
-                "minItems": 1,
-                "description": "%json.schemas.fileMatch.desc%"
-              },
-              "schema": {
-                "$ref": "http://json-schema.org/draft-04/schema#",
-                "description": "%json.schemas.schema.desc%"
-              }
-            }
-          }
-        },
-        "json.format.enable": {
-          "type": "boolean",
-          "scope": "window",
-          "default": true,
-          "description": "%json.format.enable.desc%"
-        },
-        "json.trace.server": {
-          "type": "string",
-          "scope": "window",
-          "enum": [
-            "off",
-            "messages",
-            "verbose"
-          ],
-          "default": "off",
-          "description": "%json.tracing.desc%"
-        },
-        "json.colorDecorators.enable": {
-          "type": "boolean",
-          "scope": "window",
-          "default": true,
-          "description": "%json.colorDecorators.enable.desc%",
-          "deprecationMessage": "%json.colorDecorators.enable.deprecationMessage%"
-        },
-        "json.experimental.syntaxFolding": {
-          "type": "boolean",
-          "default": false,
-          "description": "%json.experimental.syntaxFolding%"
-        }
-      }
-    },
-    "configurationDefaults": {
-      "[json]": {
-        "editor.quickSuggestions": {
-          "strings": true
-        }
-      }
-    }
-  },
-  "dependencies": {
-    "vscode-extension-telemetry": "0.0.15",
-    "vscode-languageclient": "4.0.0-next.9",
-    "vscode-nls": "^3.2.1"
-  },
-  "devDependencies": {
-    "@types/node": "7.0.43"
+    ]
   }
 }