[json] provide colorpresentations in language server

extensions/json/client/src/jsonMain.ts

@@ -6,11 +6,11 @@
 
 import * as path from 'path';
 
-import { workspace, languages, ExtensionContext, extensions, Uri, TextDocument, ColorInformation, Color, ColorPresentation, TextEdit } from 'vscode';
+import { workspace, languages, ExtensionContext, extensions, Uri, TextDocument, ColorInformation, Color, ColorPresentation } from 'vscode';
 import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification } from 'vscode-languageclient';
 import TelemetryReporter from 'vscode-extension-telemetry';
-import { ConfigurationFeature } from 'vscode-languageclient/lib/proposed';
-import { DocumentColorRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
+import { ConfigurationFeature } from 'vscode-languageclient/lib/configuration.proposed';
+import { DocumentColorRequest, DocumentColorParams, ColorPresentationParams, ColorPresentationRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
 
 
 import * as nls from 'vscode-nls';
@@ -116,14 +116,12 @@ export function activate(context: ExtensionContext) {
 
 		client.sendNotification(SchemaAssociationNotification.type, getSchemaAssociation(context));
 
-		var _toTwoDigitHex = function (n: number): string {
-			const r = n.toString(16);
-			return r.length !== 2 ? '0' + r : r;
-		};
 		// register color provider
 		context.subscriptions.push(languages.registerColorProvider(documentSelector, {
 			provideDocumentColors(document: TextDocument): Thenable<ColorInformation[]> {
-				let params = client.code2ProtocolConverter.asDocumentSymbolParams(document);
+				let params: DocumentColorParams = {
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
+				};
 				return client.sendRequest(DocumentColorRequest.type, params).then(symbols => {
 					return symbols.map(symbol => {
 						let range = client.protocol2CodeConverter.asRange(symbol.range);
@@ -132,19 +130,19 @@ export function activate(context: ExtensionContext) {
 					});
 				});
 			},
-			provideColorPresentations(document: TextDocument, colorInfo: ColorInformation): ColorPresentation[] | Thenable<ColorPresentation[]> {
-				let result: ColorPresentation[] = [];
-				let color = colorInfo.color;
-				let label;
-
-				if (color.alpha === 1) {
-					label = `#${_toTwoDigitHex(Math.round(color.red * 255))}${_toTwoDigitHex(Math.round(color.green * 255))}${_toTwoDigitHex(Math.round(color.blue * 255))}`;
-				} else {
-					label = `#${_toTwoDigitHex(Math.round(color.red * 255))}${_toTwoDigitHex(Math.round(color.green * 255))}${_toTwoDigitHex(Math.round(color.blue * 255))}${_toTwoDigitHex(Math.round(color.alpha * 255))}`;
-				}
-
-				result.push({ label: label, textEdit: new TextEdit(colorInfo.range, label) });
-				return result;
+			provideColorPresentations(document: TextDocument, colorInfo: ColorInformation): Thenable<ColorPresentation[]> {
+				let params: ColorPresentationParams = {
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
+					colorInfo: { range: client.code2ProtocolConverter.asRange(colorInfo.range), color: colorInfo.color }
+				};
+				return client.sendRequest(ColorPresentationRequest.type, params).then(presentations => {
+					return presentations.map(p => {
+						let presentation = new ColorPresentation(p.label);
+						presentation.textEdit = p.textEdit && client.protocol2CodeConverter.asTextEdit(p.textEdit);
+						presentation.additionalTextEdits = p.additionalTextEdits && client.protocol2CodeConverter.asTextEdits(p.additionalTextEdits);
+						return presentation;
+					});
+				});
 			}
 		}));
 	});

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.3.1",
-      "from": "vscode-jsonrpc@>=3.3.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"
+      "version": "3.4.0",
+      "from": "vscode-jsonrpc@>=3.4.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.4.0.tgz"
     },
     "vscode-languageclient": {
-      "version": "3.4.0-next.17",
+      "version": "3.4.2",
       "from": "vscode-languageclient@next",
-      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.0-next.17.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.4.2.tgz"
     },
     "vscode-languageserver-protocol": {
-      "version": "3.1.1",
-      "from": "vscode-languageserver-protocol@>=3.1.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.1.1.tgz"
+      "version": "3.4.2",
+      "from": "vscode-languageserver-protocol@3.4.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.4.2.tgz"
     },
     "vscode-languageserver-types": {
-      "version": "3.3.0",
-      "from": "vscode-languageserver-types@>=3.3.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz"
+      "version": "3.4.0",
+      "from": "vscode-languageserver-types@>=3.4.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.4.0.tgz"
     },
     "vscode-nls": {
       "version": "2.0.2",

extensions/json/package.json

@@ -133,8 +133,8 @@
   },
   "dependencies": {
     "vscode-extension-telemetry": "0.0.8",
-    "vscode-languageclient": "3.4.0-next.17",
-    "vscode-languageserver-protocol": "^3.1.1",
+    "vscode-languageclient": "^3.4.2",
+    "vscode-languageserver-protocol": "^3.4.2",
     "vscode-nls": "2.0.2"
   },
   "devDependencies": {

extensions/json/server/npm-shrinkwrap.json

@@ -43,29 +43,29 @@
       "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.1.tgz"
     },
     "vscode-json-languageservice": {
-      "version": "2.0.18",
+      "version": "2.0.20",
       "from": "vscode-json-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.18.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.20.tgz"
     },
     "vscode-jsonrpc": {
-      "version": "3.3.1",
-      "from": "vscode-jsonrpc@>=3.3.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"
+      "version": "3.4.0",
+      "from": "vscode-jsonrpc@>=3.4.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.4.0.tgz"
     },
     "vscode-languageserver": {
-      "version": "3.4.0-next.6",
+      "version": "3.4.2",
       "from": "vscode-languageserver@next",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.0-next.6.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.2.tgz"
     },
     "vscode-languageserver-protocol": {
-      "version": "3.1.1",
-      "from": "vscode-languageserver-protocol@>=3.1.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.1.1.tgz"
+      "version": "3.4.2",
+      "from": "vscode-languageserver-protocol@3.4.2",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.4.2.tgz"
     },
     "vscode-languageserver-types": {
-      "version": "3.3.0",
-      "from": "vscode-languageserver-types@>=3.0.3 <4.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz"
+      "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"
     },
     "vscode-nls": {
       "version": "2.0.2",

extensions/json/server/package.json

@@ -10,9 +10,10 @@
   "dependencies": {
     "jsonc-parser": "^1.0.0",
     "request-light": "^0.2.1",
-    "vscode-json-languageservice": "^2.0.18",
-    "vscode-languageserver": "3.4.0-next.6",
-    "vscode-languageserver-protocol": "^3.1.1",
+    "vscode-json-languageservice": "^2.0.20",
+    "vscode-languageserver": "^3.4.2",
+    "vscode-languageserver-protocol": "^3.4.2",
+    "vscode-languageserver-types": "^3.4.0",
     "vscode-nls": "^2.0.2",
     "vscode-uri": "^1.0.1"
   },

extensions/json/server/src/jsonServerMain.ts

@@ -10,7 +10,7 @@ import {
 	DocumentRangeFormattingRequest, Disposable, ServerCapabilities
 } from 'vscode-languageserver';
 
-import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
+import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities, ColorPresentationRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
 
 import { xhr, XHRResponse, configure as configureHttpRequests, getErrorStatusDescription } from 'request-light';
 import fs = require('fs');
@@ -311,5 +311,14 @@ connection.onRequest(DocumentColorRequest.type, params => {
 	return [];
 });
 
+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 [];
+});
+
 // Listen on the connection
 connection.listen();
\ No newline at end of file