Improve how we capture debug session output for tests (#1590)

- Capture output while we're still waiting on output handler callback
- Setup event handling sooner

Author: award999

assets/test/.vscode/settings.json

@@ -9,5 +9,6 @@
     ],
     "lldb.verboseLogging": true,
     "lldb.launch.terminal": "external",
+    "lldb-dap.detachOnError": true,
     "swift.sourcekit-lsp.backgroundIndexing": "off"
 }

src/TestExplorer/TestRunner.ts

@@ -998,15 +998,6 @@ export class TestRunner {
                         }
 
                         const startSession = vscode.debug.onDidStartDebugSession(session => {
-                            if (config.testType === TestLibrary.xctest) {
-                                this.testRun.testRunStarted();
-                            }
-
-                            this.workspaceContext.outputChannel.logDiagnostic(
-                                "Start Test Debugging",
-                                this.folderContext.name
-                            );
-
                             const outputHandler = this.testOutputHandler(config.testType, runState);
                             outputHandler(`> ${config.program} ${config.args.join(" ")}\n\n\r`);
 
@@ -1059,7 +1050,14 @@ export class TestRunner {
                                                 fifoPipePath,
                                                 runState
                                             );
+                                        } else if (config.testType === TestLibrary.xctest) {
+                                            this.testRun.testRunStarted();
                                         }
+
+                                        this.workspaceContext.outputChannel.logDiagnostic(
+                                            "Start Test Debugging",
+                                            this.folderContext.name
+                                        );
                                     } else {
                                         subscriptions.forEach(sub => sub.dispose());
                                         reject("Debugger not started");

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);
         }
     }