[json] updare service & add json schema.deprecationMessage/ enumDescriptions

extensions/json/.vscode/launch.json

@@ -11,7 +11,7 @@
 			],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outDir": "${workspaceRoot}/client/out",
+			"outFiles": ["${workspaceRoot}/client/out"],
 			"preLaunchTask": "npm"
 		},
 		{
@@ -22,8 +22,17 @@
 			"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/client/out/test" ],
 			"stopOnEntry": false,
 			"sourceMaps": true,
-			"outDir": "${workspaceRoot}/client/out/test",
+			"outFiles": ["${workspaceRoot}/client/out/test"],
 			"preLaunchTask": "npm"
-		}		
+		},
+		{
+			"name": "Attach Language Server",
+			"type": "node",
+			"request": "attach",
+			"port": 6004,
+			"sourceMaps": true,
+			"outFiles": ["${workspaceRoot}/server/out"]
+		}
+
 	]
 }
\ No newline at end of file

extensions/json/server/npm-shrinkwrap.json

@@ -43,9 +43,9 @@
       "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.1.0.tgz"
     },
     "vscode-json-languageservice": {
-      "version": "2.0.0-next.5",
+      "version": "2.0.0-next.7",
       "from": "vscode-json-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.0-next.5.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.0-next.7.tgz"
     },
     "vscode-jsonrpc": {
       "version": "3.0.1-alpha.2",

extensions/json/server/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "request-light": "^0.1.0",
-    "vscode-json-languageservice": "^2.0.0-next.5",
+    "vscode-json-languageservice": "^2.0.0-next.7",
     "vscode-languageserver": "3.0.1-alpha.3",
     "vscode-nls": "^1.0.7"
   },

src/vs/base/common/jsonSchema.ts

@@ -42,7 +42,8 @@ export interface IJSONSchema {
 
 	defaultSnippets?: IJSONSchemaSnippet[]; // VSCode extension
 	errorMessage?: string; // VSCode extension
-	deprecatedMessage?: string; // VSCode extension
+	deprecationMessage?: string; // VSCode extension
+	enumDescriptions?: string[]; // VSCode extension
 }
 
 export interface IJSONSchemaMap {

src/vs/platform/extensions/common/extensionsRegistry.ts

@@ -118,6 +118,8 @@ const schemaId = 'vscode://schemas/vscode-extensions';
 const schema: IJSONSchema = {
 	properties: {
 		engines: {
+			type: 'object',
+
 			properties: {
 				'vscode': {
 					type: 'string',