Merge branch 'main' into update-to-blockly-11

Author: mjgallag

block-lexical-variables/src/blocks/variable-get-set.js

@@ -21,7 +21,6 @@ Blockly.Blocks['lexical_variable_get'] = {
     init: function() {
         this.setStyle('variable_blocks');
         this.fieldVar_ = new FieldLexicalVariable(' ');
-        this.fieldVar_.setBlock(this);
         this.appendDummyInput()
             .appendField(Blockly.Msg.LANG_VARIABLES_GET_TITLE_GET)
             .appendField(this.fieldVar_, 'VAR');
@@ -143,7 +142,6 @@ Blockly.Blocks['lexical_variable_set'] = {
     init: function() {
         this.setStyle('variable_blocks');
         this.fieldVar_ = new FieldLexicalVariable(' ');
-        this.fieldVar_.setBlock(this);
         this.appendValueInput('VALUE')
             .appendField(Blockly.Msg.LANG_VARIABLES_SET_TITLE_SET)
             .appendField(this.fieldVar_, 'VAR')

block-lexical-variables/src/fields/field_lexical_variable.js

@@ -136,22 +136,6 @@ FieldLexicalVariable.prototype.doClassValidation_ = function(
   return /** @type {string} */ (opt_newValue);
 };
 
-/**
- * Get the block holding this drop-down variable chooser.
- * @return {string} Block holding this drop-down variable chooser.
- */
-FieldLexicalVariable.prototype.getBlock = function() {
-  return this.block_;
-};
-
-/**
- * Set the block holding this drop-down variable chooser.
- * @param {?Blockly.Block} block Block holding this drop-down variable chooser.
- */
-FieldLexicalVariable.prototype.setBlock = function(block) {
-  this.block_ = block;
-};
-
 // [lyn, 11/10/12] Returns the names of all global definitions as a list of
 // strings [lyn, 11/18/12] * Removed from prototype and stripped off "global"
 // prefix (add it elsewhere) * Add optional excluded block argument as in
@@ -205,7 +189,7 @@ FieldLexicalVariable.getGlobalNames = function(optExcludedBlock) {
 // Shared.showPrefixToUser is true, non-global names are prefixed with labels
 // specified in blocklyeditor.js
 FieldLexicalVariable.prototype.getNamesInScope = function() {
-  return FieldLexicalVariable.getNamesInScope(this.block_);
+  return FieldLexicalVariable.getNamesInScope(this.sourceBlock_);
 };
 
 /**