Merge pull request #3951 from PowerShell/andschwa/fix-temp-console

Handle `sendKeyPress` events for temporary integrated consoles

Author: andyleejordan

src/debugAdapter.ts

@@ -11,7 +11,6 @@ import { PowerShellProcess} from "../process";
 import { SessionManager, SessionStatus } from "../session";
 import Settings = require("../settings");
 import utils = require("../utils");
-import { NamedPipeDebugAdapter } from "../debugAdapter";
 import { Logger } from "../logging";
 import { LanguageClientConsumer } from "../languageClientConsumer";
 
@@ -37,20 +36,16 @@ export class DebugSessionFeature extends LanguageClientConsumer
 
     createDebugAdapterDescriptor(
         session: vscode.DebugSession,
-        _executable: vscode.DebugAdapterExecutable): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
+        _executable: vscode.DebugAdapterExecutable | undefined): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
 
         const sessionDetails = session.configuration.createTemporaryIntegratedConsole
             ? this.tempSessionDetails
             : this.sessionManager.getSessionDetails();
 
-        // Establish connection before setting up the session
         this.logger.writeVerbose(`Connecting to pipe: ${sessionDetails.debugServicePipeName}`);
         this.logger.writeVerbose(`Debug configuration: ${JSON.stringify(session.configuration)}`);
 
-        const debugAdapter = new NamedPipeDebugAdapter(sessionDetails.debugServicePipeName, this.logger);
-        debugAdapter.start();
-
-        return new vscode.DebugAdapterInlineImplementation(debugAdapter);
+        return new vscode.DebugAdapterNamedPipeServer(sessionDetails.debugServicePipeName);
     }
 
     // tslint:disable-next-line:no-empty
@@ -60,19 +55,16 @@ export class DebugSessionFeature extends LanguageClientConsumer
     public setLanguageClient(languageClient: LanguageClient) {
         languageClient.onNotification(
             StartDebuggerNotificationType,
-            () =>
-                // TODO: Use a named debug configuration.
-                vscode.debug.startDebugging(undefined, {
-                    request: "launch",
-                    type: "PowerShell",
-                    name: "PowerShell: Interactive Session",
-        }));
+            // TODO: Use a named debug configuration.
+            () => vscode.debug.startDebugging(undefined, {
+                request: "launch",
+                type: "PowerShell",
+                name: "PowerShell: Interactive Session"
+            }));
 
         languageClient.onNotification(
             StopDebuggerNotificationType,
-            () =>
-                vscode.debug.stopDebugging(undefined)
-        );
+            () => vscode.debug.stopDebugging(undefined));
     }
 
     public async provideDebugConfigurations(
@@ -374,7 +366,7 @@ export class SpecifyScriptArgsFeature implements vscode.Disposable {
 
         const text = await vscode.window.showInputBox(options);
         // When user cancel's the input box (by pressing Esc), the text value is undefined.
-        // Let's not blow away the previous settting.
+        // Let's not blow away the previous setting.
         if (text !== undefined) {
             this.context.workspaceState.update(powerShellDbgScriptArgsKey, text);
         }

src/features/DebugSession.ts

@@ -34,9 +34,6 @@ export enum SessionStatus {
     Failed,
 }
 
-export const SendKeyPressNotificationType =
-    new NotificationType<void>("powerShell/sendKeyPress");
-
 export class SessionManager implements Middleware {
     public HostName: string;
     public HostVersion: string;
@@ -273,6 +270,20 @@ export class SessionManager implements Middleware {
                 sessionPath,
                 sessionSettings);
 
+        // Similar to the regular integrated console, we need to send a key
+        // press to the process spawned for temporary integrated consoles when
+        // the server requests a cancellation os Console.ReadKey.
+        //
+        // TODO: There may be multiple sessions running in parallel, so we need
+        // to track a process per session, but that already isn't being done.
+        vscode.debug.onDidReceiveDebugSessionCustomEvent(
+            e => {
+                if (e.event === "powerShell/sendKeyPress") {
+                    this.debugSessionProcess.sendKeyPress();
+                }
+            }
+        );
+
         return this.debugSessionProcess;
     }
 
@@ -797,7 +808,7 @@ export class SessionManager implements Middleware {
             new SessionMenuItem(
                 "Restart Current Session",
                 () => {
-                    // We pass in the display name so we guarentee that the session
+                    // We pass in the display name so we guarantee that the session
                     // will be the same PowerShell.
                     this.restartSession(this.PowerShellExeDetails.displayName);
                 }),
@@ -828,6 +839,9 @@ class SessionMenuItem implements vscode.QuickPickItem {
     }
 }
 
+export const SendKeyPressNotificationType =
+    new NotificationType<void>("powerShell/sendKeyPress");
+
 export const PowerShellVersionRequestType =
     new RequestType0<IPowerShellVersionDetails, void>(
         "powerShell/getVersion");