[json] complete colorProvider adoption

extensions/json/client/src/jsonMain.ts

@@ -6,7 +6,7 @@
 
 import * as path from 'path';
 
-import { workspace, languages, ExtensionContext, extensions, Uri, Range, TextDocument, ColorRange, Color } from 'vscode';
+import { workspace, languages, ExtensionContext, extensions, Uri, TextDocument, ColorRange, Color } 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';
@@ -21,10 +21,6 @@ namespace VSCodeContentRequest {
 	export const type: RequestType<string, string, any, any> = new RequestType('vscode/content');
 }
 
-namespace ColorSymbolRequest {
-	export const type: RequestType<string, Range[], any, any> = new RequestType('json/colorSymbols');
-}
-
 export interface ISchemaAssociations {
 	[pattern: string]: string[];
 }
@@ -83,10 +79,12 @@ export function activate(context: ExtensionContext) {
 		debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions }
 	};
 
+	let documentSelector = ['json'];
+
 	// Options to control the language client
 	let clientOptions: LanguageClientOptions = {
 		// Register the server for json documents
-		documentSelector: ['json'],
+		documentSelector,
 		synchronize: {
 			// Synchronize the setting section 'json' to the server
 			configurationSection: ['json', 'http'],
@@ -123,7 +121,8 @@ export function activate(context: ExtensionContext) {
 
 		client.sendNotification(SchemaAssociationNotification.type, getSchemaAssociation(context));
 
-		context.subscriptions.push(languages.registerColorProvider('json', {
+		// register color provider
+		context.subscriptions.push(languages.registerColorProvider(documentSelector, {
 			provideDocumentColors(document: TextDocument): Thenable<ColorRange[]> {
 				let params = client.code2ProtocolConverter.asDocumentSymbolParams(document);
 				return client.sendRequest(DocumentColorRequest.type, params).then(symbols => {

extensions/json/npm-shrinkwrap.json

@@ -24,7 +24,7 @@
     },
     "vscode-languageserver-protocol": {
       "version": "3.1.1",
-      "from": "vscode-languageserver-protocol@>=3.1.0 <4.0.0",
+      "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"
     },
     "vscode-languageserver-types": {

extensions/json/package.json

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

extensions/json/server/npm-shrinkwrap.json

@@ -59,7 +59,7 @@
     },
     "vscode-languageserver-protocol": {
       "version": "3.1.1",
-      "from": "vscode-languageserver-protocol@>=3.1.0 <4.0.0",
+      "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"
     },
     "vscode-languageserver-types": {

extensions/json/server/package.json

@@ -12,6 +12,7 @@
     "request-light": "^0.2.1",
     "vscode-json-languageservice": "^2.0.15",
     "vscode-languageserver": "3.4.0-next.6",
+    "vscode-languageserver-protocol": "^3.1.1",
     "vscode-nls": "^2.0.2"
   },
   "devDependencies": {

extensions/json/server/src/jsonServerMain.ts

@@ -7,7 +7,7 @@
 import {
 	createConnection, IConnection,
 	TextDocuments, TextDocument, InitializeParams, InitializeResult, NotificationType, RequestType,
-	DocumentRangeFormattingRequest, Disposable, Range, ServerCapabilities
+	DocumentRangeFormattingRequest, Disposable, ServerCapabilities
 } from 'vscode-languageserver';
 
 import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
@@ -36,10 +36,6 @@ namespace VSCodeContentRequest {
 	export const type: RequestType<string, string, any, any> = new RequestType('vscode/content');
 }
 
-namespace ColorSymbolRequest {
-	export const type: RequestType<string, Range[], any, any> = new RequestType('json/colorSymbols');
-}
-
 // Create a connection for the server
 let connection: IConnection = createConnection();