fix: stack traces logged immediately before exit not being sourcemapped (#1358)

* fix: stack traces logged immediately before exit not being sourcemapped

Fixes microsoft/vscode#142197

* fixup! tests

Author: connor4312

CHANGELOG.md

@@ -10,6 +10,7 @@ This changelog records changes to stable releases since 1.50.2. "TBA" changes he
 - fix: allow overriding resolution of workspaceFolder in pathMapping ([#1308](https://github.com/microsoft/vscode-js-debug/issues/1308))
 - fix: extraneous warnings when restarting debugging ([vscode#156432](https://github.com/microsoft/vscode/issues/156432))
 - fix: webview debugging ([#1344](https://github.com/microsoft/vscode-js-debug/issues/1344))
+- fix: stack traces logged immediately before exit not being sourcemapped ([vscode#142197](https://github.com/microsoft/vscode/issues/142197))
 
 ## v1.70 (July 2022)
 

src/adapter/console/exceptionMessage.ts

@@ -55,7 +55,7 @@ export class ExceptionMessage extends TextualMessage<Cdp.Runtime.ExceptionDetail
     const stackTrace = this.stackTrace(thread);
     const args = this.event.exception && !preview.stackTrace ? [this.event.exception] : [];
 
-    // If there is a stacktrace in the exception message, beautiful its paths.
+    // If there is a stacktrace in the exception message, beautify its paths.
     // If there isn't (and there isn't always) then add one.
     if (StackTraceParser.isStackLike(message)) {
       message = await thread.replacePathsInStackTrace(message);

src/adapter/console/textualMessage.ts

@@ -110,6 +110,7 @@ export abstract class TextualMessage<T extends { stackTrace?: Cdp.Runtime.StackT
     if (args.some(a => a.subtype === 'error') || StackTraceParser.isStackLike(output)) {
       await this.getUiLocation(thread); // ensure the source is loaded before decoding stack
       output = await thread.replacePathsInStackTrace(output);
+      includeStackInVariables = true;
     }
 
     const outputVar = thread.replVariables.createVariableForOutput(

src/adapter/threads.ts

@@ -992,18 +992,20 @@ export class Thread implements IVariableStoreLocationProvider {
    */
   async dispose() {
     this.disposed = true;
-    this._removeAllScripts(true /* silent */);
     for (const [debuggerId, thread] of Thread._allThreadsByDebuggerId) {
       if (thread === this) Thread._allThreadsByDebuggerId.delete(debuggerId);
     }
 
-    this._executionContextsCleared();
-
     if (this.console.length) {
       await new Promise(r => this.console.onDrained(r));
     }
     this.console.dispose();
 
+    // Wait for consoles to log before disposing scripts to ensure locations map
+    // https://github.com/microsoft/vscode/issues/142197
+    this._removeAllScripts(true /* silent */);
+    this._executionContextsCleared();
+
     // Send 'exited' after all other thread-releated events
     await this._dap.with(dap =>
       dap.thread({

src/test/console/console-format-popular-types.txt

@@ -203,7 +203,8 @@ Evaluating: 'console.log([throwingLengthGetter])'
 stdout> > (1) [{…}]
 
 Evaluating: 'console.log(domException())'
-stdout> > DOMException: Failed to execute 'removeChild' on 'Node': The node to be removed is not a child of this node. {stack: <accessor>, code: 8, name: 'NotFoundError', message: 'Failed to execute 'removeChild' on 'Node': T…e to be removed is not a child of this node.'}
+stdout>
+> DOMException: Failed to execute 'removeChild' on 'Node': The node to be removed is not a child of this node. {stack: <accessor>, code: 8, name: 'NotFoundError', message: 'Failed to execute 'removeChild' on 'Node': T…e to be removed is not a child of this node.'}
 
 Evaluating: 'console.log([domException()])'
 stdout> > (1) [DOMException: Failed to execute 'removeChild' on 'Node': The node to be removed is not a child of t…]