update rearrangable custom block inputs to new pm code

Author: jwklong

src/addons/addons/reorder-custom-inputs/modified-funcs.js

@@ -1,7 +1,9 @@
-// https://github.com/scratchfoundation/scratch-blocks/blob/f210e042988b91bcdc2abeca7a2d85e178edadb2/blocks_vertical/procedures.js#L205
+// https://github.com/PenguinMod/PenguinMod-Blocks/blob/a92e9599ad2820ddda8b668a1d254931537be43e/blocks_vertical/procedures.js#L293
 export function modifiedCreateAllInputs(connectionMap) {
+  this.createIcon_()
+
   // Split the proc into components, by %n, %b, %s and %l (ignoring escaped).
-  var procComponents = this.procCode_.split(/(?=[^\\]%[nbsl])/);
+  var procComponents = this.procCode_.split(/(?=[^\\]%[nbslc])/);
   procComponents = procComponents.map(function (c) {
     return c.trim(); // Strip whitespace.
   });
@@ -10,21 +12,27 @@ export function modifiedCreateAllInputs(connectionMap) {
   var argumentCount = 0;
   for (var i = 0, component; (component = procComponents[i]); i++) {
     var labelText;
+    var argumentType = component.substring(1, 2);
+    var id = this.argumentIds_[argumentCount];
     // Don't treat %l as an argument
-    if (component.substring(0, 1) == "%" && component.substring(1, 2) !== "l") {
-      var argumentType = component.substring(1, 2);
+    if (component.substring(0, 1) == '%' && (['n', 's', 'b', 'c'].includes(argumentType)) && id) {
+      /*
       if (!(argumentType == "n" || argumentType == "b" || argumentType == "s")) {
         throw new Error("Found an custom procedure with an invalid type: " + argumentType);
       }
+      */
       labelText = component.substring(2).trim();
 
-      var id = this.argumentIds_[argumentCount];
-
-      var input = this.appendValueInput(id);
-      if (argumentType == "b") {
-        input.setCheck("Boolean");
+      if (argumentType == 'c') {
+        var input = this.appendStatementInput(id)
+      } else {
+        var input = this.appendValueInput(id);
       }
-      this.populateArgument_(argumentType, argumentCount, connectionMap, id, input);
+      if (argumentType == 'b') {
+        input.setCheck('Boolean');
+      }
+      this.populateArgument_(argumentType, argumentCount, connectionMap, id,
+          input);
       argumentCount++;
     } else {
       labelText = component == "%l" ? " " : component.replace("%l", "").trim();
@@ -36,7 +44,7 @@ export function modifiedCreateAllInputs(connectionMap) {
   this.procCode_ = this.procCode_.replace(/%l /g, "");
 }
 
-//https://github.com/scratchfoundation/scratch-blocks/blob/f210e042988b91bcdc2abeca7a2d85e178edadb2/blocks_vertical/procedures.js#L565
+//https://github.com/PenguinMod/PenguinMod-Blocks/blob/a92e9599ad2820ddda8b668a1d254931537be43e/blocks_vertical/procedures.js#L716
 export function modifiedUpdateDeclarationProcCode(prefixLabels = false) {
   this.procCode_ = "";
   this.displayNames_ = [];
@@ -49,16 +57,22 @@ export function modifiedUpdateDeclarationProcCode(prefixLabels = false) {
     if (input.type == 5) {
       // replaced Blocky.DUMMY_VALUE with 5
       this.procCode_ += (prefixLabels ? "%l " : "") + input.fieldRow[0].getValue(); // modified to prepend %l delimiter, which prevents label merging
-    } else if (input.type == 1) {
-      // replaced Blocky.INPUT_VALUE with 1
+    } else if (input.type == 1 || input.type == 3) {
+      // replaced Blocky.INPUT_VALUE with 1 and Blockly.NEXT_STATEMENT with 3
       // Inspect the argument editor.
       var target = input.connection.targetBlock();
-      this.displayNames_.push(target.getFieldValue("TEXT"));
+      this.displayNames_.push(target.getFieldValue('TEXT'));
       this.argumentIds_.push(input.name);
-      if (target.type == "argument_editor_boolean") {
-        this.procCode_ += "%b";
-      } else {
-        this.procCode_ += "%s";
+      switch (target.type) {
+        case 'argument_editor_string_number':
+          this.procCode_ += '%s';
+          break;
+        case 'argument_editor_boolean':
+          this.procCode_ += '%b';
+          break;
+        case 'argument_editor_command':
+          this.procCode_ += "%c";
+          break;
       }
     } else {
       throw new Error("Unexpected input type on a procedure mutator root: " + input.type);