Fix visual report error when thread target does not match editing target

Fixes #252

Author: GarboMuffin

src/compiler/jsgen.js

@@ -1160,7 +1160,7 @@ class JSGenerator {
             const value = this.localVariables.next();
             this.source += `const ${value} = ${this.descendInput(node.input).asUnknown()};`;
             // blocks like legacy no-ops can return a literal `undefined`
-            this.source += `if (${value} !== undefined) runtime.visualReport("${sanitize(this.script.topBlockId)}", ${value});\n`;
+            this.source += `if (${value} !== undefined) runtime.visualReport(target, "${sanitize(this.script.topBlockId)}", ${value});\n`;
             break;
         }
 

src/engine/execute.js

@@ -92,7 +92,7 @@ const handleReport = function (resolvedValue, sequencer, thread, blockCached, la
         // at the top of the thread stack.
         if (lastOperation && typeof resolvedValue !== 'undefined' && thread.atStackTop()) {
             if (thread.stackClick) {
-                sequencer.runtime.visualReport(currentBlockId, resolvedValue);
+                sequencer.runtime.visualReport(thread.target, currentBlockId, resolvedValue);
             }
             if (thread.updateMonitor) {
                 const targetId = sequencer.runtime.monitorBlocks.getBlock(currentBlockId).targetId;

src/engine/runtime.js

@@ -3073,11 +3073,14 @@ class Runtime extends EventEmitter {
 
     /**
      * Emit value for reporter to show in the blocks.
+     * @param {Target} target The target that the block was run in.
      * @param {string} blockId ID for the block.
      * @param {string} value Value to show associated with the block.
      */
-    visualReport (blockId, value) {
-        this.emit(Runtime.VISUAL_REPORT, {id: blockId, value: String(value)});
+    visualReport (target, blockId, value) {
+        if (target === this.getEditingTarget()) {
+            this.emit(Runtime.VISUAL_REPORT, {id: blockId, value: String(value)});
+        }
     }
 
     /**

test/fixtures/tw-slow-custom-reporter-stack-click.sb3

@@ -0,0 +1,66 @@
+const {test} = require('tap');
+const fs = require('fs');
+const path = require('path');
+const VirtualMachine = require('../../src/virtual-machine');
+
+const fixtureData = fs.readFileSync(path.join(__dirname, '../fixtures/tw-slow-custom-reporter-stack-click.sb3'));
+
+// After starting this block, first step will yield, second step will report value
+const procedureCallBlockId = 'e';
+
+test('when thread target is editing target', t => {
+    const vm = new VirtualMachine();
+    vm.loadProject(fixtureData).then(() => {
+        const visualReports = [];
+        vm.on('VISUAL_REPORT', visualReport => {
+            visualReports.push(visualReport);
+        });
+
+        vm.setEditingTarget(vm.runtime.getSpriteTargetByName('Sprite1').id);
+        vm.runtime.toggleScript(procedureCallBlockId, {
+            stackClick: true
+        });
+
+        t.same(visualReports, []);
+
+        vm.runtime._step();
+        t.same(visualReports, []);
+
+        vm.runtime._step();
+        t.same(visualReports, [
+            {
+                id: 'e',
+                value: 'return value'
+            }
+        ]);
+
+        t.end();
+    });
+});
+
+test('when thread target is not editing target', t => {
+    const vm = new VirtualMachine();
+    vm.loadProject(fixtureData).then(() => {
+        const visualReports = [];
+        vm.on('VISUAL_REPORT', visualReport => {
+            visualReports.push(visualReport);
+        });
+
+        vm.setEditingTarget(vm.runtime.getSpriteTargetByName('Sprite1').id);
+        vm.runtime.toggleScript(procedureCallBlockId, {
+            stackClick: true
+        });
+
+        t.same(visualReports, []);
+
+        vm.runtime._step();
+        t.same(visualReports, []);
+
+        vm.setEditingTarget(vm.runtime.getSpriteTargetByName('Sprite2').id);
+
+        vm.runtime._step();
+        t.same(visualReports, []);
+
+        t.end();
+    });
+});