Capture output while we're still waiting on output handler callback

Author: award999

assets/test/defaultPackage/.vscode/launch.json

@@ -17,6 +17,24 @@
             "args": [],
             "cwd": "${workspaceFolder:defaultPackage}",
             "preLaunchTask": "swift: Build Release package1"
+        },
+        {
+            "type": "swift",
+            "request": "launch",
+            "args": [],
+            "cwd": "${workspaceFolder:defaultPackage}",
+            "name": "Debug PackageExe",
+            "program": "${workspaceFolder:defaultPackage}/.build/debug/PackageExe",
+            "preLaunchTask": "swift: Build Debug PackageExe"
+        },
+        {
+            "type": "swift",
+            "request": "launch",
+            "args": [],
+            "cwd": "${workspaceFolder:defaultPackage}",
+            "name": "Release PackageExe",
+            "program": "${workspaceFolder:defaultPackage}/.build/release/PackageExe",
+            "preLaunchTask": "swift: Build Release PackageExe"
         }
     ]
 }

src/debugger/lldb.ts

@@ -38,7 +38,6 @@ export function updateLaunchConfigForCI(
     // Tell LLDB not to disable ASLR when running in Docker CI https://stackoverflow.com/a/78471987
     result.disableASLR = false;
     result.initCommands = ["settings set target.disable-aslr false"];
-    result.runInTerminal = process.platform !== "win32";
     return result;
 }
 

src/debugger/logTracker.ts

@@ -68,6 +68,7 @@ export class LoggingDebugAdapterTracker implements vscode.DebugAdapterTracker {
     private static debugSessionIdMap: { [id: string]: LoggingDebugAdapterTracker } = {};
 
     private cb?: (output: string) => void;
+    private output: string[] = [];
 
     constructor(public id: string) {
         LoggingDebugAdapterTracker.debugSessionIdMap[id] = this;
@@ -81,6 +82,10 @@ export class LoggingDebugAdapterTracker implements vscode.DebugAdapterTracker {
         const loggingDebugAdapter = this.debugSessionIdMap[session.id];
         if (loggingDebugAdapter) {
             loggingDebugAdapter.cb = cb;
+            for (const o of loggingDebugAdapter.output) {
+                cb(o);
+            }
+            loggingDebugAdapter.output = [];
         } else {
             outputChannel.appendLine("Could not find debug adapter for session: " + session.id);
         }
@@ -93,13 +98,20 @@ export class LoggingDebugAdapterTracker implements vscode.DebugAdapterTracker {
     onDidSendMessage(message: unknown): void {
         const debugMessage = message as DebugMessage;
         if (
-            this.cb &&
-            debugMessage &&
-            debugMessage.type === "event" &&
-            debugMessage.event === "output" &&
-            debugMessage.body.category !== "console"
+            !(
+                debugMessage &&
+                debugMessage.type === "event" &&
+                debugMessage.event === "output" &&
+                debugMessage.body.category !== "console"
+            )
         ) {
-            this.cb(debugMessage.body.output);
+            return;
+        }
+        const output = debugMessage.body.output;
+        if (this.cb) {
+            this.cb(output);
+        } else {
+            this.output.push(output);
         }
     }