Add document color endpoints

Author: davidwengier

src/lsptoolshost/razor/razorEndpoints.ts

@@ -5,13 +5,25 @@
 
 import { RoslynLanguageServer } from '../server/roslynLanguageServer';
 import * as vscode from 'vscode';
-import { LogMessageParams, NotificationType, RequestType } from 'vscode-languageclient';
+import {
+    ColorInformation,
+    ColorPresentationParams,
+    ColorPresentationRequest,
+    DocumentColorParams,
+    DocumentColorRequest,
+    LogMessageParams,
+    NotificationType,
+    RequestType,
+} from 'vscode-languageclient';
 import { RazorLogger } from '../../razor/src/razorLogger';
 import { HtmlUpdateParameters } from './htmlUpdateParameters';
 import { UriConverter } from '../utils/uriConverter';
 import { PlatformInformation } from '../../shared/platform';
 import { HtmlDocumentManager } from './htmlDocumentManager';
+import { DocumentColorHandler } from '../../razor/src/documentColor/documentColorHandler';
 import { razorOptions } from '../../shared/options';
+import { ColorPresentationHandler } from '../../razor/src/colorPresentation/colorPresentationHandler';
+import { ColorPresentation } from 'vscode-html-languageservice';
 
 export function registerRazorEndpoints(
     context: vscode.ExtensionContext,
@@ -36,6 +48,23 @@ export function registerRazorEndpoints(
         await documentManager.updateDocumentText(uri, params.text);
     });
 
+    registerRequestHandler<DocumentColorParams, ColorInformation[]>(DocumentColorRequest.method, async (params) => {
+        const uri = UriConverter.deserialize(params.textDocument.uri);
+        const document = await documentManager.getDocument(uri);
+
+        return await DocumentColorHandler.doDocumentColorRequest(document.uri);
+    });
+
+    registerRequestHandler<ColorPresentationParams, ColorPresentation[]>(
+        ColorPresentationRequest.method,
+        async (params) => {
+            const uri = UriConverter.deserialize(params.textDocument.uri);
+            const document = await documentManager.getDocument(uri);
+
+            return await ColorPresentationHandler.doColorPresentationRequest(document.uri, params);
+        }
+    );
+
     // Helper method that registers a request handler, and logs errors to the Razor logger.
     function registerRequestHandler<Params, Result>(method: string, invocation: (params: Params) => Promise<Result>) {
         const requestType = new RequestType<Params, Result, Error>(method);

src/razor/src/colorPresentation/colorPresentationHandler.ts

@@ -54,30 +54,38 @@ export class ColorPresentationHandler {
                 return this.emptyColorInformationResponse;
             }
 
-            const color = new vscode.Color(
-                colorPresentationParams.color.red,
-                colorPresentationParams.color.green,
-                colorPresentationParams.color.blue,
-                colorPresentationParams.color.alpha
-            );
             const virtualHtmlUri = razorDocument.htmlDocument.uri;
 
-            const colorPresentations = await vscode.commands.executeCommand<vscode.ColorPresentation[]>(
-                'vscode.executeColorPresentationProvider',
-                color,
-                new ColorPresentationContext(virtualHtmlUri, colorPresentationParams.range)
-            );
-
-            const serializableColorPresentations = this.SerializeColorPresentations(colorPresentations);
-            return serializableColorPresentations;
+            return await ColorPresentationHandler.doColorPresentationRequest(virtualHtmlUri, colorPresentationParams);
         } catch (error) {
             this.logger.logWarning(`${ColorPresentationHandler.provideHtmlColorPresentation} failed with ${error}`);
         }
 
         return this.emptyColorInformationResponse;
     }
 
-    private SerializeColorPresentations(colorPresentations: vscode.ColorPresentation[]) {
+    public static async doColorPresentationRequest(
+        virtualHtmlUri: vscode.Uri,
+        colorPresentationParams: SerializableColorPresentationParams
+    ) {
+        const color = new vscode.Color(
+            colorPresentationParams.color.red,
+            colorPresentationParams.color.green,
+            colorPresentationParams.color.blue,
+            colorPresentationParams.color.alpha
+        );
+
+        const colorPresentations = await vscode.commands.executeCommand<vscode.ColorPresentation[]>(
+            'vscode.executeColorPresentationProvider',
+            color,
+            new ColorPresentationContext(virtualHtmlUri, colorPresentationParams.range)
+        );
+
+        const serializableColorPresentations = ColorPresentationHandler.SerializeColorPresentations(colorPresentations);
+        return serializableColorPresentations;
+    }
+
+    private static SerializeColorPresentations(colorPresentations: vscode.ColorPresentation[]) {
         const serializableColorPresentations = new Array<SerializableColorPresentation>();
         for (const colorPresentation of colorPresentations) {
             let serializedTextEdit: any = null;

src/razor/src/documentColor/documentColorHandler.ts

@@ -67,24 +67,27 @@ export class DocumentColorHandler {
             }
 
             const virtualHtmlUri = razorDocument.htmlDocument.uri;
-
-            const colorInformation = await vscode.commands.executeCommand<vscode.ColorInformation[]>(
-                'vscode.executeDocumentColorProvider',
-                virtualHtmlUri
-            );
-
-            const serializableColorInformation = new Array<SerializableColorInformation>();
-            for (const color of colorInformation) {
-                const serializableRange = convertRangeToSerializable(color.range);
-                const serializableColor = new SerializableColorInformation(serializableRange, color.color);
-                serializableColorInformation.push(serializableColor);
-            }
-
-            return serializableColorInformation;
+            return await DocumentColorHandler.doDocumentColorRequest(virtualHtmlUri);
         } catch (error) {
             this.logger.logWarning(`${DocumentColorHandler.provideHtmlDocumentColorEndpoint} failed with ${error}`);
         }
 
         return this.emptyColorInformationResponse;
     }
+
+    public static async doDocumentColorRequest(virtualHtmlUri: vscode.Uri) {
+        const colorInformation = await vscode.commands.executeCommand<vscode.ColorInformation[]>(
+            'vscode.executeDocumentColorProvider',
+            virtualHtmlUri
+        );
+
+        const serializableColorInformation = new Array<SerializableColorInformation>();
+        for (const color of colorInformation) {
+            const serializableRange = convertRangeToSerializable(color.range);
+            const serializableColor = new SerializableColorInformation(serializableRange, color.color);
+            serializableColorInformation.push(serializableColor);
+        }
+
+        return serializableColorInformation;
+    }
 }