Move openSolutionParams and openProjectParams into roslynProtocol.ts

dotnet · Aug 8, 2023 · 84bde48 · 84bde48
1 parent 8457f04
commit 84bde48
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/src/lsptoolshost/openProjectParams.ts b/src/lsptoolshost/openProjectParams.ts
diff --git a/src/lsptoolshost/openSolutionParams.ts b/src/lsptoolshost/openSolutionParams.ts
diff --git a/src/lsptoolshost/roslynLanguageServer.ts b/src/lsptoolshost/roslynLanguageServer.ts
@@ -48,8 +48,6 @@ import ShowInformationMessage from '../shared/observers/utils/showInformationMes
 import EventEmitter = require('events');
 import Disposable from '../disposable';
 import * as RoslynProtocol from './roslynProtocol';
-import { OpenSolutionParams } from './openSolutionParams';
-import { OpenProjectParams } from './openProjectParams';
 import { CSharpDevKitExports } from '../csharpDevKitExports';
 import { ISolutionSnapshotProvider, SolutionSnapshotId } from './services/ISolutionSnapshotProvider';
 import { Options } from '../shared/options';
@@ -338,14 +336,18 @@ export class RoslynLanguageServer {
         if (this._languageClient !== undefined && this._languageClient.isRunning()) {
             if (this._solutionFile !== undefined) {
                 const protocolUri = this._languageClient.clientOptions.uriConverters!.code2Protocol(this._solutionFile);
-                await this._languageClient.sendNotification('solution/open', new OpenSolutionParams(protocolUri));
+                await this._languageClient.sendNotification(RoslynProtocol.OpenSolutionNotification.type, {
+                    solution: protocolUri,
+                });
             }
 
             if (this._projectFiles.length > 0) {
                 const projectProtocolUris = this._projectFiles.map((uri) =>
                     this._languageClient!.clientOptions.uriConverters!.code2Protocol(uri)
                 );
-                await this._languageClient.sendNotification('project/open', new OpenProjectParams(projectProtocolUris));
+                await this._languageClient.sendNotification(RoslynProtocol.OpenProjectNotification.type, {
+                    projects: projectProtocolUris,
+                });
             }
         }
     }

diff --git a/src/lsptoolshost/roslynProtocol.ts b/src/lsptoolshost/roslynProtocol.ts
@@ -116,6 +116,14 @@ export interface DebugAttachResult {
     didAttach: boolean;
 }
 
+export interface OpenSolutionParams {
+    solution: lsp.DocumentUri;
+}
+
+export interface OpenProjectParams {
+    projects: lsp.DocumentUri[];
+}
+
 export namespace WorkspaceDebugConfigurationRequest {
     export const method = 'workspace/debugConfiguration';
     export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.clientToServer;
@@ -159,3 +167,15 @@ export namespace DebugAttachRequest {
     export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.serverToClient;
     export const type = new lsp.RequestType<DebugAttachParams, DebugAttachResult, void>(method);
 }
+
+export namespace OpenSolutionNotification {
+    export const method = 'solution/open';
+    export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.clientToServer;
+    export const type = new lsp.NotificationType<OpenSolutionParams>(method);
+}
+
+export namespace OpenProjectNotification {
+    export const method = 'project/open';
+    export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.clientToServer;
+    export const type = new lsp.NotificationType<OpenProjectParams>(method);
+}