Merge 505c3f7565 into f207757ef0

src/engine/blocks.js

@@ -996,7 +996,7 @@ class Blocks {
     getAllVariableAndListReferences (optBlocks, optIncludeBroadcast) {
         const blocks = optBlocks ? optBlocks : this._blocks;
         const allReferences = Object.create(null);
-        for (const blockId in blocks) {
+        Object.keys(blocks).forEach(blockId => {
             let varOrListField = null;
             let varType = null;
             if (blocks[blockId].fields.VARIABLE) {
@@ -1028,7 +1028,7 @@ class Blocks {
                     ];
                 }
             }
-        }
+        });
         return allReferences;
     }
 

src/engine/target.js

@@ -762,12 +762,11 @@ class Target extends EventEmitter {
         }
         // Rename any local variables that were missed above because they aren't
         // referenced by any blocks
-        for (const id in unreferencedLocalVarIds) {
-            const varId = unreferencedLocalVarIds[id];
+        unreferencedLocalVarIds.forEach(varId => {
             const name = this.variables[varId].name;
             const type = this.variables[varId].type;
             renameConflictingLocalVar(varId, name, type);
-        }
+        });
         // Handle global var conflicts with existing global vars (e.g. a sprite is uploaded, and has
         // blocks referencing some variable that the sprite does not own, and this
         // variable conflicts with a global var)