Report breakpoint ID and fix extension launch config

algorand · Nov 15, 2023 · f2d96af · f2d96af
1 parent e003cfb
commit f2d96af
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
         "--extensionDevelopmentPath=${workspaceFolder}/extension",
         "${workspaceFolder}/sampleWorkspace"
       ],
-      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+      "outFiles": ["${workspaceFolder}/extension/dist/**/*.js"],
       "preLaunchTask": "npm: watch"
     },
     {

diff --git a/src/debugSession.ts b/src/debugSession.ts
@@ -93,8 +93,13 @@ export class AvmDebugSession extends DebugSession {
     this._runtime.on(RuntimeEvents.stopOnStep, () => {
       this.sendEvent(new StoppedEvent('step', AvmDebugSession.threadID));
     });
-    this._runtime.on(RuntimeEvents.stopOnBreakpoint, () => {
-      this.sendEvent(new StoppedEvent('breakpoint', AvmDebugSession.threadID));
+    this._runtime.on(RuntimeEvents.stopOnBreakpoint, (breakpointID: number) => {
+      const event = new StoppedEvent(
+        'breakpoint',
+        AvmDebugSession.threadID,
+      ) as DebugProtocol.StoppedEvent;
+      event.body.hitBreakpointIds = [breakpointID];
+      this.sendEvent(event);
     });
     this._runtime.on(RuntimeEvents.stopOnException, (message) => {
       this.sendEvent(

diff --git a/src/runtime.ts b/src/runtime.ts
@@ -301,7 +301,7 @@ export class AvmRuntime extends EventEmitter {
       );
       if (bps.length !== 0) {
         // send 'stopped' event
-        this.sendEvent(RuntimeEvents.stopOnBreakpoint);
+        this.sendEvent(RuntimeEvents.stopOnBreakpoint, bps[0].id);
 
         // the following shows the use of 'breakpoint' events to update properties of a breakpoint in the UI
         // if breakpoint is not yet verified, verify it now and send a 'breakpoint' update event