Get procedure renaming to work correctly dynamically

i.e., while typing in the name field.
mit-cml · Sep 10, 2021 · 12602ca · 12602ca
1 parent ee06205
commit 12602ca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/block-lexical-variables/src/field_procedure.js b/block-lexical-variables/src/field_procedure.js
@@ -142,7 +142,8 @@ Blockly.AIProcedure.removeProcedureValues = function(name, workspace) {
  */
 Blockly.AIProcedure.renameProcedure = function (newName) {
   // this is bound to field_textinput object
-  var oldName = this.oldName_ || this.text_;
+  var oldName = this.oldName_ || this.getValue();
+  const originalNewName = newName;
 
   // [lyn, 10/27/13] now check legality of identifiers
   newName = Blockly.LexicalVariable.makeLegalIdentifier(newName);
@@ -151,6 +152,9 @@ Blockly.AIProcedure.renameProcedure = function (newName) {
   var procBlocks = Blockly.AIProcedure.getAllProcedureDeclarationBlocksExcept(this.sourceBlock_);
   var procNames = procBlocks.map(function (decl) { return decl.getFieldValue('NAME'); });
   newName = Blockly.FieldLexicalVariable.nameNotIn(newName, procNames);
+  if (newName !== originalNewName) {
+    this.doValueUpdate_(newName);
+  }
   // Rename any callers.
   var blocks = this.sourceBlock_.workspace.getAllBlocks();
   for (var x = 0; x < blocks.length; x++) {

diff --git a/block-lexical-variables/src/field_procedurename.js b/block-lexical-variables/src/field_procedurename.js
@@ -51,6 +51,8 @@ goog.inherits(AI.Blockly.FieldProcedureName, Blockly.FieldTextInput);
  */
 AI.Blockly.FieldProcedureName.prototype.setValue = function(newValue) {
   var oldValue = this.getValue();
+  this.oldName_ = oldValue;
+  this.doValueUpdate_(newValue);
   AI.Blockly.FieldProcedureName.superClass_.setValue.call(this, newValue);
   newValue = this.getValue();
   if (typeof newValue === 'string' && this.sourceBlock_) {

diff --git a/block-lexical-variables/src/procedures.js b/block-lexical-variables/src/procedures.js
@@ -714,6 +714,11 @@ Blockly.Blocks['procedures_callnoreturn'] = {
   renameProcedure: function(oldName, newName) {
     if (!oldName ||
         Blockly.Names.equals(oldName, this.getFieldValue('PROCNAME'))) {
+      const nameField = this.getField('PROCNAME');
+      // Force the options menu to get regenerated since we might be getting
+      // called because our defining procedure got renamed and
+      // this.setFieldValue() will fail if it's value isn't in the options set
+      nameField.getOptions();
       this.setFieldValue(newName, 'PROCNAME');
     }
   },