add namedpipe type

Author: beccamc

src/lsptoolshost/roslynLanguageServer.ts

@@ -54,6 +54,7 @@ import { RoslynLanguageServerEvents } from './languageServerEvents';
 import { registerShowToastNotification } from './showToastNotification';
 import { registerRazorCommands } from './razorCommands';
 import { registerOnAutoInsert } from './onAutoInsert';
+import { NamedPipeInformation } from './roslynProtocol';
 
 let _channel: vscode.OutputChannel;
 let _traceChannel: vscode.OutputChannel;
@@ -62,11 +63,6 @@ let _traceChannel: vscode.OutputChannel;
 // Used to determine if we need to restart the server on extension changes.
 let _wasActivatedWithCSharpDevkit: boolean | undefined;
 
-interface TransmittedInformation {
-    Key: string;
-    Value: string;
-}
-
 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';
@@ -80,7 +76,7 @@ export class RoslynLanguageServer {
     /**
      * The regular expression used to find the named pipe key in the LSP server's stdout stream.
      */
-    private static readonly namedPipeKeyRegex = /{"Key":"NamedPipeInformation","Value":"[^"]+"}/;
+    private static readonly namedPipeKeyRegex = /{"pipeName":"[^"]+"}/;
 
     /**
      * The timeout for stopping the language server (in ms).
@@ -560,15 +556,15 @@ export class RoslynLanguageServer {
 
         // The server process will create the named pipe used for communcation. Wait for it to be created,
         // and listen for the server to pass back the connection information via stdout.
-        const namedPipeConnectionPromise = new Promise<TransmittedInformation>((resolve) => {
+        const namedPipeConnectionPromise = new Promise<NamedPipeInformation>((resolve) => {
             childProcess.stdout.on('data', (data: { toString: (arg0: any) => any }) => {
                 const result: string = isString(data) ? data : data.toString(RoslynLanguageServer.encoding);
                 _channel.append('[stdout] ' + result);
 
                 // Use the regular expression to find all JSON lines
                 const jsonLines = result.match(RoslynLanguageServer.namedPipeKeyRegex);
                 if (jsonLines) {
-                    const transmittedPipeNameInfo: TransmittedInformation = JSON.parse(jsonLines[0]);
+                    const transmittedPipeNameInfo: NamedPipeInformation = JSON.parse(jsonLines[0]);
                     _channel.appendLine('received named pipe information from server');
                     resolve(transmittedPipeNameInfo);
                 }
@@ -581,7 +577,7 @@ export class RoslynLanguageServer {
 
         const socketPromise = new Promise<net.Socket>((resolve) => {
             _channel.appendLine('attempting to connect client to server...');
-            const socket = net.createConnection(pipeConnectionInfo.Value, () => {
+            const socket = net.createConnection(pipeConnectionInfo.pipeName, () => {
                 _channel.appendLine('client has connected to server');
                 resolve(socket);
             });

src/lsptoolshost/roslynProtocol.ts

@@ -141,6 +141,10 @@ export interface BuildOnlyDiagnosticIdsResult {
     ids: string[];
 }
 
+export interface NamedPipeInformation {
+    pipeName: string;
+}
+
 export namespace WorkspaceDebugConfigurationRequest {
     export const method = 'workspace/debugConfiguration';
     export const messageDirection: lsp.MessageDirection = lsp.MessageDirection.clientToServer;