From 92b2702ea96fa46faab31ab79291dc33de70d589 Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Tue, 30 Jan 2024 14:14:21 -0800
Subject: [PATCH] fix decompiler tests

---
 pxtcompiler/emitter/decompiler.ts             |  3 +-
 .../baselines/always_enums.blocks             |  5 +-
 .../baselines/array_for_of.blocks             | 10 ++-
 .../baselines/array_for_of_string.blocks      |  5 +-
 .../decompile-test/baselines/block_for.blocks | 15 ++--
 .../baselines/block_for2.blocks               |  5 +-
 .../baselines/block_repeat.blocks             |  5 +-
 .../baselines/break_continue.blocks           | 10 ++-
 .../baselines/draggable_parameters.blocks     | 40 +++++----
 .../draggable_parameters_reporters.blocks     | 84 +++++++++++--------
 .../baselines/for_loop_non_int.blocks         |  5 +-
 .../baselines/for_loop_upper_bound.blocks     | 45 ++++++----
 .../baselines/name_collision_2.blocks         | 10 ++-
 tests/decompile-test/baselines/tileset.blocks | 11 +--
 14 files changed, 148 insertions(+), 105 deletions(-)

diff --git a/pxtcompiler/emitter/decompiler.ts b/pxtcompiler/emitter/decompiler.ts
index b6c23e7a1bab..0d40de18ba96 100644
--- a/pxtcompiler/emitter/decompiler.ts
+++ b/pxtcompiler/emitter/decompiler.ts
@@ -1127,9 +1127,8 @@ ${output}</xml>`;
         }
 
         function mkDraggableReporterValue(valueName: string, varName: string, varType: string) {
-            const reporterType = pxt.blocks.reporterTypeForArgType(varType);
             const reporterShadowBlock = getDraggableReporterBlock(varName, varType, true);
-            return mkValue(valueName, reporterShadowBlock, reporterType);
+            return mkValue(valueName, reporterShadowBlock, undefined);
         }
 
         function getDraggableReporterBlock(varName: string, varType: string, draggable: boolean) {
diff --git a/tests/decompile-test/baselines/always_enums.blocks b/tests/decompile-test/baselines/always_enums.blocks
index 951289f43d7d..3c55404b46b4 100644
--- a/tests/decompile-test/baselines/always_enums.blocks
+++ b/tests/decompile-test/baselines/always_enums.blocks
@@ -3,9 +3,10 @@
 <statement name="HANDLER">
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">i</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
diff --git a/tests/decompile-test/baselines/array_for_of.blocks b/tests/decompile-test/baselines/array_for_of.blocks
index bc24fbce5149..ab9f24696813 100644
--- a/tests/decompile-test/baselines/array_for_of.blocks
+++ b/tests/decompile-test/baselines/array_for_of.blocks
@@ -22,9 +22,10 @@
 </block>
 </value>
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">a</field>
-</shadow>
+</block>
 </value>
 <statement name="DO">
 <block type="variables_change">
@@ -49,9 +50,10 @@
 </block>
 </value>
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">b</field>
-</shadow>
+</block>
 </value>
 <statement name="DO">
 </statement>
diff --git a/tests/decompile-test/baselines/array_for_of_string.blocks b/tests/decompile-test/baselines/array_for_of_string.blocks
index 37ea9e7444ab..20260a38983a 100644
--- a/tests/decompile-test/baselines/array_for_of_string.blocks
+++ b/tests/decompile-test/baselines/array_for_of_string.blocks
@@ -8,9 +8,10 @@
 </shadow>
 </value>
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">i</field>
-</shadow>
+</block>
 </value>
 <statement name="DO">
 <block type="variables_set">
diff --git a/tests/decompile-test/baselines/block_for.blocks b/tests/decompile-test/baselines/block_for.blocks
index d40a3139adf5..26faea7f8418 100644
--- a/tests/decompile-test/baselines/block_for.blocks
+++ b/tests/decompile-test/baselines/block_for.blocks
@@ -3,9 +3,10 @@
 <statement name="HANDLER">
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">i</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number">
@@ -17,9 +18,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">j</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number">
@@ -148,9 +150,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">u</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
diff --git a/tests/decompile-test/baselines/block_for2.blocks b/tests/decompile-test/baselines/block_for2.blocks
index c17c93c4fc9b..6b310a3c561f 100644
--- a/tests/decompile-test/baselines/block_for2.blocks
+++ b/tests/decompile-test/baselines/block_for2.blocks
@@ -3,9 +3,10 @@
 <statement name="HANDLER">
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">i</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number">
diff --git a/tests/decompile-test/baselines/block_repeat.blocks b/tests/decompile-test/baselines/block_repeat.blocks
index 94bd4204425e..06ea025e4105 100644
--- a/tests/decompile-test/baselines/block_repeat.blocks
+++ b/tests/decompile-test/baselines/block_repeat.blocks
@@ -12,9 +12,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">r</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
diff --git a/tests/decompile-test/baselines/break_continue.blocks b/tests/decompile-test/baselines/break_continue.blocks
index 15b16e498013..e55940afa36d 100644
--- a/tests/decompile-test/baselines/break_continue.blocks
+++ b/tests/decompile-test/baselines/break_continue.blocks
@@ -3,9 +3,10 @@
 <statement name="HANDLER">
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">i</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number">
@@ -19,9 +20,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">j</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number">
diff --git a/tests/decompile-test/baselines/draggable_parameters.blocks b/tests/decompile-test/baselines/draggable_parameters.blocks
index cccbab751d88..79b232b5b45e 100644
--- a/tests/decompile-test/baselines/draggable_parameters.blocks
+++ b/tests/decompile-test/baselines/draggable_parameters.blocks
@@ -1,56 +1,64 @@
 <xml xmlns="http://www.w3.org/1999/xhtml">
 <block type="test_handler_arguments3">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">hello</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">goodbye</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
 </block>
 <block type="test_handler_arguments3">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">sure</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">whatever</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
 </block>
 <block type="test_handler_arguments3">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">okay</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">d</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
 </block>
 <block type="test_handler_arguments3">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">c</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">d</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
diff --git a/tests/decompile-test/baselines/draggable_parameters_reporters.blocks b/tests/decompile-test/baselines/draggable_parameters_reporters.blocks
index 28049b6762be..b5a5958b27c5 100644
--- a/tests/decompile-test/baselines/draggable_parameters_reporters.blocks
+++ b/tests/decompile-test/baselines/draggable_parameters_reporters.blocks
@@ -1,100 +1,112 @@
 <xml xmlns="http://www.w3.org/1999/xhtml">
 <block type="test_handler_arguments4">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="argument_reporter_string">
+<block type="argument_reporter_string">
+<mutation duplicateondrag="true" />
 <field name="VALUE">hello</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="argument_reporter_number">
+<block type="argument_reporter_number">
+<mutation duplicateondrag="true" />
 <field name="VALUE">goodbye</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_e">
-<shadow type="argument_reporter_boolean">
+<block type="argument_reporter_boolean">
+<mutation duplicateondrag="true" />
 <field name="VALUE">e</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_f">
-<shadow type="argument_reporter_custom">
-<mutation typename="testNamespace.TestClass" />
+<block type="argument_reporter_custom">
+<mutation typename="testNamespace.TestClass" duplicateondrag="true" />
 <field name="VALUE">f</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
 </block>
 <block type="test_handler_arguments4">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="argument_reporter_string">
+<block type="argument_reporter_string">
+<mutation duplicateondrag="true" />
 <field name="VALUE">what</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="argument_reporter_number">
+<block type="argument_reporter_number">
+<mutation duplicateondrag="true" />
 <field name="VALUE">are</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_e">
-<shadow type="argument_reporter_boolean">
+<block type="argument_reporter_boolean">
+<mutation duplicateondrag="true" />
 <field name="VALUE">you</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_f">
-<shadow type="argument_reporter_custom">
-<mutation typename="testNamespace.TestClass" />
+<block type="argument_reporter_custom">
+<mutation typename="testNamespace.TestClass" duplicateondrag="true" />
 <field name="VALUE">doing</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
 </block>
 <block type="test_handler_arguments4">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="argument_reporter_string">
+<block type="argument_reporter_string">
+<mutation duplicateondrag="true" />
 <field name="VALUE">stahp</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="argument_reporter_number">
+<block type="argument_reporter_number">
+<mutation duplicateondrag="true" />
 <field name="VALUE">d</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_e">
-<shadow type="argument_reporter_boolean">
+<block type="argument_reporter_boolean">
+<mutation duplicateondrag="true" />
 <field name="VALUE">e</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_f">
-<shadow type="argument_reporter_custom">
-<mutation typename="testNamespace.TestClass" />
+<block type="argument_reporter_custom">
+<mutation typename="testNamespace.TestClass" duplicateondrag="true" />
 <field name="VALUE">f</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
 </block>
 <block type="test_handler_arguments4">
 <value name="HANDLER_DRAG_PARAM_c">
-<shadow type="argument_reporter_string">
+<block type="argument_reporter_string">
+<mutation duplicateondrag="true" />
 <field name="VALUE">c</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_d">
-<shadow type="argument_reporter_number">
+<block type="argument_reporter_number">
+<mutation duplicateondrag="true" />
 <field name="VALUE">d</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_e">
-<shadow type="argument_reporter_boolean">
+<block type="argument_reporter_boolean">
+<mutation duplicateondrag="true" />
 <field name="VALUE">e</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_f">
-<shadow type="argument_reporter_custom">
-<mutation typename="testNamespace.TestClass" />
+<block type="argument_reporter_custom">
+<mutation typename="testNamespace.TestClass" duplicateondrag="true" />
 <field name="VALUE">f</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>
diff --git a/tests/decompile-test/baselines/for_loop_non_int.blocks b/tests/decompile-test/baselines/for_loop_non_int.blocks
index 1053df7c0c4e..e335772a4c98 100644
--- a/tests/decompile-test/baselines/for_loop_non_int.blocks
+++ b/tests/decompile-test/baselines/for_loop_non_int.blocks
@@ -3,9 +3,10 @@
 <statement name="HANDLER">
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">i</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
diff --git a/tests/decompile-test/baselines/for_loop_upper_bound.blocks b/tests/decompile-test/baselines/for_loop_upper_bound.blocks
index 28193b284420..43b0a5597065 100644
--- a/tests/decompile-test/baselines/for_loop_upper_bound.blocks
+++ b/tests/decompile-test/baselines/for_loop_upper_bound.blocks
@@ -3,9 +3,10 @@
 <statement name="HANDLER">
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">i</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -38,9 +39,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">j</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -73,9 +75,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">k</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -108,9 +111,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">l</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -143,9 +147,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">m</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -178,9 +183,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">n</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -213,9 +219,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">o</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -266,9 +273,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">p</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
@@ -312,9 +320,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">q</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
diff --git a/tests/decompile-test/baselines/name_collision_2.blocks b/tests/decompile-test/baselines/name_collision_2.blocks
index 1cbbb6987d12..3af8e41657cb 100644
--- a/tests/decompile-test/baselines/name_collision_2.blocks
+++ b/tests/decompile-test/baselines/name_collision_2.blocks
@@ -11,9 +11,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">j</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number">
@@ -41,9 +42,10 @@
 <next>
 <block type="pxt_controls_for">
 <value name="VAR">
-<shadow type="variables_get_reporter">
+<block type="variables_get_reporter">
+<mutation duplicateondrag="true" />
 <field name="VAR">k</field>
-</shadow>
+</block>
 </value>
 <value name="TO">
 <shadow type="math_whole_number"><field name="NUM">0</field></shadow>
diff --git a/tests/decompile-test/baselines/tileset.blocks b/tests/decompile-test/baselines/tileset.blocks
index dd3fa9fe15c2..133bad5f3022 100644
--- a/tests/decompile-test/baselines/tileset.blocks
+++ b/tests/decompile-test/baselines/tileset.blocks
@@ -18,15 +18,16 @@
 </shadow>
 </value>
 <value name="HANDLER_DRAG_PARAM_sprite">
-<shadow type="argument_reporter_number">
+<block type="argument_reporter_number">
+<mutation duplicateondrag="true" />
 <field name="VALUE">sprite</field>
-</shadow>
+</block>
 </value>
 <value name="HANDLER_DRAG_PARAM_number">
-<shadow type="argument_reporter_custom">
-<mutation typename="any" />
+<block type="argument_reporter_custom">
+<mutation typename="any" duplicateondrag="true" />
 <field name="VALUE">location</field>
-</shadow>
+</block>
 </value>
 <statement name="HANDLER">
 </statement>