Merge pull request #2114 from microsoft/connor4312/fix-wasm-bp-not-working-with-predictor

fix: wasm breakpoint pausing not working on first run w/ predictor

Author: connor4312

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "js-debug",
   "displayName": "JavaScript Debugger",
-  "version": "1.95.0",
+  "version": "1.95.1",
   "publisher": "ms-vscode",
   "author": {
     "name": "Microsoft Corporation"

package.json

@@ -1983,22 +1983,18 @@ export class Thread implements IVariableStoreLocationProvider {
     handler?: ScriptWithSourceMapHandler,
   ): Promise<boolean> {
     this._scriptWithSourceMapHandler = handler;
-
     const needsPause = pause && this._sourceContainer.sourceMapTimeouts().sourceMapMinPause
       && handler;
     if (needsPause && !this._pauseOnSourceMapBreakpointIds?.length) {
       // setting the URL breakpoint for wasm fails if debugger isn't fully initialized
       await this.debuggerReady.promise;
 
-      const wasmHandlers = Promise.all([...this._executionContexts.keys()]
-        .map(id => this._installWasmPauseHandler(id)));
       const result = await Promise.all([
         this._cdp.Debugger.setInstrumentationBreakpoint({
           instrumentation: 'beforeScriptWithSourceMapExecution',
         }),
       ]);
       this._pauseOnSourceMapBreakpointIds = result.map(r => r?.breakpointId).filter(truthy);
-      await wasmHandlers;
     } else if (!needsPause && this._pauseOnSourceMapBreakpointIds?.length) {
       const breakpointIds = this._pauseOnSourceMapBreakpointIds;
       this._pauseOnSourceMapBreakpointIds = undefined;
@@ -2007,6 +2003,14 @@ export class Thread implements IVariableStoreLocationProvider {
       );
     }
 
+    // WASM pauses should be unconditionally installed because DWARF parsing
+    // always happens at runtime, not in the brekapoint predictor (currently)
+    if (handler) {
+      await Promise.all(
+        [...this._executionContexts.keys()].map(id => this._installWasmPauseHandler(id)),
+      );
+    }
+
     return !!this._pauseOnSourceMapBreakpointIds?.length;
   }