Move endpoints to its own file, as we're going to need more

Author: davidwengier

src/lsptoolshost/activate.ts

@@ -30,6 +30,7 @@ import { RoslynLanguageServer } from './server/roslynLanguageServer';
 import { registerCopilotRelatedFilesProvider } from './copilot/relatedFilesProvider';
 import { registerCopilotContextProviders } from './copilot/contextProviders';
 import { RazorLogger } from '../razor/src/razorLogger';
+import { registerRazorEndpoints } from './razor/razorEndpoints';
 
 let _channel: vscode.LogOutputChannel;
 let _traceChannel: vscode.OutputChannel;
@@ -71,8 +72,7 @@ export async function activateRoslynLanguageServer(
         additionalExtensionPaths,
         languageServerEvents,
         _channel,
-        _traceChannel,
-        razorLogger
+        _traceChannel
     );
 
     registerLanguageStatusItems(context, languageServer, languageServerEvents);
@@ -86,6 +86,7 @@ export async function activateRoslynLanguageServer(
     registerCodeActionFixAllCommands(context, languageServer, _channel);
 
     registerRazorCommands(context, languageServer);
+    registerRazorEndpoints(context, languageServer, razorLogger);
 
     registerUnitTestingCommands(context, languageServer);
 

src/lsptoolshost/razor/razorEndpoints.ts

@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RoslynLanguageServer } from '../server/roslynLanguageServer';
+import * as vscode from 'vscode';
+import { LogMessageParams, NotificationType } from 'vscode-languageclient';
+import { RazorLogger } from '../../razor/src/razorLogger';
+
+export function registerRazorEndpoints(
+    context: vscode.ExtensionContext,
+    languageServer: RoslynLanguageServer,
+    razorLogger: RazorLogger
+) {
+    const logNotificationType = new NotificationType<LogMessageParams>('razor/log');
+    languageServer.registerOnNotificationWithParams(logNotificationType, (params) =>
+        razorLogger.log(params.message, params.type)
+    );
+}

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -10,8 +10,8 @@ import * as uuid from 'uuid';
 import * as net from 'net';
 import {
     LanguageClientOptions,
-    LogMessageParams,
     MessageTransports,
+    NotificationHandler,
     NotificationType,
     ProtocolRequestType,
     ServerOptions,
@@ -78,7 +78,6 @@ import {
     copilotLanguageServerExtensionAssemblyName,
     copilotLanguageServerExtensionComponentName,
 } from '../copilot/contextProviders';
-import { RazorLogger } from '../../razor/src/razorLogger';
 
 // Flag indicating if C# Devkit was installed the last time we activated.
 // Used to determine if we need to restart the server on extension changes.
@@ -88,7 +87,6 @@ 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';
-    private static readonly razorLogMessageMethodName: string = 'razor/log';
 
     /**
      * The encoding to use when writing to and from the stream.
@@ -128,8 +126,7 @@ export class RoslynLanguageServer {
         private _context: vscode.ExtensionContext,
         private _telemetryReporter: TelemetryReporter,
         private _languageServerEvents: RoslynLanguageServerEvents,
-        private _channel: vscode.LogOutputChannel,
-        logger: RazorLogger
+        private _channel: vscode.LogOutputChannel
     ) {
         this.registerSetTrace();
         this.registerSendOpenSolution();
@@ -148,7 +145,6 @@ export class RoslynLanguageServer {
 
         // Register Razor dynamic file info handling
         this.registerDynamicFileInfo();
-        this.registerRazorLogger(logger);
 
         this.registerDebuggerAttach();
 
@@ -264,8 +260,7 @@ export class RoslynLanguageServer {
         additionalExtensionPaths: string[],
         languageServerEvents: RoslynLanguageServerEvents,
         channel: vscode.LogOutputChannel,
-        traceChannel: vscode.OutputChannel,
-        razorlogger: RazorLogger
+        traceChannel: vscode.OutputChannel
     ): Promise<RoslynLanguageServer> {
         const devKit = getCSharpDevKit();
         if (devKit) {
@@ -328,8 +323,7 @@ export class RoslynLanguageServer {
             context,
             telemetryReporter,
             languageServerEvents,
-            channel,
-            razorlogger
+            channel
         );
 
         client.registerFeature(server._onAutoInsertFeature);
@@ -450,6 +444,13 @@ export class RoslynLanguageServer {
         this._languageClient.addDisposable(this._languageClient.onNotification(method, handler));
     }
 
+    public registerOnNotificationWithParams<Params>(
+        type: NotificationType<Params>,
+        handler: NotificationHandler<Params>
+    ) {
+        this._languageClient.addDisposable(this._languageClient.onNotification(type, handler));
+    }
+
     public async registerSolutionSnapshot(token: vscode.CancellationToken): Promise<SolutionSnapshotId> {
         const response = await this.sendRequest0(RoslynProtocol.RegisterSolutionSnapshotRequest.type, token);
         if (response) {
@@ -845,19 +846,6 @@ export class RoslynLanguageServer {
         );
     }
 
-    private RazorLoggerNotification: NotificationType<LogMessageParams> = new NotificationType(
-        RoslynLanguageServer.razorLogMessageMethodName
-    );
-
-    private registerRazorLogger(logger: RazorLogger) {
-        this._languageClient.onNotification<LogMessageParams>(
-            this.RazorLoggerNotification,
-            (params: LogMessageParams) => {
-                logger.log(params.message, params.type);
-            }
-        );
-    }
-
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     private WaitForAttachCompleteAsync(attachRequestId: string): Promise<boolean> {
         return new Promise<boolean>((resolve) => {