fixed #2234 (display all reachable local variables in drop-down menu)

HISTORY.md

@@ -2,6 +2,9 @@
 
 ## Development version
 
+###2018-10-29
+* Blocks: fixed #2234 (display all reachable local variables in drop-down menu)
+
 ## v4.2.2.3
 * New Features:
     * new fast atomic "analyze" and "group" reporters in the "Bigger Data" library

snap.html

@@ -6,7 +6,7 @@
         <link rel="shortcut icon" href="src/favicon.ico">
         <script type="text/javascript" src="src/morphic.js?version=2018-10-02"></script>
         <script type="text/javascript" src="src/widgets.js?version=2018-10-02"></script>
-        <script type="text/javascript" src="src/blocks.js?version=2018-10-26"></script>
+        <script type="text/javascript" src="src/blocks.js?version=2018-10-29"></script>
         <script type="text/javascript" src="src/threads.js?version=2018-10-26"></script>
         <script type="text/javascript" src="src/objects.js?version=2018-10-23"></script>
         <script type="text/javascript" src="src/gui.js?version=2018-10-29"></script>

src/blocks.js

@@ -148,7 +148,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2018-October-26';
+modules.blocks = '2018-October-29';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -596,15 +596,17 @@ SyntaxElementMorph.prototype.getVarNamesDict = function () {
             );
         } else if (morph instanceof BlockMorph) {
             morph.inputs().forEach(function (inp) {
-                if (inp instanceof TemplateSlotMorph) {
+                inp.forAllChildren(function (child){
-                    tempVars.push(inp.contents());
+                    if (child instanceof TemplateSlotMorph) {
-                } else if (inp instanceof MultiArgMorph) {
+                        tempVars.push(child.contents());
-                    inp.children.forEach(function (m) {
+                    } else if (child instanceof MultiArgMorph) {
-                        if (m instanceof TemplateSlotMorph) {
+                        child.children.forEach(function (m) {
-                            tempVars.push(m.contents());
+                            if (m instanceof TemplateSlotMorph) {
-                        }
+                                tempVars.push(m.contents());
-                    });
+                            }
-                }
+                        });
+                    }
+                });
             });
         }
     });