[json] update service & server

extensions/json/client/src/jsonMain.ts

@@ -148,7 +148,8 @@ export function activate(context: ExtensionContext) {
 			provideColorPresentations(color: Color, context): Thenable<ColorPresentation[]> {
 				let params: ColorPresentationParams = {
 					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(context.document),
-					colorInfo: { range: client.code2ProtocolConverter.asRange(context.range), color }
+					color: color,
+					range: client.code2ProtocolConverter.asRange(context.range)
 				};
 				return client.sendRequest(ColorPresentationRequest.type, params).then(presentations => {
 					return presentations.map(p => {

extensions/json/npm-shrinkwrap.json

@@ -13,24 +13,24 @@
       "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.8.tgz"
     },
     "vscode-jsonrpc": {
-      "version": "3.5.0-next.1",
-      "from": "vscode-jsonrpc@>=3.5.0-next.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.1.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-jsonrpc@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.2.tgz"
     },
     "vscode-languageclient": {
-      "version": "3.5.0-next.3",
-      "from": "vscode-languageclient@3.5.0-next.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0-next.3.tgz"
+      "version": "3.5.0-next.4",
+      "from": "vscode-languageclient@3.5.0-next.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0-next.4.tgz"
     },
     "vscode-languageserver-protocol": {
-      "version": "3.5.0-next.3",
-      "from": "vscode-languageserver-protocol@3.5.0-next.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.3.tgz"
+      "version": "3.5.0-next.5",
+      "from": "vscode-languageserver-protocol@3.5.0-next.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.5.tgz"
     },
     "vscode-languageserver-types": {
-      "version": "3.5.0-next.1",
-      "from": "vscode-languageserver-types@>=3.5.0-next.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.1.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-languageserver-types@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.2.tgz"
     },
     "vscode-nls": {
       "version": "2.0.2",

extensions/json/package.json

@@ -133,7 +133,7 @@
   },
   "dependencies": {
     "vscode-extension-telemetry": "0.0.8",
-    "vscode-languageclient": "3.5.0-next.3",
+    "vscode-languageclient": "3.5.0-next.4",
     "vscode-nls": "2.0.2"
   },
   "devDependencies": {

extensions/json/server/npm-shrinkwrap.json

@@ -43,36 +43,29 @@
       "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.1.tgz"
     },
     "vscode-json-languageservice": {
-      "version": "2.0.22",
+      "version": "3.0.0",
       "from": "vscode-json-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.22.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.0.0.tgz"
     },
     "vscode-jsonrpc": {
-      "version": "3.5.0-next.1",
-      "from": "vscode-jsonrpc@>=3.5.0-next.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.1.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-jsonrpc@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0-next.2.tgz"
     },
     "vscode-languageserver": {
-      "version": "3.5.0-next.2",
-      "from": "vscode-languageserver@3.5.0-next.2",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0-next.2.tgz"
+      "version": "3.5.0-next.6",
+      "from": "vscode-languageserver@3.5.0-next.6",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0-next.6.tgz"
     },
     "vscode-languageserver-protocol": {
-      "version": "3.5.0-next.3",
-      "from": "vscode-languageserver-protocol@3.5.0-next.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.3.tgz",
-      "dependencies": {
-        "vscode-languageserver-types": {
-          "version": "3.5.0-next.1",
-          "from": "vscode-languageserver-types@>=3.5.0-next.1 <4.0.0",
-          "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.1.tgz"
-        }
-      }
+      "version": "3.5.0-next.5",
+      "from": "vscode-languageserver-protocol@3.5.0-next.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0-next.5.tgz"
     },
     "vscode-languageserver-types": {
-      "version": "3.4.0",
-      "from": "vscode-languageserver-types@3.4.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.4.0.tgz"
+      "version": "3.5.0-next.2",
+      "from": "vscode-languageserver-types@3.5.0-next.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0-next.2.tgz"
     },
     "vscode-nls": {
       "version": "2.0.2",

extensions/json/server/package.json

@@ -10,8 +10,8 @@
   "dependencies": {
     "jsonc-parser": "^1.0.0",
     "request-light": "^0.2.1",
-    "vscode-json-languageservice": "^2.0.22",
-    "vscode-languageserver": "3.5.0-next.2",
+    "vscode-json-languageservice": "3.0.0",
+    "vscode-languageserver": "3.5.0-next.6",
     "vscode-nls": "^2.0.2",
     "vscode-uri": "^1.0.1"
   },

extensions/json/server/src/jsonServerMain.ts

@@ -324,7 +324,7 @@ connection.onRequest(ColorPresentationRequest.type, params => {
 	let document = documents.get(params.textDocument.uri);
 	if (document) {
 		let jsonDocument = getJSONDocument(document);
-		return languageService.getColorPresentations(document, jsonDocument, params.colorInfo);
+		return languageService.getColorPresentations(document, jsonDocument, params.color, params.range);
 	}
 	return [];
 });