Working but needs server fix

Andrew Hall · Andrew Hall · commit 3d13794a0158 · 2025-04-29T11:37:21.000-07:00
diff --git a/src/lsptoolshost/activate.ts b/src/lsptoolshost/activate.ts
@@ -85,7 +85,7 @@ export async function activateRoslynLanguageServer(
     registerNestedCodeActionCommands(context, languageServer, _channel);
     registerCodeActionFixAllCommands(context, languageServer, _channel);
 
-    registerRazorCommands(context, languageServer, razorLogger);
+    registerRazorCommands(context, languageServer);
     registerRazorEndpoints(context, languageServer, razorLogger, platformInfo);
 
     registerUnitTestingCommands(context, languageServer);
diff --git a/src/lsptoolshost/razor/razorCommands.ts b/src/lsptoolshost/razor/razorCommands.ts
@@ -31,10 +31,6 @@ import {
 import SerializableSimplifyMethodParams from '../../razor/src/simplify/serializableSimplifyMethodParams';
 import { TextEdit } from 'vscode-html-languageservice';
 import { SerializableFormatNewFileParams } from '../../razor/src/formatNewFile/serializableFormatNewFileParams';
-import { RazorLogger } from '../../razor/src/razorLogger';
-import { RazorDynamicFileChangedParams } from '../../razor/src/dynamicFile/dynamicFileUpdatedParams';
-import { DynamicFileInfoHandler } from '../../razor/src/dynamicFile/dynamicFileInfoHandler';
-import { razorOptions } from '../../shared/options';
 
 // These are commands that are invoked by the Razor extension, and are used to send LSP requests to the Roslyn LSP server
 export const roslynDidChangeCommand = 'roslyn.changeRazorCSharp';
@@ -51,11 +47,7 @@ export const razorInitializeCommand = 'razor.initialize';
 export const provideInlayHintsCommand = 'roslyn.provideInlayHints';
 export const resolveInlayHintCommand = 'roslyn.resolveInlayHint';
 
-export function registerRazorCommands(
-    context: vscode.ExtensionContext,
-    languageServer: RoslynLanguageServer,
-    razorLogger: RazorLogger
-) {
+export function registerRazorCommands(context: vscode.ExtensionContext, languageServer: RoslynLanguageServer) {
     // Razor will call into us (via command) for generated file didChange/didClose notifications. We'll then forward these
     // notifications along to Roslyn. didOpen notifications are handled separately via the vscode.openTextDocument method.
     context.subscriptions.push(
@@ -146,25 +138,4 @@ export function registerRazorCommands(
             await languageServer.sendNotification('razor/initialize', { pipeName: pipeName });
         })
     );
-
-    if (!razorOptions.cohostingEnabled) {
-        // Dynamic files are only handled when cohosting is disabled.
-        context.subscriptions.push(
-            vscode.commands.registerCommand(
-                DynamicFileInfoHandler.dynamicFileUpdatedCommand,
-                async (notification: RazorDynamicFileChangedParams) => {
-                    if (languageServer.isRunning()) {
-                        await languageServer.sendNotification<RazorDynamicFileChangedParams>(
-                            'razor/dynamicFileInfoChanged',
-                            notification
-                        );
-                    } else {
-                        razorLogger.logVerbose(
-                            'Tried to send razor/dynamicFileInfoChanged while server is not running'
-                        );
-                    }
-                }
-            )
-        );
-    }
 }
diff --git a/src/lsptoolshost/razor/razorEndpoints.ts b/src/lsptoolshost/razor/razorEndpoints.ts
@@ -30,8 +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';
+import { RazorMapTextChangesParams } from '../../razor/src/mapping/razorMapTextChangesParams';
+import { RazorMapTextChangesResponse } from '../../razor/src/mapping/razorMapTextChangesResponse';
 
 export function registerRazorEndpoints(
     context: vscode.ExtensionContext,
diff --git a/src/lsptoolshost/server/roslynLanguageServer.ts b/src/lsptoolshost/server/roslynLanguageServer.ts
@@ -32,6 +32,7 @@ import {
 } from 'vscode-languageclient/node';
 import { PlatformInformation } from '../../shared/platform';
 import { readConfigurations } from '../options/configurationMiddleware';
+import { DynamicFileInfoHandler } from '../../razor/src/dynamicFile/dynamicFileInfoHandler';
 import * as RoslynProtocol from './roslynProtocol';
 import { CSharpDevKitExports } from '../../csharpDevKitExports';
 import { SolutionSnapshotId } from '../solutionSnapshot/ISolutionSnapshotProvider';
@@ -59,13 +60,16 @@ import { BuildDiagnosticsService } from '../diagnostics/buildDiagnosticsService'
 import { getComponentPaths } from '../extensions/builtInComponents';
 import { OnAutoInsertFeature } from '../autoInsert/onAutoInsertFeature';
 import { ProjectContextService } from '../projectContext/projectContextService';
+import { ProvideDynamicFileResponse } from '../../razor/src/dynamicFile/provideDynamicFileResponse';
+import { ProvideDynamicFileParams } from '../../razor/src/dynamicFile/provideDynamicFileParams';
 import {
     ActionOption,
     CommandOption,
     showErrorMessage,
     showInformationMessage,
 } from '../../shared/observers/utils/showMessage';
 import { TelemetryEventNames } from '../../shared/telemetryEventNames';
+import { RazorDynamicFileChangedParams } from '../../razor/src/dynamicFile/dynamicFileUpdatedParams';
 import { getProfilingEnvVars } from '../profiling/profiling';
 import { isString } from '../utils/isString';
 import { getServerPath } from '../activate';
@@ -80,6 +84,10 @@ import {
 let _wasActivatedWithCSharpDevkit: boolean | undefined;
 
 export class RoslynLanguageServer {
+    // These are notifications we will get from the LSP server and will forward to the Razor extension.
+    private static readonly provideRazorDynamicFileInfoMethodName: string = 'razor/provideDynamicFileInfo';
+    private static readonly removeRazorDynamicFileInfoMethodName: string = 'razor/removeDynamicFileInfo';
+
     /**
      * The encoding to use when writing to and from the stream.
      */
@@ -134,6 +142,10 @@ export class RoslynLanguageServer {
         this.registerDocumentOpenForDiagnostics();
 
         this._projectContextService = new ProjectContextService(this, this._languageServerEvents);
+
+        // Register Razor dynamic file info handling
+        this.registerDynamicFileInfo();
+
         this.registerDebuggerAttach();
 
         registerShowToastNotification(this._languageClient);
@@ -803,6 +815,37 @@ export class RoslynLanguageServer {
         };
     }
 
+    private ProvideDyanmicFileInfoType: RequestType<ProvideDynamicFileParams, ProvideDynamicFileResponse, any> =
+        new RequestType(RoslynLanguageServer.provideRazorDynamicFileInfoMethodName);
+
+    private registerDynamicFileInfo() {
+        // When the Roslyn language server sends a request for Razor dynamic file info, we forward that request along to Razor via
+        // a command.
+        this._languageClient.onRequest<ProvideDynamicFileParams, ProvideDynamicFileResponse, any>(
+            this.ProvideDyanmicFileInfoType,
+            async (request) =>
+                vscode.commands.executeCommand(DynamicFileInfoHandler.provideDynamicFileInfoCommand, request)
+        );
+        this._languageClient.onNotification(
+            RoslynLanguageServer.removeRazorDynamicFileInfoMethodName,
+            async (notification) =>
+                vscode.commands.executeCommand(DynamicFileInfoHandler.removeDynamicFileInfoCommand, notification)
+        );
+        vscode.commands.registerCommand(
+            DynamicFileInfoHandler.dynamicFileUpdatedCommand,
+            async (notification: RazorDynamicFileChangedParams) => {
+                if (this.isRunning()) {
+                    await this.sendNotification<RazorDynamicFileChangedParams>(
+                        'razor/dynamicFileInfoChanged',
+                        notification
+                    );
+                } else {
+                    this._channel.warn('Tried to send razor/dynamicFileInfoChanged while server is not running');
+                }
+            }
+        );
+    }
+
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     private WaitForAttachCompleteAsync(attachRequestId: string): Promise<boolean> {
         return new Promise<boolean>((resolve) => {
diff --git a/src/razor/src/document/razorDocumentManager.ts b/src/razor/src/document/razorDocumentManager.ts
@@ -57,12 +57,14 @@ export class RazorDocumentManager implements IRazorDocumentManager {
     }
 
     public async getDocumentForCSharpUri(csharpUri: vscode.Uri): Promise<IRazorDocument | undefined> {
+        const csharpPath = csharpUri.fsPath ?? csharpUri.path;
+
         return this.documents.find((document) => {
             if (this.platformInfo.isLinux()) {
-                return document.csharpDocument.path === csharpUri.path;
+                return document.csharpDocument.path === csharpPath;
             }
 
-            return document.csharpDocument.path.localeCompare(csharpUri.path, undefined, { sensitivity: 'base' }) === 0;
+            return document.csharpDocument.path.localeCompare(csharpPath, undefined, { sensitivity: 'base' }) === 0;
         });
     }
 
diff --git a/src/razor/src/dynamicFile/dynamicFileInfoHandler.ts b/src/razor/src/dynamicFile/dynamicFileInfoHandler.ts
@@ -16,6 +16,7 @@ import { RazorDynamicFileChangedParams } from './dynamicFileUpdatedParams';
 import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
 import { razorTextChange } from './razorTextChange';
 import { razorTextSpan } from './razorTextSpan';
+import { razorOptions } from '../../../shared/options';
 
 // Handles Razor generated doc communication between the Roslyn workspace and Razor.
 // didChange behavior for Razor generated docs is handled in the RazorDocumentManager.
@@ -39,18 +40,21 @@ export class DynamicFileInfoHandler {
                 await this.removeDynamicFileInfo(request);
             }
         );
-        this.documentManager.onChange(async (e) => {
-            // Ignore any updates without text changes. This is important for perf since sending an update to roslyn does
-            // a round trip for producing nothing new and causes a lot of churn in solution updates.
-            if (e.kind == RazorDocumentChangeKind.csharpChanged && !e.document.isOpen && e.changes.length > 0) {
-                const uriString = UriConverter.serialize(e.document.uri);
-                const identifier = TextDocumentIdentifier.create(uriString);
-                await vscode.commands.executeCommand(
-                    DynamicFileInfoHandler.dynamicFileUpdatedCommand,
-                    new RazorDynamicFileChangedParams(identifier)
-                );
-            }
-        });
+
+        if (!razorOptions.cohostingEnabled) {
+            this.documentManager.onChange(async (e) => {
+                // Ignore any updates without text changes. This is important for perf since sending an update to roslyn does
+                // a round trip for producing nothing new and causes a lot of churn in solution updates.
+                if (e.kind == RazorDocumentChangeKind.csharpChanged && !e.document.isOpen && e.changes.length > 0) {
+                    const uriString = UriConverter.serialize(e.document.uri);
+                    const identifier = TextDocumentIdentifier.create(uriString);
+                    await vscode.commands.executeCommand(
+                        DynamicFileInfoHandler.dynamicFileUpdatedCommand,
+                        new RazorDynamicFileChangedParams(identifier)
+                    );
+                }
+            });
+        }
     }
 
     // Given Razor document URIs, returns associated generated doc URIs
diff --git a/src/razor/src/mapping/mappingHandler.ts b/src/razor/src/mapping/mappingHandler.ts
@@ -6,6 +6,7 @@
 import * as vscode from 'vscode';
 import { RazorLanguageServiceClient } from '../razorLanguageServiceClient';
 import { RazorMapSpansParams } from './razorMapSpansParams';
+import { RazorMapTextChangesParams } from './razorMapTextChangesParams';
 
 export class MappingHandler {
     public static readonly MapSpansCommand = 'razor.mapSpansCommand';
@@ -21,7 +22,9 @@ export class MappingHandler {
                 }),
                 vscode.commands.registerCommand(
                     MappingHandler.MapChangesCommand,
-                    async (params: RazorMapSpansParams) => {}
+                    async (params: RazorMapTextChangesParams) => {
+                        return this.languageServiceClient.mapTextChanges(params);
+                    }
                 ),
             ]
         );
diff --git a/src/razor/src/mapping/mappingHelpers.ts b/src/razor/src/mapping/mappingHelpers.ts
@@ -11,7 +11,6 @@ import { RazorLogger } from '../razorLogger';
 
 export class MappingHelpers {
     public static readonly language = 'Razor';
-    public static readonly MapSpansCommand = 'razor.mapSpansCommand';
 
     public static async remapGeneratedFileWorkspaceEdit(
         workspaceEdit: vscode.WorkspaceEdit,
diff --git a/src/razor/src/mapping/razorMapSpansResponse.ts b/src/razor/src/mapping/razorMapSpansResponse.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Range, TextDocumentIdentifier } from 'vscode-languageserver-types';
+import { TextDocumentIdentifier } from 'vscode-languageserver-types';
 import { razorTextSpan } from '../dynamicFile/razorTextSpan';
+import { SerializableRange } from '../rpc/serializableRange';
 
 // matches https://github.com/dotnet/razor/blob/main/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorMapSpansResponse.cs
 export class RazorMapSpansResponse {
     static empty: RazorMapSpansResponse = new RazorMapSpansResponse([], [], { uri: '' });
 
     constructor(
-        public readonly ranges: Range[],
+        public readonly ranges: SerializableRange[],
         public readonly spans: razorTextSpan[],
         public readonly razorDocument: TextDocumentIdentifier
     ) {}
diff --git a/src/razor/src/mapping/razorMapTextChangesResponse.ts b/src/razor/src/mapping/razorMapTextChangesResponse.ts
@@ -7,6 +7,7 @@ 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 {
+    static empty: RazorMapTextChangesResponse | PromiseLike<RazorMapTextChangesResponse>;
     constructor(
         public readonly razorDocument: TextDocumentIdentifier,
         public readonly textChanges: razorTextChange[]
diff --git a/src/razor/src/mapping/razorMapToDocumentEditsParams.ts b/src/razor/src/mapping/razorMapToDocumentEditsParams.ts
@@ -3,8 +3,8 @@
  *  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';
+import { LanguageKind } from '../rpc/languageKind';
 
 // Matches https://github.com/dotnet/razor/blob/401f6f8632a7e0320bc12804fa7e9659b3b3aeab/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DocumentMapping/RazorMapToDocumentEditsParams.cs
 export class RazorMapToDocumentEditsParams {
diff --git a/src/razor/src/razorLanguageServiceClient.ts b/src/razor/src/razorLanguageServiceClient.ts
@@ -15,10 +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';
+import { RazorMapTextChangesParams } from './mapping/razorMapTextChangesParams';
+import { RazorMapTextChangesResponse } from './mapping/razorMapTextChangesResponse';
+import { RazorMapToDocumentEditsParams } from './mapping/razorMapToDocumentEditsParams';
+import { RazorMapToDocumentEditsResponse } from './mapping/razorMapToDocumentEditsResponse';
 
 export class RazorLanguageServiceClient {
     constructor(
@@ -63,19 +63,13 @@ export class RazorLanguageServiceClient {
 
     public async mapSpans(params: RazorMapSpansParams): Promise<RazorMapSpansResponse> {
         const csharpUri = UriConverter.deserialize(params.csharpDocument.uri);
+        const document = await this.documentManager.getDocumentForCSharpUri(csharpUri);
 
-        const request = new RazorMapToDocumentRangesRequest(
-            LanguageKind.CSharp,
-            params.ranges.map(
-                (r) =>
-                    new vscode.Range(
-                        new vscode.Position(r.start.line, r.start.character),
-                        new vscode.Position(r.end.line, r.end.character)
-                    )
-            ),
-            csharpUri
-        );
+        if (!document) {
+            return RazorMapSpansResponse.empty;
+        }
 
+        const request = new RazorMapToDocumentRangesRequest(LanguageKind.CSharp, params.ranges, document.uri);
         const result = await this.serverClient.sendRequest<RazorMapToDocumentRangesResponse>(
             'razor/mapToDocumentRanges',
             request
@@ -85,11 +79,6 @@ export class RazorLanguageServiceClient {
             return RazorMapSpansResponse.empty;
         }
 
-        const document = await this.documentManager.getDocumentForCSharpUri(csharpUri);
-        if (!document) {
-            return RazorMapSpansResponse.empty;
-        }
-
         return new RazorMapSpansResponse(
             result.ranges.map((r) => {
                 return {

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,14 @@ export class RazorDocumentManager implements IRazorDocumentManager {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public async getDocumentForCSharpUri(csharpUri: vscode.Uri): Promise<IRazorDocument \| undefined> {`
	`60`	`+ const csharpPath = csharpUri.fsPath ?? csharpUri.path;`
	`61`	`+`
`60`	`62`	`return this.documents.find((document) => {`
`61`	`63`	`if (this.platformInfo.isLinux()) {`
`62`		`- return document.csharpDocument.path === csharpUri.path;`
	`64`	`+ return document.csharpDocument.path === csharpPath;`
`63`	`65`	`}`
`64`	`66`
`65`		`- return document.csharpDocument.path.localeCompare(csharpUri.path, undefined, { sensitivity: 'base' }) === 0;`
	`67`	`+ return document.csharpDocument.path.localeCompare(csharpPath, undefined, { sensitivity: 'base' }) === 0;`
`66`	`68`	`});`
`67`	`69`	`}`
`68`	`70`