expanding the rings in "map", "keep" and "find" shows 3 inputs named "item", "idx" and "data"

HISTORY.md

@@ -2,12 +2,14 @@
 
 ## in development:
 * **New Features:**
+    * expanding the rings in "map", "keep" and "find" shows 3 inputs named "item", "idx" and "data" 
 * **Notable Changes:**
 * **Notable Fixes:**
 * **Translation Updates:**
 
 ### 2019-11-01
 * new dev version
+* expanding the rings in "map", "keep" and "find" shows 3 inputs named "item", "idx" and "data"
 
 ## v5.2.5:
 * **Notable Fix:**

snap.html

@@ -6,7 +6,7 @@
         <link rel="shortcut icon" href="src/favicon.ico">
         <script type="text/javascript" src="src/morphic.js?version=2019-10-29"></script>
         <script type="text/javascript" src="src/widgets.js?version=2019-10-16"></script>
-        <script type="text/javascript" src="src/blocks.js?version=2019-10-28"></script>
+        <script type="text/javascript" src="src/blocks.js?version=2019-11-01"></script>
         <script type="text/javascript" src="src/threads.js?version=2019-10-30"></script>
         <script type="text/javascript" src="src/objects.js?version=2019-10-31"></script>
         <script type="text/javascript" src="src/gui.js?version=2019-11-01"></script>

src/blocks.js

@@ -148,7 +148,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2019-October-28';
+modules.blocks = '2019-November-01';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -11053,7 +11053,8 @@ MultiArgMorph.prototype.drawNew = function () {
 MultiArgMorph.prototype.addInput = function (contents) {
     var i, name,
         newPart = this.labelPart(this.slotSpec),
-        idx = this.children.length - 1;
+        idx = this.children.length - 1,
+        wantMore = false;
     // newPart.alpha = this.alpha ? 1 : (1 - this.alpha) / 2;
     if (contents) {
         newPart.setContents(contents);
@@ -11071,12 +11072,27 @@ MultiArgMorph.prototype.addInput = function (contents) {
         }
         newPart.setContents(name);
     } else if (contains(['%parms', '%ringparms'], this.elementSpec)) {
-        newPart.setContents('#' + idx);
+        if (this.is3ArgRingInHOF() && idx < 4) {
+            newPart.setContents([
+                localize('item'),
+                localize('idx'),
+                localize('data')
+            ][idx - 1]);
+            if (idx === 1) { // fully expand to 3 items
+                wantMore = true;
+            }
+        } else {
+            newPart.setContents('#' + idx);
+        }
     }
     newPart.parent = this;
     this.children.splice(idx, 0, newPart);
     newPart.drawNew();
     this.fixLayout();
+    if (wantMore) { // expand to 3 inputs in certain HOFs
+        this.addInput();
+        this.addInput();
+    }
 };
 
 MultiArgMorph.prototype.removeInput = function () {
@@ -11095,6 +11111,33 @@ MultiArgMorph.prototype.removeInput = function () {
     this.fixLayout();
 };
 
+MultiArgMorph.prototype.is3ArgRingInHOF = function () {
+    // answer true if I am embedded into a ring inside a HOF block
+    // that supports 3 parameters ("item, idx, data")
+    // of which there are currently only MAP, KEEP and FIND
+    // and their atomic counterparts
+    var ring = this.parent,
+        block;
+    if (ring) {
+        block = ring.parent;
+        if (block instanceof ReporterBlockMorph) {
+            return block.inputs()[0] === ring &&
+                contains(
+                    [
+                        'reportMap',
+                        'reportAtomicMap',
+                        'reportKeep',
+                        'reportAtomicKeep',
+                        'reportFindFirst',
+                        'reportAtomicFindFirst'
+                    ],
+                    block.selector
+                );
+        }
+    }
+    return false;
+};
+
 // MultiArgMorph events:
 
 MultiArgMorph.prototype.mouseClickLeft = function (pos) {