Add mapTextEdits

Author: Andrew Hall

src/lsptoolshost/razor/razorEndpoints.ts

@@ -30,6 +30,8 @@ import { ProvideDynamicFileResponse } from '../../razor/src/dynamicFile/provideD
 import { RazorMapSpansParams } from '../../razor/src/mapping/razorMapSpansParams';
 import { RazorMapSpansResponse } from '../../razor/src/mapping/razorMapSpansResponse';
 import { MappingHandler } from '../../razor/src/mapping/mappingHandler';
+import { RazorMapTextChangesParams } from '../../razor/src/mapping/RazorMapTextChangesParams';
+import { RazorMapTextChangesResponse } from '../../razor/src/mapping/RazorMapTextChangesResponse';
 
 export function registerRazorEndpoints(
     context: vscode.ExtensionContext,
@@ -95,6 +97,15 @@ export function registerRazorEndpoints(
         registerRequestHandler<RazorMapSpansParams, RazorMapSpansResponse>('razor/mapSpans', async (params) => {
             return await vscode.commands.executeCommand<RazorMapSpansResponse>(MappingHandler.MapSpansCommand, params);
         });
+        registerRequestHandler<RazorMapTextChangesParams, RazorMapTextChangesResponse>(
+            'razor/mapTextChanges',
+            async (params) => {
+                return await vscode.commands.executeCommand<RazorMapTextChangesResponse>(
+                    MappingHandler.MapChangesCommand,
+                    params
+                );
+            }
+        );
     }
 
     // Helper method that registers a request handler, and logs errors to the Razor logger.

src/razor/src/mapping/mappingHandler.ts

@@ -9,11 +9,21 @@ import { RazorMapSpansParams } from './razorMapSpansParams';
 
 export class MappingHandler {
     public static readonly MapSpansCommand = 'razor.mapSpansCommand';
+    public static readonly MapChangesCommand = 'razor.mapChangesCommand';
+
     constructor(private readonly languageServiceClient: RazorLanguageServiceClient) {}
 
-    public async register(): Promise<void> {
-        vscode.commands.registerCommand(MappingHandler.MapSpansCommand, async (params: RazorMapSpansParams) => {
-            return this.languageServiceClient.mapSpans(params);
-        });
+    public async register(): Promise<vscode.Disposable> {
+        return vscode.Disposable.from(
+            ...[
+                vscode.commands.registerCommand(MappingHandler.MapSpansCommand, async (params: RazorMapSpansParams) => {
+                    return this.languageServiceClient.mapSpans(params);
+                }),
+                vscode.commands.registerCommand(
+                    MappingHandler.MapChangesCommand,
+                    async (params: RazorMapSpansParams) => {}
+                ),
+            ]
+        );
     }
 }

src/razor/src/mapping/razorMapTextChangesParams.ts

@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { TextDocumentIdentifier } from 'vscode-languageserver-types';
+import { razorTextChange } from '../dynamicFile/razorTextChange';
+
+// Matches https://github.com/dotnet/razor/blob/401f6f8632a7e0320bc12804fa7e9659b3b3aeab/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorMapTextChangesParams.cs
+export class RazorMapTextChangesParams {
+    constructor(
+        public readonly csharpDocument: TextDocumentIdentifier,
+        public readonly textChanges: razorTextChange[]
+    ) {}
+}

src/razor/src/mapping/razorMapTextChangesResponse.ts

@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { TextDocumentIdentifier } from 'vscode-languageserver-types';
+import { razorTextChange } from '../dynamicFile/razorTextChange';
+
+// Matches https://github.com/dotnet/razor/blob/401f6f8632a7e0320bc12804fa7e9659b3b3aeab/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorMapTextChangesResponse.cs
+export class RazorMapTextChangesResponse {
+    constructor(
+        public readonly razorDocument: TextDocumentIdentifier,
+        public readonly textChanges: razorTextChange[]
+    ) {}
+}

src/razor/src/mapping/razorMapToDocumentEditsParams.ts

@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { Uri } from 'vscode';
+import { LanguageKind } from 'vscode-languageserver-types';
+import { razorTextChange } from '../dynamicFile/razorTextChange';
+
+// Matches https://github.com/dotnet/razor/blob/401f6f8632a7e0320bc12804fa7e9659b3b3aeab/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DocumentMapping/RazorMapToDocumentEditsParams.cs
+export class RazorMapToDocumentEditsParams {
+    constructor(
+        public readonly kind: LanguageKind,
+        public readonly razorDocumentUri: Uri,
+        public readonly textChanges: razorTextChange[]
+    ) {}
+}

src/razor/src/mapping/razorMapToDocumentEditsResponse.ts

@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { razorTextChange } from '../dynamicFile/razorTextChange';
+
+// Matches https://github.com/dotnet/razor/blob/401f6f8632a7e0320bc12804fa7e9659b3b3aeab/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DocumentMapping/RazorMapToDocumentEditsResponse.cs
+export class RazorMapToDocumentEditsResponse {
+    constructor(public readonly textChanges: razorTextChange[], public readonly hostDocumentVersion: number) {}
+}

src/razor/src/razorLanguageServiceClient.ts

@@ -15,6 +15,10 @@ import { RazorMapSpansParams } from './mapping/razorMapSpansParams';
 import { RazorMapSpansResponse } from './mapping/razorMapSpansResponse';
 import { UriConverter } from '../../lsptoolshost/utils/uriConverter';
 import { RazorDocumentManager } from './document/razorDocumentManager';
+import { RazorMapTextChangesParams } from './mapping/RazorMapTextChangesParams';
+import { RazorMapTextChangesResponse } from './mapping/RazorMapTextChangesResponse';
+import { RazorMapToDocumentEditsParams } from './mapping/RazorMapToDocumentEditsParams';
+import { RazorMapToDocumentEditsResponse } from './mapping/RazorMapToDocumentEditsResponse';
 
 export class RazorLanguageServiceClient {
     constructor(
@@ -100,6 +104,31 @@ export class RazorLanguageServiceClient {
         );
     }
 
+    async mapTextChanges(params: RazorMapTextChangesParams): Promise<RazorMapTextChangesResponse> {
+        const csharpUri = UriConverter.deserialize(params.csharpDocument.uri);
+        const document = await this.documentManager.getDocumentForCSharpUri(csharpUri);
+        if (!document) {
+            return RazorMapTextChangesResponse.empty;
+        }
+
+        const request = new RazorMapToDocumentEditsParams(LanguageKind.CSharp, document.uri, params.textChanges);
+        const response = await this.serverClient.sendRequest<RazorMapToDocumentEditsResponse>(
+            'razor/mapToDocumentEdits',
+            request
+        );
+
+        if (!response) {
+            return RazorMapTextChangesResponse.empty;
+        }
+
+        return new RazorMapTextChangesResponse(
+            {
+                uri: UriConverter.serialize(document.uri),
+            },
+            response.textChanges
+        );
+    }
+
     private async ensureStarted() {
         // If the server is already started this will instantly return.
         await this.serverClient.start();