don't decompile non-shadow blocks within shadows (#10371)

* don't decompile non-shadow blocks within shadows * fix decompiler test
microsoft · Feb 5, 2025 · ab46892 · ab46892
1 parent 7bb54a3
commit ab46892
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/pxtcompiler/emitter/decompiler.ts b/pxtcompiler/emitter/decompiler.ts
@@ -175,6 +175,7 @@ namespace ts.pxtc.decompiler {
         value: OutputNode;
         shadowType?: string;
         shadowMutation?: pxt.Map<string>;
+        emitShadowOnly?: boolean;
     }
 
     interface MutationChild {
@@ -3929,6 +3930,10 @@ ${output}</xml>`;
     }
 
     function shouldEmitShadowOnly(n: ValueNode) {
+        if (n.emitShadowOnly !== undefined) {
+            return n.emitShadowOnly;
+        }
+
         let emitShadowOnly = false;
 
         if (n.value.kind === "expr") {
@@ -3948,11 +3953,22 @@ ${output}</xml>`;
                     case "logic_boolean":
                     case "text":
                         emitShadowOnly = !n.shadowType;
-                        break
+                        break;
+                }
+            }
+
+            if (emitShadowOnly && value.inputs) {
+                for (const input of value.inputs) {
+                    if (!shouldEmitShadowOnly(input)) {
+                        emitShadowOnly = false;
+                        break;
+                    }
                 }
             }
         }
 
+        n.emitShadowOnly = emitShadowOnly;
+
         return emitShadowOnly;
     }
 }
diff --git a/tests/decompile-test/baselines/compile_hidden_arguments.blocks b/tests/decompile-test/baselines/compile_hidden_arguments.blocks
@@ -45,7 +45,8 @@
 <block type="soundExpression_playSoundEffect">
 <field name="mode">SoundExpressionPlayMode.UntilDone</field>
 <value name="sound">
-<shadow type="soundExpression_createSoundEffect">
+<shadow type="soundExpression_createSoundEffect"/>
+<block type="soundExpression_createSoundEffect">
 <mutation _expanded="5" />
 <field name="waveShape">WaveShape.Sine</field>
 <field name="effect">SoundExpressionEffect.None</field>
@@ -92,13 +93,14 @@
 <field name="SLIDER">50</field>
 </shadow>
 </value>
-</shadow>
+</block>
 </value>
 <next>
 <block type="soundExpression_playSoundEffect">
 <field name="mode">SoundExpressionPlayMode.UntilDone</field>
 <value name="sound">
-<shadow type="soundExpression_createSoundEffect">
+<shadow type="soundExpression_createSoundEffect"/>
+<block type="soundExpression_createSoundEffect">
 <mutation _expanded="3" />
 <field name="waveShape">WaveShape.Sine</field>
 <field name="effect">SoundExpressionEffect.None</field>
@@ -145,7 +147,7 @@
 </value>
 </block>
 </value>
-</shadow>
+</block>
 </value>
 </block>
 </next>