Move code to be more uniform

Andrew Hall · Andrew Hall · commit 3e6416b4b068 · 2025-04-25T14:45:01.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);
+    registerRazorCommands(context, languageServer, razorLogger);
     registerRazorEndpoints(context, languageServer, razorLogger, platformInfo);
 
     registerUnitTestingCommands(context, languageServer);
diff --git a/src/lsptoolshost/razor/razorCommands.ts b/src/lsptoolshost/razor/razorCommands.ts
@@ -31,6 +31,10 @@ 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';
@@ -47,7 +51,11 @@ export const razorInitializeCommand = 'razor.initialize';
 export const provideInlayHintsCommand = 'roslyn.provideInlayHints';
 export const resolveInlayHintCommand = 'roslyn.resolveInlayHint';
 
-export function registerRazorCommands(context: vscode.ExtensionContext, languageServer: RoslynLanguageServer) {
+export function registerRazorCommands(
+    context: vscode.ExtensionContext,
+    languageServer: RoslynLanguageServer,
+    razorLogger: RazorLogger
+) {
     // 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(
@@ -138,4 +146,25 @@ export function registerRazorCommands(context: vscode.ExtensionContext, language
             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
@@ -24,6 +24,9 @@ import { DocumentColorHandler } from '../../razor/src/documentColor/documentColo
 import { razorOptions } from '../../shared/options';
 import { ColorPresentationHandler } from '../../razor/src/colorPresentation/colorPresentationHandler';
 import { ColorPresentation } from 'vscode-html-languageservice';
+import { DynamicFileInfoHandler } from '../../razor/src/dynamicFile/dynamicFileInfoHandler';
+import { ProvideDynamicFileParams } from '../../razor/src/dynamicFile/provideDynamicFileParams';
+import { ProvideDynamicFileResponse } from '../../razor/src/dynamicFile/provideDynamicFileResponse';
 
 export function registerRazorEndpoints(
     context: vscode.ExtensionContext,
@@ -36,34 +39,59 @@ export function registerRazorEndpoints(
         razorLogger.log(params.message, params.type)
     );
 
-    if (!razorOptions.cohostingEnabled) {
-        return;
+    if (razorOptions.cohostingEnabled) {
+        registerCohostingEndpoints();
+    } else {
+        registerNonCohostingEndpoints();
     }
 
-    const documentManager = new HtmlDocumentManager(platformInfo, razorLogger);
-    context.subscriptions.push(documentManager.register());
+    return;
 
-    registerRequestHandler<HtmlUpdateParameters, void>('razor/updateHtml', async (params) => {
-        const uri = UriConverter.deserialize(params.textDocument.uri);
-        await documentManager.updateDocumentText(uri, params.text);
-    });
+    //
+    // Local Functions
+    //
+    function registerCohostingEndpoints() {
+        const documentManager = new HtmlDocumentManager(platformInfo, razorLogger);
+        context.subscriptions.push(documentManager.register());
 
-    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<HtmlUpdateParameters, void>('razor/updateHtml', async (params) => {
+            const uri = UriConverter.deserialize(params.textDocument.uri);
+            await documentManager.updateDocumentText(uri, params.text);
+        });
 
-    registerRequestHandler<ColorPresentationParams, ColorPresentation[]>(
-        ColorPresentationRequest.method,
-        async (params) => {
+        registerRequestHandler<DocumentColorParams, ColorInformation[]>(DocumentColorRequest.method, async (params) => {
             const uri = UriConverter.deserialize(params.textDocument.uri);
             const document = await documentManager.getDocument(uri);
 
-            return await ColorPresentationHandler.doColorPresentationRequest(document.uri, params);
-        }
-    );
+            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);
+            }
+        );
+    }
+
+    function registerNonCohostingEndpoints() {
+        // When the Roslyn language server sends a request for Razor dynamic file info, we forward that request along to Razor via
+        // a command.
+        registerRequestHandler<ProvideDynamicFileParams, ProvideDynamicFileResponse>(
+            'razor/provideDynamicFileInfo',
+            async (params) =>
+                vscode.commands.executeCommand(DynamicFileInfoHandler.provideDynamicFileInfoCommand, params)
+        );
+
+        registerRequestHandler<ProvideDynamicFileParams, ProvideDynamicFileResponse>(
+            'razor/removeDynamicFileInfo',
+            async (params) =>
+                vscode.commands.executeCommand(DynamicFileInfoHandler.provideDynamicFileInfoCommand, 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>) {
diff --git a/src/lsptoolshost/server/roslynLanguageServer.ts b/src/lsptoolshost/server/roslynLanguageServer.ts
@@ -32,7 +32,6 @@ 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';
@@ -60,16 +59,13 @@ 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';
@@ -84,10 +80,6 @@ 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.
      */
@@ -142,10 +134,6 @@ 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);
@@ -815,37 +803,6 @@ 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) => {
