polish branched procedures

Author: jwklong

blocks_vertical/procedures.js

@@ -313,7 +313,7 @@ Blockly.ScratchBlocks.ProcedureUtils.createAllInputs_ = function(connectionMap)
       */
       labelText = component.substring(2).trim();
 
-      if (argumentType == "c") {
+      if (argumentType == 'c') {
         var input = this.appendStatementInput(id)
       } else {
         var input = this.appendValueInput(id);
@@ -530,7 +530,7 @@ Blockly.ScratchBlocks.ProcedureUtils.populateArgumentOnCaller_ = function(type,
   if (connectionMap && oldBlock) {
     // Reattach the old block and shadow DOM.
     connectionMap[input.name] = null;
-    if (type == "c") {
+    if (type == 'c') {
       oldBlock.previousConnection.connect(input.connection);
     } else {
       oldBlock.outputConnection.connect(input.connection);
@@ -588,7 +588,7 @@ Blockly.ScratchBlocks.ProcedureUtils.populateArgumentOnPrototype_ = function(
   }
 
   // Attach the block.
-  if (type == "c") {
+  if (type == 'c') {
     input.connection.connect(argumentReporter.previousConnection);
   } else {
     input.connection.connect(argumentReporter.outputConnection);
@@ -634,7 +634,7 @@ Blockly.ScratchBlocks.ProcedureUtils.populateArgumentOnDeclaration_ = function(
   }
 
   // Attach the block.
-  if (type == "c") {
+  if (type == 'c') {
     input.connection.connect(argumentEditor.previousConnection);
   } else {
     input.connection.connect(argumentEditor.outputConnection);

core/block_render.js

@@ -1386,7 +1386,7 @@ Blockly.BlockSvg.prototype.renderDraw_ = function(iconWidth, inputRows) {
     // Width of the curve/pointy-curve
     var shape = this.getOutputShape();
     if (shape != Blockly.OUTPUT_SHAPE_SQUARE) {
-      this.edgeShapeWidth_ = inputRows.bottomEdge / 2;
+      this.edgeShapeWidth_ = (inputRows.bottomEdge + Math.max(this.inputList.filter(v => v.type == Blockly.NEXT_STATEMENT).length-1, 0) * Blockly.BlockSvg.NOTCH_WIDTH) / 2;
       this.edgeShape_ = shape;
       this.squareTopLeftCorner_ = true;
     }

tests/custom_procedure_playground.html

@@ -55,6 +55,7 @@
       <td id="editor-actions">
         <button id="text_number" onclick="addTextNumber()">Add text/number input</button>
         <button id="boolean" onclick="addBoolean()">Add boolean input</button>
+        <button id="command" onclick="addCommand()">Add command input</button>
         <button id="label" onclick="addLabel()">Add label</button>
         <button id="cancelButton" onclick="cancel()">cancel</button>
         <button id="okButton" onclick="applyMutation()">ok</button>
@@ -232,6 +233,10 @@
       mutationRoot.addStringNumberExternal();
     }
 
+    function addCommand() {
+      mutationRoot.addCommandExternal();
+    }
+
     function setOutput(type) {
       mutationRoot.setReturns(true);
       mutationRoot.setType(type);