From 042b235764e98e359d67672121170d487b618534 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 14:52:17 -0700
Subject: [PATCH 001/291] Migrate core/utils/dom.js to ES6 const/let

---
 core/utils/dom.js | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 57843c8b9..049aa9f07 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -84,9 +84,9 @@ Blockly.utils.dom.canvasContext_ = null;
  * @template T
  */
 Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
-  var e = /** @type {T} */
+  const e = /** @type {T} */
       (document.createElementNS(Blockly.utils.dom.SVG_NS, String(name)));
-  for (var key in attrs) {
+  for (const key in attrs) {
     e.setAttribute(key, attrs[key]);
   }
   // IE defines a unique attribute "runtimeStyle", it is NOT applied to
@@ -109,7 +109,7 @@ Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
  * @return {boolean} True if class was added, false if already present.
  */
 Blockly.utils.dom.addClass = function(element, className) {
-  var classes = element.getAttribute('class') || '';
+  let classes = element.getAttribute('class') || '';
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') != -1) {
     return false;
   }
@@ -127,9 +127,9 @@ Blockly.utils.dom.addClass = function(element, className) {
  *    element.
  */
 Blockly.utils.dom.removeClasses = function(element, classNames) {
-  var classList = classNames.split(' ');
-  for (var i = 0; i < classList.length; i++) {
-    var cssName = classList[i];
+  const classList = classNames.split(' ');
+  for (let i = 0; i < classList.length; i++) {
+    const cssName = classList[i];
     Blockly.utils.dom.removeClass(element, cssName);
   }
 };
@@ -142,12 +142,12 @@ Blockly.utils.dom.removeClasses = function(element, classNames) {
  * @return {boolean} True if class was removed, false if never present.
  */
 Blockly.utils.dom.removeClass = function(element, className) {
-  var classes = element.getAttribute('class');
+  const classes = element.getAttribute('class');
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') == -1) {
     return false;
   }
-  var classList = classes.split(/\s+/);
-  for (var i = 0; i < classList.length; i++) {
+  const classList = classes.split(/\s+/);
+  for (let i = 0; i < classList.length; i++) {
     if (!classList[i] || classList[i] == className) {
       classList.splice(i, 1);
       i--;
@@ -169,7 +169,7 @@ Blockly.utils.dom.removeClass = function(element, className) {
  * @return {boolean} True if class exists, false otherwise.
  */
 Blockly.utils.dom.hasClass = function(element, className) {
-  var classes = element.getAttribute('class');
+  const classes = element.getAttribute('class');
   return (' ' + classes + ' ').indexOf(' ' + className + ' ') != -1;
 };
 
@@ -190,8 +190,8 @@ Blockly.utils.dom.removeNode = function(node) {
  * @param {!Element} refNode Existing element to precede new node.
  */
 Blockly.utils.dom.insertAfter = function(newNode, refNode) {
-  var siblingNode = refNode.nextSibling;
-  var parentNode = refNode.parentNode;
+  const siblingNode = refNode.nextSibling;
+  const parentNode = refNode.parentNode;
   if (!parentNode) {
     throw Error('Reference node has no parent.');
   }
@@ -253,8 +253,8 @@ Blockly.utils.dom.stopTextWidthCache = function() {
  * @return {number} Width of element.
  */
 Blockly.utils.dom.getTextWidth = function(textElement) {
-  var key = textElement.textContent + '\n' + textElement.className.baseVal;
-  var width;
+  const key = textElement.textContent + '\n' + textElement.className.baseVal;
+  let width;
 
   // Return the cached width if it exists.
   if (Blockly.utils.dom.cacheWidths_) {
@@ -316,9 +316,9 @@ Blockly.utils.dom.getFastTextWidth = function(textElement,
  */
 Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
     fontSize, fontWeight, fontFamily) {
-  var text = textElement.textContent;
-  var key = text + '\n' + textElement.className.baseVal;
-  var width;
+  const text = textElement.textContent;
+  const key = text + '\n' + textElement.className.baseVal;
+  let width;
 
   // Return the cached width if it exists.
   if (Blockly.utils.dom.cacheWidths_) {
@@ -330,7 +330,7 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
 
   if (!Blockly.utils.dom.canvasContext_) {
     // Inject the canvas element used for computing text widths.
-    var computeCanvas = document.createElement('canvas');
+    const computeCanvas = document.createElement('canvas');
     computeCanvas.className = 'blocklyComputeCanvas';
     document.body.appendChild(computeCanvas);
 
@@ -364,15 +364,15 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
 Blockly.utils.dom.measureFontMetrics = function(text, fontSize, fontWeight,
     fontFamily) {
 
-  var span = document.createElement('span');
+  const span = document.createElement('span');
   span.style.font = fontWeight + ' ' + fontSize + ' ' + fontFamily;
   span.textContent = text;
 
-  var block = document.createElement('div');
+  const block = document.createElement('div');
   block.style.width = '1px';
   block.style.height = 0;
 
-  var div = document.createElement('div');
+  const div = document.createElement('div');
   div.setAttribute('style', 'position: fixed; top: 0; left: 0; display: flex;');
   div.appendChild(span);
   div.appendChild(block);

From 563defa3badcf64f8f18d8f5c1a4d52017b5313b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 15:01:16 -0700
Subject: [PATCH 002/291] Migrate core/utils/dom.js to goog.module

---
 core/utils/dom.js | 113 ++++++++++++++++++++++++++++------------------
 tests/deps.js     |   2 +-
 2 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 049aa9f07..7219bd93c 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -16,7 +16,8 @@
  * @name Blockly.utils.dom
  * @namespace
  */
-goog.provide('Blockly.utils.dom');
+goog.module('Blockly.utils.dom');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.Svg');
 goog.require('Blockly.utils.userAgent');
@@ -26,26 +27,26 @@ goog.require('Blockly.utils.userAgent');
  * Required name space for SVG elements.
  * @const
  */
-Blockly.utils.dom.SVG_NS = 'http://www.w3.org/2000/svg';
+const SVG_NS = 'http://www.w3.org/2000/svg';
 
 /**
  * Required name space for HTML elements.
  * @const
  */
-Blockly.utils.dom.HTML_NS = 'http://www.w3.org/1999/xhtml';
+const HTML_NS = 'http://www.w3.org/1999/xhtml';
 
 /**
  * Required name space for XLINK elements.
  * @const
  */
-Blockly.utils.dom.XLINK_NS = 'http://www.w3.org/1999/xlink';
+const XLINK_NS = 'http://www.w3.org/1999/xlink';
 
 /**
  * Node type constants.
  * https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType
  * @enum {number}
  */
-Blockly.utils.dom.NodeType = {
+const NodeType = {
   ELEMENT_NODE: 1,
   TEXT_NODE: 3,
   COMMENT_NODE: 8,
@@ -57,21 +58,21 @@ Blockly.utils.dom.NodeType = {
  * @type {Object}
  * @private
  */
-Blockly.utils.dom.cacheWidths_ = null;
+let cacheWidths = null;
 
 /**
  * Number of current references to cache.
  * @type {number}
  * @private
  */
-Blockly.utils.dom.cacheReference_ = 0;
+let cacheReference = 0;
 
 /**
  * A HTML canvas context used for computing text width.
  * @type {CanvasRenderingContext2D}
  * @private
  */
-Blockly.utils.dom.canvasContext_ = null;
+let canvasContext = null;
 
 /**
  * Helper method for creating SVG elements.
@@ -83,9 +84,9 @@ Blockly.utils.dom.canvasContext_ = null;
  *     Blockly.utils.Svg
  * @template T
  */
-Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
+const createSvgElement = function(name, attrs, opt_parent) {
   const e = /** @type {T} */
-      (document.createElementNS(Blockly.utils.dom.SVG_NS, String(name)));
+      (document.createElementNS(SVG_NS, String(name)));
   for (const key in attrs) {
     e.setAttribute(key, attrs[key]);
   }
@@ -108,7 +109,7 @@ Blockly.utils.dom.createSvgElement = function(name, attrs, opt_parent) {
  * @param {string} className Name of class to add.
  * @return {boolean} True if class was added, false if already present.
  */
-Blockly.utils.dom.addClass = function(element, className) {
+const addClass = function(element, className) {
   let classes = element.getAttribute('class') || '';
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') != -1) {
     return false;
@@ -126,11 +127,11 @@ Blockly.utils.dom.addClass = function(element, className) {
  * @param {string} classNames A string of one or multiple class names for an
  *    element.
  */
-Blockly.utils.dom.removeClasses = function(element, classNames) {
+const removeClasses = function(element, classNames) {
   const classList = classNames.split(' ');
   for (let i = 0; i < classList.length; i++) {
     const cssName = classList[i];
-    Blockly.utils.dom.removeClass(element, cssName);
+    removeClass(element, cssName);
   }
 };
 
@@ -141,7 +142,7 @@ Blockly.utils.dom.removeClasses = function(element, classNames) {
  * @param {string} className Name of class to remove.
  * @return {boolean} True if class was removed, false if never present.
  */
-Blockly.utils.dom.removeClass = function(element, className) {
+const removeClass = function(element, className) {
   const classes = element.getAttribute('class');
   if ((' ' + classes + ' ').indexOf(' ' + className + ' ') == -1) {
     return false;
@@ -168,7 +169,7 @@ Blockly.utils.dom.removeClass = function(element, className) {
  * @param {string} className Name of class to check.
  * @return {boolean} True if class exists, false otherwise.
  */
-Blockly.utils.dom.hasClass = function(element, className) {
+const hasClass = function(element, className) {
   const classes = element.getAttribute('class');
   return (' ' + classes + ' ').indexOf(' ' + className + ' ') != -1;
 };
@@ -179,7 +180,7 @@ Blockly.utils.dom.hasClass = function(element, className) {
  * @return {?Node} The node removed if removed; else, null.
  */
 // Copied from Closure goog.dom.removeNode
-Blockly.utils.dom.removeNode = function(node) {
+const removeNode = function(node) {
   return node && node.parentNode ? node.parentNode.removeChild(node) : null;
 };
 
@@ -189,7 +190,7 @@ Blockly.utils.dom.removeNode = function(node) {
  * @param {!Element} newNode New element to insert.
  * @param {!Element} refNode Existing element to precede new node.
  */
-Blockly.utils.dom.insertAfter = function(newNode, refNode) {
+const insertAfter = function(newNode, refNode) {
   const siblingNode = refNode.nextSibling;
   const parentNode = refNode.parentNode;
   if (!parentNode) {
@@ -208,9 +209,9 @@ Blockly.utils.dom.insertAfter = function(newNode, refNode) {
  * @param {!Node} descendant The node to test presence of.
  * @return {boolean} Whether the parent node contains the descendant node.
  */
-Blockly.utils.dom.containsNode = function(parent, descendant) {
+const containsNode = function(parent, descendant) {
   return !!(parent.compareDocumentPosition(descendant) &
-            Blockly.utils.dom.NodeType.DOCUMENT_POSITION_CONTAINED_BY);
+            NodeType.DOCUMENT_POSITION_CONTAINED_BY);
 };
 
 /**
@@ -220,7 +221,7 @@ Blockly.utils.dom.containsNode = function(parent, descendant) {
  * @param {!Element} element Element to which the CSS transform will be applied.
  * @param {string} transform The value of the CSS `transform` property.
  */
-Blockly.utils.dom.setCssTransform = function(element, transform) {
+const setCssTransform = function(element, transform) {
   element.style['transform'] = transform;
   element.style['-webkit-transform'] = transform;
 };
@@ -229,10 +230,10 @@ Blockly.utils.dom.setCssTransform = function(element, transform) {
  * Start caching text widths. Every call to this function MUST also call
  * stopTextWidthCache. Caches must not survive between execution threads.
  */
-Blockly.utils.dom.startTextWidthCache = function() {
-  Blockly.utils.dom.cacheReference_++;
-  if (!Blockly.utils.dom.cacheWidths_) {
-    Blockly.utils.dom.cacheWidths_ = Object.create(null);
+const startTextWidthCache = function() {
+  cacheReference++;
+  if (!cacheWidths) {
+    cacheWidths = Object.create(null);
   }
 };
 
@@ -240,10 +241,10 @@ Blockly.utils.dom.startTextWidthCache = function() {
  * Stop caching field widths. Unless caching was already on when the
  * corresponding call to startTextWidthCache was made.
  */
-Blockly.utils.dom.stopTextWidthCache = function() {
-  Blockly.utils.dom.cacheReference_--;
-  if (!Blockly.utils.dom.cacheReference_) {
-    Blockly.utils.dom.cacheWidths_ = null;
+const stopTextWidthCache = function() {
+  cacheReference--;
+  if (!cacheReference) {
+    cacheWidths = null;
   }
 };
 
@@ -252,13 +253,13 @@ Blockly.utils.dom.stopTextWidthCache = function() {
  * @param {!Element} textElement An SVG 'text' element.
  * @return {number} Width of element.
  */
-Blockly.utils.dom.getTextWidth = function(textElement) {
+const getTextWidth = function(textElement) {
   const key = textElement.textContent + '\n' + textElement.className.baseVal;
   let width;
 
   // Return the cached width if it exists.
-  if (Blockly.utils.dom.cacheWidths_) {
-    width = Blockly.utils.dom.cacheWidths_[key];
+  if (cacheWidths) {
+    width = cacheWidths[key];
     if (width) {
       return width;
     }
@@ -280,8 +281,8 @@ Blockly.utils.dom.getTextWidth = function(textElement) {
   }
 
   // Cache the computed width and return.
-  if (Blockly.utils.dom.cacheWidths_) {
-    Blockly.utils.dom.cacheWidths_[key] = width;
+  if (cacheWidths) {
+    cacheWidths[key] = width;
   }
   return width;
 };
@@ -296,9 +297,9 @@ Blockly.utils.dom.getTextWidth = function(textElement) {
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-Blockly.utils.dom.getFastTextWidth = function(textElement,
+const getFastTextWidth = function(textElement,
     fontSize, fontWeight, fontFamily) {
-  return Blockly.utils.dom.getFastTextWidthWithSizeString(textElement,
+  return getFastTextWidthWithSizeString(textElement,
       fontSize + 'pt', fontWeight, fontFamily);
 };
 
@@ -314,21 +315,21 @@ Blockly.utils.dom.getFastTextWidth = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
+const getFastTextWidthWithSizeString = function(textElement,
     fontSize, fontWeight, fontFamily) {
   const text = textElement.textContent;
   const key = text + '\n' + textElement.className.baseVal;
   let width;
 
   // Return the cached width if it exists.
-  if (Blockly.utils.dom.cacheWidths_) {
-    width = Blockly.utils.dom.cacheWidths_[key];
+  if (cacheWidths) {
+    width = cacheWidths[key];
     if (width) {
       return width;
     }
   }
 
-  if (!Blockly.utils.dom.canvasContext_) {
+  if (!canvasContext) {
     // Inject the canvas element used for computing text widths.
     const computeCanvas = document.createElement('canvas');
     computeCanvas.className = 'blocklyComputeCanvas';
@@ -337,18 +338,18 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
     // Initialize the HTML canvas context and set the font.
     // The context font must match blocklyText's fontsize and font-family
     // set in CSS.
-    Blockly.utils.dom.canvasContext_ = computeCanvas.getContext('2d');
+    canvasContext = computeCanvas.getContext('2d');
   }
   // Set the desired font size and family.
-  Blockly.utils.dom.canvasContext_.font =
+  canvasContext.font =
       fontWeight + ' ' + fontSize + ' ' + fontFamily;
 
   // Measure the text width using the helper canvas context.
-  width = Blockly.utils.dom.canvasContext_.measureText(text).width;
+  width = canvasContext.measureText(text).width;
 
   // Cache the computed width and return.
-  if (Blockly.utils.dom.cacheWidths_) {
-    Blockly.utils.dom.cacheWidths_[key] = width;
+  if (cacheWidths) {
+    cacheWidths[key] = width;
   }
   return width;
 };
@@ -361,7 +362,7 @@ Blockly.utils.dom.getFastTextWidthWithSizeString = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {{height: number, baseline: number}} Font measurements.
  */
-Blockly.utils.dom.measureFontMetrics = function(text, fontSize, fontWeight,
+const measureFontMetrics = function(text, fontSize, fontWeight,
     fontFamily) {
 
   const span = document.createElement('span');
@@ -389,3 +390,25 @@ Blockly.utils.dom.measureFontMetrics = function(text, fontSize, fontWeight,
   }
   return result;
 };
+
+exports = {
+  SVG_NS,
+  HTML_NS,
+  XLINK_NS,
+  NodeType,
+  createSvgElement,
+  addClass,
+  removeClasses,
+  removeClass,
+  hasClass,
+  removeNode,
+  insertAfter,
+  containsNode,
+  setCssTransform,
+  startTextWidthCache,
+  stopTextWidthCache,
+  getTextWidth,
+  getFastTextWidth,
+  getFastTextWidthWithSizeString,
+  measureFontMetrics,
+};
diff --git a/tests/deps.js b/tests/deps.js
index 4cb0f6fd3..dc28906b6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -173,7 +173,7 @@ goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);

From 1d8f6e903c2a74bc4ba9e2eeb0e563becd0ae33c Mon Sep 17 00:00:00 2001
From: Aaron Dodson <gonfunko@gmail.com>
Date: Wed, 14 Jul 2021 15:38:35 -0700
Subject: [PATCH 003/291] Migrate core/utils/dom.js to named requires

---
 core/utils/dom.js | 11 +++++------
 tests/deps.js     |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 7219bd93c..192aba58e 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -19,8 +19,8 @@
 goog.module('Blockly.utils.dom');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
+const Svg = goog.require('Blockly.utils.Svg');
+const userAgent = goog.require('Blockly.utils.userAgent');
 
 
 /**
@@ -76,12 +76,11 @@ let canvasContext = null;
 
 /**
  * Helper method for creating SVG elements.
- * @param {string|Blockly.utils.Svg<T>} name Element's tag name.
+ * @param {string|Svg<T>} name Element's tag name.
  * @param {!Object} attrs Dictionary of attribute names and values.
  * @param {Element=} opt_parent Optional parent on which to append the element.
  * @return {T} Newly created SVG element.  The return type is {!SVGElement} if
- *     name is a string or a more specific type if it a member of
- *     Blockly.utils.Svg
+ *     name is a string or a more specific type if it a member of Svg.
  * @template T
  */
 const createSvgElement = function(name, attrs, opt_parent) {
@@ -267,7 +266,7 @@ const getTextWidth = function(textElement) {
 
   // Attempt to compute fetch the width of the SVG text element.
   try {
-    if (Blockly.utils.userAgent.IE || Blockly.utils.userAgent.EDGE) {
+    if (userAgent.IE || userAgent.EDGE) {
       width = textElement.getBBox().width;
     } else {
       width = textElement.getComputedTextLength();
diff --git a/tests/deps.js b/tests/deps.js
index dc28906b6..b8b42f583 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -173,7 +173,7 @@ goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], []);
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], []);
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], []);
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], []);
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], []);

From 07bd3b3c799fd99aa02ce3c08462bd312925c501 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 15 Jul 2021 08:42:28 -0700
Subject: [PATCH 004/291] clang-format core/utils/dom.js

---
 core/utils/dom.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 192aba58e..0e0480c0f 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -209,8 +209,9 @@ const insertAfter = function(newNode, refNode) {
  * @return {boolean} Whether the parent node contains the descendant node.
  */
 const containsNode = function(parent, descendant) {
-  return !!(parent.compareDocumentPosition(descendant) &
-            NodeType.DOCUMENT_POSITION_CONTAINED_BY);
+  return !!(
+      parent.compareDocumentPosition(descendant) &
+      NodeType.DOCUMENT_POSITION_CONTAINED_BY);
 };
 
 /**
@@ -296,10 +297,10 @@ const getTextWidth = function(textElement) {
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-const getFastTextWidth = function(textElement,
-    fontSize, fontWeight, fontFamily) {
-  return getFastTextWidthWithSizeString(textElement,
-      fontSize + 'pt', fontWeight, fontFamily);
+const getFastTextWidth = function(
+    textElement, fontSize, fontWeight, fontFamily) {
+  return getFastTextWidthWithSizeString(
+      textElement, fontSize + 'pt', fontWeight, fontFamily);
 };
 
 /**
@@ -314,8 +315,8 @@ const getFastTextWidth = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {number} Width of element.
  */
-const getFastTextWidthWithSizeString = function(textElement,
-    fontSize, fontWeight, fontFamily) {
+const getFastTextWidthWithSizeString = function(
+    textElement, fontSize, fontWeight, fontFamily) {
   const text = textElement.textContent;
   const key = text + '\n' + textElement.className.baseVal;
   let width;
@@ -340,8 +341,7 @@ const getFastTextWidthWithSizeString = function(textElement,
     canvasContext = computeCanvas.getContext('2d');
   }
   // Set the desired font size and family.
-  canvasContext.font =
-      fontWeight + ' ' + fontSize + ' ' + fontFamily;
+  canvasContext.font = fontWeight + ' ' + fontSize + ' ' + fontFamily;
 
   // Measure the text width using the helper canvas context.
   width = canvasContext.measureText(text).width;
@@ -361,9 +361,7 @@ const getFastTextWidthWithSizeString = function(textElement,
  * @param {string} fontFamily The font family to use.
  * @return {{height: number, baseline: number}} Font measurements.
  */
-const measureFontMetrics = function(text, fontSize, fontWeight,
-    fontFamily) {
-
+const measureFontMetrics = function(text, fontSize, fontWeight, fontFamily) {
   const span = document.createElement('span');
   span.style.font = fontWeight + ' ' + fontSize + ' ' + fontFamily;
   span.textContent = text;

From f0fc360bfa8849cac38f68988f3f1370797ecac8 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 20 Jul 2021 11:30:09 -0700
Subject: [PATCH 005/291] Inline otherwise-unused variable in core/utils/dom.js

---
 core/utils/dom.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 0e0480c0f..5ec684acf 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -129,8 +129,7 @@ const addClass = function(element, className) {
 const removeClasses = function(element, classNames) {
   const classList = classNames.split(' ');
   for (let i = 0; i < classList.length; i++) {
-    const cssName = classList[i];
-    removeClass(element, cssName);
+    removeClass(element, classList[i]);
   }
 };
 

From c3d14479932c33aca47fdbdd54d9de766290fede Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 14:47:23 -0700
Subject: [PATCH 006/291] Migrate core/flyout_button.js to ES6 const/let

---
 core/flyout_button.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 643790d9f..793699e6a 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -126,7 +126,7 @@ Blockly.FlyoutButton.prototype.height = 0;
  * @return {!SVGElement} The button's SVG group.
  */
 Blockly.FlyoutButton.prototype.createDom = function() {
-  var cssClass = this.isLabel_ ? 'blocklyFlyoutLabel' : 'blocklyFlyoutButton';
+  let cssClass = this.isLabel_ ? 'blocklyFlyoutLabel' : 'blocklyFlyoutButton';
   if (this.cssClass_) {
     cssClass += ' ' + this.cssClass_;
   }
@@ -135,9 +135,10 @@ Blockly.FlyoutButton.prototype.createDom = function() {
       Blockly.utils.Svg.G, {'class': cssClass},
       this.workspace_.getCanvas());
 
+  let shadow;
   if (!this.isLabel_) {
     // Shadow rectangle (light source does not mirror in RTL).
-    var shadow = Blockly.utils.dom.createSvgElement(
+    shadow = Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.RECT,
         {
           'class': 'blocklyFlyoutButtonShadow',
@@ -146,7 +147,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
         this.svgGroup_);
   }
   // Background rectangle.
-  var rect = Blockly.utils.dom.createSvgElement(
+  const rect = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
         'class': this.isLabel_ ?
@@ -155,7 +156,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
       },
       this.svgGroup_);
 
-  var svgText = Blockly.utils.dom.createSvgElement(
+  const svgText = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.TEXT,
       {
         'class': this.isLabel_ ? 'blocklyFlyoutLabelText' : 'blocklyText',
@@ -164,7 +165,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
         'text-anchor': 'middle'
       },
       this.svgGroup_);
-  var text = Blockly.utils.replaceMessageReferences(this.text_);
+  let text = Blockly.utils.replaceMessageReferences(this.text_);
   if (this.workspace_.RTL) {
     // Force text to be RTL by adding an RLM.
     text += '\u200F';
@@ -176,12 +177,12 @@ Blockly.FlyoutButton.prototype.createDom = function() {
         'flyoutForegroundColour', 'fill');
   }
 
-  var fontSize = Blockly.utils.style.getComputedStyle(svgText, 'fontSize');
-  var fontWeight = Blockly.utils.style.getComputedStyle(svgText, 'fontWeight');
-  var fontFamily = Blockly.utils.style.getComputedStyle(svgText, 'fontFamily');
+  const fontSize = Blockly.utils.style.getComputedStyle(svgText, 'fontSize');
+  const fontWeight = Blockly.utils.style.getComputedStyle(svgText, 'fontWeight');
+  const fontFamily = Blockly.utils.style.getComputedStyle(svgText, 'fontFamily');
   this.width = Blockly.utils.dom.getFastTextWidthWithSizeString(svgText,
       fontSize, fontWeight, fontFamily);
-  var fontMetrics = Blockly.utils.dom.measureFontMetrics(text, fontSize,
+  const fontMetrics = Blockly.utils.dom.measureFontMetrics(text, fontSize,
       fontWeight, fontFamily);
   this.height = fontMetrics.height;
 
@@ -286,7 +287,7 @@ Blockly.FlyoutButton.prototype.dispose = function() {
  * @private
  */
 Blockly.FlyoutButton.prototype.onMouseUp_ = function(e) {
-  var gesture = this.targetWorkspace_.getGesture(e);
+  const gesture = this.targetWorkspace_.getGesture(e);
   if (gesture) {
     gesture.cancel();
   }

From a84660000f78ef26d89c2a204f11eeac720099f4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 14:53:15 -0700
Subject: [PATCH 007/291] Migrate core/flyout_button.js to goog.module

---
 core/flyout_button.js | 39 +++++++++++++++++++++------------------
 tests/deps.js         |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 793699e6a..7399e3997 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.FlyoutButton');
+goog.module('Blockly.FlyoutButton');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Css');
@@ -35,7 +36,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @package
  */
-Blockly.FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
+const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
   // Labels behave the same as buttons, but are styled differently.
 
   /**
@@ -102,30 +103,30 @@ Blockly.FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
 /**
  * The horizontal margin around the text in the button.
  */
-Blockly.FlyoutButton.MARGIN_X = 5;
+FlyoutButton.MARGIN_X = 5;
 
 /**
  * The vertical margin around the text in the button.
  */
-Blockly.FlyoutButton.MARGIN_Y = 2;
+FlyoutButton.MARGIN_Y = 2;
 
 /**
  * The width of the button's rect.
  * @type {number}
  */
-Blockly.FlyoutButton.prototype.width = 0;
+FlyoutButton.prototype.width = 0;
 
 /**
  * The height of the button's rect.
  * @type {number}
  */
-Blockly.FlyoutButton.prototype.height = 0;
+FlyoutButton.prototype.height = 0;
 
 /**
  * Create the button elements.
  * @return {!SVGElement} The button's SVG group.
  */
-Blockly.FlyoutButton.prototype.createDom = function() {
+FlyoutButton.prototype.createDom = function() {
   let cssClass = this.isLabel_ ? 'blocklyFlyoutLabel' : 'blocklyFlyoutButton';
   if (this.cssClass_) {
     cssClass += ' ' + this.cssClass_;
@@ -187,8 +188,8 @@ Blockly.FlyoutButton.prototype.createDom = function() {
   this.height = fontMetrics.height;
 
   if (!this.isLabel_) {
-    this.width += 2 * Blockly.FlyoutButton.MARGIN_X;
-    this.height += 2 * Blockly.FlyoutButton.MARGIN_Y;
+    this.width += 2 * FlyoutButton.MARGIN_X;
+    this.height += 2 * FlyoutButton.MARGIN_Y;
     shadow.setAttribute('width', this.width);
     shadow.setAttribute('height', this.height);
   }
@@ -209,7 +210,7 @@ Blockly.FlyoutButton.prototype.createDom = function() {
 /**
  * Correctly position the flyout button and make it visible.
  */
-Blockly.FlyoutButton.prototype.show = function() {
+FlyoutButton.prototype.show = function() {
   this.updateTransform_();
   this.svgGroup_.setAttribute('display', 'block');
 };
@@ -218,7 +219,7 @@ Blockly.FlyoutButton.prototype.show = function() {
  * Update SVG attributes to match internal state.
  * @private
  */
-Blockly.FlyoutButton.prototype.updateTransform_ = function() {
+FlyoutButton.prototype.updateTransform_ = function() {
   this.svgGroup_.setAttribute('transform',
       'translate(' + this.position_.x + ',' + this.position_.y + ')');
 };
@@ -228,7 +229,7 @@ Blockly.FlyoutButton.prototype.updateTransform_ = function() {
  * @param {number} x The new x coordinate.
  * @param {number} y The new y coordinate.
  */
-Blockly.FlyoutButton.prototype.moveTo = function(x, y) {
+FlyoutButton.prototype.moveTo = function(x, y) {
   this.position_.x = x;
   this.position_.y = y;
   this.updateTransform_();
@@ -237,7 +238,7 @@ Blockly.FlyoutButton.prototype.moveTo = function(x, y) {
 /**
  * @return {boolean} Whether or not the button is a label.
  */
-Blockly.FlyoutButton.prototype.isLabel = function() {
+FlyoutButton.prototype.isLabel = function() {
   return this.isLabel_;
 };
 
@@ -246,14 +247,14 @@ Blockly.FlyoutButton.prototype.isLabel = function() {
  * @return {!Blockly.utils.Coordinate} x, y coordinates.
  * @package
  */
-Blockly.FlyoutButton.prototype.getPosition = function() {
+FlyoutButton.prototype.getPosition = function() {
   return this.position_;
 };
 
 /**
  * @return {string} Text of the button.
  */
-Blockly.FlyoutButton.prototype.getButtonText = function() {
+FlyoutButton.prototype.getButtonText = function() {
   return this.text_;
 };
 
@@ -262,14 +263,14 @@ Blockly.FlyoutButton.prototype.getButtonText = function() {
  * @return {!Blockly.WorkspaceSvg} The target workspace of the flyout where this
  *     button resides.
  */
-Blockly.FlyoutButton.prototype.getTargetWorkspace = function() {
+FlyoutButton.prototype.getTargetWorkspace = function() {
   return this.targetWorkspace_;
 };
 
 /**
  * Dispose of this button.
  */
-Blockly.FlyoutButton.prototype.dispose = function() {
+FlyoutButton.prototype.dispose = function() {
   if (this.onMouseUpWrapper_) {
     Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
   }
@@ -286,7 +287,7 @@ Blockly.FlyoutButton.prototype.dispose = function() {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.FlyoutButton.prototype.onMouseUp_ = function(e) {
+FlyoutButton.prototype.onMouseUp_ = function(e) {
   const gesture = this.targetWorkspace_.getGesture(e);
   if (gesture) {
     gesture.cancel();
@@ -329,3 +330,5 @@ Blockly.Css.register([
   '}',
   /* eslint-enable indent */
 ]);
+
+exports = FlyoutButton;
diff --git a/tests/deps.js b/tests/deps.js
index d02bbc5ea..d0f326297 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -62,7 +62,7 @@ goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
-goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es5'});
+goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.Block', 'Blockly.internalConstants', 'Blockly.utils.deprecation']);

From fe01fbebc211a49bdd120acaeaba695486e0a9b1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 15:03:35 -0700
Subject: [PATCH 008/291] Migrate core/flyout_button.js named requires

---
 core/flyout_button.js | 79 ++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 7399e3997..372060237 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -13,24 +13,25 @@
 goog.module('Blockly.FlyoutButton');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Css');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.style');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.WorkspaceSvg');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Css = goog.require('Blockly.Css');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const style = goog.require('Blockly.utils.style');
+/* eslint-disable-next-line no-unused-vars */
+const toolbox = goog.requireType('Blockly.utils.toolbox');
+const {replaceMessageReferences} = goog.require('Blockly.utils');
 
 
 /**
  * Class for a button in the flyout.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace in which to place this
+ * @param {!WorkspaceSvg} workspace The workspace in which to place this
  *     button.
- * @param {!Blockly.WorkspaceSvg} targetWorkspace The flyout's target workspace.
- * @param {!Blockly.utils.toolbox.ButtonOrLabelInfo} json
+ * @param {!WorkspaceSvg} targetWorkspace The flyout's target workspace.
+ * @param {!toolbox.ButtonOrLabelInfo} json
  *    The JSON specifying the label/button.
  * @param {boolean} isLabel Whether this button should be styled as a label.
  * @constructor
@@ -40,13 +41,13 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
   // Labels behave the same as buttons, but are styled differently.
 
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
 
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.targetWorkspace_ = targetWorkspace;
@@ -58,10 +59,10 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
   this.text_ = json['text'];
 
   /**
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
-  this.position_ = new Blockly.utils.Coordinate(0, 0);
+  this.position_ = new Coordinate(0, 0);
 
   /**
    * Whether this button should be styled as a label.
@@ -88,14 +89,14 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
 
   /**
    * Mouse up event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * The JSON specifying the label / button.
-   * @type {!Blockly.utils.toolbox.ButtonOrLabelInfo}
+   * @type {!toolbox.ButtonOrLabelInfo}
    */
   this.info = json;
 };
@@ -132,15 +133,15 @@ FlyoutButton.prototype.createDom = function() {
     cssClass += ' ' + this.cssClass_;
   }
 
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {'class': cssClass},
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {'class': cssClass},
       this.workspace_.getCanvas());
 
   let shadow;
   if (!this.isLabel_) {
     // Shadow rectangle (light source does not mirror in RTL).
-    shadow = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    shadow = dom.createSvgElement(
+        Svg.RECT,
         {
           'class': 'blocklyFlyoutButtonShadow',
           'rx': 4, 'ry': 4, 'x': 1, 'y': 1
@@ -148,8 +149,8 @@ FlyoutButton.prototype.createDom = function() {
         this.svgGroup_);
   }
   // Background rectangle.
-  const rect = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  const rect = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': this.isLabel_ ?
             'blocklyFlyoutLabelBackground' : 'blocklyFlyoutButtonBackground',
@@ -157,8 +158,8 @@ FlyoutButton.prototype.createDom = function() {
       },
       this.svgGroup_);
 
-  const svgText = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.TEXT,
+  const svgText = dom.createSvgElement(
+      Svg.TEXT,
       {
         'class': this.isLabel_ ? 'blocklyFlyoutLabelText' : 'blocklyText',
         'x': 0,
@@ -166,7 +167,7 @@ FlyoutButton.prototype.createDom = function() {
         'text-anchor': 'middle'
       },
       this.svgGroup_);
-  let text = Blockly.utils.replaceMessageReferences(this.text_);
+  let text = replaceMessageReferences(this.text_);
   if (this.workspace_.RTL) {
     // Force text to be RTL by adding an RLM.
     text += '\u200F';
@@ -178,12 +179,12 @@ FlyoutButton.prototype.createDom = function() {
         'flyoutForegroundColour', 'fill');
   }
 
-  const fontSize = Blockly.utils.style.getComputedStyle(svgText, 'fontSize');
-  const fontWeight = Blockly.utils.style.getComputedStyle(svgText, 'fontWeight');
-  const fontFamily = Blockly.utils.style.getComputedStyle(svgText, 'fontFamily');
-  this.width = Blockly.utils.dom.getFastTextWidthWithSizeString(svgText,
+  const fontSize = style.getComputedStyle(svgText, 'fontSize');
+  const fontWeight = style.getComputedStyle(svgText, 'fontWeight');
+  const fontFamily = style.getComputedStyle(svgText, 'fontFamily');
+  this.width = dom.getFastTextWidthWithSizeString(svgText,
       fontSize, fontWeight, fontFamily);
-  const fontMetrics = Blockly.utils.dom.measureFontMetrics(text, fontSize,
+  const fontMetrics = dom.measureFontMetrics(text, fontSize,
       fontWeight, fontFamily);
   this.height = fontMetrics.height;
 
@@ -202,7 +203,7 @@ FlyoutButton.prototype.createDom = function() {
 
   this.updateTransform_();
 
-  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       this.svgGroup_, 'mouseup', this, this.onMouseUp_);
   return this.svgGroup_;
 };
@@ -244,7 +245,7 @@ FlyoutButton.prototype.isLabel = function() {
 
 /**
  * Location of the button.
- * @return {!Blockly.utils.Coordinate} x, y coordinates.
+ * @return {!Coordinate} x, y coordinates.
  * @package
  */
 FlyoutButton.prototype.getPosition = function() {
@@ -260,7 +261,7 @@ FlyoutButton.prototype.getButtonText = function() {
 
 /**
  * Get the button's target workspace.
- * @return {!Blockly.WorkspaceSvg} The target workspace of the flyout where this
+ * @return {!WorkspaceSvg} The target workspace of the flyout where this
  *     button resides.
  */
 FlyoutButton.prototype.getTargetWorkspace = function() {
@@ -272,10 +273,10 @@ FlyoutButton.prototype.getTargetWorkspace = function() {
  */
 FlyoutButton.prototype.dispose = function() {
   if (this.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
+    browserEvents.unbind(this.onMouseUpWrapper_);
   }
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
   }
   if (this.svgText_) {
     this.workspace_.getThemeManager().unsubscribe(this.svgText_);
@@ -306,7 +307,7 @@ FlyoutButton.prototype.onMouseUp_ = function(e) {
 /**
  * CSS for buttons and labels.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyFlyoutButton {',
     'fill: #888;',

From 6a43f7c9b7f04bbc355bb0fb1a9b7313d4cabfd4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 22 Jul 2021 15:04:19 -0700
Subject: [PATCH 009/291] clang-format core/flyout_button.js

---
 core/flyout_button.js | 57 ++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/core/flyout_button.js b/core/flyout_button.js
index 372060237..db05ca4f4 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -77,8 +77,8 @@ const FlyoutButton = function(workspace, targetWorkspace, json, isLabel) {
    * @private
    */
   this.callbackKey_ = json['callbackKey'] ||
-  /* Check the lower case version too to satisfy IE */
-                      json['callbackkey'];
+      /* Check the lower case version too to satisfy IE */
+      json['callbackkey'];
 
   /**
    * If specified, a CSS class to add to this button.
@@ -134,33 +134,33 @@ FlyoutButton.prototype.createDom = function() {
   }
 
   this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {'class': cssClass},
-      this.workspace_.getCanvas());
+      Svg.G, {'class': cssClass}, this.workspace_.getCanvas());
 
   let shadow;
   if (!this.isLabel_) {
     // Shadow rectangle (light source does not mirror in RTL).
     shadow = dom.createSvgElement(
-        Svg.RECT,
-        {
+        Svg.RECT, {
           'class': 'blocklyFlyoutButtonShadow',
-          'rx': 4, 'ry': 4, 'x': 1, 'y': 1
+          'rx': 4,
+          'ry': 4,
+          'x': 1,
+          'y': 1
         },
         this.svgGroup_);
   }
   // Background rectangle.
   const rect = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': this.isLabel_ ?
-            'blocklyFlyoutLabelBackground' : 'blocklyFlyoutButtonBackground',
-        'rx': 4, 'ry': 4
+      Svg.RECT, {
+        'class': this.isLabel_ ? 'blocklyFlyoutLabelBackground' :
+                                 'blocklyFlyoutButtonBackground',
+        'rx': 4,
+        'ry': 4
       },
       this.svgGroup_);
 
   const svgText = dom.createSvgElement(
-      Svg.TEXT,
-      {
+      Svg.TEXT, {
         'class': this.isLabel_ ? 'blocklyFlyoutLabelText' : 'blocklyText',
         'x': 0,
         'y': 0,
@@ -175,17 +175,17 @@ FlyoutButton.prototype.createDom = function() {
   svgText.textContent = text;
   if (this.isLabel_) {
     this.svgText_ = svgText;
-    this.workspace_.getThemeManager().subscribe(this.svgText_,
-        'flyoutForegroundColour', 'fill');
+    this.workspace_.getThemeManager().subscribe(
+        this.svgText_, 'flyoutForegroundColour', 'fill');
   }
 
   const fontSize = style.getComputedStyle(svgText, 'fontSize');
   const fontWeight = style.getComputedStyle(svgText, 'fontWeight');
   const fontFamily = style.getComputedStyle(svgText, 'fontFamily');
-  this.width = dom.getFastTextWidthWithSizeString(svgText,
-      fontSize, fontWeight, fontFamily);
-  const fontMetrics = dom.measureFontMetrics(text, fontSize,
-      fontWeight, fontFamily);
+  this.width = dom.getFastTextWidthWithSizeString(
+      svgText, fontSize, fontWeight, fontFamily);
+  const fontMetrics =
+      dom.measureFontMetrics(text, fontSize, fontWeight, fontFamily);
   this.height = fontMetrics.height;
 
   if (!this.isLabel_) {
@@ -198,8 +198,8 @@ FlyoutButton.prototype.createDom = function() {
   rect.setAttribute('height', this.height);
 
   svgText.setAttribute('x', this.width / 2);
-  svgText.setAttribute('y', this.height / 2 - fontMetrics.height / 2 +
-      fontMetrics.baseline);
+  svgText.setAttribute(
+      'y', this.height / 2 - fontMetrics.height / 2 + fontMetrics.baseline);
 
   this.updateTransform_();
 
@@ -221,7 +221,8 @@ FlyoutButton.prototype.show = function() {
  * @private
  */
 FlyoutButton.prototype.updateTransform_ = function() {
-  this.svgGroup_.setAttribute('transform',
+  this.svgGroup_.setAttribute(
+      'transform',
       'translate(' + this.position_.x + ',' + this.position_.y + ')');
 };
 
@@ -296,8 +297,10 @@ FlyoutButton.prototype.onMouseUp_ = function(e) {
 
   if (this.isLabel_ && this.callbackKey_) {
     console.warn('Labels should not have callbacks. Label text: ' + this.text_);
-  } else if (!this.isLabel_ && !(this.callbackKey_ &&
-      this.targetWorkspace_.getButtonCallback(this.callbackKey_))) {
+  } else if (
+      !this.isLabel_ &&
+      !(this.callbackKey_ &&
+        this.targetWorkspace_.getButtonCallback(this.callbackKey_))) {
     console.warn('Buttons should have callbacks. Button text: ' + this.text_);
   } else if (!this.isLabel_) {
     this.targetWorkspace_.getButtonCallback(this.callbackKey_)(this);
@@ -326,9 +329,7 @@ Css.register([
     'cursor: default;',
   '}',
 
-  '.blocklyFlyoutLabelBackground {',
-    'opacity: 0;',
-  '}',
+  '.blocklyFlyoutLabelBackground {', 'opacity: 0;', '}',
   /* eslint-enable indent */
 ]);
 

From 227030f451511c0eceb3bf303de25e2ad89e57ca Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:41:22 -0700
Subject: [PATCH 010/291] Migrate core/mutator.js to ES6 const/let

---
 core/mutator.js | 98 +++++++++++++++++++++++++------------------------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index 2733964c7..3a87e2035 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -161,17 +161,18 @@ Blockly.Mutator.prototype.createEditor_ = function() {
       {'x': Blockly.Bubble.BORDER_WIDTH, 'y': Blockly.Bubble.BORDER_WIDTH},
       null);
   // Convert the list of names into a list of XML objects for the flyout.
+  let quarkXml;
   if (this.quarkNames_.length) {
-    var quarkXml = Blockly.utils.xml.createElement('xml');
-    for (var i = 0, quarkName; (quarkName = this.quarkNames_[i]); i++) {
-      var element = Blockly.utils.xml.createElement('block');
+    quarkXml = Blockly.utils.xml.createElement('xml');
+    for (let i = 0, quarkName; (quarkName = this.quarkNames_[i]); i++) {
+      const element = Blockly.utils.xml.createElement('block');
       element.setAttribute('type', quarkName);
       quarkXml.appendChild(element);
     }
   } else {
-    var quarkXml = null;
+    quarkXml = null;
   }
-  var workspaceOptions = new Blockly.Options(
+  const workspaceOptions = new Blockly.Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         // If you want to enable disabling, also remove the
@@ -187,7 +188,7 @@ Blockly.Mutator.prototype.createEditor_ = function() {
   workspaceOptions.toolboxPosition = this.block_.RTL ?
       Blockly.utils.toolbox.Position.RIGHT :
       Blockly.utils.toolbox.Position.LEFT;
-  var hasFlyout = !!quarkXml;
+  const hasFlyout = !!quarkXml;
   if (hasFlyout) {
     workspaceOptions.languageTree =
         Blockly.utils.toolbox.convertToolboxDefToJson(quarkXml);
@@ -200,9 +201,9 @@ Blockly.Mutator.prototype.createEditor_ = function() {
   // a top level SVG. Instead of handling scale themselves, mutators
   // inherit scale from the parent workspace.
   // To fix this, scale needs to be applied at a different level in the DOM.
-  var flyoutSvg = hasFlyout ?
+  const flyoutSvg = hasFlyout ?
       this.workspace_.addFlyout(Blockly.utils.Svg.G) : null;
-  var background = this.workspace_.createDom('blocklyMutatorBackground');
+  const background = this.workspace_.createDom('blocklyMutatorBackground');
 
   if (flyoutSvg) {
     // Insert the flyout after the <rect> but before the block canvas so that
@@ -244,13 +245,13 @@ Blockly.Mutator.prototype.updateEditable = function() {
  * @private
  */
 Blockly.Mutator.prototype.resizeBubble_ = function() {
-  var doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
-  var workspaceSize = this.workspace_.getCanvas().getBBox();
-  var width = workspaceSize.width + workspaceSize.x;
-  var height = workspaceSize.height + doubleBorderWidth * 3;
-  var flyout = this.workspace_.getFlyout();
+  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+  const workspaceSize = this.workspace_.getCanvas().getBBox();
+  let width = workspaceSize.width + workspaceSize.x;
+  let height = workspaceSize.height + doubleBorderWidth * 3;
+  const flyout = this.workspace_.getFlyout();
   if (flyout) {
-    var flyoutScrollMetrics = flyout.getWorkspace().getMetricsManager()
+    const flyoutScrollMetrics = flyout.getWorkspace().getMetricsManager()
         .getScrollMetrics();
     height = Math.max(height, flyoutScrollMetrics.height + 20);
     width += flyout.getWidth();
@@ -276,7 +277,7 @@ Blockly.Mutator.prototype.resizeBubble_ = function() {
 
   if (this.block_.RTL) {
     // Scroll the workspace to always left-align.
-    var translation = 'translate(' + this.workspaceWidth_ + ',0)';
+    const translation = 'translate(' + this.workspaceWidth_ + ',0)';
     this.workspace_.getCanvas().setAttribute('transform', translation);
   }
   this.workspace_.resize();
@@ -312,27 +313,28 @@ Blockly.Mutator.prototype.setVisible = function(visible) {
     // Expose this mutator's block's ID on its top-level SVG group.
     this.bubble_.setSvgId(this.block_.id);
     this.bubble_.registerMoveEvent(this.onBubbleMove_.bind(this));
-    var tree = this.workspace_.options.languageTree;
-    var flyout = this.workspace_.getFlyout();
+    const tree = this.workspace_.options.languageTree;
+    const flyout = this.workspace_.getFlyout();
     if (tree) {
       flyout.init(this.workspace_);
       flyout.show(tree);
     }
 
     this.rootBlock_ = this.block_.decompose(this.workspace_);
-    var blocks = this.rootBlock_.getDescendants(false);
-    for (var i = 0, child; (child = blocks[i]); i++) {
+    const blocks = this.rootBlock_.getDescendants(false);
+    for (let i = 0, child; (child = blocks[i]); i++) {
       child.render();
     }
     // The root block should not be draggable or deletable.
     this.rootBlock_.setMovable(false);
     this.rootBlock_.setDeletable(false);
+    let margin, x;
     if (flyout) {
-      var margin = flyout.CORNER_RADIUS * 2;
-      var x = this.rootBlock_.RTL ? flyout.getWidth() + margin : margin;
+      margin = flyout.CORNER_RADIUS * 2;
+      x = this.rootBlock_.RTL ? flyout.getWidth() + margin : margin;
     } else {
-      var margin = 16;
-      var x = margin;
+      margin = 16;
+      x = margin;
     }
     if (this.block_.RTL) {
       x = -x;
@@ -340,8 +342,8 @@ Blockly.Mutator.prototype.setVisible = function(visible) {
     this.rootBlock_.moveBy(x, margin);
     // Save the initial connections, then listen for further changes.
     if (this.block_.saveConnections) {
-      var thisMutator = this;
-      var mutatorBlock =
+      const thisMutator = this;
+      const mutatorBlock =
         /** @type {{saveConnections: function(!Blockly.Block)}} */ (
           this.block_);
       mutatorBlock.saveConnections(this.rootBlock_);
@@ -385,11 +387,11 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
   }
 
   if (!this.workspace_.isDragging()) {
-    var blocks = this.workspace_.getTopBlocks(false);
-    var MARGIN = 20;
+    const blocks = this.workspace_.getTopBlocks(false);
+    const MARGIN = 20;
 
-    for (var b = 0, block; (block = blocks[b]); b++) {
-      var blockXY = block.getRelativeToSurfaceXY();
+    for (let b = 0, block; (block = blocks[b]); b++) {
+      const blockXY = block.getRelativeToSurfaceXY();
 
       // Bump any block that's above the top back inside.
       if (blockXY.y < MARGIN) {
@@ -397,8 +399,8 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
       }
       // Bump any block overlapping the flyout back inside.
       if (block.RTL) {
-        var right = -MARGIN;
-        var flyout = this.workspace_.getFlyout();
+        let right = -MARGIN;
+        const flyout = this.workspace_.getFlyout();
         if (flyout) {
           right -= flyout.getWidth();
         }
@@ -414,12 +416,12 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
   // When the mutator's workspace changes, update the source block.
   if (this.rootBlock_.workspace == this.workspace_) {
     Blockly.Events.setGroup(true);
-    var block = this.block_;
-    var oldMutationDom = block.mutationToDom();
-    var oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+    const block = this.block_;
+    const oldMutationDom = block.mutationToDom();
+    const oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
 
     // Switch off rendering while the source block is rebuilt.
-    var savedRendered = block.rendered;
+    const savedRendered = block.rendered;
     // TODO(#4288): We should not be setting the rendered property to false.
     block.rendered = false;
 
@@ -434,13 +436,13 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
       block.render();
     }
 
-    var newMutationDom = block.mutationToDom();
-    var newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
+    const newMutationDom = block.mutationToDom();
+    const newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
     if (oldMutation != newMutation) {
       Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
           block, 'mutation', null, oldMutation, newMutation));
       // Ensure that any bump is part of this mutation's event group.
-      var group = Blockly.Events.getGroup();
+      const group = Blockly.Events.getGroup();
       setTimeout(function() {
         Blockly.Events.setGroup(group);
         block.bumpNeighbours();
@@ -470,18 +472,18 @@ Blockly.Mutator.prototype.dispose = function() {
  * @public
  */
 Blockly.Mutator.prototype.updateBlockStyle = function() {
-  var ws = this.workspace_;
+  const ws = this.workspace_;
 
   if (ws && ws.getAllBlocks(false)) {
-    var workspaceBlocks = ws.getAllBlocks(false);
-    for (var i = 0, block; (block = workspaceBlocks[i]); i++) {
+    const workspaceBlocks = ws.getAllBlocks(false);
+    for (let i = 0, block; (block = workspaceBlocks[i]); i++) {
       block.setStyle(block.getStyleName());
     }
 
-    var flyout = ws.getFlyout();
+    const flyout = ws.getFlyout();
     if (flyout) {
-      var flyoutBlocks = flyout.workspace_.getAllBlocks(false);
-      for (var i = 0, block; (block = flyoutBlocks[i]); i++) {
+      const flyoutBlocks = flyout.workspace_.getAllBlocks(false);
+      for (let i = 0, block; (block = flyoutBlocks[i]); i++) {
         block.setStyle(block.getStyleName());
       }
     }
@@ -499,8 +501,8 @@ Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
   if (!connectionChild || !connectionChild.getSourceBlock().workspace) {
     return false;  // No connection or block has been deleted.
   }
-  var connectionParent = block.getInput(inputName).connection;
-  var currentParent = connectionChild.targetBlock();
+  const connectionParent = block.getInput(inputName).connection;
+  const currentParent = connectionChild.targetBlock();
   if ((!currentParent || currentParent == block) &&
       connectionParent.targetConnection != connectionChild) {
     if (connectionParent.isConnected()) {
@@ -521,9 +523,9 @@ Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
  * @public
  */
 Blockly.Mutator.findParentWs = function(workspace) {
-  var outerWs = null;
+  let outerWs = null;
   if (workspace && workspace.options) {
-    var parent = workspace.options.parentWorkspace;
+    const parent = workspace.options.parentWorkspace;
     // If we were in a flyout in a mutator, need to go up two levels to find
     // the actual parent.
     if (workspace.isFlyout) {

From e843a68b4117c4d96d497d22b43ed31f80007604 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:43:32 -0700
Subject: [PATCH 011/291] Migrate core/mutator.js to goog.module

---
 core/mutator.js | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index 3a87e2035..5f1c4cfab 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Mutator');
+goog.module('Blockly.Mutator');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Bubble');
 goog.require('Blockly.Events');
@@ -45,37 +46,37 @@ goog.requireType('Blockly.Workspace');
  * @extends {Blockly.Icon}
  * @constructor
  */
-Blockly.Mutator = function(quarkNames) {
-  Blockly.Mutator.superClass_.constructor.call(this, null);
+const Mutator = function(quarkNames) {
+  Mutator.superClass_.constructor.call(this, null);
   this.quarkNames_ = quarkNames;
 };
-Blockly.utils.object.inherits(Blockly.Mutator, Blockly.Icon);
+Blockly.utils.object.inherits(Mutator, Blockly.Icon);
 
 /**
  * Workspace in the mutator's bubble.
  * @type {?Blockly.WorkspaceSvg}
  * @private
  */
-Blockly.Mutator.prototype.workspace_ = null;
+Mutator.prototype.workspace_ = null;
 
 /**
  * Width of workspace.
  * @private
  */
-Blockly.Mutator.prototype.workspaceWidth_ = 0;
+Mutator.prototype.workspaceWidth_ = 0;
 
 /**
  * Height of workspace.
  * @private
  */
-Blockly.Mutator.prototype.workspaceHeight_ = 0;
+Mutator.prototype.workspaceHeight_ = 0;
 
 /**
  * Set the block this mutator is associated with.
  * @param {!Blockly.BlockSvg} block The block associated with this mutator.
  * @package
  */
-Blockly.Mutator.prototype.setBlock = function(block) {
+Mutator.prototype.setBlock = function(block) {
   this.block_ = block;
 };
 
@@ -85,7 +86,7 @@ Blockly.Mutator.prototype.setBlock = function(block) {
  *     bubble or null if the mutator isn't open.
  * @package
  */
-Blockly.Mutator.prototype.getWorkspace = function() {
+Mutator.prototype.getWorkspace = function() {
   return this.workspace_;
 };
 
@@ -94,7 +95,7 @@ Blockly.Mutator.prototype.getWorkspace = function() {
  * @param {!Element} group The icon group.
  * @protected
  */
-Blockly.Mutator.prototype.drawIcon_ = function(group) {
+Mutator.prototype.drawIcon_ = function(group) {
   // Square with rounded corners.
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
@@ -139,7 +140,7 @@ Blockly.Mutator.prototype.drawIcon_ = function(group) {
  * @protected
  * @override
  */
-Blockly.Mutator.prototype.iconClick_ = function(e) {
+Mutator.prototype.iconClick_ = function(e) {
   if (this.block_.isEditable()) {
     Blockly.Icon.prototype.iconClick_.call(this, e);
   }
@@ -150,7 +151,7 @@ Blockly.Mutator.prototype.iconClick_ = function(e) {
  * @return {!SVGElement} The top-level node of the editor.
  * @private
  */
-Blockly.Mutator.prototype.createEditor_ = function() {
+Mutator.prototype.createEditor_ = function() {
   /* Create the editor.  Here's the markup that will be generated:
   <svg>
     [Workspace]
@@ -219,8 +220,8 @@ Blockly.Mutator.prototype.createEditor_ = function() {
 /**
  * Add or remove the UI indicating if this icon may be clicked or not.
  */
-Blockly.Mutator.prototype.updateEditable = function() {
-  Blockly.Mutator.superClass_.updateEditable.call(this);
+Mutator.prototype.updateEditable = function() {
+  Mutator.superClass_.updateEditable.call(this);
   if (!this.block_.isInFlyout) {
     if (this.block_.isEditable()) {
       if (this.iconGroup_) {
@@ -244,7 +245,7 @@ Blockly.Mutator.prototype.updateEditable = function() {
  * Resize the bubble to match the size of the workspace.
  * @private
  */
-Blockly.Mutator.prototype.resizeBubble_ = function() {
+Mutator.prototype.resizeBubble_ = function() {
   const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
   const workspaceSize = this.workspace_.getCanvas().getBBox();
   let width = workspaceSize.width + workspaceSize.x;
@@ -287,7 +288,7 @@ Blockly.Mutator.prototype.resizeBubble_ = function() {
  * A method handler for when the bubble is moved.
  * @private
  */
-Blockly.Mutator.prototype.onBubbleMove_ = function() {
+Mutator.prototype.onBubbleMove_ = function() {
   if (this.workspace_) {
     this.workspace_.recordDragTargets();
   }
@@ -297,7 +298,7 @@ Blockly.Mutator.prototype.onBubbleMove_ = function() {
  * Show or hide the mutator bubble.
  * @param {boolean} visible True if the bubble should be visible.
  */
-Blockly.Mutator.prototype.setVisible = function(visible) {
+Mutator.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     // No change.
     return;
@@ -380,7 +381,7 @@ Blockly.Mutator.prototype.setVisible = function(visible) {
  * @param {!Blockly.Events.Abstract} e Custom data for event.
  * @private
  */
-Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
+Mutator.prototype.workspaceChanged_ = function(e) {
   if (e.isUiEvent ||
       (e.type == Blockly.Events.CHANGE && e.element == 'disabled')) {
     return;
@@ -462,7 +463,7 @@ Blockly.Mutator.prototype.workspaceChanged_ = function(e) {
 /**
  * Dispose of this mutator.
  */
-Blockly.Mutator.prototype.dispose = function() {
+Mutator.prototype.dispose = function() {
   this.block_.mutator = null;
   Blockly.Icon.prototype.dispose.call(this);
 };
@@ -471,7 +472,7 @@ Blockly.Mutator.prototype.dispose = function() {
  * Update the styles on all blocks in the mutator.
  * @public
  */
-Blockly.Mutator.prototype.updateBlockStyle = function() {
+Mutator.prototype.updateBlockStyle = function() {
   const ws = this.workspace_;
 
   if (ws && ws.getAllBlocks(false)) {
@@ -497,7 +498,7 @@ Blockly.Mutator.prototype.updateBlockStyle = function() {
  * @param {string} inputName Name of input on parent block.
  * @return {boolean} True iff a reconnection was made, false otherwise.
  */
-Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
+Mutator.reconnect = function(connectionChild, block, inputName) {
   if (!connectionChild || !connectionChild.getSourceBlock().workspace) {
     return false;  // No connection or block has been deleted.
   }
@@ -522,7 +523,7 @@ Blockly.Mutator.reconnect = function(connectionChild, block, inputName) {
  * @return {?Blockly.Workspace} The mutator's parent workspace or null.
  * @public
  */
-Blockly.Mutator.findParentWs = function(workspace) {
+Mutator.findParentWs = function(workspace) {
   let outerWs = null;
   if (workspace && workspace.options) {
     const parent = workspace.options.parentWorkspace;
@@ -538,3 +539,5 @@ Blockly.Mutator.findParentWs = function(workspace) {
   }
   return outerWs;
 };
+
+exports = Mutator;

From 949d3f3593d19b8fdca6d8abf8a2cb4ef976c13e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 14:59:16 -0700
Subject: [PATCH 012/291] Migrate core/mutator.js to named requires

---
 core/mutator.js | 142 +++++++++++++++++++++++++-----------------------
 tests/deps.js   |   2 +-
 2 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index 5f1c4cfab..ca8475cdf 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -14,47 +14,53 @@
 goog.module('Blockly.Mutator');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Bubble');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Blockly = goog.requireType('Blockly');
+const Bubble = goog.require('Blockly.Bubble');
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Icon = goog.require('Blockly.Icon');
+const Options = goog.require('Blockly.Options');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg');
+const Xml = goog.require('Blockly.Xml');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const xml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
-goog.require('Blockly.Icon');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Options');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.WorkspaceSvg');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.utils.Coordinate');
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a mutator dialog.
  * @param {!Array<string>} quarkNames List of names of sub-blocks for flyout.
- * @extends {Blockly.Icon}
+ * @extends {Icon}
  * @constructor
  */
 const Mutator = function(quarkNames) {
   Mutator.superClass_.constructor.call(this, null);
   this.quarkNames_ = quarkNames;
 };
-Blockly.utils.object.inherits(Mutator, Blockly.Icon);
+object.inherits(Mutator, Icon);
 
 /**
  * Workspace in the mutator's bubble.
- * @type {?Blockly.WorkspaceSvg}
+ * @type {?WorkspaceSvg}
  * @private
  */
 Mutator.prototype.workspace_ = null;
@@ -73,7 +79,7 @@ Mutator.prototype.workspaceHeight_ = 0;
 
 /**
  * Set the block this mutator is associated with.
- * @param {!Blockly.BlockSvg} block The block associated with this mutator.
+ * @param {!BlockSvg} block The block associated with this mutator.
  * @package
  */
 Mutator.prototype.setBlock = function(block) {
@@ -82,7 +88,7 @@ Mutator.prototype.setBlock = function(block) {
 
 /**
  * Returns the workspace inside this mutator icon's bubble.
- * @return {?Blockly.WorkspaceSvg} The workspace inside this mutator icon's
+ * @return {?WorkspaceSvg} The workspace inside this mutator icon's
  *     bubble or null if the mutator isn't open.
  * @package
  */
@@ -97,8 +103,8 @@ Mutator.prototype.getWorkspace = function() {
  */
 Mutator.prototype.drawIcon_ = function(group) {
   // Square with rounded corners.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyIconShape',
         'rx': '4',
@@ -108,8 +114,8 @@ Mutator.prototype.drawIcon_ = function(group) {
       },
       group);
   // Gear teeth.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyIconSymbol',
         'd': 'm4.203,7.296 0,1.368 -0.92,0.677 -0.11,0.41 0.9,1.559 0.41,' +
@@ -122,8 +128,8 @@ Mutator.prototype.drawIcon_ = function(group) {
       },
       group);
   // Axle hole.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
+  dom.createSvgElement(
+      Svg.CIRCLE,
       {
         'class': 'blocklyIconShape',
         'r': '2.7',
@@ -142,7 +148,7 @@ Mutator.prototype.drawIcon_ = function(group) {
  */
 Mutator.prototype.iconClick_ = function(e) {
   if (this.block_.isEditable()) {
-    Blockly.Icon.prototype.iconClick_.call(this, e);
+    Icon.prototype.iconClick_.call(this, e);
   }
 };
 
@@ -157,23 +163,23 @@ Mutator.prototype.createEditor_ = function() {
     [Workspace]
   </svg>
   */
-  this.svgDialog_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG,
-      {'x': Blockly.Bubble.BORDER_WIDTH, 'y': Blockly.Bubble.BORDER_WIDTH},
+  this.svgDialog_ = dom.createSvgElement(
+      Svg.SVG,
+      {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
       null);
   // Convert the list of names into a list of XML objects for the flyout.
   let quarkXml;
   if (this.quarkNames_.length) {
-    quarkXml = Blockly.utils.xml.createElement('xml');
+    quarkXml = xml.createElement('xml');
     for (let i = 0, quarkName; (quarkName = this.quarkNames_[i]); i++) {
-      const element = Blockly.utils.xml.createElement('block');
+      const element = xml.createElement('block');
       element.setAttribute('type', quarkName);
       quarkXml.appendChild(element);
     }
   } else {
     quarkXml = null;
   }
-  const workspaceOptions = new Blockly.Options(
+  const workspaceOptions = new Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         // If you want to enable disabling, also remove the
@@ -187,23 +193,23 @@ Mutator.prototype.createEditor_ = function() {
         'rendererOverrides': this.block_.workspace.options.rendererOverrides
       }));
   workspaceOptions.toolboxPosition = this.block_.RTL ?
-      Blockly.utils.toolbox.Position.RIGHT :
-      Blockly.utils.toolbox.Position.LEFT;
+      toolbox.Position.RIGHT :
+      toolbox.Position.LEFT;
   const hasFlyout = !!quarkXml;
   if (hasFlyout) {
     workspaceOptions.languageTree =
-        Blockly.utils.toolbox.convertToolboxDefToJson(quarkXml);
+        toolbox.convertToolboxDefToJson(quarkXml);
   }
-  this.workspace_ = new Blockly.WorkspaceSvg(workspaceOptions);
+  this.workspace_ = new WorkspaceSvg(workspaceOptions);
   this.workspace_.isMutator = true;
-  this.workspace_.addChangeListener(Blockly.Events.disableOrphans);
+  this.workspace_.addChangeListener(Events.disableOrphans);
 
   // Mutator flyouts go inside the mutator workspace's <g> rather than in
   // a top level SVG. Instead of handling scale themselves, mutators
   // inherit scale from the parent workspace.
   // To fix this, scale needs to be applied at a different level in the DOM.
   const flyoutSvg = hasFlyout ?
-      this.workspace_.addFlyout(Blockly.utils.Svg.G) : null;
+      this.workspace_.addFlyout(Svg.G) : null;
   const background = this.workspace_.createDom('blocklyMutatorBackground');
 
   if (flyoutSvg) {
@@ -225,7 +231,7 @@ Mutator.prototype.updateEditable = function() {
   if (!this.block_.isInFlyout) {
     if (this.block_.isEditable()) {
       if (this.iconGroup_) {
-        Blockly.utils.dom.removeClass(
+        dom.removeClass(
             /** @type {!Element} */ (this.iconGroup_),
             'blocklyIconGroupReadonly');
       }
@@ -233,7 +239,7 @@ Mutator.prototype.updateEditable = function() {
       // Close any mutator bubble.  Icon is not clickable.
       this.setVisible(false);
       if (this.iconGroup_) {
-        Blockly.utils.dom.addClass(
+        dom.addClass(
             /** @type {!Element} */ (this.iconGroup_),
             'blocklyIconGroupReadonly');
       }
@@ -246,7 +252,7 @@ Mutator.prototype.updateEditable = function() {
  * @private
  */
 Mutator.prototype.resizeBubble_ = function() {
-  const doubleBorderWidth = 2 * Blockly.Bubble.BORDER_WIDTH;
+  const doubleBorderWidth = 2 * Bubble.BORDER_WIDTH;
   const workspaceSize = this.workspace_.getCanvas().getBBox();
   let width = workspaceSize.width + workspaceSize.x;
   let height = workspaceSize.height + doubleBorderWidth * 3;
@@ -303,14 +309,14 @@ Mutator.prototype.setVisible = function(visible) {
     // No change.
     return;
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BUBBLE_OPEN))(
+  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
       this.block_, visible, 'mutator'));
   if (visible) {
     // Create the bubble.
-    this.bubble_ = new Blockly.Bubble(
-        /** @type {!Blockly.WorkspaceSvg} */ (this.block_.workspace),
+    this.bubble_ = new Bubble(
+        /** @type {!WorkspaceSvg} */ (this.block_.workspace),
         this.createEditor_(), this.block_.pathObject.svgPath,
-        /** @type {!Blockly.utils.Coordinate} */ (this.iconXY_), null, null);
+        /** @type {!Coordinate} */ (this.iconXY_), null, null);
     // Expose this mutator's block's ID on its top-level SVG group.
     this.bubble_.setSvgId(this.block_.id);
     this.bubble_.registerMoveEvent(this.onBubbleMove_.bind(this));
@@ -345,7 +351,7 @@ Mutator.prototype.setVisible = function(visible) {
     if (this.block_.saveConnections) {
       const thisMutator = this;
       const mutatorBlock =
-        /** @type {{saveConnections: function(!Blockly.Block)}} */ (
+        /** @type {{saveConnections: function(!Block)}} */ (
           this.block_);
       mutatorBlock.saveConnections(this.rootBlock_);
       this.sourceListener_ = function() {
@@ -378,12 +384,12 @@ Mutator.prototype.setVisible = function(visible) {
  * Update the source block when the mutator's blocks are changed.
  * Bump down any block that's too high.
  * Fired whenever a change is made to the mutator's workspace.
- * @param {!Blockly.Events.Abstract} e Custom data for event.
+ * @param {!Abstract} e Custom data for event.
  * @private
  */
 Mutator.prototype.workspaceChanged_ = function(e) {
   if (e.isUiEvent ||
-      (e.type == Blockly.Events.CHANGE && e.element == 'disabled')) {
+      (e.type == Events.CHANGE && e.element == 'disabled')) {
     return;
   }
 
@@ -416,10 +422,10 @@ Mutator.prototype.workspaceChanged_ = function(e) {
 
   // When the mutator's workspace changes, update the source block.
   if (this.rootBlock_.workspace == this.workspace_) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
     const block = this.block_;
     const oldMutationDom = block.mutationToDom();
-    const oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+    const oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
 
     // Switch off rendering while the source block is rebuilt.
     const savedRendered = block.rendered;
@@ -438,17 +444,17 @@ Mutator.prototype.workspaceChanged_ = function(e) {
     }
 
     const newMutationDom = block.mutationToDom();
-    const newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
+    const newMutation = newMutationDom && Xml.domToText(newMutationDom);
     if (oldMutation != newMutation) {
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
           block, 'mutation', null, oldMutation, newMutation));
       // Ensure that any bump is part of this mutation's event group.
-      const group = Blockly.Events.getGroup();
+      const group = Events.getGroup();
       setTimeout(function() {
-        Blockly.Events.setGroup(group);
+        Events.setGroup(group);
         block.bumpNeighbours();
-        Blockly.Events.setGroup(false);
-      }, Blockly.internalConstants.BUMP_DELAY);
+        Events.setGroup(false);
+      }, internalConstants.BUMP_DELAY);
     }
 
     // Don't update the bubble until the drag has ended, to avoid moving blocks
@@ -456,7 +462,7 @@ Mutator.prototype.workspaceChanged_ = function(e) {
     if (!this.workspace_.isDragging()) {
       this.resizeBubble_();
     }
-    Blockly.Events.setGroup(false);
+    Events.setGroup(false);
   }
 };
 
@@ -465,7 +471,7 @@ Mutator.prototype.workspaceChanged_ = function(e) {
  */
 Mutator.prototype.dispose = function() {
   this.block_.mutator = null;
-  Blockly.Icon.prototype.dispose.call(this);
+  Icon.prototype.dispose.call(this);
 };
 
 /**
@@ -493,8 +499,8 @@ Mutator.prototype.updateBlockStyle = function() {
 
 /**
  * Reconnect an block to a mutated input.
- * @param {Blockly.Connection} connectionChild Connection on child block.
- * @param {!Blockly.Block} block Parent block.
+ * @param {Connection} connectionChild Connection on child block.
+ * @param {!Block} block Parent block.
  * @param {string} inputName Name of input on parent block.
  * @return {boolean} True iff a reconnection was made, false otherwise.
  */
@@ -519,8 +525,8 @@ Mutator.reconnect = function(connectionChild, block, inputName) {
 /**
  * Get the parent workspace of a workspace that is inside a mutator, taking into
  * account whether it is a flyout.
- * @param {Blockly.Workspace} workspace The workspace that is inside a mutator.
- * @return {?Blockly.Workspace} The mutator's parent workspace or null.
+ * @param {Workspace} workspace The workspace that is inside a mutator.
+ * @return {?Workspace} The mutator's parent workspace or null.
  * @public
  */
 Mutator.findParentWs = function(workspace) {
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..de6795326 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -112,7 +112,7 @@ goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEven
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
-goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml']);
+goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']);
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);

From e7feef669ebe281630c1cd16e8d1bf7c9ef011a5 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 23 Jul 2021 15:00:09 -0700
Subject: [PATCH 013/291] clang-format core/mutator.js

---
 core/mutator.js | 55 ++++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/core/mutator.js b/core/mutator.js
index ca8475cdf..8f9bab118 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -104,8 +104,7 @@ Mutator.prototype.getWorkspace = function() {
 Mutator.prototype.drawIcon_ = function(group) {
   // Square with rounded corners.
   dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blocklyIconShape',
         'rx': '4',
         'ry': '4',
@@ -115,28 +114,21 @@ Mutator.prototype.drawIcon_ = function(group) {
       group);
   // Gear teeth.
   dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm4.203,7.296 0,1.368 -0.92,0.677 -0.11,0.41 0.9,1.559 0.41,' +
-             '0.11 1.043,-0.457 1.187,0.683 0.127,1.134 0.3,0.3 1.8,0 0.3,' +
-             '-0.299 0.127,-1.138 1.185,-0.682 1.046,0.458 0.409,-0.11 0.9,' +
-             '-1.559 -0.11,-0.41 -0.92,-0.677 0,-1.366 0.92,-0.677 0.11,' +
-             '-0.41 -0.9,-1.559 -0.409,-0.109 -1.046,0.458 -1.185,-0.682 ' +
-             '-0.127,-1.138 -0.3,-0.299 -1.8,0 -0.3,0.3 -0.126,1.135 -1.187,' +
-             '0.682 -1.043,-0.457 -0.41,0.11 -0.899,1.559 0.108,0.409z'
+            '0.11 1.043,-0.457 1.187,0.683 0.127,1.134 0.3,0.3 1.8,0 0.3,' +
+            '-0.299 0.127,-1.138 1.185,-0.682 1.046,0.458 0.409,-0.11 0.9,' +
+            '-1.559 -0.11,-0.41 -0.92,-0.677 0,-1.366 0.92,-0.677 0.11,' +
+            '-0.41 -0.9,-1.559 -0.409,-0.109 -1.046,0.458 -1.185,-0.682 ' +
+            '-0.127,-1.138 -0.3,-0.299 -1.8,0 -0.3,0.3 -0.126,1.135 -1.187,' +
+            '0.682 -1.043,-0.457 -0.41,0.11 -0.899,1.559 0.108,0.409z'
       },
       group);
   // Axle hole.
   dom.createSvgElement(
       Svg.CIRCLE,
-      {
-        'class': 'blocklyIconShape',
-        'r': '2.7',
-        'cx': '8',
-        'cy': '8'
-      },
-      group);
+      {'class': 'blocklyIconShape', 'r': '2.7', 'cx': '8', 'cy': '8'}, group);
 };
 
 /**
@@ -164,9 +156,7 @@ Mutator.prototype.createEditor_ = function() {
   </svg>
   */
   this.svgDialog_ = dom.createSvgElement(
-      Svg.SVG,
-      {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
-      null);
+      Svg.SVG, {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH}, null);
   // Convert the list of names into a list of XML objects for the flyout.
   let quarkXml;
   if (this.quarkNames_.length) {
@@ -192,13 +182,11 @@ Mutator.prototype.createEditor_ = function() {
         'renderer': this.block_.workspace.options.renderer,
         'rendererOverrides': this.block_.workspace.options.rendererOverrides
       }));
-  workspaceOptions.toolboxPosition = this.block_.RTL ?
-      toolbox.Position.RIGHT :
-      toolbox.Position.LEFT;
+  workspaceOptions.toolboxPosition =
+      this.block_.RTL ? toolbox.Position.RIGHT : toolbox.Position.LEFT;
   const hasFlyout = !!quarkXml;
   if (hasFlyout) {
-    workspaceOptions.languageTree =
-        toolbox.convertToolboxDefToJson(quarkXml);
+    workspaceOptions.languageTree = toolbox.convertToolboxDefToJson(quarkXml);
   }
   this.workspace_ = new WorkspaceSvg(workspaceOptions);
   this.workspace_.isMutator = true;
@@ -208,8 +196,7 @@ Mutator.prototype.createEditor_ = function() {
   // a top level SVG. Instead of handling scale themselves, mutators
   // inherit scale from the parent workspace.
   // To fix this, scale needs to be applied at a different level in the DOM.
-  const flyoutSvg = hasFlyout ?
-      this.workspace_.addFlyout(Svg.G) : null;
+  const flyoutSvg = hasFlyout ? this.workspace_.addFlyout(Svg.G) : null;
   const background = this.workspace_.createDom('blocklyMutatorBackground');
 
   if (flyoutSvg) {
@@ -258,8 +245,8 @@ Mutator.prototype.resizeBubble_ = function() {
   let height = workspaceSize.height + doubleBorderWidth * 3;
   const flyout = this.workspace_.getFlyout();
   if (flyout) {
-    const flyoutScrollMetrics = flyout.getWorkspace().getMetricsManager()
-        .getScrollMetrics();
+    const flyoutScrollMetrics =
+        flyout.getWorkspace().getMetricsManager().getScrollMetrics();
     height = Math.max(height, flyoutScrollMetrics.height + 20);
     width += flyout.getWidth();
   }
@@ -309,8 +296,8 @@ Mutator.prototype.setVisible = function(visible) {
     // No change.
     return;
   }
-  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
-      this.block_, visible, 'mutator'));
+  Events.fire(
+      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'mutator'));
   if (visible) {
     // Create the bubble.
     this.bubble_ = new Bubble(
@@ -351,8 +338,7 @@ Mutator.prototype.setVisible = function(visible) {
     if (this.block_.saveConnections) {
       const thisMutator = this;
       const mutatorBlock =
-        /** @type {{saveConnections: function(!Block)}} */ (
-          this.block_);
+          /** @type {{saveConnections: function(!Block)}} */ (this.block_);
       mutatorBlock.saveConnections(this.rootBlock_);
       this.sourceListener_ = function() {
         mutatorBlock.saveConnections(thisMutator.rootBlock_);
@@ -388,8 +374,7 @@ Mutator.prototype.setVisible = function(visible) {
  * @private
  */
 Mutator.prototype.workspaceChanged_ = function(e) {
-  if (e.isUiEvent ||
-      (e.type == Events.CHANGE && e.element == 'disabled')) {
+  if (e.isUiEvent || (e.type == Events.CHANGE && e.element == 'disabled')) {
     return;
   }
 

From ccd314279e022002fe4feaa1011e43dd6c66c5de Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:24:43 -0700
Subject: [PATCH 014/291] Migrate core/registry.js to ES6 const/let

---
 core/registry.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 2959cf73e..0ea2883f8 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -139,7 +139,7 @@ Blockly.registry.register = function(
   if (!registryItem) {
     throw Error('Can not register a null value');
   }
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  let typeRegistry = Blockly.registry.typeMap_[type];
   // If the type registry has not been created, create it.
   if (!typeRegistry) {
     typeRegistry = Blockly.registry.typeMap_[type] = Object.create(null);
@@ -184,7 +184,7 @@ Blockly.registry.validate_ = function(type, registryItem) {
 Blockly.registry.unregister = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = Blockly.registry.typeMap_[type];
   if (!typeRegistry || !typeRegistry[name]) {
     console.warn('Unable to unregister [' + name + '][' + type + '] from the ' +
       'registry.');
@@ -208,9 +208,9 @@ Blockly.registry.unregister = function(type, name) {
 Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = Blockly.registry.typeMap_[type];
   if (!typeRegistry || !typeRegistry[name]) {
-    var msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
+    const msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
     if (opt_throwIfMissing) {
       throw new Error(msg + ' You must require or register a ' + type +
         ' plugin.');
@@ -235,7 +235,7 @@ Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
 Blockly.registry.hasItem = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  var typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = Blockly.registry.typeMap_[type];
   if (!typeRegistry) {
     return false;
   }
@@ -286,8 +286,8 @@ Blockly.registry.getObject = function(type, name, opt_throwIfMissing) {
  */
 Blockly.registry.getClassFromOptions = function(type, options,
     opt_throwIfMissing) {
-  var typeName = type.toString();
-  var plugin = options.plugins[typeName] || Blockly.registry.DEFAULT;
+  const typeName = type.toString();
+  const plugin = options.plugins[typeName] || Blockly.registry.DEFAULT;
 
   // If the user passed in a plugin class instead of a registered plugin name.
   if (typeof plugin == 'function') {

From 6ce759d15e02ffbd7bddb5902ccf7dca93d9f7f7 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:40:02 -0700
Subject: [PATCH 015/291] Migrate core/registry.js to goog.module

---
 core/registry.js | 138 +++++++++++++++++++++++++----------------------
 tests/deps.js    |   2 +-
 2 files changed, 75 insertions(+), 65 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 0ea2883f8..9d7d72201 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.registry');
+goog.module('Blockly.registry');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.blockRendering.Renderer');
 goog.requireType('Blockly.Cursor');
@@ -34,13 +35,16 @@ goog.requireType('Blockly.ToolboxItem');
  *
  * @type {Object<string, Object<string, function(new:?)>>}
  */
-Blockly.registry.typeMap_ = Object.create(null);
+const typeMap = Object.create(null);
+/** @private */
+exports.typeMap_ = typeMap;
 
 /**
  * The string used to register the default class for a type of plugin.
  * @type {string}
  */
-Blockly.registry.DEFAULT = 'default';
+const DEFAULT = 'default';
+exports.DEFAULT = DEFAULT;
 
 /**
  * A name with the type of the element stored in the generic.
@@ -48,67 +52,68 @@ Blockly.registry.DEFAULT = 'default';
  * @constructor
  * @template T
  */
-Blockly.registry.Type = function(name) {
+const Type = function(name) {
   /**
    * @type {string}
    * @private
    */
   this.name_ = name;
 };
+exports.Type = Type;
 
 /**
  * Returns the name of the type.
  * @return {string} The name.
  * @override
  */
-Blockly.registry.Type.prototype.toString = function() {
+Type.prototype.toString = function() {
   return this.name_;
 };
 
-/** @type {!Blockly.registry.Type<Blockly.IConnectionChecker>} */
-Blockly.registry.Type.CONNECTION_CHECKER =
-    new Blockly.registry.Type('connectionChecker');
+/** @type {!Type<Blockly.IConnectionChecker>} */
+Type.CONNECTION_CHECKER =
+    new Type('connectionChecker');
 
-/** @type {!Blockly.registry.Type<Blockly.Cursor>} */
-Blockly.registry.Type.CURSOR = new Blockly.registry.Type('cursor');
+/** @type {!Type<Blockly.Cursor>} */
+Type.CURSOR = new Type('cursor');
 
-/** @type {!Blockly.registry.Type<Blockly.Events.Abstract>} */
-Blockly.registry.Type.EVENT = new Blockly.registry.Type('event');
+/** @type {!Type<Blockly.Events.Abstract>} */
+Type.EVENT = new Type('event');
 
-/** @type {!Blockly.registry.Type<Blockly.Field>} */
-Blockly.registry.Type.FIELD = new Blockly.registry.Type('field');
+/** @type {!Type<Blockly.Field>} */
+Type.FIELD = new Type('field');
 
-/** @type {!Blockly.registry.Type<Blockly.blockRendering.Renderer>} */
-Blockly.registry.Type.RENDERER = new Blockly.registry.Type('renderer');
+/** @type {!Type<Blockly.blockRendering.Renderer>} */
+Type.RENDERER = new Type('renderer');
 
-/** @type {!Blockly.registry.Type<Blockly.IToolbox>} */
-Blockly.registry.Type.TOOLBOX = new Blockly.registry.Type('toolbox');
+/** @type {!Type<Blockly.IToolbox>} */
+Type.TOOLBOX = new Type('toolbox');
 
-/** @type {!Blockly.registry.Type<Blockly.Theme>} */
-Blockly.registry.Type.THEME = new Blockly.registry.Type('theme');
+/** @type {!Type<Blockly.Theme>} */
+Type.THEME = new Type('theme');
 
-/** @type {!Blockly.registry.Type<Blockly.ToolboxItem>} */
-Blockly.registry.Type.TOOLBOX_ITEM = new Blockly.registry.Type('toolboxItem');
+/** @type {!Type<Blockly.ToolboxItem>} */
+Type.TOOLBOX_ITEM = new Type('toolboxItem');
 
-/** @type {!Blockly.registry.Type<Blockly.IFlyout>} */
-Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX =
-    new Blockly.registry.Type('flyoutsVerticalToolbox');
+/** @type {!Type<Blockly.IFlyout>} */
+Type.FLYOUTS_VERTICAL_TOOLBOX =
+    new Type('flyoutsVerticalToolbox');
 
-/** @type {!Blockly.registry.Type<Blockly.IFlyout>} */
-Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX =
-    new Blockly.registry.Type('flyoutsHorizontalToolbox');
+/** @type {!Type<Blockly.IFlyout>} */
+Type.FLYOUTS_HORIZONTAL_TOOLBOX =
+    new Type('flyoutsHorizontalToolbox');
 
-/** @type {!Blockly.registry.Type<Blockly.IMetricsManager>} */
-Blockly.registry.Type.METRICS_MANAGER =
-    new Blockly.registry.Type('metricsManager');
+/** @type {!Type<Blockly.IMetricsManager>} */
+Type.METRICS_MANAGER =
+    new Type('metricsManager');
 
-/** @type {!Blockly.registry.Type<Blockly.IBlockDragger>} */
-Blockly.registry.Type.BLOCK_DRAGGER =
-    new Blockly.registry.Type('blockDragger');
+/** @type {!Type<Blockly.IBlockDragger>} */
+Type.BLOCK_DRAGGER =
+    new Type('blockDragger');
 
 /**
  * Registers a class based on a type and name.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @param {?function(new:T, ...?)|Object} registryItem The class or object to
@@ -120,13 +125,13 @@ Blockly.registry.Type.BLOCK_DRAGGER =
  * it's type.
  * @template T
  */
-Blockly.registry.register = function(
+const register = function(
     type, name, registryItem, opt_allowOverrides) {
-  if ((!(type instanceof Blockly.registry.Type) && typeof type != 'string') ||
+  if ((!(type instanceof Type) && typeof type != 'string') ||
       String(type).trim() == '') {
     throw Error(
         'Invalid type "' + type + '". The type must be a' +
-        ' non-empty string or a Blockly.registry.Type.');
+        ' non-empty string or a Type.');
   }
   type = String(type).toLowerCase();
 
@@ -139,14 +144,14 @@ Blockly.registry.register = function(
   if (!registryItem) {
     throw Error('Can not register a null value');
   }
-  let typeRegistry = Blockly.registry.typeMap_[type];
+  let typeRegistry = typeMap[type];
   // If the type registry has not been created, create it.
   if (!typeRegistry) {
-    typeRegistry = Blockly.registry.typeMap_[type] = Object.create(null);
+    typeRegistry = typeMap[type] = Object.create(null);
   }
 
   // Validate that the given class has all the required properties.
-  Blockly.registry.validate_(type, registryItem);
+  validate(type, registryItem);
 
   // Don't throw an error if opt_allowOverrides is true.
   if (!opt_allowOverrides && typeRegistry[name]) {
@@ -155,6 +160,7 @@ Blockly.registry.register = function(
   }
   typeRegistry[name] = registryItem;
 };
+exports.register = register;
 
 /**
  * Checks the given registry item for properties that are required based on the
@@ -162,11 +168,10 @@ Blockly.registry.register = function(
  * @param {string} type The type of the plugin. (e.g. Field, Renderer)
  * @param {Function|Object} registryItem A class or object that we are checking
  *     for the required properties.
- * @private
  */
-Blockly.registry.validate_ = function(type, registryItem) {
+const validate = function(type, registryItem) {
   switch (type) {
-    case String(Blockly.registry.Type.FIELD):
+    case String(Type.FIELD):
       if (typeof registryItem.fromJson != 'function') {
         throw Error('Type "' + type + '" must have a fromJson function');
       }
@@ -176,27 +181,28 @@ Blockly.registry.validate_ = function(type, registryItem) {
 
 /**
  * Unregisters the registry item with the given type and name.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @template T
  */
-Blockly.registry.unregister = function(type, name) {
+const unregister = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  const typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = typeMap[type];
   if (!typeRegistry || !typeRegistry[name]) {
     console.warn('Unable to unregister [' + name + '][' + type + '] from the ' +
       'registry.');
     return;
   }
-  delete Blockly.registry.typeMap_[type][name];
+  delete typeMap[type][name];
 };
+exports.unregister = unregister;
 
 /**
  * Gets the registry item for the given name and type. This can be either a
  * class or an object.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -205,10 +211,10 @@ Blockly.registry.unregister = function(type, name) {
  *     name and type or null if none exists.
  * @template T
  */
-Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
+const getItem = function(type, name, opt_throwIfMissing) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  const typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = typeMap[type];
   if (!typeRegistry || !typeRegistry[name]) {
     const msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
     if (opt_throwIfMissing) {
@@ -225,26 +231,27 @@ Blockly.registry.getItem_ = function(type, name, opt_throwIfMissing) {
 /**
  * Returns whether or not the registry contains an item with the given type and
  * name.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @return {boolean} True if the registry has an item with the given type and
  *     name, false otherwise.
  * @template T
  */
-Blockly.registry.hasItem = function(type, name) {
+const hasItem = function(type, name) {
   type = String(type).toLowerCase();
   name = name.toLowerCase();
-  const typeRegistry = Blockly.registry.typeMap_[type];
+  const typeRegistry = typeMap[type];
   if (!typeRegistry) {
     return false;
   }
   return !!(typeRegistry[name]);
 };
+exports.hasItem = hasItem;
 
 /**
  * Gets the class for the given name and type.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Field, Renderer)
  * @param {string} name The plugin's name. (Ex. field_angle, geras)
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -253,14 +260,15 @@ Blockly.registry.hasItem = function(type, name) {
  *     null if none exists.
  * @template T
  */
-Blockly.registry.getClass = function(type, name, opt_throwIfMissing) {
+const getClass = function(type, name, opt_throwIfMissing) {
   return /** @type {?function(new:T, ...?)} */ (
-    Blockly.registry.getItem_(type, name, opt_throwIfMissing));
+    getItem(type, name, opt_throwIfMissing));
 };
+exports.getClass = getClass;
 
 /**
  * Gets the object for the given name and type.
- * @param {string|!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {string|!Type<T>} type The type of the plugin.
  *     (e.g. Category)
  * @param {string} name The plugin's name. (Ex. logic_category)
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -268,15 +276,16 @@ Blockly.registry.getClass = function(type, name, opt_throwIfMissing) {
  * @return {?T} The object with the given name and type or null if none exists.
  * @template T
  */
-Blockly.registry.getObject = function(type, name, opt_throwIfMissing) {
+const getObject = function(type, name, opt_throwIfMissing) {
   return /** @type {T} */ (
-    Blockly.registry.getItem_(type, name, opt_throwIfMissing));
+    getItem(type, name, opt_throwIfMissing));
 };
+exports.getObject = getObject;
 
 /**
  * Gets the class from Blockly options for the given type.
  * This is used for plugins that override a built in feature. (e.g. Toolbox)
- * @param {!Blockly.registry.Type<T>} type The type of the plugin.
+ * @param {!Type<T>} type The type of the plugin.
  * @param {!Blockly.Options} options The option object to check for the given
  *     plugin.
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
@@ -284,14 +293,15 @@ Blockly.registry.getObject = function(type, name, opt_throwIfMissing) {
  * @return {?function(new:T, ...?)} The class for the plugin.
  * @template T
  */
-Blockly.registry.getClassFromOptions = function(type, options,
+const getClassFromOptions = function(type, options,
     opt_throwIfMissing) {
   const typeName = type.toString();
-  const plugin = options.plugins[typeName] || Blockly.registry.DEFAULT;
+  const plugin = options.plugins[typeName] || DEFAULT;
 
   // If the user passed in a plugin class instead of a registered plugin name.
   if (typeof plugin == 'function') {
     return plugin;
   }
-  return Blockly.registry.getClass(type, plugin, opt_throwIfMissing);
+  return getClass(type, plugin, opt_throwIfMissing);
 };
+exports.getClassFromOptions = getClassFromOptions;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..93d8ee6a0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -117,7 +117,7 @@ goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Bl
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
-goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
+goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});

From 6c40e05dc83973d108a4baf1b7997745b8b81140 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:46:35 -0700
Subject: [PATCH 016/291] Migrate core/registry.js to named requires

---
 core/registry.js | 62 +++++++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 9d7d72201..8c29a6e3e 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -14,18 +14,30 @@
 goog.module('Blockly.registry');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.blockRendering.Renderer');
-goog.requireType('Blockly.Cursor');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IBlockDragger');
-goog.requireType('Blockly.IConnectionChecker');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.IMetricsManager');
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.Options');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.ToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Cursor = goog.requireType('Blockly.Cursor');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const IBlockDragger = goog.requireType('Blockly.IBlockDragger');
+/* eslint-disable-next-line no-unused-vars */
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
+/* eslint-disable-next-line no-unused-vars */
+const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+const IMetricsManager = goog.requireType('Blockly.IMetricsManager');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
+const Options = goog.requireType('Blockly.Options');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const ToolboxItem = goog.requireType('Blockly.ToolboxItem');
 
 
 /**
@@ -70,44 +82,44 @@ Type.prototype.toString = function() {
   return this.name_;
 };
 
-/** @type {!Type<Blockly.IConnectionChecker>} */
+/** @type {!Type<IConnectionChecker>} */
 Type.CONNECTION_CHECKER =
     new Type('connectionChecker');
 
-/** @type {!Type<Blockly.Cursor>} */
+/** @type {!Type<Cursor>} */
 Type.CURSOR = new Type('cursor');
 
-/** @type {!Type<Blockly.Events.Abstract>} */
+/** @type {!Type<Abstract>} */
 Type.EVENT = new Type('event');
 
-/** @type {!Type<Blockly.Field>} */
+/** @type {!Type<Field>} */
 Type.FIELD = new Type('field');
 
-/** @type {!Type<Blockly.blockRendering.Renderer>} */
+/** @type {!Type<Renderer>} */
 Type.RENDERER = new Type('renderer');
 
-/** @type {!Type<Blockly.IToolbox>} */
+/** @type {!Type<IToolbox>} */
 Type.TOOLBOX = new Type('toolbox');
 
-/** @type {!Type<Blockly.Theme>} */
+/** @type {!Type<Theme>} */
 Type.THEME = new Type('theme');
 
-/** @type {!Type<Blockly.ToolboxItem>} */
+/** @type {!Type<ToolboxItem>} */
 Type.TOOLBOX_ITEM = new Type('toolboxItem');
 
-/** @type {!Type<Blockly.IFlyout>} */
+/** @type {!Type<IFlyout>} */
 Type.FLYOUTS_VERTICAL_TOOLBOX =
     new Type('flyoutsVerticalToolbox');
 
-/** @type {!Type<Blockly.IFlyout>} */
+/** @type {!Type<IFlyout>} */
 Type.FLYOUTS_HORIZONTAL_TOOLBOX =
     new Type('flyoutsHorizontalToolbox');
 
-/** @type {!Type<Blockly.IMetricsManager>} */
+/** @type {!Type<IMetricsManager>} */
 Type.METRICS_MANAGER =
     new Type('metricsManager');
 
-/** @type {!Type<Blockly.IBlockDragger>} */
+/** @type {!Type<IBlockDragger>} */
 Type.BLOCK_DRAGGER =
     new Type('blockDragger');
 
@@ -286,7 +298,7 @@ exports.getObject = getObject;
  * Gets the class from Blockly options for the given type.
  * This is used for plugins that override a built in feature. (e.g. Toolbox)
  * @param {!Type<T>} type The type of the plugin.
- * @param {!Blockly.Options} options The option object to check for the given
+ * @param {!Options} options The option object to check for the given
  *     plugin.
  * @param {boolean=} opt_throwIfMissing Whether or not to throw an error if we
  *     are unable to find the plugin.

From e0efd4cf29293dd5ee348ccde3674c171be8905a Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:47:06 -0700
Subject: [PATCH 017/291] clang-format core/registry.js

---
 core/registry.js | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/core/registry.js b/core/registry.js
index 8c29a6e3e..1be9b2a2b 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -83,8 +83,7 @@ Type.prototype.toString = function() {
 };
 
 /** @type {!Type<IConnectionChecker>} */
-Type.CONNECTION_CHECKER =
-    new Type('connectionChecker');
+Type.CONNECTION_CHECKER = new Type('connectionChecker');
 
 /** @type {!Type<Cursor>} */
 Type.CURSOR = new Type('cursor');
@@ -108,20 +107,16 @@ Type.THEME = new Type('theme');
 Type.TOOLBOX_ITEM = new Type('toolboxItem');
 
 /** @type {!Type<IFlyout>} */
-Type.FLYOUTS_VERTICAL_TOOLBOX =
-    new Type('flyoutsVerticalToolbox');
+Type.FLYOUTS_VERTICAL_TOOLBOX = new Type('flyoutsVerticalToolbox');
 
 /** @type {!Type<IFlyout>} */
-Type.FLYOUTS_HORIZONTAL_TOOLBOX =
-    new Type('flyoutsHorizontalToolbox');
+Type.FLYOUTS_HORIZONTAL_TOOLBOX = new Type('flyoutsHorizontalToolbox');
 
 /** @type {!Type<IMetricsManager>} */
-Type.METRICS_MANAGER =
-    new Type('metricsManager');
+Type.METRICS_MANAGER = new Type('metricsManager');
 
 /** @type {!Type<IBlockDragger>} */
-Type.BLOCK_DRAGGER =
-    new Type('blockDragger');
+Type.BLOCK_DRAGGER = new Type('blockDragger');
 
 /**
  * Registers a class based on a type and name.
@@ -137,8 +132,7 @@ Type.BLOCK_DRAGGER =
  * it's type.
  * @template T
  */
-const register = function(
-    type, name, registryItem, opt_allowOverrides) {
+const register = function(type, name, registryItem, opt_allowOverrides) {
   if ((!(type instanceof Type) && typeof type != 'string') ||
       String(type).trim() == '') {
     throw Error(
@@ -203,8 +197,9 @@ const unregister = function(type, name) {
   name = name.toLowerCase();
   const typeRegistry = typeMap[type];
   if (!typeRegistry || !typeRegistry[name]) {
-    console.warn('Unable to unregister [' + name + '][' + type + '] from the ' +
-      'registry.');
+    console.warn(
+        'Unable to unregister [' + name + '][' + type + '] from the ' +
+        'registry.');
     return;
   }
   delete typeMap[type][name];
@@ -230,8 +225,8 @@ const getItem = function(type, name, opt_throwIfMissing) {
   if (!typeRegistry || !typeRegistry[name]) {
     const msg = 'Unable to find [' + name + '][' + type + '] in the registry.';
     if (opt_throwIfMissing) {
-      throw new Error(msg + ' You must require or register a ' + type +
-        ' plugin.');
+      throw new Error(
+          msg + ' You must require or register a ' + type + ' plugin.');
     } else {
       console.warn(msg);
     }
@@ -274,7 +269,7 @@ exports.hasItem = hasItem;
  */
 const getClass = function(type, name, opt_throwIfMissing) {
   return /** @type {?function(new:T, ...?)} */ (
-    getItem(type, name, opt_throwIfMissing));
+      getItem(type, name, opt_throwIfMissing));
 };
 exports.getClass = getClass;
 
@@ -289,8 +284,7 @@ exports.getClass = getClass;
  * @template T
  */
 const getObject = function(type, name, opt_throwIfMissing) {
-  return /** @type {T} */ (
-    getItem(type, name, opt_throwIfMissing));
+  return /** @type {T} */ (getItem(type, name, opt_throwIfMissing));
 };
 exports.getObject = getObject;
 
@@ -305,8 +299,7 @@ exports.getObject = getObject;
  * @return {?function(new:T, ...?)} The class for the plugin.
  * @template T
  */
-const getClassFromOptions = function(type, options,
-    opt_throwIfMissing) {
+const getClassFromOptions = function(type, options, opt_throwIfMissing) {
   const typeName = type.toString();
   const plugin = options.plugins[typeName] || DEFAULT;
 

From d5f729e636b2c318b820b79afceabcfbfc74e1d1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:56:57 -0700
Subject: [PATCH 018/291] Migrate core/rendered_connection.js to ES6 const/let

---
 core/rendered_connection.js | 88 ++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index cddda9200..11c7a9a6d 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -135,8 +135,8 @@ Blockly.RenderedConnection.prototype.targetBlock = function() {
  * @return {number} The distance between connections, in workspace units.
  */
 Blockly.RenderedConnection.prototype.distanceFrom = function(otherConnection) {
-  var xDiff = this.x - otherConnection.x;
-  var yDiff = this.y - otherConnection.y;
+  const xDiff = this.x - otherConnection.x;
+  const yDiff = this.y - otherConnection.y;
   return Math.sqrt(xDiff * xDiff + yDiff * yDiff);
 };
 
@@ -153,12 +153,12 @@ Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
     return;
   }
   // Move the root block.
-  var rootBlock = this.sourceBlock_.getRootBlock();
+  let rootBlock = this.sourceBlock_.getRootBlock();
   if (rootBlock.isInFlyout) {
     // Don't move blocks around in a flyout.
     return;
   }
-  var reverse = false;
+  let reverse = false;
   if (!rootBlock.isMovable()) {
     // Can't bump an uneditable block away.
     // Check to see if the other block is movable.
@@ -171,13 +171,13 @@ Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
     reverse = true;
   }
   // Raise it to the top for extra visibility.
-  var selected = Blockly.selected == rootBlock;
+  const selected = Blockly.selected == rootBlock;
   selected || rootBlock.addSelect();
-  var dx =
+  let dx =
       (staticConnection.x + Blockly.internalConstants.SNAP_RADIUS +
        Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
       this.x;
-  var dy =
+  let dy =
       (staticConnection.y + Blockly.internalConstants.SNAP_RADIUS +
        Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
       this.y;
@@ -257,16 +257,16 @@ Blockly.RenderedConnection.prototype.getOffsetInBlock = function() {
  * @package
  */
 Blockly.RenderedConnection.prototype.tighten = function() {
-  var dx = this.targetConnection.x - this.x;
-  var dy = this.targetConnection.y - this.y;
+  const dx = this.targetConnection.x - this.x;
+  const dy = this.targetConnection.y - this.y;
   if (dx != 0 || dy != 0) {
-    var block = this.targetBlock();
-    var svgRoot = block.getSvgRoot();
+    const block = this.targetBlock();
+    const svgRoot = block.getSvgRoot();
     if (!svgRoot) {
       throw Error('block is not rendered.');
     }
     // Workspace coordinates.
-    var xy = Blockly.utils.getRelativeXY(svgRoot);
+    const xy = Blockly.utils.getRelativeXY(svgRoot);
     block.getSvgRoot().setAttribute('transform',
         'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
     block.moveConnections(-dx, -dy);
@@ -291,20 +291,20 @@ Blockly.RenderedConnection.prototype.closest = function(maxLimit, dxy) {
  * Add highlighting around this connection.
  */
 Blockly.RenderedConnection.prototype.highlight = function() {
-  var steps;
-  var sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
-  var renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
-  var shape = renderConstants.shapeFor(this);
+  let steps;
+  const sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
+  const renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
+  const shape = renderConstants.shapeFor(this);
   if (this.type == Blockly.connectionTypes.INPUT_VALUE ||
       this.type == Blockly.connectionTypes.OUTPUT_VALUE) {
     // Vertical line, puzzle tab, vertical line.
-    var yLen = renderConstants.TAB_OFFSET_FROM_TOP;
+    const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
     steps = Blockly.utils.svgPaths.moveBy(0, -yLen) +
         Blockly.utils.svgPaths.lineOnAxis('v', yLen) +
         shape.pathDown +
         Blockly.utils.svgPaths.lineOnAxis('v', yLen);
   } else {
-    var xLen =
+    const xLen =
         renderConstants.NOTCH_OFFSET_LEFT - renderConstants.CORNER_RADIUS;
     // Horizontal line, notch, horizontal line.
     steps = Blockly.utils.svgPaths.moveBy(-xLen, 0) +
@@ -312,9 +312,9 @@ Blockly.RenderedConnection.prototype.highlight = function() {
         shape.pathLeft +
         Blockly.utils.svgPaths.lineOnAxis('h', xLen);
   }
-  var xy = this.sourceBlock_.getRelativeToSurfaceXY();
-  var x = this.x - xy.x;
-  var y = this.y - xy.y;
+  const xy = this.sourceBlock_.getRelativeToSurfaceXY();
+  const x = this.x - xy.x;
+  const y = this.y - xy.y;
   Blockly.Connection.highlightedPath_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.PATH,
       {
@@ -372,17 +372,17 @@ Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
 Blockly.RenderedConnection.prototype.stopTrackingAll = function() {
   this.setTracking(false);
   if (this.targetConnection) {
-    var blocks = this.targetBlock().getDescendants(false);
-    for (var i = 0; i < blocks.length; i++) {
-      var block = blocks[i];
+    const blocks = this.targetBlock().getDescendants(false);
+    for (let i = 0; i < blocks.length; i++) {
+      const block = blocks[i];
       // Stop tracking connections of all children.
-      var connections = block.getConnections_(true);
-      for (var j = 0; j < connections.length; j++) {
+      const connections = block.getConnections_(true);
+      for (let j = 0; j < connections.length; j++) {
         connections[j].setTracking(false);
       }
       // Close all bubbles of all children.
-      var icons = block.getIcons();
-      for (var j = 0; j < icons.length; j++) {
+      const icons = block.getIcons();
+      for (let j = 0; j < icons.length; j++) {
         icons[j].setVisible(false);
       }
     }
@@ -400,15 +400,15 @@ Blockly.RenderedConnection.prototype.startTrackingAll = function() {
   // rendering takes place, since rendering requires knowing the dimensions
   // of lower blocks. Also, since rendering a block renders all its parents,
   // we only need to render the leaf nodes.
-  var renderList = [];
+  const renderList = [];
   if (this.type != Blockly.connectionTypes.INPUT_VALUE &&
       this.type != Blockly.connectionTypes.NEXT_STATEMENT) {
     // Only spider down.
     return renderList;
   }
-  var block = this.targetBlock();
+  const block = this.targetBlock();
   if (block) {
-    var connections;
+    let connections;
     if (block.isCollapsed()) {
       // This block should only be partially revealed since it is collapsed.
       connections = [];
@@ -419,7 +419,7 @@ Blockly.RenderedConnection.prototype.startTrackingAll = function() {
       // Show all connections of this block.
       connections = block.getConnections_(true);
     }
-    for (var i = 0; i < connections.length; i++) {
+    for (let i = 0; i < connections.length; i++) {
       renderList.push.apply(renderList, connections[i].startTrackingAll());
     }
     if (!renderList.length) {
@@ -463,9 +463,9 @@ Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  */
 Blockly.RenderedConnection.prototype.onFailedConnect =
     function(otherConnection) {
-      var block = this.getSourceBlock();
+      const block = this.getSourceBlock();
       if (Blockly.Events.recordUndo) {
-        var group = Blockly.Events.getGroup();
+        const group = Blockly.Events.getGroup();
         setTimeout(function() {
           if (!block.isDisposed() && !block.getParent()) {
             Blockly.Events.setGroup(group);
@@ -508,7 +508,7 @@ Blockly.RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
  */
 Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
   Blockly.RenderedConnection.superClass_.respawnShadow_.call(this);
-  var blockShadow = this.targetBlock();
+  const blockShadow = this.targetBlock();
   if (!blockShadow) {
     // This connection must not have a shadowDom_.
     return;
@@ -516,7 +516,7 @@ Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
   blockShadow.initSvg();
   blockShadow.render(false);
 
-  var parentBlock = this.getSourceBlock();
+  const parentBlock = this.getSourceBlock();
   if (parentBlock.rendered) {
     parentBlock.render();
   }
@@ -543,11 +543,11 @@ Blockly.RenderedConnection.prototype.neighbours = function(maxLimit) {
 Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
   Blockly.RenderedConnection.superClass_.connect_.call(this, childConnection);
 
-  var parentConnection = this;
-  var parentBlock = parentConnection.getSourceBlock();
-  var childBlock = childConnection.getSourceBlock();
-  var parentRendered = parentBlock.rendered;
-  var childRendered = childBlock.rendered;
+  const parentConnection = this;
+  const parentBlock = parentConnection.getSourceBlock();
+  const childBlock = childConnection.getSourceBlock();
+  const parentRendered = parentBlock.rendered;
+  const childRendered = childBlock.rendered;
 
   if (parentRendered) {
     parentBlock.updateDisabled();
@@ -569,9 +569,9 @@ Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
   }
 
   // The input the child block is connected to (if any).
-  var parentInput = parentBlock.getInputWithBlock(childBlock);
+  const parentInput = parentBlock.getInputWithBlock(childBlock);
   if (parentInput) {
-    var visible = parentInput.isVisible();
+    const visible = parentInput.isVisible();
     childBlock.getSvgRoot().style.display = visible ? 'block' : 'none';
   }
 };
@@ -585,7 +585,7 @@ Blockly.RenderedConnection.prototype.onCheckChanged_ = function() {
   if (this.isConnected() && (!this.targetConnection ||
       !this.getConnectionChecker().canConnect(
           this, this.targetConnection, false))) {
-    var child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
+    const child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
     child.unplug();
     // Bump away.
     this.sourceBlock_.bumpNeighbours();

From 07b2e07ba88903ff385ebdc595c59f9eab9f9a95 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 09:59:41 -0700
Subject: [PATCH 019/291] Migrate core/rendered_connection.js to goog.module

---
 core/rendered_connection.js | 99 +++++++++++++++++++------------------
 tests/deps.js               |  2 +-
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 11c7a9a6d..a4d265746 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.RenderedConnection');
+goog.module('Blockly.RenderedConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Connection');
 goog.require('Blockly.connectionTypes');
@@ -34,8 +35,8 @@ goog.requireType('Blockly.ConnectionDB');
  * @extends {Blockly.Connection}
  * @constructor
  */
-Blockly.RenderedConnection = function(source, type) {
-  Blockly.RenderedConnection.superClass_.constructor.call(this, source, type);
+const RenderedConnection = function(source, type) {
+  RenderedConnection.superClass_.constructor.call(this, source, type);
 
   /**
    * Connection database for connections of this type on the current workspace.
@@ -63,18 +64,18 @@ Blockly.RenderedConnection = function(source, type) {
 
   /**
    * Describes the state of this connection's tracked-ness.
-   * @type {Blockly.RenderedConnection.TrackedState}
+   * @type {RenderedConnection.TrackedState}
    * @private
    */
-  this.trackedState_ = Blockly.RenderedConnection.TrackedState.WILL_TRACK;
+  this.trackedState_ = RenderedConnection.TrackedState.WILL_TRACK;
 
   /**
    * Connection this connection connects to.  Null if not connected.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    */
   this.targetConnection = null;
 };
-Blockly.utils.object.inherits(Blockly.RenderedConnection, Blockly.Connection);
+Blockly.utils.object.inherits(RenderedConnection, Blockly.Connection);
 
 /**
  * Enum for different kinds of tracked states.
@@ -88,7 +89,7 @@ Blockly.utils.object.inherits(Blockly.RenderedConnection, Blockly.Connection);
  * TRACKED means that this connection is currently being tracked.
  * @enum {number}
  */
-Blockly.RenderedConnection.TrackedState = {
+RenderedConnection.TrackedState = {
   WILL_TRACK: -1,
   UNTRACKED: 0,
   TRACKED: 1
@@ -100,9 +101,9 @@ Blockly.RenderedConnection.TrackedState = {
  * @override
  * @package
  */
-Blockly.RenderedConnection.prototype.dispose = function() {
-  Blockly.RenderedConnection.superClass_.dispose.call(this);
-  if (this.trackedState_ == Blockly.RenderedConnection.TrackedState.TRACKED) {
+RenderedConnection.prototype.dispose = function() {
+  RenderedConnection.superClass_.dispose.call(this);
+  if (this.trackedState_ == RenderedConnection.TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
   }
 };
@@ -112,9 +113,9 @@ Blockly.RenderedConnection.prototype.dispose = function() {
  * @return {!Blockly.BlockSvg} The source block.
  * @override
  */
-Blockly.RenderedConnection.prototype.getSourceBlock = function() {
+RenderedConnection.prototype.getSourceBlock = function() {
   return /** @type {!Blockly.BlockSvg} */ (
-    Blockly.RenderedConnection.superClass_.getSourceBlock.call(this));
+    RenderedConnection.superClass_.getSourceBlock.call(this));
 };
 
 /**
@@ -122,9 +123,9 @@ Blockly.RenderedConnection.prototype.getSourceBlock = function() {
  * @return {?Blockly.BlockSvg} The connected block or null if none is connected.
  * @override
  */
-Blockly.RenderedConnection.prototype.targetBlock = function() {
+RenderedConnection.prototype.targetBlock = function() {
   return /** @type {Blockly.BlockSvg} */ (
-    Blockly.RenderedConnection.superClass_.targetBlock.call(this));
+    RenderedConnection.superClass_.targetBlock.call(this));
 };
 
 /**
@@ -134,7 +135,7 @@ Blockly.RenderedConnection.prototype.targetBlock = function() {
  *     the distance to.
  * @return {number} The distance between connections, in workspace units.
  */
-Blockly.RenderedConnection.prototype.distanceFrom = function(otherConnection) {
+RenderedConnection.prototype.distanceFrom = function(otherConnection) {
   const xDiff = this.x - otherConnection.x;
   const yDiff = this.y - otherConnection.y;
   return Math.sqrt(xDiff * xDiff + yDiff * yDiff);
@@ -147,7 +148,7 @@ Blockly.RenderedConnection.prototype.distanceFrom = function(otherConnection) {
  *     from.
  * @package
  */
-Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
+RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   if (this.sourceBlock_.workspace.isDragging()) {
     // Don't move blocks around while the user is doing the same.
     return;
@@ -200,11 +201,11 @@ Blockly.RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
  * @param {number} x New absolute x coordinate, in workspace coordinates.
  * @param {number} y New absolute y coordinate, in workspace coordinates.
  */
-Blockly.RenderedConnection.prototype.moveTo = function(x, y) {
-  if (this.trackedState_ == Blockly.RenderedConnection.TrackedState.WILL_TRACK) {
+RenderedConnection.prototype.moveTo = function(x, y) {
+  if (this.trackedState_ == RenderedConnection.TrackedState.WILL_TRACK) {
     this.db_.addConnection(this, y);
-    this.trackedState_ = Blockly.RenderedConnection.TrackedState.TRACKED;
-  } else if (this.trackedState_ == Blockly.RenderedConnection
+    this.trackedState_ = RenderedConnection.TrackedState.TRACKED;
+  } else if (this.trackedState_ == RenderedConnection
       .TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
     this.db_.addConnection(this, y);
@@ -218,7 +219,7 @@ Blockly.RenderedConnection.prototype.moveTo = function(x, y) {
  * @param {number} dx Change to x coordinate, in workspace units.
  * @param {number} dy Change to y coordinate, in workspace units.
  */
-Blockly.RenderedConnection.prototype.moveBy = function(dx, dy) {
+RenderedConnection.prototype.moveBy = function(dx, dy) {
   this.moveTo(this.x + dx, this.y + dy);
 };
 
@@ -228,7 +229,7 @@ Blockly.RenderedConnection.prototype.moveBy = function(dx, dy) {
  * @param {!Blockly.utils.Coordinate} blockTL The location of the top left
  *     corner of the block, in workspace coordinates.
  */
-Blockly.RenderedConnection.prototype.moveToOffset = function(blockTL) {
+RenderedConnection.prototype.moveToOffset = function(blockTL) {
   this.moveTo(blockTL.x + this.offsetInBlock_.x,
       blockTL.y + this.offsetInBlock_.y);
 };
@@ -238,7 +239,7 @@ Blockly.RenderedConnection.prototype.moveToOffset = function(blockTL) {
  * @param {number} x The new relative x, in workspace units.
  * @param {number} y The new relative y, in workspace units.
  */
-Blockly.RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
+RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
   this.offsetInBlock_.x = x;
   this.offsetInBlock_.y = y;
 };
@@ -248,7 +249,7 @@ Blockly.RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
  * @return {!Blockly.utils.Coordinate} The offset of the connection.
  * @package
  */
-Blockly.RenderedConnection.prototype.getOffsetInBlock = function() {
+RenderedConnection.prototype.getOffsetInBlock = function() {
   return this.offsetInBlock_;
 };
 
@@ -256,7 +257,7 @@ Blockly.RenderedConnection.prototype.getOffsetInBlock = function() {
  * Move the blocks on either side of this connection right next to each other.
  * @package
  */
-Blockly.RenderedConnection.prototype.tighten = function() {
+RenderedConnection.prototype.tighten = function() {
   const dx = this.targetConnection.x - this.x;
   const dy = this.targetConnection.y - this.y;
   if (dx != 0 || dy != 0) {
@@ -283,14 +284,14 @@ Blockly.RenderedConnection.prototype.tighten = function() {
  *     properties: 'connection' which is either another connection or null,
  *     and 'radius' which is the distance.
  */
-Blockly.RenderedConnection.prototype.closest = function(maxLimit, dxy) {
+RenderedConnection.prototype.closest = function(maxLimit, dxy) {
   return this.dbOpposite_.searchForClosest(this, maxLimit, dxy);
 };
 
 /**
  * Add highlighting around this connection.
  */
-Blockly.RenderedConnection.prototype.highlight = function() {
+RenderedConnection.prototype.highlight = function() {
   let steps;
   const sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
   const renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
@@ -329,7 +330,7 @@ Blockly.RenderedConnection.prototype.highlight = function() {
 /**
  * Remove the highlighting around this connection.
  */
-Blockly.RenderedConnection.prototype.unhighlight = function() {
+RenderedConnection.prototype.unhighlight = function() {
   Blockly.utils.dom.removeNode(Blockly.Connection.highlightedPath_);
   delete Blockly.Connection.highlightedPath_;
 };
@@ -339,11 +340,11 @@ Blockly.RenderedConnection.prototype.unhighlight = function() {
  * @param {boolean} doTracking If true, start tracking. If false, stop tracking.
  * @package
  */
-Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
+RenderedConnection.prototype.setTracking = function(doTracking) {
   if ((doTracking && this.trackedState_ ==
-      Blockly.RenderedConnection.TrackedState.TRACKED) ||
+      RenderedConnection.TrackedState.TRACKED) ||
       (!doTracking && this.trackedState_ ==
-      Blockly.RenderedConnection.TrackedState.UNTRACKED)) {
+      RenderedConnection.TrackedState.UNTRACKED)) {
     return;
   }
   if (this.sourceBlock_.isInFlyout) {
@@ -352,13 +353,13 @@ Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
   }
   if (doTracking) {
     this.db_.addConnection(this, this.y);
-    this.trackedState_ = Blockly.RenderedConnection.TrackedState.TRACKED;
+    this.trackedState_ = RenderedConnection.TrackedState.TRACKED;
     return;
   }
-  if (this.trackedState_ == Blockly.RenderedConnection.TrackedState.TRACKED) {
+  if (this.trackedState_ == RenderedConnection.TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
   }
-  this.trackedState_ = Blockly.RenderedConnection.TrackedState.UNTRACKED;
+  this.trackedState_ = RenderedConnection.TrackedState.UNTRACKED;
 };
 
 /**
@@ -369,7 +370,7 @@ Blockly.RenderedConnection.prototype.setTracking = function(doTracking) {
  * Also closes down-stream icons/bubbles.
  * @package
  */
-Blockly.RenderedConnection.prototype.stopTrackingAll = function() {
+RenderedConnection.prototype.stopTrackingAll = function() {
   this.setTracking(false);
   if (this.targetConnection) {
     const blocks = this.targetBlock().getDescendants(false);
@@ -394,7 +395,7 @@ Blockly.RenderedConnection.prototype.stopTrackingAll = function() {
  * any block attached to this connection. This happens when a block is expanded.
  * @return {!Array<!Blockly.Block>} List of blocks to render.
  */
-Blockly.RenderedConnection.prototype.startTrackingAll = function() {
+RenderedConnection.prototype.startTrackingAll = function() {
   this.setTracking(true);
   // All blocks that are not tracked must start tracking before any
   // rendering takes place, since rendering requires knowing the dimensions
@@ -438,7 +439,7 @@ Blockly.RenderedConnection.prototype.startTrackingAll = function() {
  * @return {boolean} True if the connection is allowed, false otherwise.
  * @deprecated July 2020
  */
-Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
+RenderedConnection.prototype.isConnectionAllowed = function(candidate,
     maxRadius) {
   Blockly.utils.deprecation.warn(
       'RenderedConnection.prototype.isConnectionAllowed',
@@ -449,7 +450,7 @@ Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
     return false;
   }
 
-  return Blockly.RenderedConnection.superClass_.isConnectionAllowed.call(this,
+  return RenderedConnection.superClass_.isConnectionAllowed.call(this,
       candidate);
 };
 
@@ -461,7 +462,7 @@ Blockly.RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  *     failed to connect to.
  * @package
  */
-Blockly.RenderedConnection.prototype.onFailedConnect =
+RenderedConnection.prototype.onFailedConnect =
     function(otherConnection) {
       const block = this.getSourceBlock();
       if (Blockly.Events.recordUndo) {
@@ -484,9 +485,9 @@ Blockly.RenderedConnection.prototype.onFailedConnect =
  * @protected
  * @override
  */
-Blockly.RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
+RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
     childBlock) {
-  Blockly.RenderedConnection.superClass_.disconnectInternal_.call(this,
+  RenderedConnection.superClass_.disconnectInternal_.call(this,
       parentBlock, childBlock);
   // Rerender the parent so that it may reflow.
   if (parentBlock.rendered) {
@@ -506,8 +507,8 @@ Blockly.RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
  * @protected
  * @override
  */
-Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
-  Blockly.RenderedConnection.superClass_.respawnShadow_.call(this);
+RenderedConnection.prototype.respawnShadow_ = function() {
+  RenderedConnection.superClass_.respawnShadow_.call(this);
   const blockShadow = this.targetBlock();
   if (!blockShadow) {
     // This connection must not have a shadowDom_.
@@ -530,7 +531,7 @@ Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
  * @return {!Array<!Blockly.Connection>} List of connections.
  * @package
  */
-Blockly.RenderedConnection.prototype.neighbours = function(maxLimit) {
+RenderedConnection.prototype.neighbours = function(maxLimit) {
   return this.dbOpposite_.getNeighbours(this, maxLimit);
 };
 
@@ -540,8 +541,8 @@ Blockly.RenderedConnection.prototype.neighbours = function(maxLimit) {
  * @param {!Blockly.Connection} childConnection Connection on inferior block.
  * @protected
  */
-Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
-  Blockly.RenderedConnection.superClass_.connect_.call(this, childConnection);
+RenderedConnection.prototype.connect_ = function(childConnection) {
+  RenderedConnection.superClass_.connect_.call(this, childConnection);
 
   const parentConnection = this;
   const parentBlock = parentConnection.getSourceBlock();
@@ -580,7 +581,7 @@ Blockly.RenderedConnection.prototype.connect_ = function(childConnection) {
  * Function to be called when this connection's compatible types have changed.
  * @protected
  */
-Blockly.RenderedConnection.prototype.onCheckChanged_ = function() {
+RenderedConnection.prototype.onCheckChanged_ = function() {
   // The new value type may not be compatible with the existing connection.
   if (this.isConnected() && (!this.targetConnection ||
       !this.getConnectionChecker().canConnect(
@@ -591,3 +592,5 @@ Blockly.RenderedConnection.prototype.onCheckChanged_ = function() {
     this.sourceBlock_.bumpNeighbours();
   }
 };
+
+exports = RenderedConnection;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..367e41229 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -118,7 +118,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});

From c9225da3f3038f7965f9bb94de6aebdd09fa2185 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 10:38:47 -0700
Subject: [PATCH 020/291] Migrate core/rendered_connection.js to named requires

---
 core/rendered_connection.js | 139 ++++++++++++++++++------------------
 tests/deps.js               |   2 +-
 2 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index a4d265746..953062f20 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -13,26 +13,29 @@
 goog.module('Blockly.RenderedConnection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Connection');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.ConnectionDB');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Connection = goog.require('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Svg = goog.require('Blockly.utils.Svg');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
  * Class for a connection between blocks that may be rendered on screen.
- * @param {!Blockly.BlockSvg} source The block establishing this connection.
+ * @param {!BlockSvg} source The block establishing this connection.
  * @param {number} type The type of the connection.
- * @extends {Blockly.Connection}
+ * @extends {Connection}
  * @constructor
  */
 const RenderedConnection = function(source, type) {
@@ -40,7 +43,7 @@ const RenderedConnection = function(source, type) {
 
   /**
    * Connection database for connections of this type on the current workspace.
-   * @const {!Blockly.ConnectionDB}
+   * @const {!ConnectionDB}
    * @private
    */
   this.db_ = source.workspace.connectionDBList[type];
@@ -48,19 +51,19 @@ const RenderedConnection = function(source, type) {
   /**
    * Connection database for connections compatible with this type on the
    * current workspace.
-   * @const {!Blockly.ConnectionDB}
+   * @const {!ConnectionDB}
    * @private
    */
   this.dbOpposite_ =
       source.workspace
-          .connectionDBList[Blockly.internalConstants.OPPOSITE_TYPE[type]];
+          .connectionDBList[internalConstants.OPPOSITE_TYPE[type]];
 
   /**
    * Workspace units, (0, 0) is top left of block.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
-  this.offsetInBlock_ = new Blockly.utils.Coordinate(0, 0);
+  this.offsetInBlock_ = new Coordinate(0, 0);
 
   /**
    * Describes the state of this connection's tracked-ness.
@@ -75,7 +78,7 @@ const RenderedConnection = function(source, type) {
    */
   this.targetConnection = null;
 };
-Blockly.utils.object.inherits(RenderedConnection, Blockly.Connection);
+object.inherits(RenderedConnection, Connection);
 
 /**
  * Enum for different kinds of tracked states.
@@ -110,28 +113,28 @@ RenderedConnection.prototype.dispose = function() {
 
 /**
  * Get the source block for this connection.
- * @return {!Blockly.BlockSvg} The source block.
+ * @return {!BlockSvg} The source block.
  * @override
  */
 RenderedConnection.prototype.getSourceBlock = function() {
-  return /** @type {!Blockly.BlockSvg} */ (
+  return /** @type {!BlockSvg} */ (
     RenderedConnection.superClass_.getSourceBlock.call(this));
 };
 
 /**
  * Returns the block that this connection connects to.
- * @return {?Blockly.BlockSvg} The connected block or null if none is connected.
+ * @return {?BlockSvg} The connected block or null if none is connected.
  * @override
  */
 RenderedConnection.prototype.targetBlock = function() {
-  return /** @type {Blockly.BlockSvg} */ (
+  return /** @type {BlockSvg} */ (
     RenderedConnection.superClass_.targetBlock.call(this));
 };
 
 /**
  * Returns the distance between this connection and another connection in
  * workspace units.
- * @param {!Blockly.Connection} otherConnection The other connection to measure
+ * @param {!Connection} otherConnection The other connection to measure
  *     the distance to.
  * @return {number} The distance between connections, in workspace units.
  */
@@ -144,7 +147,7 @@ RenderedConnection.prototype.distanceFrom = function(otherConnection) {
 /**
  * Move the block(s) belonging to the connection to a point where they don't
  * visually interfere with the specified connection.
- * @param {!Blockly.Connection} staticConnection The connection to move away
+ * @param {!Connection} staticConnection The connection to move away
  *     from.
  * @package
  */
@@ -175,21 +178,21 @@ RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   const selected = Blockly.selected == rootBlock;
   selected || rootBlock.addSelect();
   let dx =
-      (staticConnection.x + Blockly.internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+      (staticConnection.x + internalConstants.SNAP_RADIUS +
+       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.x;
   let dy =
-      (staticConnection.y + Blockly.internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+      (staticConnection.y + internalConstants.SNAP_RADIUS +
+       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.y;
   if (reverse) {
     // When reversing a bump due to an uneditable block, bump up.
     dy = -dy;
   }
   if (rootBlock.RTL) {
-    dx = (staticConnection.x - Blockly.internalConstants.SNAP_RADIUS -
+    dx = (staticConnection.x - internalConstants.SNAP_RADIUS -
           Math.floor(
-              Math.random() * Blockly.internalConstants.BUMP_RANDOMNESS)) -
+              Math.random() * internalConstants.BUMP_RANDOMNESS)) -
         this.x;
   }
   rootBlock.moveBy(dx, dy);
@@ -226,7 +229,7 @@ RenderedConnection.prototype.moveBy = function(dx, dy) {
 /**
  * Move this connection to the location given by its offset within the block and
  * the location of the block's top left corner.
- * @param {!Blockly.utils.Coordinate} blockTL The location of the top left
+ * @param {!Coordinate} blockTL The location of the top left
  *     corner of the block, in workspace coordinates.
  */
 RenderedConnection.prototype.moveToOffset = function(blockTL) {
@@ -246,7 +249,7 @@ RenderedConnection.prototype.setOffsetInBlock = function(x, y) {
 
 /**
  * Get the offset of this connection relative to the top left of its block.
- * @return {!Blockly.utils.Coordinate} The offset of the connection.
+ * @return {!Coordinate} The offset of the connection.
  * @package
  */
 RenderedConnection.prototype.getOffsetInBlock = function() {
@@ -267,7 +270,7 @@ RenderedConnection.prototype.tighten = function() {
       throw Error('block is not rendered.');
     }
     // Workspace coordinates.
-    const xy = Blockly.utils.getRelativeXY(svgRoot);
+    const xy = utils.getRelativeXY(svgRoot);
     block.getSvgRoot().setAttribute('transform',
         'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
     block.moveConnections(-dx, -dy);
@@ -278,9 +281,9 @@ RenderedConnection.prototype.tighten = function() {
  * Find the closest compatible connection to this connection.
  * All parameters are in workspace units.
  * @param {number} maxLimit The maximum radius to another connection.
- * @param {!Blockly.utils.Coordinate} dxy Offset between this connection's location
+ * @param {!Coordinate} dxy Offset between this connection's location
  *     in the database and the current location (as a result of dragging).
- * @return {!{connection: ?Blockly.Connection, radius: number}} Contains two
+ * @return {!{connection: ?Connection, radius: number}} Contains two
  *     properties: 'connection' which is either another connection or null,
  *     and 'radius' which is the distance.
  */
@@ -293,31 +296,31 @@ RenderedConnection.prototype.closest = function(maxLimit, dxy) {
  */
 RenderedConnection.prototype.highlight = function() {
   let steps;
-  const sourceBlockSvg = /** @type {!Blockly.BlockSvg} */ (this.sourceBlock_);
+  const sourceBlockSvg = /** @type {!BlockSvg} */ (this.sourceBlock_);
   const renderConstants = sourceBlockSvg.workspace.getRenderer().getConstants();
   const shape = renderConstants.shapeFor(this);
-  if (this.type == Blockly.connectionTypes.INPUT_VALUE ||
-      this.type == Blockly.connectionTypes.OUTPUT_VALUE) {
+  if (this.type == connectionTypes.INPUT_VALUE ||
+      this.type == connectionTypes.OUTPUT_VALUE) {
     // Vertical line, puzzle tab, vertical line.
     const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
-    steps = Blockly.utils.svgPaths.moveBy(0, -yLen) +
-        Blockly.utils.svgPaths.lineOnAxis('v', yLen) +
+    steps = utils.svgPaths.moveBy(0, -yLen) +
+        utils.svgPaths.lineOnAxis('v', yLen) +
         shape.pathDown +
-        Blockly.utils.svgPaths.lineOnAxis('v', yLen);
+        utils.svgPaths.lineOnAxis('v', yLen);
   } else {
     const xLen =
         renderConstants.NOTCH_OFFSET_LEFT - renderConstants.CORNER_RADIUS;
     // Horizontal line, notch, horizontal line.
-    steps = Blockly.utils.svgPaths.moveBy(-xLen, 0) +
-        Blockly.utils.svgPaths.lineOnAxis('h', xLen) +
+    steps = utils.svgPaths.moveBy(-xLen, 0) +
+        utils.svgPaths.lineOnAxis('h', xLen) +
         shape.pathLeft +
-        Blockly.utils.svgPaths.lineOnAxis('h', xLen);
+        utils.svgPaths.lineOnAxis('h', xLen);
   }
   const xy = this.sourceBlock_.getRelativeToSurfaceXY();
   const x = this.x - xy.x;
   const y = this.y - xy.y;
-  Blockly.Connection.highlightedPath_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  Connection.highlightedPath_ = dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyHighlightedConnectionPath',
         'd': steps,
@@ -331,8 +334,8 @@ RenderedConnection.prototype.highlight = function() {
  * Remove the highlighting around this connection.
  */
 RenderedConnection.prototype.unhighlight = function() {
-  Blockly.utils.dom.removeNode(Blockly.Connection.highlightedPath_);
-  delete Blockly.Connection.highlightedPath_;
+  dom.removeNode(Connection.highlightedPath_);
+  delete Connection.highlightedPath_;
 };
 
 /**
@@ -393,7 +396,7 @@ RenderedConnection.prototype.stopTrackingAll = function() {
 /**
  * Start tracking this connection, as well as all down-stream connections on
  * any block attached to this connection. This happens when a block is expanded.
- * @return {!Array<!Blockly.Block>} List of blocks to render.
+ * @return {!Array<!Block>} List of blocks to render.
  */
 RenderedConnection.prototype.startTrackingAll = function() {
   this.setTracking(true);
@@ -402,8 +405,8 @@ RenderedConnection.prototype.startTrackingAll = function() {
   // of lower blocks. Also, since rendering a block renders all its parents,
   // we only need to render the leaf nodes.
   const renderList = [];
-  if (this.type != Blockly.connectionTypes.INPUT_VALUE &&
-      this.type != Blockly.connectionTypes.NEXT_STATEMENT) {
+  if (this.type != connectionTypes.INPUT_VALUE &&
+      this.type != connectionTypes.NEXT_STATEMENT) {
     // Only spider down.
     return renderList;
   }
@@ -433,7 +436,7 @@ RenderedConnection.prototype.startTrackingAll = function() {
 
 /**
  * Check if the two connections can be dragged to connect to each other.
- * @param {!Blockly.Connection} candidate A nearby connection to check.
+ * @param {!Connection} candidate A nearby connection to check.
  * @param {number=} maxRadius The maximum radius allowed for connections, in
  *     workspace units.
  * @return {boolean} True if the connection is allowed, false otherwise.
@@ -441,7 +444,7 @@ RenderedConnection.prototype.startTrackingAll = function() {
  */
 RenderedConnection.prototype.isConnectionAllowed = function(candidate,
     maxRadius) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'RenderedConnection.prototype.isConnectionAllowed',
       'July 2020',
       'July 2021',
@@ -458,30 +461,30 @@ RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  * Behavior after a connection attempt fails.
  * Bumps this connection away from the other connection. Called when an
  * attempted connection fails.
- * @param {!Blockly.Connection} otherConnection Connection that this connection
+ * @param {!Connection} otherConnection Connection that this connection
  *     failed to connect to.
  * @package
  */
 RenderedConnection.prototype.onFailedConnect =
     function(otherConnection) {
       const block = this.getSourceBlock();
-      if (Blockly.Events.recordUndo) {
-        const group = Blockly.Events.getGroup();
+      if (Events.recordUndo) {
+        const group = Events.getGroup();
         setTimeout(function() {
           if (!block.isDisposed() && !block.getParent()) {
-            Blockly.Events.setGroup(group);
+            Events.setGroup(group);
             this.bumpAwayFrom(otherConnection);
-            Blockly.Events.setGroup(false);
+            Events.setGroup(false);
           }
-        }.bind(this), Blockly.internalConstants.BUMP_DELAY);
+        }.bind(this), internalConstants.BUMP_DELAY);
       }
     };
 
 
 /**
  * Disconnect two blocks that are connected by this connection.
- * @param {!Blockly.Block} parentBlock The superior block.
- * @param {!Blockly.Block} childBlock The inferior block.
+ * @param {!Block} parentBlock The superior block.
+ * @param {!Block} childBlock The inferior block.
  * @protected
  * @override
  */
@@ -528,7 +531,7 @@ RenderedConnection.prototype.respawnShadow_ = function() {
  * Type checking does not apply, since this function is used for bumping.
  * @param {number} maxLimit The maximum radius to another connection, in
  *     workspace units.
- * @return {!Array<!Blockly.Connection>} List of connections.
+ * @return {!Array<!Connection>} List of connections.
  * @package
  */
 RenderedConnection.prototype.neighbours = function(maxLimit) {
@@ -538,7 +541,7 @@ RenderedConnection.prototype.neighbours = function(maxLimit) {
 /**
  * Connect two connections together.  This is the connection on the superior
  * block.  Rerender blocks as needed.
- * @param {!Blockly.Connection} childConnection Connection on inferior block.
+ * @param {!Connection} childConnection Connection on inferior block.
  * @protected
  */
 RenderedConnection.prototype.connect_ = function(childConnection) {
@@ -557,8 +560,8 @@ RenderedConnection.prototype.connect_ = function(childConnection) {
     childBlock.updateDisabled();
   }
   if (parentRendered && childRendered) {
-    if (parentConnection.type == Blockly.connectionTypes.NEXT_STATEMENT ||
-        parentConnection.type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+    if (parentConnection.type == connectionTypes.NEXT_STATEMENT ||
+        parentConnection.type == connectionTypes.PREVIOUS_STATEMENT) {
       // Child block may need to square off its corners if it is in a stack.
       // Rendering a child will render its parent.
       childBlock.render();
diff --git a/tests/deps.js b/tests/deps.js
index 367e41229..1b419caf7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -118,7 +118,7 @@ goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], []);
-goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});

From 372f5c0834f23d8e08cfc6fee4278f2c7bc74668 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 10:39:45 -0700
Subject: [PATCH 021/291] clang-format core/rendered_connection.js

---
 core/rendered_connection.js | 99 +++++++++++++++++--------------------
 1 file changed, 45 insertions(+), 54 deletions(-)

diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index 953062f20..0abc123e5 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -55,8 +55,7 @@ const RenderedConnection = function(source, type) {
    * @private
    */
   this.dbOpposite_ =
-      source.workspace
-          .connectionDBList[internalConstants.OPPOSITE_TYPE[type]];
+      source.workspace.connectionDBList[internalConstants.OPPOSITE_TYPE[type]];
 
   /**
    * Workspace units, (0, 0) is top left of block.
@@ -118,7 +117,7 @@ RenderedConnection.prototype.dispose = function() {
  */
 RenderedConnection.prototype.getSourceBlock = function() {
   return /** @type {!BlockSvg} */ (
-    RenderedConnection.superClass_.getSourceBlock.call(this));
+      RenderedConnection.superClass_.getSourceBlock.call(this));
 };
 
 /**
@@ -128,7 +127,7 @@ RenderedConnection.prototype.getSourceBlock = function() {
  */
 RenderedConnection.prototype.targetBlock = function() {
   return /** @type {BlockSvg} */ (
-    RenderedConnection.superClass_.targetBlock.call(this));
+      RenderedConnection.superClass_.targetBlock.call(this));
 };
 
 /**
@@ -177,13 +176,11 @@ RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   // Raise it to the top for extra visibility.
   const selected = Blockly.selected == rootBlock;
   selected || rootBlock.addSelect();
-  let dx =
-      (staticConnection.x + internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
+  let dx = (staticConnection.x + internalConstants.SNAP_RADIUS +
+            Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.x;
-  let dy =
-      (staticConnection.y + internalConstants.SNAP_RADIUS +
-       Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
+  let dy = (staticConnection.y + internalConstants.SNAP_RADIUS +
+            Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
       this.y;
   if (reverse) {
     // When reversing a bump due to an uneditable block, bump up.
@@ -191,8 +188,7 @@ RenderedConnection.prototype.bumpAwayFrom = function(staticConnection) {
   }
   if (rootBlock.RTL) {
     dx = (staticConnection.x - internalConstants.SNAP_RADIUS -
-          Math.floor(
-              Math.random() * internalConstants.BUMP_RANDOMNESS)) -
+          Math.floor(Math.random() * internalConstants.BUMP_RANDOMNESS)) -
         this.x;
   }
   rootBlock.moveBy(dx, dy);
@@ -208,8 +204,7 @@ RenderedConnection.prototype.moveTo = function(x, y) {
   if (this.trackedState_ == RenderedConnection.TrackedState.WILL_TRACK) {
     this.db_.addConnection(this, y);
     this.trackedState_ = RenderedConnection.TrackedState.TRACKED;
-  } else if (this.trackedState_ == RenderedConnection
-      .TrackedState.TRACKED) {
+  } else if (this.trackedState_ == RenderedConnection.TrackedState.TRACKED) {
     this.db_.removeConnection(this, this.y);
     this.db_.addConnection(this, y);
   }
@@ -233,8 +228,8 @@ RenderedConnection.prototype.moveBy = function(dx, dy) {
  *     corner of the block, in workspace coordinates.
  */
 RenderedConnection.prototype.moveToOffset = function(blockTL) {
-  this.moveTo(blockTL.x + this.offsetInBlock_.x,
-      blockTL.y + this.offsetInBlock_.y);
+  this.moveTo(
+      blockTL.x + this.offsetInBlock_.x, blockTL.y + this.offsetInBlock_.y);
 };
 
 /**
@@ -271,8 +266,8 @@ RenderedConnection.prototype.tighten = function() {
     }
     // Workspace coordinates.
     const xy = utils.getRelativeXY(svgRoot);
-    block.getSvgRoot().setAttribute('transform',
-        'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
+    block.getSvgRoot().setAttribute(
+        'transform', 'translate(' + (xy.x - dx) + ',' + (xy.y - dy) + ')');
     block.moveConnections(-dx, -dy);
   }
 };
@@ -304,24 +299,21 @@ RenderedConnection.prototype.highlight = function() {
     // Vertical line, puzzle tab, vertical line.
     const yLen = renderConstants.TAB_OFFSET_FROM_TOP;
     steps = utils.svgPaths.moveBy(0, -yLen) +
-        utils.svgPaths.lineOnAxis('v', yLen) +
-        shape.pathDown +
+        utils.svgPaths.lineOnAxis('v', yLen) + shape.pathDown +
         utils.svgPaths.lineOnAxis('v', yLen);
   } else {
     const xLen =
         renderConstants.NOTCH_OFFSET_LEFT - renderConstants.CORNER_RADIUS;
     // Horizontal line, notch, horizontal line.
     steps = utils.svgPaths.moveBy(-xLen, 0) +
-        utils.svgPaths.lineOnAxis('h', xLen) +
-        shape.pathLeft +
+        utils.svgPaths.lineOnAxis('h', xLen) + shape.pathLeft +
         utils.svgPaths.lineOnAxis('h', xLen);
   }
   const xy = this.sourceBlock_.getRelativeToSurfaceXY();
   const x = this.x - xy.x;
   const y = this.y - xy.y;
   Connection.highlightedPath_ = dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyHighlightedConnectionPath',
         'd': steps,
         transform: 'translate(' + x + ',' + y + ')' +
@@ -344,10 +336,10 @@ RenderedConnection.prototype.unhighlight = function() {
  * @package
  */
 RenderedConnection.prototype.setTracking = function(doTracking) {
-  if ((doTracking && this.trackedState_ ==
-      RenderedConnection.TrackedState.TRACKED) ||
-      (!doTracking && this.trackedState_ ==
-      RenderedConnection.TrackedState.UNTRACKED)) {
+  if ((doTracking &&
+       this.trackedState_ == RenderedConnection.TrackedState.TRACKED) ||
+      (!doTracking &&
+       this.trackedState_ == RenderedConnection.TrackedState.UNTRACKED)) {
     return;
   }
   if (this.sourceBlock_.isInFlyout) {
@@ -442,19 +434,18 @@ RenderedConnection.prototype.startTrackingAll = function() {
  * @return {boolean} True if the connection is allowed, false otherwise.
  * @deprecated July 2020
  */
-RenderedConnection.prototype.isConnectionAllowed = function(candidate,
-    maxRadius) {
+RenderedConnection.prototype.isConnectionAllowed = function(
+    candidate, maxRadius) {
   deprecation.warn(
-      'RenderedConnection.prototype.isConnectionAllowed',
-      'July 2020',
+      'RenderedConnection.prototype.isConnectionAllowed', 'July 2020',
       'July 2021',
       'Blockly.Workspace.prototype.getConnectionChecker().canConnect');
   if (this.distanceFrom(candidate) > maxRadius) {
     return false;
   }
 
-  return RenderedConnection.superClass_.isConnectionAllowed.call(this,
-      candidate);
+  return RenderedConnection.superClass_.isConnectionAllowed.call(
+      this, candidate);
 };
 
 /**
@@ -465,20 +456,19 @@ RenderedConnection.prototype.isConnectionAllowed = function(candidate,
  *     failed to connect to.
  * @package
  */
-RenderedConnection.prototype.onFailedConnect =
-    function(otherConnection) {
-      const block = this.getSourceBlock();
-      if (Events.recordUndo) {
-        const group = Events.getGroup();
-        setTimeout(function() {
-          if (!block.isDisposed() && !block.getParent()) {
-            Events.setGroup(group);
-            this.bumpAwayFrom(otherConnection);
-            Events.setGroup(false);
-          }
-        }.bind(this), internalConstants.BUMP_DELAY);
+RenderedConnection.prototype.onFailedConnect = function(otherConnection) {
+  const block = this.getSourceBlock();
+  if (Events.recordUndo) {
+    const group = Events.getGroup();
+    setTimeout(function() {
+      if (!block.isDisposed() && !block.getParent()) {
+        Events.setGroup(group);
+        this.bumpAwayFrom(otherConnection);
+        Events.setGroup(false);
       }
-    };
+    }.bind(this), internalConstants.BUMP_DELAY);
+  }
+};
 
 
 /**
@@ -488,10 +478,10 @@ RenderedConnection.prototype.onFailedConnect =
  * @protected
  * @override
  */
-RenderedConnection.prototype.disconnectInternal_ = function(parentBlock,
-    childBlock) {
-  RenderedConnection.superClass_.disconnectInternal_.call(this,
-      parentBlock, childBlock);
+RenderedConnection.prototype.disconnectInternal_ = function(
+    parentBlock, childBlock) {
+  RenderedConnection.superClass_.disconnectInternal_.call(
+      this, parentBlock, childBlock);
   // Rerender the parent so that it may reflow.
   if (parentBlock.rendered) {
     parentBlock.render();
@@ -586,9 +576,10 @@ RenderedConnection.prototype.connect_ = function(childConnection) {
  */
 RenderedConnection.prototype.onCheckChanged_ = function() {
   // The new value type may not be compatible with the existing connection.
-  if (this.isConnected() && (!this.targetConnection ||
-      !this.getConnectionChecker().canConnect(
-          this, this.targetConnection, false))) {
+  if (this.isConnected() &&
+      (!this.targetConnection ||
+       !this.getConnectionChecker().canConnect(
+           this, this.targetConnection, false))) {
     const child = this.isSuperior() ? this.targetBlock() : this.sourceBlock_;
     child.unplug();
     // Bump away.

From a106f37cbb3f9a1dd62062c3ed5eedb7b472c0c4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:33:46 -0700
Subject: [PATCH 022/291] Migrate core/theme.js to ES6 const/let

---
 core/theme.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 182710f16..75bfb3779 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -165,7 +165,7 @@ Blockly.Theme.prototype.setCategoryStyle = function(categoryStyleName,
  * @return {?string} The style value.
  */
 Blockly.Theme.prototype.getComponentStyle = function(componentName) {
-  var style = this.componentStyles[componentName];
+  const style = this.componentStyles[componentName];
   if (style && typeof style == 'string' &&
       this.getComponentStyle(/** @type {string} */ (style))) {
     return this.getComponentStyle(/** @type {string} */ (style));
@@ -207,8 +207,8 @@ Blockly.Theme.prototype.setStartHats = function(startHats) {
  * @return {!Blockly.Theme} A new Blockly theme.
 */
 Blockly.Theme.defineTheme = function(name, themeObj) {
-  var theme = new Blockly.Theme(name);
-  var base = themeObj['base'];
+  const theme = new Blockly.Theme(name);
+  let base = themeObj['base'];
   if (base) {
     if (typeof base == "string") {
       base = Blockly.registry.getObject(Blockly.registry.Type.THEME, base);

From 367b94dfdd8c2856efea4f9b66e6237a73200787 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:36:48 -0700
Subject: [PATCH 023/291] Migrate core/theme.js to goog.module

---
 core/theme.js | 61 +++++++++++++++++++++++++++------------------------
 tests/deps.js |  2 +-
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 75bfb3779..16289a3ad 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -9,7 +9,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Theme');
+goog.module('Blockly.Theme');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 goog.require('Blockly.utils');
@@ -19,16 +20,16 @@ goog.require('Blockly.utils.object');
 /**
  * Class for a theme.
  * @param {string} name Theme name.
- * @param {!Object<string, Blockly.Theme.BlockStyle>=} opt_blockStyles A map
+ * @param {!Object<string, Theme.BlockStyle>=} opt_blockStyles A map
  *     from style names (strings) to objects with style attributes for blocks.
- * @param {!Object<string, Blockly.Theme.CategoryStyle>=} opt_categoryStyles A
+ * @param {!Object<string, Theme.CategoryStyle>=} opt_categoryStyles A
  *     map from style names (strings) to objects with style attributes for
  *     categories.
- * @param {!Blockly.Theme.ComponentStyle=} opt_componentStyles A map of Blockly
+ * @param {!Theme.ComponentStyle=} opt_componentStyles A map of Blockly
  *     component names to style value.
  * @constructor
  */
-Blockly.Theme = function(name, opt_blockStyles, opt_categoryStyles,
+const Theme = function(name, opt_blockStyles, opt_categoryStyles,
     opt_componentStyles) {
 
   /**
@@ -39,32 +40,32 @@ Blockly.Theme = function(name, opt_blockStyles, opt_categoryStyles,
 
   /**
    * The block styles map.
-   * @type {!Object<string, !Blockly.Theme.BlockStyle>}
+   * @type {!Object<string, !Theme.BlockStyle>}
    * @package
    */
   this.blockStyles = opt_blockStyles || Object.create(null);
 
   /**
    * The category styles map.
-   * @type {!Object<string, Blockly.Theme.CategoryStyle>}
+   * @type {!Object<string, Theme.CategoryStyle>}
    * @package
    */
   this.categoryStyles = opt_categoryStyles || Object.create(null);
 
   /**
    * The UI components styles map.
-   * @type {!Blockly.Theme.ComponentStyle}
+   * @type {!Theme.ComponentStyle}
    * @package
    */
   this.componentStyles = opt_componentStyles ||
-    (/** @type {Blockly.Theme.ComponentStyle} */ (Object.create(null)));
+    (/** @type {Theme.ComponentStyle} */ (Object.create(null)));
 
   /**
    * The font style.
-   * @type {!Blockly.Theme.FontStyle}
+   * @type {!Theme.FontStyle}
    * @package
    */
-  this.fontStyle = /** @type {Blockly.Theme.FontStyle} */ (Object.create(null));
+  this.fontStyle = /** @type {Theme.FontStyle} */ (Object.create(null));
 
   /**
    * Whether or not to add a 'hat' on top of all blocks with no previous or
@@ -87,7 +88,7 @@ Blockly.Theme = function(name, opt_blockStyles, opt_categoryStyles,
  *            hat:string
  *          }}
  */
-Blockly.Theme.BlockStyle;
+Theme.BlockStyle;
 
 /**
  * A category style.
@@ -95,7 +96,7 @@ Blockly.Theme.BlockStyle;
  *            colour:string
  *          }}
  */
-Blockly.Theme.CategoryStyle;
+Theme.CategoryStyle;
 
 /**
  * A component style.
@@ -118,7 +119,7 @@ Blockly.Theme.CategoryStyle;
  *            replacementGlowOpacity:?number
  *          }}
  */
-Blockly.Theme.ComponentStyle;
+Theme.ComponentStyle;
 
 /**
  * A font style.
@@ -128,32 +129,32 @@ Blockly.Theme.ComponentStyle;
  *            size:?number
  *          }}
  */
-Blockly.Theme.FontStyle;
+Theme.FontStyle;
 
 /**
  * Gets the class name that identifies this theme.
  * @return {string} The CSS class name.
  * @package
  */
-Blockly.Theme.prototype.getClassName = function() {
+Theme.prototype.getClassName = function() {
   return this.name + '-theme';
 };
 
 /**
  * Overrides or adds a style to the blockStyles map.
  * @param {string} blockStyleName The name of the block style.
- * @param {Blockly.Theme.BlockStyle} blockStyle The block style.
+ * @param {Theme.BlockStyle} blockStyle The block style.
 */
-Blockly.Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
+Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
   this.blockStyles[blockStyleName] = blockStyle;
 };
 
 /**
  * Overrides or adds a style to the categoryStyles map.
  * @param {string} categoryStyleName The name of the category style.
- * @param {Blockly.Theme.CategoryStyle} categoryStyle The category style.
+ * @param {Theme.CategoryStyle} categoryStyle The category style.
 */
-Blockly.Theme.prototype.setCategoryStyle = function(categoryStyleName,
+Theme.prototype.setCategoryStyle = function(categoryStyleName,
     categoryStyle) {
   this.categoryStyles[categoryStyleName] = categoryStyle;
 };
@@ -164,7 +165,7 @@ Blockly.Theme.prototype.setCategoryStyle = function(categoryStyleName,
  * @param {string} componentName The name of the component.
  * @return {?string} The style value.
  */
-Blockly.Theme.prototype.getComponentStyle = function(componentName) {
+Theme.prototype.getComponentStyle = function(componentName) {
   const style = this.componentStyles[componentName];
   if (style && typeof style == 'string' &&
       this.getComponentStyle(/** @type {string} */ (style))) {
@@ -178,16 +179,16 @@ Blockly.Theme.prototype.getComponentStyle = function(componentName) {
  * @param {string} componentName The name of the component.
  * @param {*} styleValue The style value.
 */
-Blockly.Theme.prototype.setComponentStyle = function(componentName,
+Theme.prototype.setComponentStyle = function(componentName,
     styleValue) {
   this.componentStyles[componentName] = styleValue;
 };
 
 /**
  * Configure a theme's font style.
- * @param {Blockly.Theme.FontStyle} fontStyle The font style.
+ * @param {Theme.FontStyle} fontStyle The font style.
 */
-Blockly.Theme.prototype.setFontStyle = function(fontStyle) {
+Theme.prototype.setFontStyle = function(fontStyle) {
   this.fontStyle = fontStyle;
 };
 
@@ -196,7 +197,7 @@ Blockly.Theme.prototype.setFontStyle = function(fontStyle) {
  * @param {boolean} startHats True if the theme enables start hats, false
  *     otherwise.
 */
-Blockly.Theme.prototype.setStartHats = function(startHats) {
+Theme.prototype.setStartHats = function(startHats) {
   this.startHats = startHats;
 };
 
@@ -204,16 +205,16 @@ Blockly.Theme.prototype.setStartHats = function(startHats) {
  * Define a new Blockly theme.
  * @param {string} name The name of the theme.
  * @param {!Object} themeObj An object containing theme properties.
- * @return {!Blockly.Theme} A new Blockly theme.
+ * @return {!Theme} A new Blockly theme.
 */
-Blockly.Theme.defineTheme = function(name, themeObj) {
-  const theme = new Blockly.Theme(name);
+Theme.defineTheme = function(name, themeObj) {
+  const theme = new Theme(name);
   let base = themeObj['base'];
   if (base) {
     if (typeof base == "string") {
       base = Blockly.registry.getObject(Blockly.registry.Type.THEME, base);
     }
-    if (base instanceof Blockly.Theme) {
+    if (base instanceof Theme) {
       Blockly.utils.object.deepMerge(theme, base);
       theme.name = name;
     }
@@ -233,3 +234,5 @@ Blockly.Theme.defineTheme = function(name, themeObj) {
 
   return theme;
 };
+
+exports = Theme;
diff --git a/tests/deps.js b/tests/deps.js
index de575339f..42d14c6a8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -161,7 +161,7 @@ goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', '
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);

From 9cf50a61c189e9e3c076f81bd86d1b436a1878dc Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:39:57 -0700
Subject: [PATCH 024/291] Migrate core/theme.js to named requires

---
 core/theme.js | 19 +++++++++----------
 tests/deps.js |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 16289a3ad..c9cd46968 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -12,9 +12,8 @@
 goog.module('Blockly.Theme');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -76,7 +75,7 @@ const Theme = function(name, opt_blockStyles, opt_categoryStyles,
   this.startHats = null;
 
   // Register the theme by name.
-  Blockly.registry.register(Blockly.registry.Type.THEME, name, this);
+  registry.register(registry.Type.THEME, name, this);
 };
 
 /**
@@ -212,21 +211,21 @@ Theme.defineTheme = function(name, themeObj) {
   let base = themeObj['base'];
   if (base) {
     if (typeof base == "string") {
-      base = Blockly.registry.getObject(Blockly.registry.Type.THEME, base);
+      base = registry.getObject(registry.Type.THEME, base);
     }
     if (base instanceof Theme) {
-      Blockly.utils.object.deepMerge(theme, base);
+      object.deepMerge(theme, base);
       theme.name = name;
     }
   }
 
-  Blockly.utils.object.deepMerge(theme.blockStyles,
+  object.deepMerge(theme.blockStyles,
       themeObj['blockStyles']);
-  Blockly.utils.object.deepMerge(theme.categoryStyles,
+  object.deepMerge(theme.categoryStyles,
       themeObj['categoryStyles']);
-  Blockly.utils.object.deepMerge(theme.componentStyles,
+  object.deepMerge(theme.componentStyles,
       themeObj['componentStyles']);
-  Blockly.utils.object.deepMerge(theme.fontStyle,
+  object.deepMerge(theme.fontStyle,
       themeObj['fontStyle']);
   if (themeObj['startHats'] != null) {
     theme.startHats = themeObj['startHats'];
diff --git a/tests/deps.js b/tests/deps.js
index 42d14c6a8..d27093d4d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -161,7 +161,7 @@ goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', '
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object']);
-goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.Theme']);

From 4e3bfee2aacb5391a8ee0ede11b4d3b8989ceaf2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 26 Jul 2021 11:42:17 -0700
Subject: [PATCH 025/291] clang-format core/theme.js

---
 core/theme.js | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index c9cd46968..11c72e491 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -28,9 +28,8 @@ const registry = goog.require('Blockly.registry');
  *     component names to style value.
  * @constructor
  */
-const Theme = function(name, opt_blockStyles, opt_categoryStyles,
-    opt_componentStyles) {
-
+const Theme = function(
+    name, opt_blockStyles, opt_categoryStyles, opt_componentStyles) {
   /**
    * The theme name. This can be used to reference a specific theme in CSS.
    * @type {string}
@@ -57,7 +56,7 @@ const Theme = function(name, opt_blockStyles, opt_categoryStyles,
    * @package
    */
   this.componentStyles = opt_componentStyles ||
-    (/** @type {Theme.ComponentStyle} */ (Object.create(null)));
+      (/** @type {Theme.ComponentStyle} */ (Object.create(null)));
 
   /**
    * The font style.
@@ -143,7 +142,7 @@ Theme.prototype.getClassName = function() {
  * Overrides or adds a style to the blockStyles map.
  * @param {string} blockStyleName The name of the block style.
  * @param {Theme.BlockStyle} blockStyle The block style.
-*/
+ */
 Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
   this.blockStyles[blockStyleName] = blockStyle;
 };
@@ -152,9 +151,8 @@ Theme.prototype.setBlockStyle = function(blockStyleName, blockStyle) {
  * Overrides or adds a style to the categoryStyles map.
  * @param {string} categoryStyleName The name of the category style.
  * @param {Theme.CategoryStyle} categoryStyle The category style.
-*/
-Theme.prototype.setCategoryStyle = function(categoryStyleName,
-    categoryStyle) {
+ */
+Theme.prototype.setCategoryStyle = function(categoryStyleName, categoryStyle) {
   this.categoryStyles[categoryStyleName] = categoryStyle;
 };
 
@@ -177,16 +175,15 @@ Theme.prototype.getComponentStyle = function(componentName) {
  * Configure a specific Blockly UI component with a style value.
  * @param {string} componentName The name of the component.
  * @param {*} styleValue The style value.
-*/
-Theme.prototype.setComponentStyle = function(componentName,
-    styleValue) {
+ */
+Theme.prototype.setComponentStyle = function(componentName, styleValue) {
   this.componentStyles[componentName] = styleValue;
 };
 
 /**
  * Configure a theme's font style.
  * @param {Theme.FontStyle} fontStyle The font style.
-*/
+ */
 Theme.prototype.setFontStyle = function(fontStyle) {
   this.fontStyle = fontStyle;
 };
@@ -195,7 +192,7 @@ Theme.prototype.setFontStyle = function(fontStyle) {
  * Configure a theme's start hats.
  * @param {boolean} startHats True if the theme enables start hats, false
  *     otherwise.
-*/
+ */
 Theme.prototype.setStartHats = function(startHats) {
   this.startHats = startHats;
 };
@@ -205,12 +202,12 @@ Theme.prototype.setStartHats = function(startHats) {
  * @param {string} name The name of the theme.
  * @param {!Object} themeObj An object containing theme properties.
  * @return {!Theme} A new Blockly theme.
-*/
+ */
 Theme.defineTheme = function(name, themeObj) {
   const theme = new Theme(name);
   let base = themeObj['base'];
   if (base) {
-    if (typeof base == "string") {
+    if (typeof base == 'string') {
       base = registry.getObject(registry.Type.THEME, base);
     }
     if (base instanceof Theme) {
@@ -219,14 +216,10 @@ Theme.defineTheme = function(name, themeObj) {
     }
   }
 
-  object.deepMerge(theme.blockStyles,
-      themeObj['blockStyles']);
-  object.deepMerge(theme.categoryStyles,
-      themeObj['categoryStyles']);
-  object.deepMerge(theme.componentStyles,
-      themeObj['componentStyles']);
-  object.deepMerge(theme.fontStyle,
-      themeObj['fontStyle']);
+  object.deepMerge(theme.blockStyles, themeObj['blockStyles']);
+  object.deepMerge(theme.categoryStyles, themeObj['categoryStyles']);
+  object.deepMerge(theme.componentStyles, themeObj['componentStyles']);
+  object.deepMerge(theme.fontStyle, themeObj['fontStyle']);
   if (themeObj['startHats'] != null) {
     theme.startHats = themeObj['startHats'];
   }

From c068a3b6f9dcd304278bd5aa87a0d66460d698df Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 14:26:04 -0700
Subject: [PATCH 026/291] Migrate core/renderers/common/path_object.js to
 goog.module

---
 core/renderers/common/path_object.js | 39 +++++++++++++++-------------
 tests/deps.js                        |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index e81b8e0e2..c6de3c492 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.PathObject');
+goog.module('Blockly.blockRendering.PathObject');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.blockRendering.IPathObject');
@@ -35,7 +36,7 @@ goog.requireType('Blockly.Connection');
  * @implements {Blockly.blockRendering.IPathObject}
  * @package
  */
-Blockly.blockRendering.PathObject = function(root, style, constants) {
+const PathObject = function(root, style, constants) {
   /**
    * The renderer's constant provider.
    * @type {!Blockly.blockRendering.ConstantProvider}
@@ -83,7 +84,7 @@ Blockly.blockRendering.PathObject = function(root, style, constants) {
  * @param {string} pathString The path.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setPath = function(pathString) {
+PathObject.prototype.setPath = function(pathString) {
   this.svgPath.setAttribute('d', pathString);
 };
 
@@ -91,7 +92,7 @@ Blockly.blockRendering.PathObject.prototype.setPath = function(pathString) {
  * Flip the SVG paths in RTL.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.flipRTL = function() {
+PathObject.prototype.flipRTL = function() {
   // Mirror the block's path.
   this.svgPath.setAttribute('transform', 'scale(-1 1)');
 };
@@ -102,7 +103,7 @@ Blockly.blockRendering.PathObject.prototype.flipRTL = function() {
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setCursorSvg = function(cursorSvg) {
+PathObject.prototype.setCursorSvg = function(cursorSvg) {
   if (!cursorSvg) {
     this.cursorSvg = null;
     return;
@@ -118,7 +119,7 @@ Blockly.blockRendering.PathObject.prototype.setCursorSvg = function(cursorSvg) {
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setMarkerSvg = function(markerSvg) {
+PathObject.prototype.setMarkerSvg = function(markerSvg) {
   if (!markerSvg) {
     this.markerSvg = null;
     return;
@@ -138,7 +139,7 @@ Blockly.blockRendering.PathObject.prototype.setMarkerSvg = function(markerSvg) {
  * @param {!Blockly.Block} block The source block.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.applyColour = function(block) {
+PathObject.prototype.applyColour = function(block) {
   this.svgPath.setAttribute('stroke', this.style.colourTertiary);
   this.svgPath.setAttribute('fill', this.style.colourPrimary);
 
@@ -151,7 +152,7 @@ Blockly.blockRendering.PathObject.prototype.applyColour = function(block) {
  * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.setStyle = function(blockStyle) {
+PathObject.prototype.setStyle = function(blockStyle) {
   this.style = blockStyle;
 };
 
@@ -162,7 +163,7 @@ Blockly.blockRendering.PathObject.prototype.setStyle = function(blockStyle) {
  *     be removed.
  * @protected
  */
-Blockly.blockRendering.PathObject.prototype.setClass_ = function(
+PathObject.prototype.setClass_ = function(
     className, add) {
   if (add) {
     Blockly.utils.dom.addClass(/** @type {!Element} */ (this.svgRoot),
@@ -179,7 +180,7 @@ Blockly.blockRendering.PathObject.prototype.setClass_ = function(
  * @param {boolean} enable True if highlighted.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateHighlighted = function(
+PathObject.prototype.updateHighlighted = function(
     enable) {
   if (enable) {
     this.svgPath.setAttribute('filter',
@@ -194,7 +195,7 @@ Blockly.blockRendering.PathObject.prototype.updateHighlighted = function(
  * @param {boolean} shadow True if the block is a shadow block.
  * @protected
  */
-Blockly.blockRendering.PathObject.prototype.updateShadow_ = function(shadow) {
+PathObject.prototype.updateShadow_ = function(shadow) {
   if (shadow) {
     this.svgPath.setAttribute('stroke', 'none');
     this.svgPath.setAttribute('fill', this.style.colourSecondary);
@@ -206,7 +207,7 @@ Blockly.blockRendering.PathObject.prototype.updateShadow_ = function(shadow) {
  * @param {boolean} disabled True if disabled.
  * @protected
  */
-Blockly.blockRendering.PathObject.prototype.updateDisabled_ = function(
+PathObject.prototype.updateDisabled_ = function(
     disabled) {
   this.setClass_('blocklyDisabled', disabled);
   if (disabled) {
@@ -220,7 +221,7 @@ Blockly.blockRendering.PathObject.prototype.updateDisabled_ = function(
  * @param {boolean} enable True if selection is enabled, false otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateSelected = function(enable) {
+PathObject.prototype.updateSelected = function(enable) {
   this.setClass_('blocklySelected', enable);
 };
 
@@ -230,7 +231,7 @@ Blockly.blockRendering.PathObject.prototype.updateSelected = function(enable) {
  *     area, false otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateDraggingDelete = function(
+PathObject.prototype.updateDraggingDelete = function(
     enable) {
   this.setClass_('blocklyDraggingDelete', enable);
 };
@@ -241,7 +242,7 @@ Blockly.blockRendering.PathObject.prototype.updateDraggingDelete = function(
  *     otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateInsertionMarker = function(
+PathObject.prototype.updateInsertionMarker = function(
     enable) {
   this.setClass_('blocklyInsertionMarker', enable);
 };
@@ -251,7 +252,7 @@ Blockly.blockRendering.PathObject.prototype.updateInsertionMarker = function(
  * @param {boolean} enable True if the block is movable, false otherwise.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateMovable = function(enable) {
+PathObject.prototype.updateMovable = function(enable) {
   this.setClass_('blocklyDraggable', enable);
 };
 
@@ -262,7 +263,7 @@ Blockly.blockRendering.PathObject.prototype.updateMovable = function(enable) {
  * @param {boolean} enable True if styling should be added.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateReplacementFade =
+PathObject.prototype.updateReplacementFade =
     function(enable) {
     /* eslint-disable indent */
   this.setClass_('blocklyReplaceable', enable);
@@ -275,8 +276,10 @@ Blockly.blockRendering.PathObject.prototype.updateReplacementFade =
  * @param {boolean} _enable True if styling should be added.
  * @package
  */
-Blockly.blockRendering.PathObject.prototype.updateShapeForInputHighlight =
+PathObject.prototype.updateShapeForInputHighlight =
     function(_conn, _enable) {
     /* eslint-disable indent */
   // NOP
 }; /* eslint-enable indent */
+
+exports = PathObject;
diff --git a/tests/deps.js b/tests/deps.js
index 805416071..aa69691cb 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -126,7 +126,7 @@ goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRende
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);

From cf3d22c4901b65894ce6a63151140139079173f2 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 14:39:02 -0700
Subject: [PATCH 027/291] Migrate core/renderers/common/path_object.js named
 requires

---
 core/renderers/common/path_object.js | 44 +++++++++++++++-------------
 tests/deps.js                        |  2 +-
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index c6de3c492..bb3cca63a 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -14,32 +14,36 @@
 goog.module('Blockly.blockRendering.PathObject');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.IPathObject');
-goog.require('Blockly.Theme');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const dom = goog.require('Blockly.utils.dom');
 
 
 /**
  * An object that handles creating and setting each of the SVG elements
  * used by the renderer.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The renderer's
+ * @param {!ConstantProvider} constants The renderer's
  *     constants.
  * @constructor
- * @implements {Blockly.blockRendering.IPathObject}
+ * @implements {IPathObject}
  * @package
  */
 const PathObject = function(root, style, constants) {
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @package
    */
   this.constants = constants;
@@ -51,13 +55,13 @@ const PathObject = function(root, style, constants) {
    * @type {!SVGElement}
    * @package
    */
-  this.svgPath = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  this.svgPath = dom.createSvgElement(
+      Svg.PATH,
       {'class': 'blocklyPath'}, this.svgRoot);
 
   /**
    * The style object to use when colouring block paths.
-   * @type {!Blockly.Theme.BlockStyle}
+   * @type {!Theme.BlockStyle}
    * @package
    */
   this.style = style;
@@ -136,7 +140,7 @@ PathObject.prototype.setMarkerSvg = function(markerSvg) {
 /**
  * Apply the stored colours to the block's path, taking into account whether
  * the paths belong to a shadow block.
- * @param {!Blockly.Block} block The source block.
+ * @param {!Block} block The source block.
  * @package
  */
 PathObject.prototype.applyColour = function(block) {
@@ -149,7 +153,7 @@ PathObject.prototype.applyColour = function(block) {
 
 /**
  * Set the style.
- * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
+ * @param {!Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
 PathObject.prototype.setStyle = function(blockStyle) {
@@ -166,10 +170,10 @@ PathObject.prototype.setStyle = function(blockStyle) {
 PathObject.prototype.setClass_ = function(
     className, add) {
   if (add) {
-    Blockly.utils.dom.addClass(/** @type {!Element} */ (this.svgRoot),
+    dom.addClass(/** @type {!Element} */ (this.svgRoot),
         className);
   } else {
-    Blockly.utils.dom.removeClass(/** @type {!Element} */ (this.svgRoot),
+    dom.removeClass(/** @type {!Element} */ (this.svgRoot),
         className);
   }
 };
@@ -272,7 +276,7 @@ PathObject.prototype.updateReplacementFade =
 /**
  * Add or remove styling that shows that if the dragging block is dropped, this
  * block will be connected to the input.
- * @param {Blockly.Connection} _conn The connection on the input to highlight.
+ * @param {Connection} _conn The connection on the input to highlight.
  * @param {boolean} _enable True if styling should be added.
  * @package
  */
diff --git a/tests/deps.js b/tests/deps.js
index aa69691cb..8d394ea2f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -126,7 +126,7 @@ goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRende
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);

From 55207a2e7fd152412d0a41740e5dfdc17201a705 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 14:41:29 -0700
Subject: [PATCH 028/291] clang-format core/renderers/common/path_object.js

---
 core/renderers/common/path_object.js | 46 ++++++++++------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index bb3cca63a..7b1f6af9d 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -55,9 +55,8 @@ const PathObject = function(root, style, constants) {
    * @type {!SVGElement}
    * @package
    */
-  this.svgPath = dom.createSvgElement(
-      Svg.PATH,
-      {'class': 'blocklyPath'}, this.svgRoot);
+  this.svgPath =
+      dom.createSvgElement(Svg.PATH, {'class': 'blocklyPath'}, this.svgRoot);
 
   /**
    * The style object to use when colouring block paths.
@@ -167,14 +166,11 @@ PathObject.prototype.setStyle = function(blockStyle) {
  *     be removed.
  * @protected
  */
-PathObject.prototype.setClass_ = function(
-    className, add) {
+PathObject.prototype.setClass_ = function(className, add) {
   if (add) {
-    dom.addClass(/** @type {!Element} */ (this.svgRoot),
-        className);
+    dom.addClass(/** @type {!Element} */ (this.svgRoot), className);
   } else {
-    dom.removeClass(/** @type {!Element} */ (this.svgRoot),
-        className);
+    dom.removeClass(/** @type {!Element} */ (this.svgRoot), className);
   }
 };
 
@@ -184,11 +180,10 @@ PathObject.prototype.setClass_ = function(
  * @param {boolean} enable True if highlighted.
  * @package
  */
-PathObject.prototype.updateHighlighted = function(
-    enable) {
+PathObject.prototype.updateHighlighted = function(enable) {
   if (enable) {
-    this.svgPath.setAttribute('filter',
-        'url(#' + this.constants.embossFilterId + ')');
+    this.svgPath.setAttribute(
+        'filter', 'url(#' + this.constants.embossFilterId + ')');
   } else {
     this.svgPath.setAttribute('filter', 'none');
   }
@@ -211,12 +206,11 @@ PathObject.prototype.updateShadow_ = function(shadow) {
  * @param {boolean} disabled True if disabled.
  * @protected
  */
-PathObject.prototype.updateDisabled_ = function(
-    disabled) {
+PathObject.prototype.updateDisabled_ = function(disabled) {
   this.setClass_('blocklyDisabled', disabled);
   if (disabled) {
-    this.svgPath.setAttribute('fill',
-        'url(#' + this.constants.disabledPatternId + ')');
+    this.svgPath.setAttribute(
+        'fill', 'url(#' + this.constants.disabledPatternId + ')');
   }
 };
 
@@ -235,8 +229,7 @@ PathObject.prototype.updateSelected = function(enable) {
  *     area, false otherwise.
  * @package
  */
-PathObject.prototype.updateDraggingDelete = function(
-    enable) {
+PathObject.prototype.updateDraggingDelete = function(enable) {
   this.setClass_('blocklyDraggingDelete', enable);
 };
 
@@ -246,8 +239,7 @@ PathObject.prototype.updateDraggingDelete = function(
  *     otherwise.
  * @package
  */
-PathObject.prototype.updateInsertionMarker = function(
-    enable) {
+PathObject.prototype.updateInsertionMarker = function(enable) {
   this.setClass_('blocklyInsertionMarker', enable);
 };
 
@@ -267,11 +259,9 @@ PathObject.prototype.updateMovable = function(enable) {
  * @param {boolean} enable True if styling should be added.
  * @package
  */
-PathObject.prototype.updateReplacementFade =
-    function(enable) {
-    /* eslint-disable indent */
+PathObject.prototype.updateReplacementFade = function(enable) {
   this.setClass_('blocklyReplaceable', enable);
-}; /* eslint-enable indent */
+};
 
 /**
  * Add or remove styling that shows that if the dragging block is dropped, this
@@ -280,10 +270,8 @@ PathObject.prototype.updateReplacementFade =
  * @param {boolean} _enable True if styling should be added.
  * @package
  */
-PathObject.prototype.updateShapeForInputHighlight =
-    function(_conn, _enable) {
-    /* eslint-disable indent */
+PathObject.prototype.updateShapeForInputHighlight = function(_conn, _enable) {
   // NOP
-}; /* eslint-enable indent */
+};
 
 exports = PathObject;

From e04050cd710199763591270640fefa7b3a3d6aba Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:54:32 -0700
Subject: [PATCH 029/291] Migrate core/warning.js to ES6 const/let

---
 core/warning.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index 9bbd9c91b..e596f0328 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -145,8 +145,8 @@ Blockly.Warning.prototype.setText = function(text, id) {
  * @return {string} All texts concatenated into one string.
  */
 Blockly.Warning.prototype.getText = function() {
-  var allWarnings = [];
-  for (var id in this.text_) {
+  const allWarnings = [];
+  for (let id in this.text_) {
     allWarnings.push(this.text_[id]);
   }
   return allWarnings.join('\n');

From 94b9169bf56402140a0cbcb123595fd5cabb64ab Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:54:52 -0700
Subject: [PATCH 030/291] Migrate core/warning.js to goog.module

---
 core/warning.js | 27 +++++++++++++++------------
 tests/deps.js   |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index e596f0328..c39e7cad9 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Warning');
+goog.module('Blockly.Warning');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Bubble');
 goog.require('Blockly.Events');
@@ -32,25 +33,25 @@ goog.requireType('Blockly.utils.Coordinate');
  * @extends {Blockly.Icon}
  * @constructor
  */
-Blockly.Warning = function(block) {
-  Blockly.Warning.superClass_.constructor.call(this, block);
+const Warning = function(block) {
+  Warning.superClass_.constructor.call(this, block);
   this.createIcon();
   // The text_ object can contain multiple warnings.
   this.text_ = Object.create(null);
 };
-Blockly.utils.object.inherits(Blockly.Warning, Blockly.Icon);
+Blockly.utils.object.inherits(Warning, Blockly.Icon);
 
 /**
  * Does this icon get hidden when the block is collapsed.
  */
-Blockly.Warning.prototype.collapseHidden = false;
+Warning.prototype.collapseHidden = false;
 
 /**
  * Draw the warning icon.
  * @param {!Element} group The icon group.
  * @protected
  */
-Blockly.Warning.prototype.drawIcon_ = function(group) {
+Warning.prototype.drawIcon_ = function(group) {
   // Triangle with rounded corners.
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.PATH,
@@ -83,7 +84,7 @@ Blockly.Warning.prototype.drawIcon_ = function(group) {
  * Show or hide the warning bubble.
  * @param {boolean} visible True if the bubble should be visible.
  */
-Blockly.Warning.prototype.setVisible = function(visible) {
+Warning.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
@@ -100,7 +101,7 @@ Blockly.Warning.prototype.setVisible = function(visible) {
  * Show the bubble.
  * @private
  */
-Blockly.Warning.prototype.createBubble_ = function() {
+Warning.prototype.createBubble_ = function() {
   this.paragraphElement_ = Blockly.Bubble.textToDom(this.getText());
   this.bubble_ = Blockly.Bubble.createNonEditableBubble(
       this.paragraphElement_, /** @type {!Blockly.BlockSvg} */ (this.block_),
@@ -112,7 +113,7 @@ Blockly.Warning.prototype.createBubble_ = function() {
  * Dispose of the bubble and references to it.
  * @private
  */
-Blockly.Warning.prototype.disposeBubble_ = function() {
+Warning.prototype.disposeBubble_ = function() {
   this.bubble_.dispose();
   this.bubble_ = null;
   this.paragraphElement_ = null;
@@ -125,7 +126,7 @@ Blockly.Warning.prototype.disposeBubble_ = function() {
  * @param {string} id An ID for this text entry to be able to maintain
  *     multiple warnings.
  */
-Blockly.Warning.prototype.setText = function(text, id) {
+Warning.prototype.setText = function(text, id) {
   if (this.text_[id] == text) {
     return;
   }
@@ -144,7 +145,7 @@ Blockly.Warning.prototype.setText = function(text, id) {
  * Get this warning's texts.
  * @return {string} All texts concatenated into one string.
  */
-Blockly.Warning.prototype.getText = function() {
+Warning.prototype.getText = function() {
   const allWarnings = [];
   for (let id in this.text_) {
     allWarnings.push(this.text_[id]);
@@ -155,7 +156,9 @@ Blockly.Warning.prototype.getText = function() {
 /**
  * Dispose of this warning.
  */
-Blockly.Warning.prototype.dispose = function() {
+Warning.prototype.dispose = function() {
   this.block_.warning = null;
   Blockly.Icon.prototype.dispose.call(this);
 };
+
+exports = Warning;
diff --git a/tests/deps.js b/tests/deps.js
index 84c1c2b48..c6ccc9bb8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -199,7 +199,7 @@ goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Bloc
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
-goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});

From 9f3139c7520906c91ba18bc2edbcbda170414893 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:58:28 -0700
Subject: [PATCH 031/291] Migrate core/warning.js named requires

---
 core/warning.js | 52 +++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index c39e7cad9..90bc15b12 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -13,24 +13,26 @@
 goog.module('Blockly.Warning');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Bubble');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Bubble = goog.require('Blockly.Bubble');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Icon = goog.require('Blockly.Icon');
+const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BubbleOpen');
-goog.require('Blockly.Icon');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.utils.Coordinate');
 
 
 /**
  * Class for a warning.
- * @param {!Blockly.Block} block The block associated with this warning.
- * @extends {Blockly.Icon}
+ * @param {!Block} block The block associated with this warning.
+ * @extends {Icon}
  * @constructor
  */
 const Warning = function(block) {
@@ -39,7 +41,7 @@ const Warning = function(block) {
   // The text_ object can contain multiple warnings.
   this.text_ = Object.create(null);
 };
-Blockly.utils.object.inherits(Warning, Blockly.Icon);
+object.inherits(Warning, Icon);
 
 /**
  * Does this icon get hidden when the block is collapsed.
@@ -53,8 +55,8 @@ Warning.prototype.collapseHidden = false;
  */
 Warning.prototype.drawIcon_ = function(group) {
   // Triangle with rounded corners.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyIconShape',
         'd': 'M2,15Q-1,15 0.5,12L6.5,1.7Q8,-1 9.5,1.7L15.5,12Q17,15 14,15z'
@@ -63,16 +65,16 @@ Warning.prototype.drawIcon_ = function(group) {
   // Can't use a real '!' text character since different browsers and operating
   // systems render it differently.
   // Body of exclamation point.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  dom.createSvgElement(
+      Svg.PATH,
       {
         'class': 'blocklyIconSymbol',
         'd': 'm7,4.8v3.16l0.27,2.27h1.46l0.27,-2.27v-3.16z'
       },
       group);
   // Dot of exclamation point.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyIconSymbol',
         'x': '7', 'y': '11', 'height': '2', 'width': '2'
@@ -88,7 +90,7 @@ Warning.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BUBBLE_OPEN))(
+  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
       this.block_, visible, 'warning'));
   if (visible) {
     this.createBubble_();
@@ -102,10 +104,10 @@ Warning.prototype.setVisible = function(visible) {
  * @private
  */
 Warning.prototype.createBubble_ = function() {
-  this.paragraphElement_ = Blockly.Bubble.textToDom(this.getText());
-  this.bubble_ = Blockly.Bubble.createNonEditableBubble(
-      this.paragraphElement_, /** @type {!Blockly.BlockSvg} */ (this.block_),
-      /** @type {!Blockly.utils.Coordinate} */ (this.iconXY_));
+  this.paragraphElement_ = Bubble.textToDom(this.getText());
+  this.bubble_ = Bubble.createNonEditableBubble(
+      this.paragraphElement_, /** @type {!BlockSvg} */ (this.block_),
+      /** @type {!Coordinate} */ (this.iconXY_));
   this.applyColour();
 };
 
@@ -158,7 +160,7 @@ Warning.prototype.getText = function() {
  */
 Warning.prototype.dispose = function() {
   this.block_.warning = null;
-  Blockly.Icon.prototype.dispose.call(this);
+  Icon.prototype.dispose.call(this);
 };
 
 exports = Warning;

From 8056bf04845a1c6666e6db8a3f02b4f2a762b291 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 13:59:56 -0700
Subject: [PATCH 032/291] clang-format core/warning.js

---
 core/warning.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/warning.js b/core/warning.js
index 90bc15b12..e08088e94 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -56,8 +56,7 @@ Warning.prototype.collapseHidden = false;
 Warning.prototype.drawIcon_ = function(group) {
   // Triangle with rounded corners.
   dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyIconShape',
         'd': 'M2,15Q-1,15 0.5,12L6.5,1.7Q8,-1 9.5,1.7L15.5,12Q17,15 14,15z'
       },
@@ -66,18 +65,19 @@ Warning.prototype.drawIcon_ = function(group) {
   // systems render it differently.
   // Body of exclamation point.
   dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm7,4.8v3.16l0.27,2.27h1.46l0.27,-2.27v-3.16z'
       },
       group);
   // Dot of exclamation point.
   dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blocklyIconSymbol',
-        'x': '7', 'y': '11', 'height': '2', 'width': '2'
+        'x': '7',
+        'y': '11',
+        'height': '2',
+        'width': '2'
       },
       group);
 };
@@ -90,8 +90,8 @@ Warning.prototype.setVisible = function(visible) {
   if (visible == this.isVisible()) {
     return;
   }
-  Events.fire(new (Events.get(Events.BUBBLE_OPEN))(
-      this.block_, visible, 'warning'));
+  Events.fire(
+      new (Events.get(Events.BUBBLE_OPEN))(this.block_, visible, 'warning'));
   if (visible) {
     this.createBubble_();
   } else {

From 284d68be805dfc891d5f12d44abf73076098e70e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:17:11 -0700
Subject: [PATCH 033/291] Update syntax for for..in loop

---
 core/warning.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/warning.js b/core/warning.js
index e08088e94..6ed5d0c02 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -149,7 +149,7 @@ Warning.prototype.setText = function(text, id) {
  */
 Warning.prototype.getText = function() {
   const allWarnings = [];
-  for (let id in this.text_) {
+  for (const id in this.text_) {
     allWarnings.push(this.text_[id]);
   }
   return allWarnings.join('\n');

From e6bd6cabb18a312ae9c7ba35157d28576c5bc2b3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:01:01 -0700
Subject: [PATCH 034/291] Migrate core/keyboard_nav/ast_node.js to ES6
 const/let

---
 core/keyboard_nav/ast_node.js | 156 ++++++++++++++++++----------------
 1 file changed, 85 insertions(+), 71 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index d86a22a4c..115ffe2a1 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -147,7 +147,7 @@ Blockly.ASTNode.createConnectionNode = function(connection) {
   if (!connection) {
     return null;
   }
-  var type = connection.type;
+  const type = connection.type;
   if (type == Blockly.connectionTypes.INPUT_VALUE) {
     return Blockly.ASTNode.createInputNode(connection.getParentInput());
   } else if (type == Blockly.connectionTypes.NEXT_STATEMENT &&
@@ -215,7 +215,7 @@ Blockly.ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
   if (!wsCoordinate || !workspace) {
     return null;
   }
-  var params = {
+  const params = {
     wsCoordinate: wsCoordinate
   };
   return new Blockly.ASTNode(
@@ -230,8 +230,8 @@ Blockly.ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
  *     block.
  */
 Blockly.ASTNode.createTopNode = function(block) {
-  var astNode;
-  var topConnection = block.previousConnection || block.outputConnection;
+  let astNode;
+  const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
     astNode = Blockly.ASTNode.createConnectionNode(topConnection);
   } else {
@@ -302,13 +302,15 @@ Blockly.ASTNode.prototype.isConnection = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findNextForInput_ = function() {
-  var location = /** @type {!Blockly.Connection} */ (this.location_);
-  var parentInput = location.getParentInput();
-  var block = parentInput.getSourceBlock();
-  var curIdx = block.inputList.indexOf(parentInput);
-  for (var i = curIdx + 1, input; (input = block.inputList[i]); i++) {
-    var fieldRow = input.fieldRow;
-    for (var j = 0, field; (field = fieldRow[j]); j++) {
+  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const parentInput = location.getParentInput();
+  const block = parentInput.getSourceBlock();
+  const curIdx = block.inputList.indexOf(parentInput);
+  let i = curIdx + 1, input;
+  for (; (input = block.inputList[i]); i++) {
+    const fieldRow = input.fieldRow;
+    let j = 0, field;
+    for (; (field = fieldRow[j]); j++) {
       if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(field);
       }
@@ -329,13 +331,14 @@ Blockly.ASTNode.prototype.findNextForInput_ = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findNextForField_ = function() {
-  var location = /** @type {!Blockly.Field} */ (this.location_);
-  var input = location.getParentInput();
-  var block = location.getSourceBlock();
-  var curIdx = block.inputList.indexOf(/** @type {!Blockly.Input} */ (input));
-  var fieldIdx = input.fieldRow.indexOf(location) + 1;
-  for (var i = curIdx, newInput; (newInput = block.inputList[i]); i++) {
-    var fieldRow = newInput.fieldRow;
+  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const input = location.getParentInput();
+  const block = location.getSourceBlock();
+  const curIdx = block.inputList.indexOf(/** @type {!Blockly.Input} */ (input));
+  let fieldIdx = input.fieldRow.indexOf(location) + 1;
+  let i = curIdx, newInput;
+  for (; (newInput = block.inputList[i]); i++) {
+    const fieldRow = newInput.fieldRow;
     while (fieldIdx < fieldRow.length) {
       if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
@@ -359,16 +362,18 @@ Blockly.ASTNode.prototype.findNextForField_ = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findPrevForInput_ = function() {
-  var location = /** @type {!Blockly.Connection} */ (this.location_);
-  var parentInput = location.getParentInput();
-  var block = parentInput.getSourceBlock();
-  var curIdx = block.inputList.indexOf(parentInput);
-  for (var i = curIdx, input; (input = block.inputList[i]); i--) {
+  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const parentInput = location.getParentInput();
+  const block = parentInput.getSourceBlock();
+  const curIdx = block.inputList.indexOf(parentInput);
+  let i = curIdx, input;
+  for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
       return Blockly.ASTNode.createInputNode(input);
     }
-    var fieldRow = input.fieldRow;
-    for (var j = fieldRow.length - 1, field; (field = fieldRow[j]); j--) {
+    const fieldRow = input.fieldRow;
+    let j = fieldRow.length - 1, field;
+    for (; (field = fieldRow[j]); j--) {
       if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(field);
       }
@@ -384,17 +389,18 @@ Blockly.ASTNode.prototype.findPrevForInput_ = function() {
  * @private
  */
 Blockly.ASTNode.prototype.findPrevForField_ = function() {
-  var location = /** @type {!Blockly.Field} */ (this.location_);
-  var parentInput = location.getParentInput();
-  var block = location.getSourceBlock();
-  var curIdx = block.inputList.indexOf(
+  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const parentInput = location.getParentInput();
+  const block = location.getSourceBlock();
+  const curIdx = block.inputList.indexOf(
       /** @type {!Blockly.Input} */ (parentInput));
-  var fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
-  for (var i = curIdx, input; (input = block.inputList[i]); i--) {
+  let fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
+  let i = curIdx, input;
+  for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
       return Blockly.ASTNode.createInputNode(input);
     }
-    var fieldRow = input.fieldRow;
+    const fieldRow = input.fieldRow;
     while (fieldIdx > -1) {
       if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
@@ -425,12 +431,13 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   if (!curLocation || !curLocation.workspace) {
     return null;
   }
-  var curRoot = curLocation.getRootBlock();
-  var topBlocks = curRoot.workspace.getTopBlocks(true);
-  for (var i = 0, topBlock; (topBlock = topBlocks[i]); i++) {
+  const curRoot = curLocation.getRootBlock();
+  const topBlocks = curRoot.workspace.getTopBlocks(true);
+  let i = 0, topBlock;
+  for (; (topBlock = topBlocks[i]); i++) {
     if (curRoot.id == topBlock.id) {
-      var offset = forward ? 1 : -1;
-      var resultIndex = i + offset;
+      const offset = forward ? 1 : -1;
+      const resultIndex = i + offset;
       if (resultIndex == -1 || resultIndex == topBlocks.length) {
         return null;
       }
@@ -450,7 +457,7 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
  * @private
  */
 Blockly.ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
-  var topConnection = block.previousConnection || block.outputConnection;
+  const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
     return /** @type {!Blockly.ASTNode} */ (Blockly.ASTNode.createConnectionNode(
         topConnection));
@@ -472,11 +479,12 @@ Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
   if (!block) {
     return null;
   }
-  var topBlock;
+  let topBlock;
   // If the block doesn't have a previous connection then it is the top of the
   // substack.
   topBlock = block.getTopStackBlock();
-  var topConnection = topBlock.previousConnection || topBlock.outputConnection;
+  const topConnection =
+      topBlock.previousConnection || topBlock.outputConnection;
   // If the top connection has a parentInput, create an AST node pointing to
   // that input.
   if (topConnection && topConnection.targetConnection &&
@@ -497,10 +505,12 @@ Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
  * @private
  */
 Blockly.ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
-  var inputs = block.inputList;
-  for (var i = 0, input; (input = inputs[i]); i++) {
-    var fieldRow = input.fieldRow;
-    for (var j = 0, field; (field = fieldRow[j]); j++) {
+  const inputs = block.inputList;
+  let i = 0, input;
+  for (; (input = inputs[i]); i++) {
+    const fieldRow = input.fieldRow;
+    let j = 0, field;
+    for (; (field = fieldRow[j]); j++) {
       if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
         return Blockly.ASTNode.createFieldNode(field);
       }
@@ -536,12 +546,13 @@ Blockly.ASTNode.prototype.getSourceBlock = function() {
  *     block, or workspace. Or null if there is no node to the right.
  */
 Blockly.ASTNode.prototype.next = function() {
+  let connection, block, nextConnection, targetConnection;
   switch (this.type_) {
     case Blockly.ASTNode.types.STACK:
       return this.navigateBetweenStacks_(true);
 
     case Blockly.ASTNode.types.OUTPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.FIELD:
@@ -551,17 +562,17 @@ Blockly.ASTNode.prototype.next = function() {
       return this.findNextForInput_();
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
-      var nextConnection = block.nextConnection;
+      block = /** @type {!Blockly.Block} */ (this.location_);
+      nextConnection = block.nextConnection;
       return Blockly.ASTNode.createConnectionNode(nextConnection);
 
     case Blockly.ASTNode.types.PREVIOUS:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.NEXT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var targetConnection = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      targetConnection = connection.targetConnection;
       return Blockly.ASTNode.createConnectionNode(targetConnection);
   }
 
@@ -575,26 +586,27 @@ Blockly.ASTNode.prototype.next = function() {
  * workspace, or block. Or null if there is nothing below this node.
  */
 Blockly.ASTNode.prototype.in = function() {
+  let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
     case Blockly.ASTNode.types.WORKSPACE:
-      var workspace = /** @type {!Blockly.Workspace} */ (this.location_);
-      var topBlocks = workspace.getTopBlocks(true);
+      workspace = /** @type {!Blockly.Workspace} */ (this.location_);
+      topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
         return Blockly.ASTNode.createStackNode(topBlocks[0]);
       }
       break;
 
     case Blockly.ASTNode.types.STACK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
 
     case Blockly.ASTNode.types.INPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var targetConnection = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      targetConnection = connection.targetConnection;
       return Blockly.ASTNode.createConnectionNode(targetConnection);
   }
 
@@ -608,6 +620,7 @@ Blockly.ASTNode.prototype.in = function() {
  * null.
  */
 Blockly.ASTNode.prototype.prev = function() {
+  let block, topConnection, connection, targetConnection;
   switch (this.type_) {
     case Blockly.ASTNode.types.STACK:
       return this.navigateBetweenStacks_(false);
@@ -622,20 +635,20 @@ Blockly.ASTNode.prototype.prev = function() {
       return this.findPrevForInput_();
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
-      var topConnection = block.previousConnection || block.outputConnection;
+      block = /** @type {!Blockly.Block} */ (this.location_);
+      topConnection = block.previousConnection || block.outputConnection;
       return Blockly.ASTNode.createConnectionNode(topConnection);
 
     case Blockly.ASTNode.types.PREVIOUS:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var targetConnection = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
         return Blockly.ASTNode.createConnectionNode(targetConnection);
       }
       break;
 
     case Blockly.ASTNode.types.NEXT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
   }
 
@@ -649,41 +662,42 @@ Blockly.ASTNode.prototype.prev = function() {
  *     workspace or block. Or null if we are at the workspace level.
  */
 Blockly.ASTNode.prototype.out = function() {
+  let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
     case Blockly.ASTNode.types.STACK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
-      var blockPos = block.getRelativeToSurfaceXY();
+      block = /** @type {!Blockly.Block} */ (this.location_);
+      blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      var wsCoordinate = new Blockly.utils.Coordinate(
+      wsCoordinate = new Blockly.utils.Coordinate(
           blockPos.x, blockPos.y + Blockly.ASTNode.DEFAULT_OFFSET_Y);
       return Blockly.ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
     case Blockly.ASTNode.types.OUTPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
-      var target = connection.targetConnection;
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      target = connection.targetConnection;
       if (target) {
         return Blockly.ASTNode.createConnectionNode(target);
       }
       return Blockly.ASTNode.createStackNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.FIELD:
-      var field = /** @type {!Blockly.Field} */ (this.location_);
+      field = /** @type {!Blockly.Field} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(field.getSourceBlock());
 
     case Blockly.ASTNode.types.INPUT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.BLOCK:
-      var block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Blockly.Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
 
     case Blockly.ASTNode.types.PREVIOUS:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
 
     case Blockly.ASTNode.types.NEXT:
-      var connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
   }
 

From ec06ea6586f06ded38c27815bdc07722406f6819 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 16:13:39 -0700
Subject: [PATCH 035/291] Migrate core/keyboard_nav/ast_node.js to goog.module

---
 core/keyboard_nav/ast_node.js | 279 +++++++++++++++++-----------------
 tests/deps.js                 |   2 +-
 2 files changed, 142 insertions(+), 139 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 115ffe2a1..e0a75d0c0 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ASTNode');
+goog.module('Blockly.ASTNode');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.utils.Coordinate');
@@ -29,19 +30,19 @@ goog.requireType('Blockly.Workspace');
  * It is recommended that you use one of the createNode methods instead of
  * creating a node directly.
  * @param {string} type The type of the location.
- *     Must be in Blockly.ASTNode.types.
+ *     Must be in ASTNode.types.
  * @param {!Blockly.IASTNodeLocation} location The position in the AST.
- * @param {!Blockly.ASTNode.Params=} opt_params Optional dictionary of options.
+ * @param {!ASTNode.Params=} opt_params Optional dictionary of options.
  * @constructor
  */
-Blockly.ASTNode = function(type, location, opt_params) {
+const ASTNode = function(type, location, opt_params) {
   if (!location) {
     throw Error('Cannot create a node without a location.');
   }
 
   /**
    * The type of the location.
-   * One of Blockly.ASTNode.types
+   * One of ASTNode.types
    * @type {string}
    * @private
    */
@@ -52,7 +53,7 @@ Blockly.ASTNode = function(type, location, opt_params) {
    * @type {boolean}
    * @private
    */
-  this.isConnection_ = Blockly.ASTNode.isConnectionType_(type);
+  this.isConnection_ = ASTNode.isConnectionType_(type);
 
   /**
    * The location of the AST node.
@@ -76,13 +77,13 @@ Blockly.ASTNode = function(type, location, opt_params) {
  *     wsCoordinate: Blockly.utils.Coordinate
  * }}
  */
-Blockly.ASTNode.Params;
+ASTNode.Params;
 
 /**
  * Object holding different types for an AST node.
  * @enum {string}
  */
-Blockly.ASTNode.types = {
+ASTNode.types = {
   FIELD: 'field',
   BLOCK: 'block',
   INPUT: 'input',
@@ -97,7 +98,7 @@ Blockly.ASTNode.types = {
  * True to navigate to all fields. False to only navigate to clickable fields.
  * @type {boolean}
  */
-Blockly.ASTNode.NAVIGATE_ALL_FIELDS = false;
+ASTNode.NAVIGATE_ALL_FIELDS = false;
 
 /**
  * The default y offset to use when moving the cursor from a stack to the
@@ -105,20 +106,20 @@ Blockly.ASTNode.NAVIGATE_ALL_FIELDS = false;
  * @type {number}
  * @private
  */
-Blockly.ASTNode.DEFAULT_OFFSET_Y = -20;
+ASTNode.DEFAULT_OFFSET_Y = -20;
 
 /**
  * Whether an AST node of the given type points to a connection.
- * @param {string} type The type to check.  One of Blockly.ASTNode.types.
+ * @param {string} type The type to check.  One of ASTNode.types.
  * @return {boolean} True if a node of the given type points to a connection.
  * @private
  */
-Blockly.ASTNode.isConnectionType_ = function(type) {
+ASTNode.isConnectionType_ = function(type) {
   switch (type) {
-    case Blockly.ASTNode.types.PREVIOUS:
-    case Blockly.ASTNode.types.NEXT:
-    case Blockly.ASTNode.types.INPUT:
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.PREVIOUS:
+    case ASTNode.types.NEXT:
+    case ASTNode.types.INPUT:
+    case ASTNode.types.OUTPUT:
       return true;
   }
   return false;
@@ -127,13 +128,13 @@ Blockly.ASTNode.isConnectionType_ = function(type) {
 /**
  * Create an AST node pointing to a field.
  * @param {Blockly.Field} field The location of the AST node.
- * @return {Blockly.ASTNode} An AST node pointing to a field.
+ * @return {ASTNode} An AST node pointing to a field.
  */
-Blockly.ASTNode.createFieldNode = function(field) {
+ASTNode.createFieldNode = function(field) {
   if (!field) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.FIELD, field);
+  return new ASTNode(ASTNode.types.FIELD, field);
 };
 
 /**
@@ -141,24 +142,24 @@ Blockly.ASTNode.createFieldNode = function(field) {
  * input then create an AST node of type input that will hold the connection.
  * @param {Blockly.Connection} connection This is the connection the node will
  *     point to.
- * @return {Blockly.ASTNode} An AST node pointing to a connection.
+ * @return {ASTNode} An AST node pointing to a connection.
  */
-Blockly.ASTNode.createConnectionNode = function(connection) {
+ASTNode.createConnectionNode = function(connection) {
   if (!connection) {
     return null;
   }
   const type = connection.type;
   if (type == Blockly.connectionTypes.INPUT_VALUE) {
-    return Blockly.ASTNode.createInputNode(connection.getParentInput());
+    return ASTNode.createInputNode(connection.getParentInput());
   } else if (type == Blockly.connectionTypes.NEXT_STATEMENT &&
       connection.getParentInput()) {
-    return Blockly.ASTNode.createInputNode(connection.getParentInput());
+    return ASTNode.createInputNode(connection.getParentInput());
   } else if (type == Blockly.connectionTypes.NEXT_STATEMENT) {
-    return new Blockly.ASTNode(Blockly.ASTNode.types.NEXT, connection);
+    return new ASTNode(ASTNode.types.NEXT, connection);
   } else if (type == Blockly.connectionTypes.OUTPUT_VALUE) {
-    return new Blockly.ASTNode(Blockly.ASTNode.types.OUTPUT, connection);
+    return new ASTNode(ASTNode.types.OUTPUT, connection);
   } else if (type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
-    return new Blockly.ASTNode(Blockly.ASTNode.types.PREVIOUS, connection);
+    return new ASTNode(ASTNode.types.PREVIOUS, connection);
   }
   return null;
 };
@@ -167,25 +168,25 @@ Blockly.ASTNode.createConnectionNode = function(connection) {
  * Creates an AST node pointing to an input. Stores the input connection as the
  *     location.
  * @param {Blockly.Input} input The input used to create an AST node.
- * @return {Blockly.ASTNode} An AST node pointing to a input.
+ * @return {ASTNode} An AST node pointing to a input.
  */
-Blockly.ASTNode.createInputNode = function(input) {
+ASTNode.createInputNode = function(input) {
   if (!input || !input.connection) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.INPUT, input.connection);
+  return new ASTNode(ASTNode.types.INPUT, input.connection);
 };
 
 /**
  * Creates an AST node pointing to a block.
  * @param {Blockly.Block} block The block used to create an AST node.
- * @return {Blockly.ASTNode} An AST node pointing to a block.
+ * @return {ASTNode} An AST node pointing to a block.
  */
-Blockly.ASTNode.createBlockNode = function(block) {
+ASTNode.createBlockNode = function(block) {
   if (!block) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.BLOCK, block);
+  return new ASTNode(ASTNode.types.BLOCK, block);
 };
 
 /**
@@ -193,14 +194,14 @@ Blockly.ASTNode.createBlockNode = function(block) {
  *     the set of all blocks connected to a top block, including the top block.
  * @param {Blockly.Block} topBlock A top block has no parent and can be found
  *     in the list returned by workspace.getTopBlocks().
- * @return {Blockly.ASTNode} An AST node of type stack that points to the top
+ * @return {ASTNode} An AST node of type stack that points to the top
  *     block on the stack.
  */
-Blockly.ASTNode.createStackNode = function(topBlock) {
+ASTNode.createStackNode = function(topBlock) {
   if (!topBlock) {
     return null;
   }
-  return new Blockly.ASTNode(Blockly.ASTNode.types.STACK, topBlock);
+  return new ASTNode(ASTNode.types.STACK, topBlock);
 };
 
 /**
@@ -208,44 +209,44 @@ Blockly.ASTNode.createStackNode = function(topBlock) {
  * @param {!Blockly.Workspace} workspace The workspace that we are on.
  * @param {Blockly.utils.Coordinate} wsCoordinate The position on the workspace
  *     for this node.
- * @return {Blockly.ASTNode} An AST node pointing to a workspace and a position
+ * @return {ASTNode} An AST node pointing to a workspace and a position
  *     on the workspace.
  */
-Blockly.ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
+ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
   if (!wsCoordinate || !workspace) {
     return null;
   }
   const params = {
     wsCoordinate: wsCoordinate
   };
-  return new Blockly.ASTNode(
-      Blockly.ASTNode.types.WORKSPACE, workspace, params);
+  return new ASTNode(
+      ASTNode.types.WORKSPACE, workspace, params);
 };
 
 /**
  * Creates an AST node for the top position on a block.
  * This is either an output connection, previous connection, or block.
  * @param {!Blockly.Block} block The block to find the top most AST node on.
- * @return {Blockly.ASTNode} The AST node holding the top most position on the
+ * @return {ASTNode} The AST node holding the top most position on the
  *     block.
  */
-Blockly.ASTNode.createTopNode = function(block) {
+ASTNode.createTopNode = function(block) {
   let astNode;
   const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
-    astNode = Blockly.ASTNode.createConnectionNode(topConnection);
+    astNode = ASTNode.createConnectionNode(topConnection);
   } else {
-    astNode = Blockly.ASTNode.createBlockNode(block);
+    astNode = ASTNode.createBlockNode(block);
   }
   return astNode;
 };
 
 /**
  * Parse the optional parameters.
- * @param {?Blockly.ASTNode.Params} params The user specified parameters.
+ * @param {?ASTNode.Params} params The user specified parameters.
  * @private
  */
-Blockly.ASTNode.prototype.processParams_ = function(params) {
+ASTNode.prototype.processParams_ = function(params) {
   if (!params) {
     return;
   }
@@ -261,16 +262,16 @@ Blockly.ASTNode.prototype.processParams_ = function(params) {
  * @return {!Blockly.IASTNodeLocation} The current field, connection, workspace, or
  *     block the cursor is on.
  */
-Blockly.ASTNode.prototype.getLocation = function() {
+ASTNode.prototype.getLocation = function() {
   return this.location_;
 };
 
 /**
  * The type of the current location.
- * One of Blockly.ASTNode.types
+ * One of ASTNode.types
  * @return {string} The type of the location.
  */
-Blockly.ASTNode.prototype.getType = function() {
+ASTNode.prototype.getType = function() {
   return this.type_;
 };
 
@@ -279,7 +280,7 @@ Blockly.ASTNode.prototype.getType = function() {
  * @return {Blockly.utils.Coordinate} The workspace coordinate or null if the
  *     location is not a workspace.
  */
-Blockly.ASTNode.prototype.getWsCoordinate = function() {
+ASTNode.prototype.getWsCoordinate = function() {
   return this.wsCoordinate_;
 };
 
@@ -288,7 +289,7 @@ Blockly.ASTNode.prototype.getWsCoordinate = function() {
  * @return {boolean} [description]
  * @package
  */
-Blockly.ASTNode.prototype.isConnection = function() {
+ASTNode.prototype.isConnection = function() {
   return this.isConnection_;
 };
 
@@ -296,12 +297,12 @@ Blockly.ASTNode.prototype.isConnection = function() {
  * Given an input find the next editable field or an input with a non null
  * connection in the same block. The current location must be an input
  * connection.
- * @return {Blockly.ASTNode} The AST node holding the next field or connection
+ * @return {ASTNode} The AST node holding the next field or connection
  *     or null if there is no editable field or input connection after the given
  *     input.
  * @private
  */
-Blockly.ASTNode.prototype.findNextForInput_ = function() {
+ASTNode.prototype.findNextForInput_ = function() {
   const location = /** @type {!Blockly.Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
@@ -311,12 +312,12 @@ Blockly.ASTNode.prototype.findNextForInput_ = function() {
     const fieldRow = input.fieldRow;
     let j = 0, field;
     for (; (field = fieldRow[j]); j++) {
-      if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(field);
+      if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(field);
       }
     }
     if (input.connection) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
   }
   return null;
@@ -325,12 +326,12 @@ Blockly.ASTNode.prototype.findNextForInput_ = function() {
 /**
  * Given a field find the next editable field or an input with a non null
  * connection in the same block. The current location must be a field.
- * @return {Blockly.ASTNode} The AST node pointing to the next field or
+ * @return {ASTNode} The AST node pointing to the next field or
  *     connection or null if there is no editable field or input connection
  *     after the given input.
  * @private
  */
-Blockly.ASTNode.prototype.findNextForField_ = function() {
+ASTNode.prototype.findNextForField_ = function() {
   const location = /** @type {!Blockly.Field} */ (this.location_);
   const input = location.getParentInput();
   const block = location.getSourceBlock();
@@ -340,14 +341,14 @@ Blockly.ASTNode.prototype.findNextForField_ = function() {
   for (; (newInput = block.inputList[i]); i++) {
     const fieldRow = newInput.fieldRow;
     while (fieldIdx < fieldRow.length) {
-      if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
+      if (fieldRow[fieldIdx].isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(fieldRow[fieldIdx]);
       }
       fieldIdx++;
     }
     fieldIdx = 0;
     if (newInput.connection) {
-      return Blockly.ASTNode.createInputNode(newInput);
+      return ASTNode.createInputNode(newInput);
     }
   }
   return null;
@@ -357,11 +358,11 @@ Blockly.ASTNode.prototype.findNextForField_ = function() {
  * Given an input find the previous editable field or an input with a non null
  * connection in the same block. The current location must be an input
  * connection.
- * @return {Blockly.ASTNode} The AST node holding the previous field or
+ * @return {ASTNode} The AST node holding the previous field or
  *     connection.
  * @private
  */
-Blockly.ASTNode.prototype.findPrevForInput_ = function() {
+ASTNode.prototype.findPrevForInput_ = function() {
   const location = /** @type {!Blockly.Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
@@ -369,13 +370,13 @@ Blockly.ASTNode.prototype.findPrevForInput_ = function() {
   let i = curIdx, input;
   for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
     const fieldRow = input.fieldRow;
     let j = fieldRow.length - 1, field;
     for (; (field = fieldRow[j]); j--) {
-      if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(field);
+      if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(field);
       }
     }
   }
@@ -385,10 +386,10 @@ Blockly.ASTNode.prototype.findPrevForInput_ = function() {
 /**
  * Given a field find the previous editable field or an input with a non null
  * connection in the same block. The current location must be a field.
- * @return {Blockly.ASTNode} The AST node holding the previous input or field.
+ * @return {ASTNode} The AST node holding the previous input or field.
  * @private
  */
-Blockly.ASTNode.prototype.findPrevForField_ = function() {
+ASTNode.prototype.findPrevForField_ = function() {
   const location = /** @type {!Blockly.Field} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = location.getSourceBlock();
@@ -398,12 +399,12 @@ Blockly.ASTNode.prototype.findPrevForField_ = function() {
   let i = curIdx, input;
   for (; (input = block.inputList[i]); i--) {
     if (input.connection && input !== parentInput) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
     const fieldRow = input.fieldRow;
     while (fieldIdx > -1) {
-      if (fieldRow[fieldIdx].isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(fieldRow[fieldIdx]);
+      if (fieldRow[fieldIdx].isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(fieldRow[fieldIdx]);
       }
       fieldIdx--;
     }
@@ -418,11 +419,11 @@ Blockly.ASTNode.prototype.findPrevForField_ = function() {
 /**
  * Navigate between stacks of blocks on the workspace.
  * @param {boolean} forward True to go forward. False to go backwards.
- * @return {Blockly.ASTNode} The first block of the next stack or null if there
+ * @return {ASTNode} The first block of the next stack or null if there
  * are no blocks on the workspace.
  * @private
  */
-Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
+ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   var curLocation = this.getLocation();
   if (curLocation.getSourceBlock) {
     curLocation = /** @type {!Blockly.IASTNodeLocationWithBlock} */ (
@@ -441,7 +442,7 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
       if (resultIndex == -1 || resultIndex == topBlocks.length) {
         return null;
       }
-      return Blockly.ASTNode.createStackNode(topBlocks[resultIndex]);
+      return ASTNode.createStackNode(topBlocks[resultIndex]);
     }
   }
   throw Error('Couldn\'t find ' + (forward ? 'next' : 'previous') + ' stack?!');
@@ -453,16 +454,16 @@ Blockly.ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
  * on what kind of connections the block has.
  * @param {!Blockly.Block} block The block that we want to find the top
  *     connection on.
- * @return {!Blockly.ASTNode} The AST node containing the top connection.
+ * @return {!ASTNode} The AST node containing the top connection.
  * @private
  */
-Blockly.ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
+ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
   const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
-    return /** @type {!Blockly.ASTNode} */ (Blockly.ASTNode.createConnectionNode(
+    return /** @type {!ASTNode} */ (ASTNode.createConnectionNode(
         topConnection));
   } else {
-    return /** @type {!Blockly.ASTNode} */ (Blockly.ASTNode.createBlockNode(
+    return /** @type {!ASTNode} */ (ASTNode.createBlockNode(
         block));
   }
 };
@@ -471,11 +472,11 @@ Blockly.ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
  * Get the AST node pointing to the input that the block is nested under or if
  * the block is not nested then get the stack AST node.
  * @param {Blockly.Block} block The source block of the current location.
- * @return {Blockly.ASTNode} The AST node pointing to the input connection or
+ * @return {ASTNode} The AST node pointing to the input connection or
  *     the top block of the stack this block is in.
  * @private
  */
-Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
+ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
   if (!block) {
     return null;
   }
@@ -489,34 +490,34 @@ Blockly.ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
   // that input.
   if (topConnection && topConnection.targetConnection &&
       topConnection.targetConnection.getParentInput()) {
-    return Blockly.ASTNode.createInputNode(
+    return ASTNode.createInputNode(
         topConnection.targetConnection.getParentInput());
   } else {
     // Go to stack level if you are not underneath an input.
-    return Blockly.ASTNode.createStackNode(topBlock);
+    return ASTNode.createStackNode(topBlock);
   }
 };
 
 /**
  * Find the first editable field or input with a connection on a given block.
  * @param {!Blockly.Block} block The source block of the current location.
- * @return {Blockly.ASTNode} An AST node pointing to the first field or input.
+ * @return {ASTNode} An AST node pointing to the first field or input.
  * Null if there are no editable fields or inputs with connections on the block.
  * @private
  */
-Blockly.ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
+ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
   const inputs = block.inputList;
   let i = 0, input;
   for (; (input = inputs[i]); i++) {
     const fieldRow = input.fieldRow;
     let j = 0, field;
     for (; (field = fieldRow[j]); j++) {
-      if (field.isClickable() || Blockly.ASTNode.NAVIGATE_ALL_FIELDS) {
-        return Blockly.ASTNode.createFieldNode(field);
+      if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
+        return ASTNode.createFieldNode(field);
       }
     }
     if (input.connection) {
-      return Blockly.ASTNode.createInputNode(input);
+      return ASTNode.createInputNode(input);
     }
   }
   return null;
@@ -527,12 +528,12 @@ Blockly.ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
  * @return {Blockly.Block} The source block of the location, or null if the node
  * is of type workspace.
  */
-Blockly.ASTNode.prototype.getSourceBlock = function() {
-  if (this.getType() === Blockly.ASTNode.types.BLOCK) {
+ASTNode.prototype.getSourceBlock = function() {
+  if (this.getType() === ASTNode.types.BLOCK) {
     return /** @type {Blockly.Block} */ (this.getLocation());
-  } else if (this.getType() === Blockly.ASTNode.types.STACK) {
+  } else if (this.getType() === ASTNode.types.STACK) {
     return /** @type {Blockly.Block} */ (this.getLocation());
-  } else if (this.getType() === Blockly.ASTNode.types.WORKSPACE) {
+  } else if (this.getType() === ASTNode.types.WORKSPACE) {
     return null;
   } else {
     return /** @type {Blockly.IASTNodeLocationWithBlock} */ (
@@ -542,38 +543,38 @@ Blockly.ASTNode.prototype.getSourceBlock = function() {
 
 /**
  * Find the element to the right of the current element in the AST.
- * @return {Blockly.ASTNode} An AST node that wraps the next field, connection,
+ * @return {ASTNode} An AST node that wraps the next field, connection,
  *     block, or workspace. Or null if there is no node to the right.
  */
-Blockly.ASTNode.prototype.next = function() {
+ASTNode.prototype.next = function() {
   let connection, block, nextConnection, targetConnection;
   switch (this.type_) {
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(true);
 
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.OUTPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.FIELD:
+    case ASTNode.types.FIELD:
       return this.findNextForField_();
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       return this.findNextForInput_();
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       nextConnection = block.nextConnection;
-      return Blockly.ASTNode.createConnectionNode(nextConnection);
+      return ASTNode.createConnectionNode(nextConnection);
 
-    case Blockly.ASTNode.types.PREVIOUS:
+    case ASTNode.types.PREVIOUS:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.NEXT:
+    case ASTNode.types.NEXT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
-      return Blockly.ASTNode.createConnectionNode(targetConnection);
+      return ASTNode.createConnectionNode(targetConnection);
   }
 
   return null;
@@ -582,32 +583,32 @@ Blockly.ASTNode.prototype.next = function() {
 /**
  * Find the element one level below and all the way to the left of the current
  * location.
- * @return {Blockly.ASTNode} An AST node that wraps the next field, connection,
+ * @return {ASTNode} An AST node that wraps the next field, connection,
  * workspace, or block. Or null if there is nothing below this node.
  */
-Blockly.ASTNode.prototype.in = function() {
+ASTNode.prototype.in = function() {
   let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
-    case Blockly.ASTNode.types.WORKSPACE:
+    case ASTNode.types.WORKSPACE:
       workspace = /** @type {!Blockly.Workspace} */ (this.location_);
       topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
-        return Blockly.ASTNode.createStackNode(topBlocks[0]);
+        return ASTNode.createStackNode(topBlocks[0]);
       }
       break;
 
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
-      return Blockly.ASTNode.createConnectionNode(targetConnection);
+      return ASTNode.createConnectionNode(targetConnection);
   }
 
   return null;
@@ -615,41 +616,41 @@ Blockly.ASTNode.prototype.in = function() {
 
 /**
  * Find the element to the left of the current element in the AST.
- * @return {Blockly.ASTNode} An AST node that wraps the previous field,
+ * @return {ASTNode} An AST node that wraps the previous field,
  * connection, workspace or block. Or null if no node exists to the left.
  * null.
  */
-Blockly.ASTNode.prototype.prev = function() {
+ASTNode.prototype.prev = function() {
   let block, topConnection, connection, targetConnection;
   switch (this.type_) {
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(false);
 
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.OUTPUT:
       return null;
 
-    case Blockly.ASTNode.types.FIELD:
+    case ASTNode.types.FIELD:
       return this.findPrevForField_();
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       return this.findPrevForInput_();
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       topConnection = block.previousConnection || block.outputConnection;
-      return Blockly.ASTNode.createConnectionNode(topConnection);
+      return ASTNode.createConnectionNode(topConnection);
 
-    case Blockly.ASTNode.types.PREVIOUS:
+    case ASTNode.types.PREVIOUS:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
-        return Blockly.ASTNode.createConnectionNode(targetConnection);
+        return ASTNode.createConnectionNode(targetConnection);
       }
       break;
 
-    case Blockly.ASTNode.types.NEXT:
+    case ASTNode.types.NEXT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
   }
 
   return null;
@@ -658,48 +659,50 @@ Blockly.ASTNode.prototype.prev = function() {
 /**
  * Find the next element that is one position above and all the way to the left
  * of the current location.
- * @return {Blockly.ASTNode} An AST node that wraps the next field, connection,
+ * @return {ASTNode} An AST node that wraps the next field, connection,
  *     workspace or block. Or null if we are at the workspace level.
  */
-Blockly.ASTNode.prototype.out = function() {
+ASTNode.prototype.out = function() {
   let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
-    case Blockly.ASTNode.types.STACK:
+    case ASTNode.types.STACK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
       wsCoordinate = new Blockly.utils.Coordinate(
-          blockPos.x, blockPos.y + Blockly.ASTNode.DEFAULT_OFFSET_Y);
-      return Blockly.ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
+          blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
+      return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
-    case Blockly.ASTNode.types.OUTPUT:
+    case ASTNode.types.OUTPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       target = connection.targetConnection;
       if (target) {
-        return Blockly.ASTNode.createConnectionNode(target);
+        return ASTNode.createConnectionNode(target);
       }
-      return Blockly.ASTNode.createStackNode(connection.getSourceBlock());
+      return ASTNode.createStackNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.FIELD:
+    case ASTNode.types.FIELD:
       field = /** @type {!Blockly.Field} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(field.getSourceBlock());
+      return ASTNode.createBlockNode(field.getSourceBlock());
 
-    case Blockly.ASTNode.types.INPUT:
+    case ASTNode.types.INPUT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
-      return Blockly.ASTNode.createBlockNode(connection.getSourceBlock());
+      return ASTNode.createBlockNode(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.BLOCK:
+    case ASTNode.types.BLOCK:
       block = /** @type {!Blockly.Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
 
-    case Blockly.ASTNode.types.PREVIOUS:
+    case ASTNode.types.PREVIOUS:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
 
-    case Blockly.ASTNode.types.NEXT:
+    case ASTNode.types.NEXT:
       connection = /** @type {!Blockly.Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
   }
 
   return null;
 };
+
+exports = ASTNode;
diff --git a/tests/deps.js b/tests/deps.js
index c6ccc9bb8..957896ec3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -102,7 +102,7 @@ goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'
 goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es5'});
+goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);

From e79faf4147255a29982e12b95d3d6bb3bfc36939 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 21 Jul 2021 17:16:02 -0700
Subject: [PATCH 036/291] Migrate core/keyboard_nav/ast_node.js named requires

---
 core/keyboard_nav/ast_node.js | 123 +++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 62 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index e0a75d0c0..09a63b3a2 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -13,16 +13,15 @@
 goog.module('Blockly.ASTNode');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.utils.Coordinate');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IASTNodeLocation');
-goog.requireType('Blockly.IASTNodeLocationWithBlock');
-goog.requireType('Blockly.Input');
-goog.requireType('Blockly.Workspace');
+const Block = goog.requireType('Blockly.Block');
+const Connection = goog.requireType('Blockly.Connection');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Field = goog.requireType('Blockly.Field');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
+const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
+const Input = goog.requireType('Blockly.Input');
+const Workspace = goog.requireType('Blockly.Workspace');
+const connectionTypes = goog.require('Blockly.connectionTypes');
 
 
 /**
@@ -31,7 +30,7 @@ goog.requireType('Blockly.Workspace');
  * creating a node directly.
  * @param {string} type The type of the location.
  *     Must be in ASTNode.types.
- * @param {!Blockly.IASTNodeLocation} location The position in the AST.
+ * @param {!IASTNodeLocation} location The position in the AST.
  * @param {!ASTNode.Params=} opt_params Optional dictionary of options.
  * @constructor
  */
@@ -57,14 +56,14 @@ const ASTNode = function(type, location, opt_params) {
 
   /**
    * The location of the AST node.
-   * @type {!Blockly.IASTNodeLocation}
+   * @type {!IASTNodeLocation}
    * @private
    */
   this.location_ = location;
 
   /**
    * The coordinate on the workspace.
-   * @type {Blockly.utils.Coordinate}
+   * @type {Coordinate}
    * @private
    */
   this.wsCoordinate_ = null;
@@ -74,7 +73,7 @@ const ASTNode = function(type, location, opt_params) {
 
 /**
  * @typedef {{
- *     wsCoordinate: Blockly.utils.Coordinate
+ *     wsCoordinate: Coordinate
  * }}
  */
 ASTNode.Params;
@@ -127,7 +126,7 @@ ASTNode.isConnectionType_ = function(type) {
 
 /**
  * Create an AST node pointing to a field.
- * @param {Blockly.Field} field The location of the AST node.
+ * @param {Field} field The location of the AST node.
  * @return {ASTNode} An AST node pointing to a field.
  */
 ASTNode.createFieldNode = function(field) {
@@ -140,7 +139,7 @@ ASTNode.createFieldNode = function(field) {
 /**
  * Creates an AST node pointing to a connection. If the connection has a parent
  * input then create an AST node of type input that will hold the connection.
- * @param {Blockly.Connection} connection This is the connection the node will
+ * @param {Connection} connection This is the connection the node will
  *     point to.
  * @return {ASTNode} An AST node pointing to a connection.
  */
@@ -149,16 +148,16 @@ ASTNode.createConnectionNode = function(connection) {
     return null;
   }
   const type = connection.type;
-  if (type == Blockly.connectionTypes.INPUT_VALUE) {
+  if (type == connectionTypes.INPUT_VALUE) {
     return ASTNode.createInputNode(connection.getParentInput());
-  } else if (type == Blockly.connectionTypes.NEXT_STATEMENT &&
+  } else if (type == connectionTypes.NEXT_STATEMENT &&
       connection.getParentInput()) {
     return ASTNode.createInputNode(connection.getParentInput());
-  } else if (type == Blockly.connectionTypes.NEXT_STATEMENT) {
+  } else if (type == connectionTypes.NEXT_STATEMENT) {
     return new ASTNode(ASTNode.types.NEXT, connection);
-  } else if (type == Blockly.connectionTypes.OUTPUT_VALUE) {
+  } else if (type == connectionTypes.OUTPUT_VALUE) {
     return new ASTNode(ASTNode.types.OUTPUT, connection);
-  } else if (type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+  } else if (type == connectionTypes.PREVIOUS_STATEMENT) {
     return new ASTNode(ASTNode.types.PREVIOUS, connection);
   }
   return null;
@@ -167,7 +166,7 @@ ASTNode.createConnectionNode = function(connection) {
 /**
  * Creates an AST node pointing to an input. Stores the input connection as the
  *     location.
- * @param {Blockly.Input} input The input used to create an AST node.
+ * @param {Input} input The input used to create an AST node.
  * @return {ASTNode} An AST node pointing to a input.
  */
 ASTNode.createInputNode = function(input) {
@@ -179,7 +178,7 @@ ASTNode.createInputNode = function(input) {
 
 /**
  * Creates an AST node pointing to a block.
- * @param {Blockly.Block} block The block used to create an AST node.
+ * @param {Block} block The block used to create an AST node.
  * @return {ASTNode} An AST node pointing to a block.
  */
 ASTNode.createBlockNode = function(block) {
@@ -192,7 +191,7 @@ ASTNode.createBlockNode = function(block) {
 /**
  * Create an AST node of type stack. A stack, represented by its top block, is
  *     the set of all blocks connected to a top block, including the top block.
- * @param {Blockly.Block} topBlock A top block has no parent and can be found
+ * @param {Block} topBlock A top block has no parent and can be found
  *     in the list returned by workspace.getTopBlocks().
  * @return {ASTNode} An AST node of type stack that points to the top
  *     block on the stack.
@@ -206,8 +205,8 @@ ASTNode.createStackNode = function(topBlock) {
 
 /**
  * Creates an AST node pointing to a workspace.
- * @param {!Blockly.Workspace} workspace The workspace that we are on.
- * @param {Blockly.utils.Coordinate} wsCoordinate The position on the workspace
+ * @param {!Workspace} workspace The workspace that we are on.
+ * @param {Coordinate} wsCoordinate The position on the workspace
  *     for this node.
  * @return {ASTNode} An AST node pointing to a workspace and a position
  *     on the workspace.
@@ -226,7 +225,7 @@ ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
 /**
  * Creates an AST node for the top position on a block.
  * This is either an output connection, previous connection, or block.
- * @param {!Blockly.Block} block The block to find the top most AST node on.
+ * @param {!Block} block The block to find the top most AST node on.
  * @return {ASTNode} The AST node holding the top most position on the
  *     block.
  */
@@ -259,7 +258,7 @@ ASTNode.prototype.processParams_ = function(params) {
  * Gets the value pointed to by this node.
  * It is the callers responsibility to check the node type to figure out what
  * type of object they get back from this.
- * @return {!Blockly.IASTNodeLocation} The current field, connection, workspace, or
+ * @return {!IASTNodeLocation} The current field, connection, workspace, or
  *     block the cursor is on.
  */
 ASTNode.prototype.getLocation = function() {
@@ -277,7 +276,7 @@ ASTNode.prototype.getType = function() {
 
 /**
  * The coordinate on the workspace.
- * @return {Blockly.utils.Coordinate} The workspace coordinate or null if the
+ * @return {Coordinate} The workspace coordinate or null if the
  *     location is not a workspace.
  */
 ASTNode.prototype.getWsCoordinate = function() {
@@ -303,7 +302,7 @@ ASTNode.prototype.isConnection = function() {
  * @private
  */
 ASTNode.prototype.findNextForInput_ = function() {
-  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const location = /** @type {!Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
@@ -332,10 +331,10 @@ ASTNode.prototype.findNextForInput_ = function() {
  * @private
  */
 ASTNode.prototype.findNextForField_ = function() {
-  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const location = /** @type {!Field} */ (this.location_);
   const input = location.getParentInput();
   const block = location.getSourceBlock();
-  const curIdx = block.inputList.indexOf(/** @type {!Blockly.Input} */ (input));
+  const curIdx = block.inputList.indexOf(/** @type {!Input} */ (input));
   let fieldIdx = input.fieldRow.indexOf(location) + 1;
   let i = curIdx, newInput;
   for (; (newInput = block.inputList[i]); i++) {
@@ -363,7 +362,7 @@ ASTNode.prototype.findNextForField_ = function() {
  * @private
  */
 ASTNode.prototype.findPrevForInput_ = function() {
-  const location = /** @type {!Blockly.Connection} */ (this.location_);
+  const location = /** @type {!Connection} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
@@ -390,11 +389,11 @@ ASTNode.prototype.findPrevForInput_ = function() {
  * @private
  */
 ASTNode.prototype.findPrevForField_ = function() {
-  const location = /** @type {!Blockly.Field} */ (this.location_);
+  const location = /** @type {!Field} */ (this.location_);
   const parentInput = location.getParentInput();
   const block = location.getSourceBlock();
   const curIdx = block.inputList.indexOf(
-      /** @type {!Blockly.Input} */ (parentInput));
+      /** @type {!Input} */ (parentInput));
   let fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
   let i = curIdx, input;
   for (; (input = block.inputList[i]); i--) {
@@ -426,7 +425,7 @@ ASTNode.prototype.findPrevForField_ = function() {
 ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   var curLocation = this.getLocation();
   if (curLocation.getSourceBlock) {
-    curLocation = /** @type {!Blockly.IASTNodeLocationWithBlock} */ (
+    curLocation = /** @type {!IASTNodeLocationWithBlock} */ (
       curLocation).getSourceBlock();
   }
   if (!curLocation || !curLocation.workspace) {
@@ -452,7 +451,7 @@ ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
  * Finds the top most AST node for a given block.
  * This is either the previous connection, output connection or block depending
  * on what kind of connections the block has.
- * @param {!Blockly.Block} block The block that we want to find the top
+ * @param {!Block} block The block that we want to find the top
  *     connection on.
  * @return {!ASTNode} The AST node containing the top connection.
  * @private
@@ -471,7 +470,7 @@ ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
 /**
  * Get the AST node pointing to the input that the block is nested under or if
  * the block is not nested then get the stack AST node.
- * @param {Blockly.Block} block The source block of the current location.
+ * @param {Block} block The source block of the current location.
  * @return {ASTNode} The AST node pointing to the input connection or
  *     the top block of the stack this block is in.
  * @private
@@ -500,7 +499,7 @@ ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
 
 /**
  * Find the first editable field or input with a connection on a given block.
- * @param {!Blockly.Block} block The source block of the current location.
+ * @param {!Block} block The source block of the current location.
  * @return {ASTNode} An AST node pointing to the first field or input.
  * Null if there are no editable fields or inputs with connections on the block.
  * @private
@@ -525,18 +524,18 @@ ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
 
 /**
  * Finds the source block of the location of this node.
- * @return {Blockly.Block} The source block of the location, or null if the node
+ * @return {Block} The source block of the location, or null if the node
  * is of type workspace.
  */
 ASTNode.prototype.getSourceBlock = function() {
   if (this.getType() === ASTNode.types.BLOCK) {
-    return /** @type {Blockly.Block} */ (this.getLocation());
+    return /** @type {Block} */ (this.getLocation());
   } else if (this.getType() === ASTNode.types.STACK) {
-    return /** @type {Blockly.Block} */ (this.getLocation());
+    return /** @type {Block} */ (this.getLocation());
   } else if (this.getType() === ASTNode.types.WORKSPACE) {
     return null;
   } else {
-    return /** @type {Blockly.IASTNodeLocationWithBlock} */ (
+    return /** @type {IASTNodeLocationWithBlock} */ (
       this.getLocation()).getSourceBlock();
   }
 };
@@ -553,7 +552,7 @@ ASTNode.prototype.next = function() {
       return this.navigateBetweenStacks_(true);
 
     case ASTNode.types.OUTPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
 
     case ASTNode.types.FIELD:
@@ -563,16 +562,16 @@ ASTNode.prototype.next = function() {
       return this.findNextForInput_();
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       nextConnection = block.nextConnection;
       return ASTNode.createConnectionNode(nextConnection);
 
     case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
 
     case ASTNode.types.NEXT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
   }
@@ -590,7 +589,7 @@ ASTNode.prototype.in = function() {
   let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
     case ASTNode.types.WORKSPACE:
-      workspace = /** @type {!Blockly.Workspace} */ (this.location_);
+      workspace = /** @type {!Workspace} */ (this.location_);
       topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
         return ASTNode.createStackNode(topBlocks[0]);
@@ -598,15 +597,15 @@ ASTNode.prototype.in = function() {
       break;
 
     case ASTNode.types.STACK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
 
     case ASTNode.types.INPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
   }
@@ -636,12 +635,12 @@ ASTNode.prototype.prev = function() {
       return this.findPrevForInput_();
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       topConnection = block.previousConnection || block.outputConnection;
       return ASTNode.createConnectionNode(topConnection);
 
     case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
         return ASTNode.createConnectionNode(targetConnection);
@@ -649,7 +648,7 @@ ASTNode.prototype.prev = function() {
       break;
 
     case ASTNode.types.NEXT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
   }
 
@@ -666,15 +665,15 @@ ASTNode.prototype.out = function() {
   let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
     case ASTNode.types.STACK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      wsCoordinate = new Blockly.utils.Coordinate(
+      wsCoordinate = new Coordinate(
           blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
       return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
     case ASTNode.types.OUTPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       target = connection.targetConnection;
       if (target) {
         return ASTNode.createConnectionNode(target);
@@ -682,23 +681,23 @@ ASTNode.prototype.out = function() {
       return ASTNode.createStackNode(connection.getSourceBlock());
 
     case ASTNode.types.FIELD:
-      field = /** @type {!Blockly.Field} */ (this.location_);
+      field = /** @type {!Field} */ (this.location_);
       return ASTNode.createBlockNode(field.getSourceBlock());
 
     case ASTNode.types.INPUT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
 
     case ASTNode.types.BLOCK:
-      block = /** @type {!Blockly.Block} */ (this.location_);
+      block = /** @type {!Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
 
     case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
 
     case ASTNode.types.NEXT:
-      connection = /** @type {!Blockly.Connection} */ (this.location_);
+      connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
   }
 

From c19ce37a4accf24f1f044691bcf68af1d19c1938 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:29:05 -0700
Subject: [PATCH 037/291] clang-format core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 09a63b3a2..0c349bbd0 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -150,8 +150,8 @@ ASTNode.createConnectionNode = function(connection) {
   const type = connection.type;
   if (type == connectionTypes.INPUT_VALUE) {
     return ASTNode.createInputNode(connection.getParentInput());
-  } else if (type == connectionTypes.NEXT_STATEMENT &&
-      connection.getParentInput()) {
+  } else if (
+      type == connectionTypes.NEXT_STATEMENT && connection.getParentInput()) {
     return ASTNode.createInputNode(connection.getParentInput());
   } else if (type == connectionTypes.NEXT_STATEMENT) {
     return new ASTNode(ASTNode.types.NEXT, connection);
@@ -215,11 +215,8 @@ ASTNode.createWorkspaceNode = function(workspace, wsCoordinate) {
   if (!wsCoordinate || !workspace) {
     return null;
   }
-  const params = {
-    wsCoordinate: wsCoordinate
-  };
-  return new ASTNode(
-      ASTNode.types.WORKSPACE, workspace, params);
+  const params = {wsCoordinate: wsCoordinate};
+  return new ASTNode(ASTNode.types.WORKSPACE, workspace, params);
 };
 
 /**
@@ -425,8 +422,8 @@ ASTNode.prototype.findPrevForField_ = function() {
 ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   var curLocation = this.getLocation();
   if (curLocation.getSourceBlock) {
-    curLocation = /** @type {!IASTNodeLocationWithBlock} */ (
-      curLocation).getSourceBlock();
+    curLocation = /** @type {!IASTNodeLocationWithBlock} */ (curLocation)
+                      .getSourceBlock();
   }
   if (!curLocation || !curLocation.workspace) {
     return null;
@@ -459,11 +456,10 @@ ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
 ASTNode.prototype.findTopASTNodeForBlock_ = function(block) {
   const topConnection = block.previousConnection || block.outputConnection;
   if (topConnection) {
-    return /** @type {!ASTNode} */ (ASTNode.createConnectionNode(
-        topConnection));
+    return /** @type {!ASTNode} */ (
+        ASTNode.createConnectionNode(topConnection));
   } else {
-    return /** @type {!ASTNode} */ (ASTNode.createBlockNode(
-        block));
+    return /** @type {!ASTNode} */ (ASTNode.createBlockNode(block));
   }
 };
 
@@ -535,8 +531,8 @@ ASTNode.prototype.getSourceBlock = function() {
   } else if (this.getType() === ASTNode.types.WORKSPACE) {
     return null;
   } else {
-    return /** @type {IASTNodeLocationWithBlock} */ (
-      this.getLocation()).getSourceBlock();
+    return /** @type {IASTNodeLocationWithBlock} */ (this.getLocation())
+        .getSourceBlock();
   }
 };
 
@@ -668,8 +664,8 @@ ASTNode.prototype.out = function() {
       block = /** @type {!Block} */ (this.location_);
       blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      wsCoordinate = new Coordinate(
-          blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
+      wsCoordinate =
+          new Coordinate(blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
       return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
 
     case ASTNode.types.OUTPUT:

From 02f1055c445fb3db78a1dd30695dc2802f94c523 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:05:24 -0700
Subject: [PATCH 038/291] Add eslint disable lines to
 core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 0c349bbd0..c1323099f 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -13,13 +13,20 @@
 goog.module('Blockly.ASTNode');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
+/* eslint-disable-next-line no-unused-vars */
 const Input = goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 

From d9edeca432351250bf2077c4b2ffd8ba3b91eba6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:19:13 -0700
Subject: [PATCH 039/291] Update for loop syntax in
 core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index c1323099f..11405bc22 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -310,11 +310,11 @@ ASTNode.prototype.findNextForInput_ = function() {
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
-  let i = curIdx + 1, input;
-  for (; (input = block.inputList[i]); i++) {
+  for (let i = curIdx + 1; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
     const fieldRow = input.fieldRow;
-    let j = 0, field;
-    for (; (field = fieldRow[j]); j++) {
+    for (let j = 0; j < fieldRow.length; j++) {
+      const field = fieldRow[j];
       if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
         return ASTNode.createFieldNode(field);
       }
@@ -340,8 +340,8 @@ ASTNode.prototype.findNextForField_ = function() {
   const block = location.getSourceBlock();
   const curIdx = block.inputList.indexOf(/** @type {!Input} */ (input));
   let fieldIdx = input.fieldRow.indexOf(location) + 1;
-  let i = curIdx, newInput;
-  for (; (newInput = block.inputList[i]); i++) {
+  for (let i = curIdx; i < block.inputList.length; i++) {
+    const newInput = block.inputList[i];
     const fieldRow = newInput.fieldRow;
     while (fieldIdx < fieldRow.length) {
       if (fieldRow[fieldIdx].isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
@@ -370,14 +370,14 @@ ASTNode.prototype.findPrevForInput_ = function() {
   const parentInput = location.getParentInput();
   const block = parentInput.getSourceBlock();
   const curIdx = block.inputList.indexOf(parentInput);
-  let i = curIdx, input;
-  for (; (input = block.inputList[i]); i--) {
+  for (let i = curIdx; i >= 0; i--) {
+    const input = block.inputList[i];
     if (input.connection && input !== parentInput) {
       return ASTNode.createInputNode(input);
     }
     const fieldRow = input.fieldRow;
-    let j = fieldRow.length - 1, field;
-    for (; (field = fieldRow[j]); j--) {
+    for (let j = fieldRow.length - 1; j >= 0; j--) {
+      const field = fieldRow[j];
       if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
         return ASTNode.createFieldNode(field);
       }
@@ -399,8 +399,8 @@ ASTNode.prototype.findPrevForField_ = function() {
   const curIdx = block.inputList.indexOf(
       /** @type {!Input} */ (parentInput));
   let fieldIdx = parentInput.fieldRow.indexOf(location) - 1;
-  let i = curIdx, input;
-  for (; (input = block.inputList[i]); i--) {
+  for (let i = curIdx; i >= 0; i--) {
+    const input = block.inputList[i];
     if (input.connection && input !== parentInput) {
       return ASTNode.createInputNode(input);
     }
@@ -437,8 +437,8 @@ ASTNode.prototype.navigateBetweenStacks_ = function(forward) {
   }
   const curRoot = curLocation.getRootBlock();
   const topBlocks = curRoot.workspace.getTopBlocks(true);
-  let i = 0, topBlock;
-  for (; (topBlock = topBlocks[i]); i++) {
+  for (let i = 0; i < topBlocks.length; i++) {
+    const topBlock = topBlocks[i];
     if (curRoot.id == topBlock.id) {
       const offset = forward ? 1 : -1;
       const resultIndex = i + offset;
@@ -509,11 +509,11 @@ ASTNode.prototype.getOutAstNodeForBlock_ = function(block) {
  */
 ASTNode.prototype.findFirstFieldOrInput_ = function(block) {
   const inputs = block.inputList;
-  let i = 0, input;
-  for (; (input = inputs[i]); i++) {
+  for (let i = 0; i < inputs.length; i++) {
+    const input = inputs[i];
     const fieldRow = input.fieldRow;
-    let j = 0, field;
-    for (; (field = fieldRow[j]); j++) {
+    for (let j = 0; j < fieldRow.length; j++) {
+      const field = fieldRow[j];
       if (field.isClickable() || ASTNode.NAVIGATE_ALL_FIELDS) {
         return ASTNode.createFieldNode(field);
       }

From fabba95beb07a268b81e2a5e7f408aa20555e917 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:26:15 -0700
Subject: [PATCH 040/291] Adding blocks to case statements in
 core/keyboard_nav/ast_node.js

---
 core/keyboard_nav/ast_node.js | 126 +++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 11405bc22..b52ca1b18 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -549,34 +549,34 @@ ASTNode.prototype.getSourceBlock = function() {
  *     block, or workspace. Or null if there is no node to the right.
  */
 ASTNode.prototype.next = function() {
-  let connection, block, nextConnection, targetConnection;
   switch (this.type_) {
     case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(true);
 
-    case ASTNode.types.OUTPUT:
-      connection = /** @type {!Connection} */ (this.location_);
+    case ASTNode.types.OUTPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
-
+    }
     case ASTNode.types.FIELD:
       return this.findNextForField_();
 
     case ASTNode.types.INPUT:
       return this.findNextForInput_();
 
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
-      nextConnection = block.nextConnection;
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
+      const nextConnection = block.nextConnection;
       return ASTNode.createConnectionNode(nextConnection);
-
-    case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.PREVIOUS: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
-
-    case ASTNode.types.NEXT:
-      connection = /** @type {!Connection} */ (this.location_);
-      targetConnection = connection.targetConnection;
+    }
+    case ASTNode.types.NEXT: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
+    }
   }
 
   return null;
@@ -589,28 +589,28 @@ ASTNode.prototype.next = function() {
  * workspace, or block. Or null if there is nothing below this node.
  */
 ASTNode.prototype.in = function() {
-  let workspace, topBlocks, block, connection, targetConnection;
   switch (this.type_) {
-    case ASTNode.types.WORKSPACE:
-      workspace = /** @type {!Workspace} */ (this.location_);
-      topBlocks = workspace.getTopBlocks(true);
+    case ASTNode.types.WORKSPACE: {
+      const workspace = /** @type {!Workspace} */ (this.location_);
+      const topBlocks = workspace.getTopBlocks(true);
       if (topBlocks.length > 0) {
         return ASTNode.createStackNode(topBlocks[0]);
       }
       break;
-
-    case ASTNode.types.STACK:
-      block = /** @type {!Block} */ (this.location_);
+    }
+    case ASTNode.types.STACK: {
+      const block = /** @type {!Block} */ (this.location_);
       return this.findTopASTNodeForBlock_(block);
-
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
+    }
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
       return this.findFirstFieldOrInput_(block);
-
-    case ASTNode.types.INPUT:
-      connection = /** @type {!Connection} */ (this.location_);
-      targetConnection = connection.targetConnection;
+    }
+    case ASTNode.types.INPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const targetConnection = connection.targetConnection;
       return ASTNode.createConnectionNode(targetConnection);
+    }
   }
 
   return null;
@@ -623,7 +623,6 @@ ASTNode.prototype.in = function() {
  * null.
  */
 ASTNode.prototype.prev = function() {
-  let block, topConnection, connection, targetConnection;
   switch (this.type_) {
     case ASTNode.types.STACK:
       return this.navigateBetweenStacks_(false);
@@ -637,22 +636,23 @@ ASTNode.prototype.prev = function() {
     case ASTNode.types.INPUT:
       return this.findPrevForInput_();
 
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
-      topConnection = block.previousConnection || block.outputConnection;
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
+      const topConnection = block.previousConnection || block.outputConnection;
       return ASTNode.createConnectionNode(topConnection);
-
-    case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Connection} */ (this.location_);
-      targetConnection = connection.targetConnection;
+    }
+    case ASTNode.types.PREVIOUS: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const targetConnection = connection.targetConnection;
       if (targetConnection && !targetConnection.getParentInput()) {
         return ASTNode.createConnectionNode(targetConnection);
       }
       break;
-
-    case ASTNode.types.NEXT:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.NEXT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
+    }
   }
 
   return null;
@@ -665,43 +665,43 @@ ASTNode.prototype.prev = function() {
  *     workspace or block. Or null if we are at the workspace level.
  */
 ASTNode.prototype.out = function() {
-  let block, blockPos, wsCoordinate, connection, target, field;
   switch (this.type_) {
-    case ASTNode.types.STACK:
-      block = /** @type {!Block} */ (this.location_);
-      blockPos = block.getRelativeToSurfaceXY();
+    case ASTNode.types.STACK: {
+      const block = /** @type {!Block} */ (this.location_);
+      const blockPos = block.getRelativeToSurfaceXY();
       // TODO: Make sure this is in the bounds of the workspace.
-      wsCoordinate =
+      const wsCoordinate =
           new Coordinate(blockPos.x, blockPos.y + ASTNode.DEFAULT_OFFSET_Y);
       return ASTNode.createWorkspaceNode(block.workspace, wsCoordinate);
-
-    case ASTNode.types.OUTPUT:
-      connection = /** @type {!Connection} */ (this.location_);
-      target = connection.targetConnection;
+    }
+    case ASTNode.types.OUTPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
+      const target = connection.targetConnection;
       if (target) {
         return ASTNode.createConnectionNode(target);
       }
       return ASTNode.createStackNode(connection.getSourceBlock());
-
-    case ASTNode.types.FIELD:
-      field = /** @type {!Field} */ (this.location_);
+    }
+    case ASTNode.types.FIELD: {
+      const field = /** @type {!Field} */ (this.location_);
       return ASTNode.createBlockNode(field.getSourceBlock());
-
-    case ASTNode.types.INPUT:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.INPUT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return ASTNode.createBlockNode(connection.getSourceBlock());
-
-    case ASTNode.types.BLOCK:
-      block = /** @type {!Block} */ (this.location_);
+    }
+    case ASTNode.types.BLOCK: {
+      const block = /** @type {!Block} */ (this.location_);
       return this.getOutAstNodeForBlock_(block);
-
-    case ASTNode.types.PREVIOUS:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.PREVIOUS: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
-
-    case ASTNode.types.NEXT:
-      connection = /** @type {!Connection} */ (this.location_);
+    }
+    case ASTNode.types.NEXT: {
+      const connection = /** @type {!Connection} */ (this.location_);
       return this.getOutAstNodeForBlock_(connection.getSourceBlock());
+    }
   }
 
   return null;

From 6787624e3ef9cb748b3d8e1f534b3ece46d483e1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:46:10 -0700
Subject: [PATCH 041/291] Migrate core/workspace_audio.js to ES6 const/let

---
 core/workspace_audio.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 378c19287..1ca2a2255 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -71,17 +71,18 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
   if (!filenames.length) {
     return;
   }
+  let audioTest;
   try {
-    var audioTest = new Blockly.utils.global['Audio']();
+    audioTest = new Blockly.utils.global['Audio']();
   } catch (e) {
     // No browser support for Audio.
     // IE can throw an error even if the Audio object exists.
     return;
   }
-  var sound;
-  for (var i = 0; i < filenames.length; i++) {
-    var filename = filenames[i];
-    var ext = filename.match(/\.(\w+)$/);
+  let sound;
+  for (let i = 0; i < filenames.length; i++) {
+    const filename = filenames[i];
+    const ext = filename.match(/\.(\w+)$/);
     if (ext && audioTest.canPlayType('audio/' + ext[1])) {
       // Found an audio format we can play.
       sound = new Blockly.utils.global['Audio'](filename);
@@ -98,10 +99,10 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
  * @package
  */
 Blockly.WorkspaceAudio.prototype.preload = function() {
-  for (var name in this.SOUNDS_) {
-    var sound = this.SOUNDS_[name];
+  for (let name in this.SOUNDS_) {
+    const sound = this.SOUNDS_[name];
     sound.volume = 0.01;
-    var playPromise = sound.play();
+    const playPromise = sound.play();
     // Edge does not return a promise, so we need to check.
     if (playPromise !== undefined) {
       // If we don't wait for the play request to complete before calling pause()
@@ -129,16 +130,16 @@ Blockly.WorkspaceAudio.prototype.preload = function() {
  * @param {number=} opt_volume Volume of sound (0-1).
  */
 Blockly.WorkspaceAudio.prototype.play = function(name, opt_volume) {
-  var sound = this.SOUNDS_[name];
+  const sound = this.SOUNDS_[name];
   if (sound) {
     // Don't play one sound on top of another.
-    var now = new Date;
+    const now = new Date;
     if (this.lastSound_ != null &&
         now - this.lastSound_ < Blockly.internalConstants.SOUND_LIMIT) {
       return;
     }
     this.lastSound_ = now;
-    var mySound;
+    let mySound;
     if (Blockly.utils.userAgent.IPAD || Blockly.utils.userAgent.ANDROID) {
       // Creating a new audio node causes lag in Android and iPad.  Android
       // refetches the file from the server, iPad uses a singleton audio

From f7c88bfcd91bb2168137358e91ce01ae17036bee Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:46:27 -0700
Subject: [PATCH 042/291] Migrate core/workspace_audio.js to goog.module

---
 core/workspace_audio.js | 18 ++++++++++--------
 tests/deps.js           |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 1ca2a2255..72e66d952 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -11,10 +11,10 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceAudio');
+goog.module('Blockly.WorkspaceAudio');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils');
 goog.require('Blockly.utils.global');
 goog.require('Blockly.utils.userAgent');
 
@@ -27,7 +27,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  *     this audio object belongs to, or null.
  * @constructor
  */
-Blockly.WorkspaceAudio = function(parentWorkspace) {
+const WorkspaceAudio = function(parentWorkspace) {
 
   /**
    * The parent of the workspace this object belongs to, or null.  May be
@@ -49,13 +49,13 @@ Blockly.WorkspaceAudio = function(parentWorkspace) {
  * @type {Date}
  * @private
  */
-Blockly.WorkspaceAudio.prototype.lastSound_ = null;
+WorkspaceAudio.prototype.lastSound_ = null;
 
 /**
  * Dispose of this audio manager.
  * @package
  */
-Blockly.WorkspaceAudio.prototype.dispose = function() {
+WorkspaceAudio.prototype.dispose = function() {
   this.parentWorkspace_ = null;
   this.SOUNDS_ = null;
 };
@@ -67,7 +67,7 @@ Blockly.WorkspaceAudio.prototype.dispose = function() {
  *   Filenames include path from Blockly's root.  File extensions matter.
  * @param {string} name Name of sound.
  */
-Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
+WorkspaceAudio.prototype.load = function(filenames, name) {
   if (!filenames.length) {
     return;
   }
@@ -98,7 +98,7 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
  * Preload all the audio files so that they play quickly when asked for.
  * @package
  */
-Blockly.WorkspaceAudio.prototype.preload = function() {
+WorkspaceAudio.prototype.preload = function() {
   for (let name in this.SOUNDS_) {
     const sound = this.SOUNDS_[name];
     sound.volume = 0.01;
@@ -129,7 +129,7 @@ Blockly.WorkspaceAudio.prototype.preload = function() {
  * @param {string} name Name of sound.
  * @param {number=} opt_volume Volume of sound (0-1).
  */
-Blockly.WorkspaceAudio.prototype.play = function(name, opt_volume) {
+WorkspaceAudio.prototype.play = function(name, opt_volume) {
   const sound = this.SOUNDS_[name];
   if (sound) {
     // Don't play one sound on top of another.
@@ -155,3 +155,5 @@ Blockly.WorkspaceAudio.prototype.play = function(name, opt_volume) {
     this.parentWorkspace_.getAudioManager().play(name, opt_volume);
   }
 };
+
+exports = WorkspaceAudio;
diff --git a/tests/deps.js b/tests/deps.js
index 957896ec3..0018d3a1d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -202,7 +202,7 @@ goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
-goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
 goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);

From 5f819cd0fe949c619b1d333492ad074e3e51e38d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:48:10 -0700
Subject: [PATCH 043/291] Migrate core/workspace_audio.js named requires

---
 core/workspace_audio.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 72e66d952..7a6acde4f 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -14,16 +14,16 @@
 goog.module('Blockly.WorkspaceAudio');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.utils.global');
-goog.require('Blockly.utils.userAgent');
-
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const global = goog.require('Blockly.utils.global');
+const internalConstants = goog.require('Blockly.internalConstants');
+const userAgent = goog.require('Blockly.utils.userAgent');
 
 
 /**
  * Class for loading, storing, and playing audio for a workspace.
- * @param {Blockly.WorkspaceSvg} parentWorkspace The parent of the workspace
+ * @param {WorkspaceSvg} parentWorkspace The parent of the workspace
  *     this audio object belongs to, or null.
  * @constructor
  */
@@ -32,7 +32,7 @@ const WorkspaceAudio = function(parentWorkspace) {
   /**
    * The parent of the workspace this object belongs to, or null.  May be
    * checked for sounds that this object can't find.
-   * @type {Blockly.WorkspaceSvg}
+   * @type {WorkspaceSvg}
    * @private
    */
   this.parentWorkspace_ = parentWorkspace;
@@ -73,7 +73,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
   }
   let audioTest;
   try {
-    audioTest = new Blockly.utils.global['Audio']();
+    audioTest = new global['Audio']();
   } catch (e) {
     // No browser support for Audio.
     // IE can throw an error even if the Audio object exists.
@@ -85,7 +85,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
     const ext = filename.match(/\.(\w+)$/);
     if (ext && audioTest.canPlayType('audio/' + ext[1])) {
       // Found an audio format we can play.
-      sound = new Blockly.utils.global['Audio'](filename);
+      sound = new global['Audio'](filename);
       break;
     }
   }
@@ -117,7 +117,7 @@ WorkspaceAudio.prototype.preload = function() {
 
     // iOS can only process one sound at a time.  Trying to load more than one
     // corrupts the earlier ones.  Just load one and leave the others uncached.
-    if (Blockly.utils.userAgent.IPAD || Blockly.utils.userAgent.IPHONE) {
+    if (userAgent.IPAD || userAgent.IPHONE) {
       break;
     }
   }
@@ -135,12 +135,12 @@ WorkspaceAudio.prototype.play = function(name, opt_volume) {
     // Don't play one sound on top of another.
     const now = new Date;
     if (this.lastSound_ != null &&
-        now - this.lastSound_ < Blockly.internalConstants.SOUND_LIMIT) {
+        now - this.lastSound_ < internalConstants.SOUND_LIMIT) {
       return;
     }
     this.lastSound_ = now;
     let mySound;
-    if (Blockly.utils.userAgent.IPAD || Blockly.utils.userAgent.ANDROID) {
+    if (userAgent.IPAD || userAgent.ANDROID) {
       // Creating a new audio node causes lag in Android and iPad.  Android
       // refetches the file from the server, iPad uses a singleton audio
       // node which must be deleted and recreated for each new audio tag.

From 813f27706f4ce84db3d54ac8d1e41341e35559a2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:50:13 -0700
Subject: [PATCH 044/291] clang-format core/workspace_audio.js

---
 core/workspace_audio.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 7a6acde4f..11f16b8b1 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -28,7 +28,6 @@ const userAgent = goog.require('Blockly.utils.userAgent');
  * @constructor
  */
 const WorkspaceAudio = function(parentWorkspace) {
-
   /**
    * The parent of the workspace this object belongs to, or null.  May be
    * checked for sounds that this object can't find.
@@ -105,9 +104,10 @@ WorkspaceAudio.prototype.preload = function() {
     const playPromise = sound.play();
     // Edge does not return a promise, so we need to check.
     if (playPromise !== undefined) {
-      // If we don't wait for the play request to complete before calling pause()
-      // we will get an exception: (DOMException: The play() request was interrupted)
-      // See more: https://developers.google.com/web/updates/2017/06/play-request-was-interrupted
+      // If we don't wait for the play request to complete before calling
+      // pause() we will get an exception: (DOMException: The play() request was
+      // interrupted) See more:
+      // https://developers.google.com/web/updates/2017/06/play-request-was-interrupted
       playPromise.then(sound.pause).catch(function() {
         // Play without user interaction was prevented.
       });

From 4e147b2593befd887a06c5dae91583019c4cbc00 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:32:42 -0700
Subject: [PATCH 045/291] Update syntax for for..in loop

---
 core/workspace_audio.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 11f16b8b1..ba1da0c95 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -98,7 +98,7 @@ WorkspaceAudio.prototype.load = function(filenames, name) {
  * @package
  */
 WorkspaceAudio.prototype.preload = function() {
-  for (let name in this.SOUNDS_) {
+  for (const name in this.SOUNDS_) {
     const sound = this.SOUNDS_[name];
     sound.volume = 0.01;
     const playPromise = sound.play();

From adc4c02abfd85b4d60a064d94b433e52ed56f787 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 16:39:44 -0700
Subject: [PATCH 046/291] Fix lint

---
 core/field_variable.js | 3 +++
 core/gesture.js        | 2 ++
 core/zoom_controls.js  | 8 ++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/field_variable.js b/core/field_variable.js
index f700d4a99..f4ae38a51 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -13,9 +13,12 @@
 goog.module('Blockly.FieldVariable');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
 const FieldDropdown = goog.require('Blockly.FieldDropdown');
+/* eslint-disable-next-line no-unused-vars */
 const Menu = goog.requireType('Blockly.Menu');
+/* eslint-disable-next-line no-unused-vars */
 const MenuItem = goog.requireType('Blockly.MenuItem');
 const Msg = goog.require('Blockly.Msg');
 const Size = goog.require('Blockly.utils.Size');
diff --git a/core/gesture.js b/core/gesture.js
index 933930e44..a1ef6ca91 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -22,6 +22,7 @@ const BubbleDragger = goog.require('Blockly.BubbleDragger');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 /* eslint-disable-next-line no-unused-vars */
 const IBlockDragger = goog.requireType('Blockly.IBlockDragger');
@@ -33,6 +34,7 @@ const Tooltip = goog.require('Blockly.Tooltip');
 const Touch = goog.require('Blockly.Touch');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.require('Blockly.Workspace');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const WorkspaceDragger = goog.require('Blockly.WorkspaceDragger');
 const blockAnimations = goog.require('Blockly.blockAnimations');
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 37c1cb17d..1b7a568cc 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.ZoomControls');
 goog.module.declareLegacyNamespace();
 
-const Blockly = goog.require('Blockly');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
 const IPositionable = goog.require('Blockly.IPositionable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
@@ -54,7 +54,7 @@ const ZoomControls = function(workspace) {
 
   /**
    * A handle to use to unbind the mouse down event handler for zoom reset
-   *    button. Opaque data returned from Blockly.bindEventWithChecks_.
+   *    button. Opaque data returned from browserEvents.conditionalBind.
    * @type {?browserEvents.Data}
    * @private
    */
@@ -62,7 +62,7 @@ const ZoomControls = function(workspace) {
 
   /**
    * A handle to use to unbind the mouse down event handler for zoom in button.
-   * Opaque data returned from Blockly.bindEventWithChecks_.
+   * Opaque data returned from browserEvents.conditionalBind.
    * @type {?browserEvents.Data}
    * @private
    */
@@ -70,7 +70,7 @@ const ZoomControls = function(workspace) {
 
   /**
    * A handle to use to unbind the mouse down event handler for zoom out button.
-   * Opaque data returned from Blockly.bindEventWithChecks_.
+   * Opaque data returned from browserEvents.conditionalBind.
    * @type {?browserEvents.Data}
    * @private
    */

From 4c6b2bae3985979c565d83af4622c1d01adb7c1f Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Tue, 27 Jul 2021 16:45:05 -0700
Subject: [PATCH 047/291] Rebuild

---
 tests/deps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/deps.js b/tests/deps.js
index 0018d3a1d..0820fc9e1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -210,6 +210,6 @@ goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.Workspa
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 38374405647c789c4e74eafae77f578e5a92177f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 11:27:57 -0700
Subject: [PATCH 048/291] Migrate core/keyboard_nav/marker.js to ES6 const/let

---
 core/keyboard_nav/marker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index de31d6084..555bf7c97 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -85,7 +85,7 @@ Blockly.Marker.prototype.getCurNode = function() {
  * @param {Blockly.ASTNode} newNode The new location of the marker.
  */
 Blockly.Marker.prototype.setCurNode = function(newNode) {
-  var oldNode = this.curNode_;
+  const oldNode = this.curNode_;
   this.curNode_ = newNode;
   if (this.drawer_) {
     this.drawer_.draw(oldNode, this.curNode_);

From 014316431e848ff549352d1f5ba4e491219199a3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 19 Jul 2021 11:28:11 -0700
Subject: [PATCH 049/291] Migrate core/keyboard_nav/marker.js to goog.module

---
 core/keyboard_nav/marker.js | 21 ++++++++++++---------
 tests/deps.js               |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 555bf7c97..115a1f861 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Marker');
+goog.module('Blockly.Marker');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ASTNode');
 
@@ -23,7 +24,7 @@ goog.requireType('Blockly.blockRendering.MarkerSvg');
  * This is used in keyboard navigation to save a location in the Blockly AST.
  * @constructor
  */
-Blockly.Marker = function() {
+const Marker = function() {
   /**
    * The colour of the marker.
    * @type {?string}
@@ -56,7 +57,7 @@ Blockly.Marker = function() {
  * @param {Blockly.blockRendering.MarkerSvg} drawer The object in charge of
  *     drawing the marker.
  */
-Blockly.Marker.prototype.setDrawer = function(drawer) {
+Marker.prototype.setDrawer = function(drawer) {
   this.drawer_ = drawer;
 };
 
@@ -65,7 +66,7 @@ Blockly.Marker.prototype.setDrawer = function(drawer) {
  * @return {Blockly.blockRendering.MarkerSvg} The object in charge of drawing
  *     the marker.
  */
-Blockly.Marker.prototype.getDrawer = function() {
+Marker.prototype.getDrawer = function() {
   return this.drawer_;
 };
 
@@ -74,7 +75,7 @@ Blockly.Marker.prototype.getDrawer = function() {
  * @return {Blockly.ASTNode} The current field, connection, or block the marker
  *     is on.
  */
-Blockly.Marker.prototype.getCurNode = function() {
+Marker.prototype.getCurNode = function() {
   return this.curNode_;
 };
 
@@ -84,7 +85,7 @@ Blockly.Marker.prototype.getCurNode = function() {
  * output or previous connection on a stack.
  * @param {Blockly.ASTNode} newNode The new location of the marker.
  */
-Blockly.Marker.prototype.setCurNode = function(newNode) {
+Marker.prototype.setCurNode = function(newNode) {
   const oldNode = this.curNode_;
   this.curNode_ = newNode;
   if (this.drawer_) {
@@ -96,7 +97,7 @@ Blockly.Marker.prototype.setCurNode = function(newNode) {
  * Redraw the current marker.
  * @package
  */
-Blockly.Marker.prototype.draw = function() {
+Marker.prototype.draw = function() {
   if (this.drawer_) {
     this.drawer_.draw(this.curNode_, this.curNode_);
   }
@@ -105,7 +106,7 @@ Blockly.Marker.prototype.draw = function() {
 /**
  * Hide the marker SVG.
  */
-Blockly.Marker.prototype.hide = function() {
+Marker.prototype.hide = function() {
   if (this.drawer_) {
     this.drawer_.hide();
   }
@@ -114,8 +115,10 @@ Blockly.Marker.prototype.hide = function() {
 /**
  * Dispose of this marker.
  */
-Blockly.Marker.prototype.dispose = function() {
+Marker.prototype.dispose = function() {
   if (this.getDrawer()) {
     this.getDrawer().dispose();
   }
 };
+
+exports = Marker;
diff --git a/tests/deps.js b/tests/deps.js
index 759caeae4..8d3102c14 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -105,7 +105,7 @@ goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstan
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode']);
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});

From 50f7293f2d4b16eda5c72cf3e4d9e1c275991d5e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:34:35 -0700
Subject: [PATCH 050/291] Migrate core/keyboard_nav/marker.js named requires

---
 core/keyboard_nav/marker.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 115a1f861..28f905949 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -14,9 +14,8 @@
 goog.module('Blockly.Marker');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-
-goog.requireType('Blockly.blockRendering.MarkerSvg');
+const ASTNode = goog.require('Blockly.ASTNode');
+const MarkerSvg = goog.requireType('Blockly.blockRendering.MarkerSvg');
 
 
 /**
@@ -33,14 +32,14 @@ const Marker = function() {
 
   /**
    * The current location of the marker.
-   * @type {Blockly.ASTNode}
+   * @type {ASTNode}
    * @private
    */
   this.curNode_ = null;
 
   /**
    * The object in charge of drawing the visual representation of the current node.
-   * @type {Blockly.blockRendering.MarkerSvg}
+   * @type {MarkerSvg}
    * @private
    */
   this.drawer_ = null;
@@ -54,7 +53,7 @@ const Marker = function() {
 
 /**
  * Sets the object in charge of drawing the marker.
- * @param {Blockly.blockRendering.MarkerSvg} drawer The object in charge of
+ * @param {MarkerSvg} drawer The object in charge of
  *     drawing the marker.
  */
 Marker.prototype.setDrawer = function(drawer) {
@@ -63,7 +62,7 @@ Marker.prototype.setDrawer = function(drawer) {
 
 /**
  * Get the current drawer for the marker.
- * @return {Blockly.blockRendering.MarkerSvg} The object in charge of drawing
+ * @return {MarkerSvg} The object in charge of drawing
  *     the marker.
  */
 Marker.prototype.getDrawer = function() {
@@ -72,7 +71,7 @@ Marker.prototype.getDrawer = function() {
 
 /**
  * Gets the current location of the marker.
- * @return {Blockly.ASTNode} The current field, connection, or block the marker
+ * @return {ASTNode} The current field, connection, or block the marker
  *     is on.
  */
 Marker.prototype.getCurNode = function() {
@@ -83,7 +82,7 @@ Marker.prototype.getCurNode = function() {
  * Set the location of the marker and call the update method.
  * Setting isStack to true will only work if the newLocation is the top most
  * output or previous connection on a stack.
- * @param {Blockly.ASTNode} newNode The new location of the marker.
+ * @param {ASTNode} newNode The new location of the marker.
  */
 Marker.prototype.setCurNode = function(newNode) {
   const oldNode = this.curNode_;

From 1a83b7584680f48a226d40cc87780d50eeec127c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 22 Jul 2021 10:34:44 -0700
Subject: [PATCH 051/291] clang-format core/keyboard_nav/marker.js

---
 core/keyboard_nav/marker.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 28f905949..654703f7b 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -38,7 +38,8 @@ const Marker = function() {
   this.curNode_ = null;
 
   /**
-   * The object in charge of drawing the visual representation of the current node.
+   * The object in charge of drawing the visual representation of the current
+   * node.
    * @type {MarkerSvg}
    * @private
    */

From 667048b3f52262e8f1e0ff3c78a0bf411b20be4d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:29:17 -0700
Subject: [PATCH 052/291] Add eslint disable and make ASTNode a requireType

---
 core/keyboard_nav/marker.js | 4 +++-
 tests/deps.js               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 654703f7b..4b6f341bb 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -14,7 +14,9 @@
 goog.module('Blockly.Marker');
 goog.module.declareLegacyNamespace();
 
-const ASTNode = goog.require('Blockly.ASTNode');
+/* eslint-disable-next-line no-unused-vars */
+const ASTNode = goog.requireType('Blockly.ASTNode');
+/* eslint-disable-next-line no-unused-vars */
 const MarkerSvg = goog.requireType('Blockly.blockRendering.MarkerSvg');
 
 
diff --git a/tests/deps.js b/tests/deps.js
index 8d3102c14..6666e9369 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -105,7 +105,7 @@ goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstan
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/basic_cursor.js', ['Blockly.BasicCursor'], ['Blockly.ASTNode', 'Blockly.Cursor', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/cursor.js', ['Blockly.Cursor'], ['Blockly.ASTNode', 'Blockly.Marker', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], ['Blockly.ASTNode'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});

From 961254663d1a0347e664638c077af54d3fbc6002 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 11:57:24 -0700
Subject: [PATCH 053/291] Move clipboard functions to a separate namespace

---
 core/blockly.js                       |  50 ++----------
 core/clipboard.js                     | 106 ++++++++++++++++++++++++++
 core/contextmenu_items.js             |   4 +-
 core/shortcut_items.js                |   7 +-
 tests/deps.js                         |   7 +-
 tests/mocha/contextmenu_items_test.js |  10 +--
 tests/mocha/keydown_test.js           |   2 +-
 7 files changed, 129 insertions(+), 57 deletions(-)
 create mode 100644 core/clipboard.js

diff --git a/core/blockly.js b/core/blockly.js
index 94f485c99..808c035b0 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -17,6 +17,7 @@
 goog.provide('Blockly');
 
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.clipboard');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
@@ -96,21 +97,21 @@ Blockly.draggingConnections = [];
  * @type {Element}
  * @private
  */
-Blockly.clipboardXml_ = null;
+Blockly.clipboardXml_ = Blockly.clipboard.xml;
 
 /**
  * Source of the local clipboard.
  * @type {Blockly.WorkspaceSvg}
  * @private
  */
-Blockly.clipboardSource_ = null;
+Blockly.clipboardSource_ = Blockly.clipboard.source;
 
 /**
  * Map of types to type counts for the clipboard object and descendants.
  * @type {Object}
  * @private
  */
-Blockly.clipboardTypeCounts_ = null;
+Blockly.clipboardTypeCounts_ = Blockly.clipboard.typeCounts;
 
 /**
  * Cached value for whether 3D is supported.
@@ -234,39 +235,14 @@ Blockly.deleteBlock = function(selected) {
  * @param {!Blockly.ICopyable} toCopy Block or Workspace Comment to be copied.
  * @package
  */
-Blockly.copy = function(toCopy) {
-  var data = toCopy.toCopyData();
-  if (data) {
-    Blockly.clipboardXml_ = data.xml;
-    Blockly.clipboardSource_ = data.source;
-    Blockly.clipboardTypeCounts_ = data.typeCounts;
-  }
-};
+Blockly.copy = Blockly.clipboard.copy;
 
 /**
  * Paste a block or workspace comment on to the main workspace.
  * @return {boolean} True if the paste was successful, false otherwise.
  * @package
  */
-Blockly.paste = function() {
-  if (!Blockly.clipboardXml_) {
-    return false;
-  }
-  // Pasting always pastes to the main workspace, even if the copy
-  // started in a flyout workspace.
-  var workspace = Blockly.clipboardSource_;
-  if (workspace.isFlyout) {
-    workspace = workspace.targetWorkspace;
-  }
-  if (Blockly.clipboardTypeCounts_ &&
-      workspace.isCapacityAvailable(Blockly.clipboardTypeCounts_)) {
-    Blockly.Events.setGroup(true);
-    workspace.paste(Blockly.clipboardXml_);
-    Blockly.Events.setGroup(false);
-    return true;
-  }
-  return false;
-};
+Blockly.paste = Blockly.clipboard.paste;
 
 /**
  * Duplicate this block and its children, or a workspace comment.
@@ -274,19 +250,7 @@ Blockly.paste = function() {
  *     copied.
  * @package
  */
-Blockly.duplicate = function(toDuplicate) {
-  // Save the clipboard.
-  var clipboardXml = Blockly.clipboardXml_;
-  var clipboardSource = Blockly.clipboardSource_;
-
-  // Create a duplicate via a copy/paste operation.
-  Blockly.copy(toDuplicate);
-  toDuplicate.workspace.paste(Blockly.clipboardXml_);
-
-  // Restore the clipboard.
-  Blockly.clipboardXml_ = clipboardXml;
-  Blockly.clipboardSource_ = clipboardSource;
-};
+Blockly.duplicate = Blockly.clipboard.duplicate;
 
 /**
  * Cancel the native context menu, unless the focus is on an HTML input widget.
diff --git a/core/clipboard.js b/core/clipboard.js
new file mode 100644
index 000000000..887346a58
--- /dev/null
+++ b/core/clipboard.js
@@ -0,0 +1,106 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Blockly's internal clipboard for managing copy-paste.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.clipboard');
+goog.module.declareLegacyNamespace();
+
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.requireType('Blockly.ICopyable');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+
+
+/**
+ * Contents of the local clipboard.
+ * @type {Element}
+ * @private
+ */
+let xml = null;
+exports.xml = xml;
+
+/**
+ * Source of the local clipboard.
+ * @type {WorkspaceSvg}
+ * @private
+ */
+let source = null;
+exports.source = source;
+
+/**
+ * Map of types to type counts for the clipboard object and descendants.
+ * @type {Object}
+ * @private
+ */
+let typeCounts = null;
+exports.typeCounts = typeCounts;
+
+/**
+ * Copy a block or workspace comment onto the local clipboard.
+ * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
+ * @package
+ */
+const copy = function(toCopy) {
+  var data = toCopy.toCopyData();
+  if (data) {
+    xml = data.xml;
+    source = data.source;
+    typeCounts = data.typeCounts;
+  }
+};
+exports.copy = copy;
+
+/**
+ * Paste a block or workspace comment on to the main workspace.
+ * @return {boolean} True if the paste was successful, false otherwise.
+ * @package
+ */
+const paste = function() {
+  if (!xml) {
+    return false;
+  }
+  // Pasting always pastes to the main workspace, even if the copy
+  // started in a flyout workspace.
+  var workspace = source;
+  if (workspace.isFlyout) {
+    workspace = workspace.targetWorkspace;
+  }
+  if (typeCounts && workspace.isCapacityAvailable(typeCounts)) {
+    Events.setGroup(true);
+    workspace.paste(xml);
+    Events.setGroup(false);
+    return true;
+  }
+  return false;
+};
+exports.paste = paste;
+
+/**
+ * Duplicate this block and its children, or a workspace comment.
+ * @param {!ICopyable} toDuplicate Block or Workspace Comment to be
+ *     copied.
+ * @package
+ */
+const duplicate = function(toDuplicate) {
+  // Save the clipboard.
+  const oldXml = xml;
+  const oldSource = source;
+
+  // Create a duplicate via a copy/paste operation.
+  copy(toDuplicate);
+  toDuplicate.workspace.paste(xml);
+
+  // Restore the clipboard.
+  xml = oldXml;
+  source = oldSource;
+};
+exports.duplicate = duplicate;
diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index dffd4a83d..e985a8e5c 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -15,7 +15,7 @@
  * @namespace
  */
 goog.provide('Blockly.ContextMenuItems');
-
+goog.require('Blockly.clipboard');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenuRegistry');
@@ -316,7 +316,7 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
     },
     callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
       if (scope.block) {
-        Blockly.duplicate(scope.block);
+        Blockly.clipboard.duplicate(scope.block);
       }
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index ef1cb07fc..494b64bfe 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -16,6 +16,7 @@
  */
 goog.provide('Blockly.ShortcutItems');
 
+goog.require('Blockly.clipboard');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.ShortcutRegistry');
 goog.require('Blockly.utils.KeyCodes');
@@ -104,7 +105,7 @@ Blockly.ShortcutItems.registerCopy = function() {
       // an error due to the lack of a selection.
       e.preventDefault();
       Blockly.hideChaff();
-      Blockly.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
+      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
       return true;
     }
   };
@@ -137,7 +138,7 @@ Blockly.ShortcutItems.registerCut = function() {
         !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
-      Blockly.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
+      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
       Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected));
       return true;
     }
@@ -167,7 +168,7 @@ Blockly.ShortcutItems.registerPaste = function() {
       return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
     },
     callback: function() {
-      return Blockly.paste();
+      return Blockly.clipboard.paste();
     }
   };
 
diff --git a/tests/deps.js b/tests/deps.js
index b28f86da2..44b852995 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,11 +12,12 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations']
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
@@ -25,7 +26,7 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.clipboard', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -159,7 +160,7 @@ goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.utils.KeyCodes']);
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
diff --git a/tests/mocha/contextmenu_items_test.js b/tests/mocha/contextmenu_items_test.js
index 62dd6f9ea..0d69fa77e 100644
--- a/tests/mocha/contextmenu_items_test.js
+++ b/tests/mocha/contextmenu_items_test.js
@@ -17,11 +17,11 @@ suite('Context Menu Items', function() {
     Blockly.ContextMenuItems.registerDefaultOptions();
     this.registry = Blockly.ContextMenuRegistry.registry;
   });
-  
+
   teardown(function() {
     sharedTestTeardown.call(this);
   });
-  
+
   suite('Workspace Items', function() {
     setup(function() {
       this.scope = {workspace: this.workspace};
@@ -328,12 +328,12 @@ suite('Context Menu Items', function() {
       });
 
       test('Calls duplicate', function() {
-        var stub = sinon.stub(Blockly, 'duplicate');
+        var spy = sinon.spy(Blockly.clipboard, 'duplicate');
 
         this.duplicateOption.callback(this.scope);
 
-        sinon.assert.calledOnce(stub);
-        sinon.assert.calledWith(stub, this.block);
+        sinon.assert.calledOnce(spy);
+        sinon.assert.calledWith(spy, this.block);
       });
 
       test('Has correct label', function() {
diff --git a/tests/mocha/keydown_test.js b/tests/mocha/keydown_test.js
index aec646111..22fdbf96e 100644
--- a/tests/mocha/keydown_test.js
+++ b/tests/mocha/keydown_test.js
@@ -93,7 +93,7 @@ suite('Key Down', function() {
   suite('Copy', function() {
     setup(function() {
       setSelectedBlock(this.workspace);
-      this.copySpy = sinon.spy(Blockly, 'copy');
+      this.copySpy = sinon.spy(Blockly.clipboard, 'copy');
       this.hideChaffSpy = sinon.spy(Blockly, 'hideChaff');
     });
     var testCases = [

From 311373230fed2adb4cdfd103a87d412902f574e3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 14:48:08 -0700
Subject: [PATCH 054/291] Fix help log

---
 scripts/goog_module/convert-file.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index ebf791d3b..a412a7933 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -312,8 +312,8 @@ help() {
   echo ""
   echo "Usage: $0 [-h] [-c <step> <filepath>|-s <step> <filepath>]"
   echo "  -h                    Display help and exit"
-  echo "  -c <step> <filepath>  Create a commit for the specified step [2-4]"
-  echo "  -s <step> <filepath>  Run the specified step [1-4]"
+  echo "  -c <step> <filepath>  Create a commit for the specified step [1-4]"
+  echo "  -s <step> <filepath>  Run the specified step [2-4]"
 }
 
 #######################################

From 87a714fff8d10073f813a9afce8aceda6060c2f9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 14:47:25 -0700
Subject: [PATCH 055/291] Add handling for modules that are not leaf nodes

---
 scripts/goog_module/convert-file.sh | 85 ++++++++++++++++++++++++-----
 1 file changed, 71 insertions(+), 14 deletions(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index a412a7933..1c5b92fc8 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -125,6 +125,59 @@ commit-step() {
   success "created commit with message: \"${message}\""
 }
 
+#######################################
+# Extracts a list of properties that are accessed on the specified module name.
+# Excludes any matches
+# Arguments:
+#   The module name to find properties accessed for.
+#   The modules required by the specified module as a single string.
+#   The filepath to extract requires from.
+#   Optional: The top-level module.
+# Outputs:
+#   Writes list of properties to stdout as items separated by spaces.
+#######################################
+getPropertiesAccessed() {
+  local module_name="$1"
+  local requires="$2"
+  local filepath="$3"
+  local top_module_name="$4"
+  # Get any strings that follow "$module_name.", excluding matches for
+  # "$module_name.prototype" and remove list item duplicates (sort -u).
+  local properties_accessed=$(perl -nle 'print $& while m{(?<='"${module_name}"'\.)(?!prototype)\w+}g' "${filepath}" | sort -u)
+
+  # Get a list of any requires that are a child of $module_name.
+  # Ex: Blockly.utils.dom is a child of Blockly.utils, this would return "dom"
+  local requires_overlap=$(echo "${requires}" | perl -nle 'print $& while m{(?<='"${module_name}"'\.)\w+}g')
+  # Detect if there was any overlap.
+  if [[ -n "${requires_overlap}" ]]; then
+    while read -r requires_overlap_prop; do
+      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
+    done <<<"${requires_overlap}"
+  fi
+
+  # Fix formatting (remove extra whitespace) and delimit the list with spaces.
+  properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
+
+  echo "${properties_accessed}"
+}
+
+#######################################
+# Extracts a list of requires defined in the file in the form of a single string
+# of items separated by newlines.
+# Arguments:
+#   The filepath to extract requires from.
+# Outputs:
+#   Writes list of requires to stdout as items separated by newlines.
+#######################################
+getRequires() {
+  local filepath="$1"
+  # Extracts all strings that start with goog.require(' or goog.requireType('
+  # up until the ending single quote.
+  # Ex: "goog.require('Blockly.utils')" would extract "Blockly.utils"
+  local requires=$(perl -nle 'print $& while m{(?:(?<=^goog.require\('\'')|(?<=^goog.requireType\('\''))[^'\'']+}g' "${filepath}")
+  echo "${requires}"
+}
+
 #######################################
 # Runs step 2 of the automated conversion.
 # Arguments:
@@ -166,8 +219,18 @@ step2 () {
   # No top level class.
   inf 'Updating top-level property declarations...'
   perl -pi -e 's/^'"${module_name}"'\.([^ ]+) =/const \1 =/g' "${filepath}"
+
+  # Extract specific properties accessed so that properties from requires that
+  # are children of the module aren't changed.
+  # Ex: The module Blockly.utils shouldn't update Blockly.utils.dom (since it is
+  # a require from another module.
+  local requires=$(getRequires "${filepath}")
+  local properties_accessed=$(getPropertiesAccessed "${module_name}" "${requires}" "${filepath}")
   inf "Updating local references to module..."
-  perl -pi -e 's/'"${module_name}"'\.([^ ]+)/\1/g' "${filepath}"
+  for property in $(echo "${properties_accessed}"); do
+    inf "Updating references of ${module_name}.${property} to ${property}..."
+    perl -pi -e 's/'"${module_name}"'\.'"${property}"'(?!\w)/'"${property}"'/g' "${filepath}"
+  done
 
   npm run build:deps
   success "Completed automation for step 2. Please manually review and add exports for non-private top-level functions."
@@ -187,7 +250,7 @@ step3() {
   fi
   inf "Extracted module name \"${module_name}\""
 
-  local requires=$(perl -nle 'print $& while m{(?:(?<=^goog.require\('\'')|(?<=^goog.requireType\('\''))[^'\'']+}g' "${filepath}")
+  local requires=$(getRequires "${filepath}")
 
   # Process each require
   echo "${requires}" | while read -r require; do
@@ -205,23 +268,17 @@ step3() {
 
     # Parse property access of module
     local direct_access_count=$(perl -nle 'print $& while m{'"${require}"'[^\.'\'']}g' "${filepath}" | wc -l)
-    local properties_accessed=$(perl -nle 'print $& while m{(?<='"${require}"'\.)(?!prototype)\w+}g' "${filepath}" | sort -u)
+    local properties_accessed=$(getPropertiesAccessed "${require}" "${requires}" "${filepath}")
 
-    # Detect requires overlap
-    # (ex: Blockly.utils require and Blockly.utils.dom also in requires)
-    local requires_overlap=$(echo "${requires}" | perl -nle 'print $& while m{(?<='"${require}"'\.)\w+}g')
-    if [[ -n "${requires_overlap}" ]]; then
-      while read -r requires_overlap_prop; do
-        properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
-      done <<<"${requires_overlap}"
-    fi
-    # Detect module name overlap
-    # (ex: Blockly require and Blockly.ContextMenuItems module being converted)
+    # Remove $module_name in case it is a child of $require.
+    # Ex: Blockly.utils.dom would be a child of Blockly, module_overlap would be
+    # "utils"
     local module_overlap=$(echo "${module_name}" | perl -nle 'print $& while m{(?<='"${require}"'\.)\w+}g')
     if [[ -n "${module_overlap}" ]]; then
       properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${module_overlap}"'//g')
+      # Trim any extra whitespace created.
+      properties_accessed=$(echo "${properties_accessed}" | xargs)
     fi
-    properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/\s+/ /g' | xargs)
 
     if [[ -n "${properties_accessed}" ]]; then
       local comma_properties=$(echo "${properties_accessed}" | perl -pe 's/\s+/, /g' | perl -pe 's/, $//')

From 8372ecb2125e75e35ec532fa40b46fa4f10fb34d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:05:40 -0700
Subject: [PATCH 056/291] Include full namespace in error message

---
 core/registry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/registry.js b/core/registry.js
index 1be9b2a2b..5752702ae 100644
--- a/core/registry.js
+++ b/core/registry.js
@@ -137,7 +137,7 @@ const register = function(type, name, registryItem, opt_allowOverrides) {
       String(type).trim() == '') {
     throw Error(
         'Invalid type "' + type + '". The type must be a' +
-        ' non-empty string or a Type.');
+        ' non-empty string or a Blockly.registry.Type.');
   }
   type = String(type).toLowerCase();
 

From 0f193f1f5a9c502824fb7987f494062ee39ca1cf Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:17:57 -0700
Subject: [PATCH 057/291] Migrate core/trashcan.js to ES6 const/let

---
 core/trashcan.js | 62 ++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index 619299b21..dea20acd2 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -80,7 +80,7 @@ Blockly.Trashcan = function(workspace) {
     return;
   }
   // Create flyout options.
-  var flyoutWorkspaceOptions = new Blockly.Options(
+  const flyoutWorkspaceOptions = new Blockly.Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         'scrollbars': true,
@@ -98,7 +98,7 @@ Blockly.Trashcan = function(workspace) {
     flyoutWorkspaceOptions.toolboxPosition =
         this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
         Blockly.utils.toolbox.Position.BOTTOM : Blockly.utils.toolbox.Position.TOP;
-    var HorizontalFlyout = Blockly.registry.getClassFromOptions(
+    const HorizontalFlyout = Blockly.registry.getClassFromOptions(
         Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new HorizontalFlyout(flyoutWorkspaceOptions);
@@ -106,7 +106,7 @@ Blockly.Trashcan = function(workspace) {
     flyoutWorkspaceOptions.toolboxPosition =
       this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ?
         Blockly.utils.toolbox.Position.LEFT : Blockly.utils.toolbox.Position.RIGHT;
-    var VerticalFlyout = Blockly.registry.getClassFromOptions(
+    const VerticalFlyout = Blockly.registry.getClassFromOptions(
         Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new VerticalFlyout(flyoutWorkspaceOptions);
@@ -300,8 +300,8 @@ Blockly.Trashcan.prototype.createDom = function() {
   this.svgGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {'class': 'blocklyTrash'}, null);
-  var clip;
-  var rnd = String(Math.random()).substring(2);
+  let clip;
+  const rnd = String(Math.random()).substring(2);
   clip = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.CLIPPATH,
       {'id': 'blocklyTrashBodyClipPath' + rnd},
@@ -314,7 +314,7 @@ Blockly.Trashcan.prototype.createDom = function() {
         'y': this.LID_HEIGHT_
       },
       clip);
-  var body = Blockly.utils.dom.createSvgElement(
+  const body = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
         'x': -this.SPRITE_LEFT_,
@@ -427,7 +427,7 @@ Blockly.Trashcan.prototype.openFlyout = function() {
   if (this.contentsIsOpen()) {
     return;
   }
-  var xml = this.contents_.map(Blockly.Xml.textToDom);
+  const xml = this.contents_.map(Blockly.Xml.textToDom);
   this.flyout.show(xml);
   this.fireUiEvent_(true);
 };
@@ -483,20 +483,20 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
     return;
   }
 
-  var cornerPosition =
+  const cornerPosition =
       Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
 
-  var height = this.BODY_HEIGHT_ + this.LID_HEIGHT_;
-  var startRect = Blockly.uiPosition.getStartPositionRect(
+  const height = this.BODY_HEIGHT_ + this.LID_HEIGHT_;
+  const startRect = Blockly.uiPosition.getStartPositionRect(
       cornerPosition, new Blockly.utils.Size(this.WIDTH_, height),
       this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics, this.workspace_);
 
-  var verticalPosition = cornerPosition.vertical;
-  var bumpDirection =
+  const verticalPosition = cornerPosition.vertical;
+  const bumpDirection =
       verticalPosition === Blockly.uiPosition.verticalPosition.TOP ?
           Blockly.uiPosition.bumpDirection.DOWN :
           Blockly.uiPosition.bumpDirection.UP;
-  var positionRect = Blockly.uiPosition.bumpPositionRect(
+  const positionRect = Blockly.uiPosition.bumpPositionRect(
       startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
@@ -512,8 +512,8 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
  *   bounding box should be ignored by other UI elements.
  */
 Blockly.Trashcan.prototype.getBoundingRectangle = function() {
-  var bottom = this.top_ + this.BODY_HEIGHT_ + this.LID_HEIGHT_;
-  var right = this.left_ + this.WIDTH_;
+  const bottom = this.top_ + this.BODY_HEIGHT_ + this.LID_HEIGHT_;
+  const right = this.left_ + this.WIDTH_;
   return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
 };
 
@@ -528,12 +528,12 @@ Blockly.Trashcan.prototype.getClientRect = function() {
     return null;
   }
 
-  var trashRect = this.svgGroup_.getBoundingClientRect();
-  var top = trashRect.top + this.SPRITE_TOP_ - this.MARGIN_HOTSPOT_;
-  var bottom = top + this.LID_HEIGHT_ + this.BODY_HEIGHT_ +
+  const trashRect = this.svgGroup_.getBoundingClientRect();
+  const top = trashRect.top + this.SPRITE_TOP_ - this.MARGIN_HOTSPOT_;
+  const bottom = top + this.LID_HEIGHT_ + this.BODY_HEIGHT_ +
       2 * this.MARGIN_HOTSPOT_;
-  var left = trashRect.left + this.SPRITE_LEFT_ - this.MARGIN_HOTSPOT_;
-  var right = left + this.WIDTH_ + 2 * this.MARGIN_HOTSPOT_;
+  const left = trashRect.left + this.SPRITE_LEFT_ - this.MARGIN_HOTSPOT_;
+  const right = left + this.WIDTH_ + 2 * this.MARGIN_HOTSPOT_;
   return new Blockly.utils.Rect(top, bottom, left, right);
 };
 
@@ -588,18 +588,18 @@ Blockly.Trashcan.prototype.setLidOpen = function(state) {
  * @private
  */
 Blockly.Trashcan.prototype.animateLid_ = function() {
-  var frames = Blockly.Trashcan.ANIMATION_FRAMES_;
+  const frames = Blockly.Trashcan.ANIMATION_FRAMES_;
 
-  var delta = 1 / (frames + 1);
+  const delta = 1 / (frames + 1);
   this.lidOpen_ += this.isLidOpen ? delta : -delta;
   this.lidOpen_ = Math.min(Math.max(this.lidOpen_, this.minOpenness_), 1);
 
   this.setLidAngle_(this.lidOpen_ * Blockly.Trashcan.MAX_LID_ANGLE_);
 
-  var minOpacity = Blockly.Trashcan.OPACITY_MIN_;
-  var maxOpacity = Blockly.Trashcan.OPACITY_MAX_;
+  const minOpacity = Blockly.Trashcan.OPACITY_MIN_;
+  const maxOpacity = Blockly.Trashcan.OPACITY_MAX_;
   // Linear interpolation between min and max.
-  var opacity = minOpacity + this.lidOpen_ * (maxOpacity - minOpacity);
+  const opacity = minOpacity + this.lidOpen_ * (maxOpacity - minOpacity);
   this.svgGroup_.style.opacity = opacity;
 
   if (this.lidOpen_ > this.minOpenness_ && this.lidOpen_ < 1) {
@@ -614,7 +614,7 @@ Blockly.Trashcan.prototype.animateLid_ = function() {
  * @private
  */
 Blockly.Trashcan.prototype.setLidAngle_ = function(lidAngle) {
-  var openAtRight =
+  const openAtRight =
       this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
   this.svgLid_.setAttribute('transform', 'rotate(' +
@@ -661,7 +661,7 @@ Blockly.Trashcan.prototype.click = function() {
  * @private
  */
 Blockly.Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
-  var uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
+  const uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
       trashcanOpen,this.workspace_.id);
   Blockly.Events.fire(uiEvent);
 };
@@ -710,7 +710,7 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
   // Must check that the tagName exists since oldXml can be a DocumentFragment.
   if (event.type == Blockly.Events.BLOCK_DELETE && event.oldXml.tagName &&
       event.oldXml.tagName.toLowerCase() != 'shadow') {
-    var cleanedXML = this.cleanBlockXML_(event.oldXml);
+    const cleanedXML = this.cleanBlockXML_(event.oldXml);
     if (this.contents_.indexOf(cleanedXML) != -1) {
       return;
     }
@@ -734,8 +734,8 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
  * @private
  */
 Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
-  var xmlBlock = xml.cloneNode(true);
-  var node = xmlBlock;
+  const xmlBlock = xml.cloneNode(true);
+  let node = xmlBlock;
   while (node) {
     // Things like text inside tags are still treated as nodes, but they
     // don't have attributes (or the removeAttribute function) so we can
@@ -753,7 +753,7 @@ Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
     }
 
     // Try to go down the tree
-    var nextNode = node.firstChild || node.nextSibling;
+    let nextNode = node.firstChild || node.nextSibling;
     // If we can't go down, try to go back up the tree.
     if (!nextNode) {
       nextNode = node.parentNode;

From 1d9c9359f959d931668ef625ad0a7bdb36fc74cb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:30:44 -0700
Subject: [PATCH 058/291] Migrate core/variable_map.js to ES6 const/let

---
 core/variable_map.js | 98 ++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 34fa926ec..3cbe5d561 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -66,9 +66,9 @@ Blockly.VariableMap.prototype.clear = function() {
  * @package
  */
 Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
-  var type = variable.type;
-  var conflictVar = this.getVariable(newName, type);
-  var blocks = this.workspace.getAllBlocks(false);
+  const type = variable.type;
+  const conflictVar = this.getVariable(newName, type);
+  const blocks = this.workspace.getAllBlocks(false);
   Blockly.Events.setGroup(true);
   try {
     // The IDs may match if the rename is a simple case change (name1 -> Name1).
@@ -89,7 +89,7 @@ Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
  * @param {string} newName New variable name.
  */
 Blockly.VariableMap.prototype.renameVariableById = function(id, newName) {
-  var variable = this.getVariableById(id);
+  const variable = this.getVariableById(id);
   if (!variable) {
     throw Error('Tried to rename a variable that didn\'t exist. ID: ' + id);
   }
@@ -111,7 +111,7 @@ Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
   Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_RENAME))(
       variable, newName));
   variable.name = newName;
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     blocks[i].updateVarName(variable);
   }
 };
@@ -131,8 +131,8 @@ Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
  */
 Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
     newName, conflictVar, blocks) {
-  var type = variable.type;
-  var oldCase = conflictVar.name;
+  const type = variable.type;
+  const oldCase = conflictVar.name;
 
   if (newName != oldCase) {
     // Simple rename to change the case and update references.
@@ -141,7 +141,7 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
 
   // These blocks now refer to a different variable.
   // These will fire change events.
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     blocks[i].renameVarById(variable.getId(), conflictVar.getId());
   }
 
@@ -149,8 +149,8 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
   Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
       variable));
   // And remove it from the list.
-  var variableList = this.getVariablesOfType(type);
-  var variableIndex = variableList.indexOf(variable);
+  const variableList = this.getVariablesOfType(type);
+  const variableIndex = variableList.indexOf(variable);
   this.variableMap_[type].splice(variableIndex, 1);
 
 };
@@ -170,7 +170,7 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  */
 Blockly.VariableMap.prototype.createVariable = function(name,
     opt_type, opt_id) {
-  var variable = this.getVariable(name, opt_type);
+  let variable = this.getVariable(name, opt_type);
   if (variable) {
     if (opt_id && variable.getId() != opt_id) {
       throw Error('Variable "' + name + '" is already in use and its id is "' +
@@ -183,11 +183,11 @@ Blockly.VariableMap.prototype.createVariable = function(name,
   if (opt_id && this.getVariableById(opt_id)) {
     throw Error('Variable id, "' + opt_id + '", is already in use.');
   }
-  var id = opt_id || Blockly.utils.genUid();
-  var type = opt_type || '';
+  const id = opt_id || Blockly.utils.genUid();
+  const type = opt_type || '';
   variable = new Blockly.VariableModel(this.workspace, name, type, id);
 
-  var variables = this.variableMap_[type] || [];
+  const variables = this.variableMap_[type] || [];
   variables.push(variable);
   // Delete the list of variables of this type, and re-add it so that
   // the most recent addition is at the end.
@@ -205,8 +205,8 @@ Blockly.VariableMap.prototype.createVariable = function(name,
  * @param {!Blockly.VariableModel} variable Variable to delete.
  */
 Blockly.VariableMap.prototype.deleteVariable = function(variable) {
-  var variableList = this.variableMap_[variable.type];
-  for (var i = 0, tempVar; (tempVar = variableList[i]); i++) {
+  const variableList = this.variableMap_[variable.type];
+  for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
       variableList.splice(i, 1);
       Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
@@ -222,16 +222,16 @@ Blockly.VariableMap.prototype.deleteVariable = function(variable) {
  * @param {string} id ID of variable to delete.
  */
 Blockly.VariableMap.prototype.deleteVariableById = function(id) {
-  var variable = this.getVariableById(id);
+  const variable = this.getVariableById(id);
   if (variable) {
     // Check whether this variable is a function parameter before deleting.
-    var variableName = variable.name;
-    var uses = this.getVariableUsesById(id);
-    for (var i = 0, block; (block = uses[i]); i++) {
+    const variableName = variable.name;
+    const uses = this.getVariableUsesById(id);
+    for (let i = 0, block; (block = uses[i]); i++) {
       if (block.type == 'procedures_defnoreturn' ||
         block.type == 'procedures_defreturn') {
-        var procedureName = block.getFieldValue('NAME');
-        var deleteText = Blockly.Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
+        const procedureName = block.getFieldValue('NAME');
+        const deleteText = Blockly.Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
             replace('%1', variableName).
             replace('%2', procedureName);
         Blockly.alert(deleteText);
@@ -239,10 +239,10 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
       }
     }
 
-    var map = this;
+    const map = this;
     if (uses.length > 1) {
       // Confirm before deleting multiple blocks.
-      var confirmText = Blockly.Msg['DELETE_VARIABLE_CONFIRMATION'].
+      const confirmText = Blockly.Msg['DELETE_VARIABLE_CONFIRMATION'].
           replace('%1', String(uses.length)).
           replace('%2', variableName);
       Blockly.confirm(confirmText,
@@ -269,12 +269,12 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
  */
 Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
     uses) {
-  var existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Blockly.Events.getGroup();
   if (!existingGroup) {
     Blockly.Events.setGroup(true);
   }
   try {
-    for (var i = 0; i < uses.length; i++) {
+    for (let i = 0; i < uses.length; i++) {
       uses[i].dispose(true);
     }
     this.deleteVariable(variable);
@@ -297,10 +297,10 @@ Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
  *     it was not found.
  */
 Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
-  var type = opt_type || '';
-  var list = this.variableMap_[type];
+  const type = opt_type || '';
+  const list = this.variableMap_[type];
   if (list) {
-    for (var j = 0, variable; (variable = list[j]); j++) {
+    for (let j = 0, variable; (variable = list[j]); j++) {
       if (Blockly.Names.equals(variable.name, name)) {
         return variable;
       }
@@ -315,10 +315,10 @@ Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
  * @return {?Blockly.VariableModel} The variable with the given ID.
  */
 Blockly.VariableMap.prototype.getVariableById = function(id) {
-  var keys = Object.keys(this.variableMap_);
-  for (var i = 0; i < keys.length; i++) {
-    var key = keys[i];
-    for (var j = 0, variable; (variable = this.variableMap_[key][j]); j++) {
+  const keys = Object.keys(this.variableMap_);
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    for (let j = 0, variable; (variable = this.variableMap_[key][j]); j++) {
       if (variable.getId() == id) {
         return variable;
       }
@@ -336,7 +336,7 @@ Blockly.VariableMap.prototype.getVariableById = function(id) {
  */
 Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
   type = type || '';
-  var variable_list = this.variableMap_[type];
+  const variable_list = this.variableMap_[type];
   if (variable_list) {
     return variable_list.slice();
   }
@@ -353,15 +353,15 @@ Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
  * @package
  */
 Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
-  var variableMap = {};
+  const variableMap = {};
   Blockly.utils.object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
     Blockly.utils.object.mixin(variableMap,
         ws.getPotentialVariableMap().variableMap_);
   }
-  var types = Object.keys(variableMap);
-  var hasEmpty = false;
-  for (var i = 0; i < types.length; i++) {
+  const types = Object.keys(variableMap);
+  let hasEmpty = false;
+  for (let i = 0; i < types.length; i++) {
     if (types[i] == '') {
       hasEmpty = true;
     }
@@ -377,8 +377,8 @@ Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
  * @return {!Array<!Blockly.VariableModel>} List of variable models.
  */
 Blockly.VariableMap.prototype.getAllVariables = function() {
-  var all_variables = [];
-  for (var key in this.variableMap_) {
+  let all_variables = [];
+  for (const key in this.variableMap_) {
     all_variables = all_variables.concat(this.variableMap_[key]);
   }
   return all_variables;
@@ -389,10 +389,10 @@ Blockly.VariableMap.prototype.getAllVariables = function() {
  * @return {!Array<string>} All of the variable names of all types.
  */
 Blockly.VariableMap.prototype.getAllVariableNames = function() {
-  var allNames = [];
-  for (var key in this.variableMap_) {
-    var variables = this.variableMap_[key];
-    for (var i = 0, variable; (variable = variables[i]); i++) {
+  const allNames = [];
+  for (const key in this.variableMap_) {
+    const variables = this.variableMap_[key];
+    for (let i = 0, variable; (variable = variables[i]); i++) {
       allNames.push(variable.name);
     }
   }
@@ -405,13 +405,13 @@ Blockly.VariableMap.prototype.getAllVariableNames = function() {
  * @return {!Array<!Blockly.Block>} Array of block usages.
  */
 Blockly.VariableMap.prototype.getVariableUsesById = function(id) {
-  var uses = [];
-  var blocks = this.workspace.getAllBlocks(false);
+  const uses = [];
+  const blocks = this.workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
-  for (var i = 0; i < blocks.length; i++) {
-    var blockVariables = blocks[i].getVarModels();
+  for (let i = 0; i < blocks.length; i++) {
+    const blockVariables = blocks[i].getVarModels();
     if (blockVariables) {
-      for (var j = 0; j < blockVariables.length; j++) {
+      for (let j = 0; j < blockVariables.length; j++) {
         if (blockVariables[j].getId() == id) {
           uses.push(blocks[i]);
         }

From 959d976723edc29c9caecfdb648c7975b0d39f64 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:34:37 -0700
Subject: [PATCH 059/291] Migrate core/variable_map.js to goog.module

---
 core/variable_map.js | 39 +++++++++++++++++++++------------------
 tests/deps.js        |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 3cbe5d561..22eb11c9c 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.VariableMap');
+goog.module('Blockly.VariableMap');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -33,7 +34,7 @@ goog.requireType('Blockly.Workspace');
  * @param {!Blockly.Workspace} workspace The workspace this map belongs to.
  * @constructor
  */
-Blockly.VariableMap = function(workspace) {
+const VariableMap = function(workspace) {
   /**
    * A map from variable type to list of variable names.  The lists contain all
    * of the named variables in the workspace, including variables
@@ -53,7 +54,7 @@ Blockly.VariableMap = function(workspace) {
 /**
  * Clear the variable map.
  */
-Blockly.VariableMap.prototype.clear = function() {
+VariableMap.prototype.clear = function() {
   this.variableMap_ = Object.create(null);
 };
 
@@ -65,7 +66,7 @@ Blockly.VariableMap.prototype.clear = function() {
  * @param {string} newName New variable name.
  * @package
  */
-Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
+VariableMap.prototype.renameVariable = function(variable, newName) {
   const type = variable.type;
   const conflictVar = this.getVariable(newName, type);
   const blocks = this.workspace.getAllBlocks(false);
@@ -88,7 +89,7 @@ Blockly.VariableMap.prototype.renameVariable = function(variable, newName) {
  * @param {string} id ID of the variable to rename.
  * @param {string} newName New variable name.
  */
-Blockly.VariableMap.prototype.renameVariableById = function(id, newName) {
+VariableMap.prototype.renameVariableById = function(id, newName) {
   const variable = this.getVariableById(id);
   if (!variable) {
     throw Error('Tried to rename a variable that didn\'t exist. ID: ' + id);
@@ -106,7 +107,7 @@ Blockly.VariableMap.prototype.renameVariableById = function(id, newName) {
  *     workspace.
  * @private
  */
-Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
+VariableMap.prototype.renameVariableAndUses_ = function(variable,
     newName, blocks) {
   Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_RENAME))(
       variable, newName));
@@ -129,7 +130,7 @@ Blockly.VariableMap.prototype.renameVariableAndUses_ = function(variable,
  *     workspace.
  * @private
  */
-Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
+VariableMap.prototype.renameVariableWithConflict_ = function(variable,
     newName, conflictVar, blocks) {
   const type = variable.type;
   const oldCase = conflictVar.name;
@@ -168,7 +169,7 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  *     a UUID.
  * @return {!Blockly.VariableModel} The newly created variable.
  */
-Blockly.VariableMap.prototype.createVariable = function(name,
+VariableMap.prototype.createVariable = function(name,
     opt_type, opt_id) {
   let variable = this.getVariable(name, opt_type);
   if (variable) {
@@ -204,7 +205,7 @@ Blockly.VariableMap.prototype.createVariable = function(name,
  * Delete a variable.
  * @param {!Blockly.VariableModel} variable Variable to delete.
  */
-Blockly.VariableMap.prototype.deleteVariable = function(variable) {
+VariableMap.prototype.deleteVariable = function(variable) {
   const variableList = this.variableMap_[variable.type];
   for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
@@ -221,7 +222,7 @@ Blockly.VariableMap.prototype.deleteVariable = function(variable) {
  * workspace. May prompt the user for confirmation.
  * @param {string} id ID of variable to delete.
  */
-Blockly.VariableMap.prototype.deleteVariableById = function(id) {
+VariableMap.prototype.deleteVariableById = function(id) {
   const variable = this.getVariableById(id);
   if (variable) {
     // Check whether this variable is a function parameter before deleting.
@@ -267,7 +268,7 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
  * @param {!Array<!Blockly.Block>} uses An array of uses of the variable.
  * @package
  */
-Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
+VariableMap.prototype.deleteVariableInternal = function(variable,
     uses) {
   const existingGroup = Blockly.Events.getGroup();
   if (!existingGroup) {
@@ -296,7 +297,7 @@ Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
  * @return {?Blockly.VariableModel} The variable with the given name, or null if
  *     it was not found.
  */
-Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
+VariableMap.prototype.getVariable = function(name, opt_type) {
   const type = opt_type || '';
   const list = this.variableMap_[type];
   if (list) {
@@ -314,7 +315,7 @@ Blockly.VariableMap.prototype.getVariable = function(name, opt_type) {
  * @param {string} id The ID to check for.
  * @return {?Blockly.VariableModel} The variable with the given ID.
  */
-Blockly.VariableMap.prototype.getVariableById = function(id) {
+VariableMap.prototype.getVariableById = function(id) {
   const keys = Object.keys(this.variableMap_);
   for (let i = 0; i < keys.length; i++) {
     const key = keys[i];
@@ -334,7 +335,7 @@ Blockly.VariableMap.prototype.getVariableById = function(id) {
  * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
-Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
+VariableMap.prototype.getVariablesOfType = function(type) {
   type = type || '';
   const variable_list = this.variableMap_[type];
   if (variable_list) {
@@ -352,7 +353,7 @@ Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
  * @return {!Array<string>} List of variable types.
  * @package
  */
-Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
+VariableMap.prototype.getVariableTypes = function(ws) {
   const variableMap = {};
   Blockly.utils.object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
@@ -376,7 +377,7 @@ Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
  * Return all variables of all types.
  * @return {!Array<!Blockly.VariableModel>} List of variable models.
  */
-Blockly.VariableMap.prototype.getAllVariables = function() {
+VariableMap.prototype.getAllVariables = function() {
   let all_variables = [];
   for (const key in this.variableMap_) {
     all_variables = all_variables.concat(this.variableMap_[key]);
@@ -388,7 +389,7 @@ Blockly.VariableMap.prototype.getAllVariables = function() {
  * Returns all of the variable names of all types.
  * @return {!Array<string>} All of the variable names of all types.
  */
-Blockly.VariableMap.prototype.getAllVariableNames = function() {
+VariableMap.prototype.getAllVariableNames = function() {
   const allNames = [];
   for (const key in this.variableMap_) {
     const variables = this.variableMap_[key];
@@ -404,7 +405,7 @@ Blockly.VariableMap.prototype.getAllVariableNames = function() {
  * @param {string} id ID of the variable to find.
  * @return {!Array<!Blockly.Block>} Array of block usages.
  */
-Blockly.VariableMap.prototype.getVariableUsesById = function(id) {
+VariableMap.prototype.getVariableUsesById = function(id) {
   const uses = [];
   const blocks = this.workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
@@ -420,3 +421,5 @@ Blockly.VariableMap.prototype.getVariableUsesById = function(id) {
   }
   return uses;
 };
+
+exports = VariableMap;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..d4217d539 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -195,7 +195,7 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);

From 9847b8c027c6581246616d6554eb1e6c541eb6fc Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:39:58 -0700
Subject: [PATCH 060/291] Migrate core/variable_map.js to named requires

---
 core/variable_map.js | 86 ++++++++++++++++++++++----------------------
 tests/deps.js        |  2 +-
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index 22eb11c9c..e2c371149 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -13,25 +13,27 @@
 goog.module('Blockly.VariableMap');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const Msg = goog.require('Blockly.Msg');
+const Names = goog.require('Blockly.Names');
+const VariableModel = goog.require('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarDelete');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarRename');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a variable map.  This contains a dictionary data structure with
  * variable types as keys and lists of variables as values.  The list of
  * variables are the type indicated by the key.
- * @param {!Blockly.Workspace} workspace The workspace this map belongs to.
+ * @param {!Workspace} workspace The workspace this map belongs to.
  * @constructor
  */
 const VariableMap = function(workspace) {
@@ -39,14 +41,14 @@ const VariableMap = function(workspace) {
    * A map from variable type to list of variable names.  The lists contain all
    * of the named variables in the workspace, including variables
    * that are not currently in use.
-   * @type {!Object<string, !Array<Blockly.VariableModel>>}
+   * @type {!Object<string, !Array<VariableModel>>}
    * @private
    */
   this.variableMap_ = Object.create(null);
 
   /**
    * The workspace this map belongs to.
-   * @type {!Blockly.Workspace}
+   * @type {!Workspace}
    */
   this.workspace = workspace;
 };
@@ -62,7 +64,7 @@ VariableMap.prototype.clear = function() {
 
 /**
  * Rename the given variable by updating its name in the variable map.
- * @param {!Blockly.VariableModel} variable Variable to rename.
+ * @param {!VariableModel} variable Variable to rename.
  * @param {string} newName New variable name.
  * @package
  */
@@ -70,7 +72,7 @@ VariableMap.prototype.renameVariable = function(variable, newName) {
   const type = variable.type;
   const conflictVar = this.getVariable(newName, type);
   const blocks = this.workspace.getAllBlocks(false);
-  Blockly.Events.setGroup(true);
+  Events.setGroup(true);
   try {
     // The IDs may match if the rename is a simple case change (name1 -> Name1).
     if (!conflictVar || conflictVar.getId() == variable.getId()) {
@@ -79,7 +81,7 @@ VariableMap.prototype.renameVariable = function(variable, newName) {
       this.renameVariableWithConflict_(variable, newName, conflictVar, blocks);
     }
   } finally {
-    Blockly.Events.setGroup(false);
+    Events.setGroup(false);
   }
 };
 
@@ -101,15 +103,15 @@ VariableMap.prototype.renameVariableById = function(id, newName) {
 /**
  * Update the name of the given variable and refresh all references to it.
  * The new name must not conflict with any existing variable names.
- * @param {!Blockly.VariableModel} variable Variable to rename.
+ * @param {!VariableModel} variable Variable to rename.
  * @param {string} newName New variable name.
- * @param {!Array<!Blockly.Block>} blocks The list of all blocks in the
+ * @param {!Array<!Block>} blocks The list of all blocks in the
  *     workspace.
  * @private
  */
 VariableMap.prototype.renameVariableAndUses_ = function(variable,
     newName, blocks) {
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_RENAME))(
+  Events.fire(new (Events.get(Events.VAR_RENAME))(
       variable, newName));
   variable.name = newName;
   for (let i = 0; i < blocks.length; i++) {
@@ -122,11 +124,11 @@ VariableMap.prototype.renameVariableAndUses_ = function(variable,
  * variable.  The two variables are coalesced into a single variable with the ID
  * of the existing variable that was already using newName.
  * Refresh all references to the variable.
- * @param {!Blockly.VariableModel} variable Variable to rename.
+ * @param {!VariableModel} variable Variable to rename.
  * @param {string} newName New variable name.
- * @param {!Blockly.VariableModel} conflictVar The variable that was already
+ * @param {!VariableModel} conflictVar The variable that was already
  *     using newName.
- * @param {!Array<!Blockly.Block>} blocks The list of all blocks in the
+ * @param {!Array<!Block>} blocks The list of all blocks in the
  *     workspace.
  * @private
  */
@@ -147,7 +149,7 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
   }
 
   // Finally delete the original variable, which is now unreferenced.
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
+  Events.fire(new (Events.get(Events.VAR_DELETE))(
       variable));
   // And remove it from the list.
   const variableList = this.getVariablesOfType(type);
@@ -167,7 +169,7 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  *     their type. This will default to '' which is a specific type.
  * @param {?string=} opt_id The unique ID of the variable. This will default to
  *     a UUID.
- * @return {!Blockly.VariableModel} The newly created variable.
+ * @return {!VariableModel} The newly created variable.
  */
 VariableMap.prototype.createVariable = function(name,
     opt_type, opt_id) {
@@ -184,9 +186,9 @@ VariableMap.prototype.createVariable = function(name,
   if (opt_id && this.getVariableById(opt_id)) {
     throw Error('Variable id, "' + opt_id + '", is already in use.');
   }
-  const id = opt_id || Blockly.utils.genUid();
+  const id = opt_id || utils.genUid();
   const type = opt_type || '';
-  variable = new Blockly.VariableModel(this.workspace, name, type, id);
+  variable = new VariableModel(this.workspace, name, type, id);
 
   const variables = this.variableMap_[type] || [];
   variables.push(variable);
@@ -203,14 +205,14 @@ VariableMap.prototype.createVariable = function(name,
 
 /**
  * Delete a variable.
- * @param {!Blockly.VariableModel} variable Variable to delete.
+ * @param {!VariableModel} variable Variable to delete.
  */
 VariableMap.prototype.deleteVariable = function(variable) {
   const variableList = this.variableMap_[variable.type];
   for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
       variableList.splice(i, 1);
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_DELETE))(
+      Events.fire(new (Events.get(Events.VAR_DELETE))(
           variable));
       return;
     }
@@ -232,7 +234,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
       if (block.type == 'procedures_defnoreturn' ||
         block.type == 'procedures_defreturn') {
         const procedureName = block.getFieldValue('NAME');
-        const deleteText = Blockly.Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
+        const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
             replace('%1', variableName).
             replace('%2', procedureName);
         Blockly.alert(deleteText);
@@ -243,7 +245,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
     const map = this;
     if (uses.length > 1) {
       // Confirm before deleting multiple blocks.
-      const confirmText = Blockly.Msg['DELETE_VARIABLE_CONFIRMATION'].
+      const confirmText = Msg['DELETE_VARIABLE_CONFIRMATION'].
           replace('%1', String(uses.length)).
           replace('%2', variableName);
       Blockly.confirm(confirmText,
@@ -264,15 +266,15 @@ VariableMap.prototype.deleteVariableById = function(id) {
 /**
  * Deletes a variable and all of its uses from this workspace without asking the
  * user for confirmation.
- * @param {!Blockly.VariableModel} variable Variable to delete.
- * @param {!Array<!Blockly.Block>} uses An array of uses of the variable.
+ * @param {!VariableModel} variable Variable to delete.
+ * @param {!Array<!Block>} uses An array of uses of the variable.
  * @package
  */
 VariableMap.prototype.deleteVariableInternal = function(variable,
     uses) {
-  const existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Events.getGroup();
   if (!existingGroup) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
   }
   try {
     for (let i = 0; i < uses.length; i++) {
@@ -281,7 +283,7 @@ VariableMap.prototype.deleteVariableInternal = function(variable,
     this.deleteVariable(variable);
   } finally {
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
   }
 };
@@ -294,7 +296,7 @@ VariableMap.prototype.deleteVariableInternal = function(variable,
  * @param {string} name The name to check for.
  * @param {?string=} opt_type The type of the variable.  If not provided it
  *     defaults to the empty string, which is a specific type.
- * @return {?Blockly.VariableModel} The variable with the given name, or null if
+ * @return {?VariableModel} The variable with the given name, or null if
  *     it was not found.
  */
 VariableMap.prototype.getVariable = function(name, opt_type) {
@@ -302,7 +304,7 @@ VariableMap.prototype.getVariable = function(name, opt_type) {
   const list = this.variableMap_[type];
   if (list) {
     for (let j = 0, variable; (variable = list[j]); j++) {
-      if (Blockly.Names.equals(variable.name, name)) {
+      if (Names.equals(variable.name, name)) {
         return variable;
       }
     }
@@ -313,7 +315,7 @@ VariableMap.prototype.getVariable = function(name, opt_type) {
 /**
  * Find the variable by the given ID and return it.  Return null if not found.
  * @param {string} id The ID to check for.
- * @return {?Blockly.VariableModel} The variable with the given ID.
+ * @return {?VariableModel} The variable with the given ID.
  */
 VariableMap.prototype.getVariableById = function(id) {
   const keys = Object.keys(this.variableMap_);
@@ -332,7 +334,7 @@ VariableMap.prototype.getVariableById = function(id) {
  * Get a list containing all of the variables of a specified type. If type is
  *     null, return list of variables with empty string type.
  * @param {?string} type Type of the variables to find.
- * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
+ * @return {!Array<!VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
 VariableMap.prototype.getVariablesOfType = function(type) {
@@ -347,7 +349,7 @@ VariableMap.prototype.getVariablesOfType = function(type) {
 /**
  * Return all variable and potential variable types.  This list always contains
  * the empty string.
- * @param {?Blockly.Workspace} ws The workspace used to look for potential
+ * @param {?Workspace} ws The workspace used to look for potential
  * variables. This can be different than the workspace stored on this object
  * if the passed in ws is a flyout workspace.
  * @return {!Array<string>} List of variable types.
@@ -355,9 +357,9 @@ VariableMap.prototype.getVariablesOfType = function(type) {
  */
 VariableMap.prototype.getVariableTypes = function(ws) {
   const variableMap = {};
-  Blockly.utils.object.mixin(variableMap, this.variableMap_);
+  object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
-    Blockly.utils.object.mixin(variableMap,
+    object.mixin(variableMap,
         ws.getPotentialVariableMap().variableMap_);
   }
   const types = Object.keys(variableMap);
@@ -375,7 +377,7 @@ VariableMap.prototype.getVariableTypes = function(ws) {
 
 /**
  * Return all variables of all types.
- * @return {!Array<!Blockly.VariableModel>} List of variable models.
+ * @return {!Array<!VariableModel>} List of variable models.
  */
 VariableMap.prototype.getAllVariables = function() {
   let all_variables = [];
@@ -403,7 +405,7 @@ VariableMap.prototype.getAllVariableNames = function() {
 /**
  * Find all the uses of a named variable.
  * @param {string} id ID of the variable to find.
- * @return {!Array<!Blockly.Block>} Array of block usages.
+ * @return {!Array<!Block>} Array of block usages.
  */
 VariableMap.prototype.getVariableUsesById = function(id) {
   const uses = [];
diff --git a/tests/deps.js b/tests/deps.js
index d4217d539..fa4d62a5c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -195,7 +195,7 @@ goog.addDependency('../../core/utils/svg_paths.js', ['Blockly.utils.svgPaths'],
 goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['Blockly.Xml', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
-goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.Names', 'Blockly.VariableModel', 'Blockly.utils', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);

From d58a878fad99b4eedc4db2f09d6ee1820cb0c110 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 12:43:49 -0700
Subject: [PATCH 061/291] Switch to getter for keyboard contents.

---
 core/blockly.js   | 34 +++++++++-------------------------
 core/clipboard.js | 21 ++++++++++++++-------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 808c035b0..ab82638fe 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -93,25 +93,12 @@ Blockly.selected = null;
 Blockly.draggingConnections = [];
 
 /**
- * Contents of the local clipboard.
- * @type {Element}
- * @private
+ * Get the current contents of the clipboard and associated metadata.
+ * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
+ *     containing the clipboard contents and associated metadata.
+ * @public
  */
-Blockly.clipboardXml_ = Blockly.clipboard.xml;
-
-/**
- * Source of the local clipboard.
- * @type {Blockly.WorkspaceSvg}
- * @private
- */
-Blockly.clipboardSource_ = Blockly.clipboard.source;
-
-/**
- * Map of types to type counts for the clipboard object and descendants.
- * @type {Object}
- * @private
- */
-Blockly.clipboardTypeCounts_ = Blockly.clipboard.typeCounts;
+Blockly.getClipboardInfo = Blockly.common.getClipboardInfo;
 
 /**
  * Cached value for whether 3D is supported.
@@ -137,9 +124,7 @@ Blockly.svgSize = function(svg) {
   // When removing this function, remove svg.cachedWidth_ and svg.cachedHeight_
   // from setCachedParentSvgSize.
   Blockly.utils.deprecation.warn(
-      'Blockly.svgSize',
-      'March 2021',
-      'March 2022',
+      'Blockly.svgSize', 'March 2021', 'March 2022',
       'workspace.getCachedParentSvgSize');
   svg = /** @type {?} */ (svg);
   return new Blockly.utils.Size(svg.cachedWidth_, svg.cachedHeight_);
@@ -221,7 +206,8 @@ Blockly.deleteBlock = function(selected) {
     Blockly.Events.setGroup(true);
     Blockly.hideChaff();
     if (selected.outputConnection) {
-      // Do not attempt to heal rows (https://github.com/google/blockly/issues/4832)
+      // Do not attempt to heal rows
+      // (https://github.com/google/blockly/issues/4832)
       selected.dispose(false, true);
     } else {
       selected.dispose(/* heal */ true, true);
@@ -366,9 +352,7 @@ Blockly.defineBlocksWithJsonArray = function(jsonArray) {
               'Block definition #' + i + ' in JSON array' +
               ' overwrites prior definition of "' + typename + '".');
         }
-        Blockly.Blocks[typename] = {
-          init: Blockly.jsonInitFactory_(elem)
-        };
+        Blockly.Blocks[typename] = {init: Blockly.jsonInitFactory_(elem)};
       }
     }
   }
diff --git a/core/clipboard.js b/core/clipboard.js
index 887346a58..b93f92530 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -26,7 +26,6 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
  * @private
  */
 let xml = null;
-exports.xml = xml;
 
 /**
  * Source of the local clipboard.
@@ -34,7 +33,6 @@ exports.xml = xml;
  * @private
  */
 let source = null;
-exports.source = source;
 
 /**
  * Map of types to type counts for the clipboard object and descendants.
@@ -42,12 +40,20 @@ exports.source = source;
  * @private
  */
 let typeCounts = null;
-exports.typeCounts = typeCounts;
+
+/**
+ * Get the current contents of the clipboard and associated metadata.
+ * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
+ *     containing the clipboard contents and associated metadata.
+ */
+const getClipboardInfo = function() {
+  return {xml: xml, source: source, typeCounts: typeCounts};
+};
+exports.getClipboardInfo = getClipboardInfo;
 
 /**
  * Copy a block or workspace comment onto the local clipboard.
  * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
- * @package
  */
 const copy = function(toCopy) {
   var data = toCopy.toCopyData();
@@ -57,12 +63,12 @@ const copy = function(toCopy) {
     typeCounts = data.typeCounts;
   }
 };
+/** @package */
 exports.copy = copy;
 
 /**
  * Paste a block or workspace comment on to the main workspace.
  * @return {boolean} True if the paste was successful, false otherwise.
- * @package
  */
 const paste = function() {
   if (!xml) {
@@ -82,13 +88,13 @@ const paste = function() {
   }
   return false;
 };
+/** @package */
 exports.paste = paste;
 
 /**
  * Duplicate this block and its children, or a workspace comment.
  * @param {!ICopyable} toDuplicate Block or Workspace Comment to be
- *     copied.
- * @package
+ *     duplicated.
  */
 const duplicate = function(toDuplicate) {
   // Save the clipboard.
@@ -103,4 +109,5 @@ const duplicate = function(toDuplicate) {
   xml = oldXml;
   source = oldSource;
 };
+/** @package */
 exports.duplicate = duplicate;

From 78646eae51980af96b9e97add9a13d8978773595 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:47:51 -0700
Subject: [PATCH 062/291] clang-format core/variable_map.js

---
 core/variable_map.js | 57 +++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 32 deletions(-)

diff --git a/core/variable_map.js b/core/variable_map.js
index e2c371149..a22ab75d5 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -109,10 +109,9 @@ VariableMap.prototype.renameVariableById = function(id, newName) {
  *     workspace.
  * @private
  */
-VariableMap.prototype.renameVariableAndUses_ = function(variable,
-    newName, blocks) {
-  Events.fire(new (Events.get(Events.VAR_RENAME))(
-      variable, newName));
+VariableMap.prototype.renameVariableAndUses_ = function(
+    variable, newName, blocks) {
+  Events.fire(new (Events.get(Events.VAR_RENAME))(variable, newName));
   variable.name = newName;
   for (let i = 0; i < blocks.length; i++) {
     blocks[i].updateVarName(variable);
@@ -132,8 +131,8 @@ VariableMap.prototype.renameVariableAndUses_ = function(variable,
  *     workspace.
  * @private
  */
-VariableMap.prototype.renameVariableWithConflict_ = function(variable,
-    newName, conflictVar, blocks) {
+VariableMap.prototype.renameVariableWithConflict_ = function(
+    variable, newName, conflictVar, blocks) {
   const type = variable.type;
   const oldCase = conflictVar.name;
 
@@ -149,13 +148,11 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
   }
 
   // Finally delete the original variable, which is now unreferenced.
-  Events.fire(new (Events.get(Events.VAR_DELETE))(
-      variable));
+  Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
   // And remove it from the list.
   const variableList = this.getVariablesOfType(type);
   const variableIndex = variableList.indexOf(variable);
   this.variableMap_[type].splice(variableIndex, 1);
-
 };
 
 /* End functions for renaming variables. */
@@ -171,12 +168,12 @@ VariableMap.prototype.renameVariableWithConflict_ = function(variable,
  *     a UUID.
  * @return {!VariableModel} The newly created variable.
  */
-VariableMap.prototype.createVariable = function(name,
-    opt_type, opt_id) {
+VariableMap.prototype.createVariable = function(name, opt_type, opt_id) {
   let variable = this.getVariable(name, opt_type);
   if (variable) {
     if (opt_id && variable.getId() != opt_id) {
-      throw Error('Variable "' + name + '" is already in use and its id is "' +
+      throw Error(
+          'Variable "' + name + '" is already in use and its id is "' +
           variable.getId() + '" which conflicts with the passed in ' +
           'id, "' + opt_id + '".');
     }
@@ -212,8 +209,7 @@ VariableMap.prototype.deleteVariable = function(variable) {
   for (let i = 0, tempVar; (tempVar = variableList[i]); i++) {
     if (tempVar.getId() == variable.getId()) {
       variableList.splice(i, 1);
-      Events.fire(new (Events.get(Events.VAR_DELETE))(
-          variable));
+      Events.fire(new (Events.get(Events.VAR_DELETE))(variable));
       return;
     }
   }
@@ -232,11 +228,11 @@ VariableMap.prototype.deleteVariableById = function(id) {
     const uses = this.getVariableUsesById(id);
     for (let i = 0, block; (block = uses[i]); i++) {
       if (block.type == 'procedures_defnoreturn' ||
-        block.type == 'procedures_defreturn') {
+          block.type == 'procedures_defreturn') {
         const procedureName = block.getFieldValue('NAME');
-        const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE'].
-            replace('%1', variableName).
-            replace('%2', procedureName);
+        const deleteText = Msg['CANNOT_DELETE_VARIABLE_PROCEDURE']
+                               .replace('%1', variableName)
+                               .replace('%2', procedureName);
         Blockly.alert(deleteText);
         return;
       }
@@ -245,21 +241,20 @@ VariableMap.prototype.deleteVariableById = function(id) {
     const map = this;
     if (uses.length > 1) {
       // Confirm before deleting multiple blocks.
-      const confirmText = Msg['DELETE_VARIABLE_CONFIRMATION'].
-          replace('%1', String(uses.length)).
-          replace('%2', variableName);
-      Blockly.confirm(confirmText,
-          function(ok) {
-            if (ok && variable) {
-              map.deleteVariableInternal(variable, uses);
-            }
-          });
+      const confirmText = Msg['DELETE_VARIABLE_CONFIRMATION']
+                              .replace('%1', String(uses.length))
+                              .replace('%2', variableName);
+      Blockly.confirm(confirmText, function(ok) {
+        if (ok && variable) {
+          map.deleteVariableInternal(variable, uses);
+        }
+      });
     } else {
       // No confirmation necessary for a single block.
       map.deleteVariableInternal(variable, uses);
     }
   } else {
-    console.warn("Can't delete non-existent variable: " + id);
+    console.warn('Can\'t delete non-existent variable: ' + id);
   }
 };
 
@@ -270,8 +265,7 @@ VariableMap.prototype.deleteVariableById = function(id) {
  * @param {!Array<!Block>} uses An array of uses of the variable.
  * @package
  */
-VariableMap.prototype.deleteVariableInternal = function(variable,
-    uses) {
+VariableMap.prototype.deleteVariableInternal = function(variable, uses) {
   const existingGroup = Events.getGroup();
   if (!existingGroup) {
     Events.setGroup(true);
@@ -359,8 +353,7 @@ VariableMap.prototype.getVariableTypes = function(ws) {
   const variableMap = {};
   object.mixin(variableMap, this.variableMap_);
   if (ws && ws.getPotentialVariableMap()) {
-    object.mixin(variableMap,
-        ws.getPotentialVariableMap().variableMap_);
+    object.mixin(variableMap, ws.getPotentialVariableMap().variableMap_);
   }
   const types = Object.keys(variableMap);
   let hasEmpty = false;

From dc4a719e2f507468b303ed228381dc7d033cdd57 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:50:42 -0700
Subject: [PATCH 063/291] Migrate core/variable_model.js to goog.module

---
 core/variable_model.js | 15 +++++++++------
 tests/deps.js          |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/variable_model.js b/core/variable_model.js
index bc097da8a..ce4c37c66 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.VariableModel');
+goog.module('Blockly.VariableModel');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -34,7 +35,7 @@ goog.requireType('Blockly.Workspace');
  * @see {Blockly.FieldVariable}
  * @constructor
  */
-Blockly.VariableModel = function(workspace, name, opt_type, opt_id) {
+const VariableModel = function(workspace, name, opt_type, opt_id) {
   /**
    * The workspace the variable is in.
    * @type {!Blockly.Workspace}
@@ -73,18 +74,20 @@ Blockly.VariableModel = function(workspace, name, opt_type, opt_id) {
 /**
  * @return {string} The ID for the variable.
  */
-Blockly.VariableModel.prototype.getId = function() {
+VariableModel.prototype.getId = function() {
   return this.id_;
 };
 
 /**
  * A custom compare function for the VariableModel objects.
- * @param {Blockly.VariableModel} var1 First variable to compare.
- * @param {Blockly.VariableModel} var2 Second variable to compare.
+ * @param {VariableModel} var1 First variable to compare.
+ * @param {VariableModel} var2 Second variable to compare.
  * @return {number} -1 if name of var1 is less than name of var2, 0 if equal,
  *     and 1 if greater.
  * @package
  */
-Blockly.VariableModel.compareByName = function(var1, var2) {
+VariableModel.compareByName = function(var1, var2) {
   return var1.name.localeCompare(var2.name, undefined, {sensitivity: 'base'});
 };
+
+exports = VariableModel;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..0e0a7f034 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -196,7 +196,7 @@ goog.addDependency('../../core/utils/toolbox.js', ['Blockly.utils.toolbox'], ['B
 goog.addDependency('../../core/utils/useragent.js', ['Blockly.utils.userAgent'], ['Blockly.utils.global']);
 goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
-goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils']);
+goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 714bb6120f9caebc04dc6707d300f784924b33b7 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 12:52:14 -0700
Subject: [PATCH 064/291] Fix annotations

---
 core/blockly.js   |  6 +++---
 core/clipboard.js | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index ab82638fe..9fae4e84a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -94,11 +94,11 @@ Blockly.draggingConnections = [];
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
- *     containing the clipboard contents and associated metadata.
+ * @return {{xml: ?Element, source: ?Blockly.WorkspaceSvg, typeCounts: ?Object}}
+ *     An object containing the clipboard contents and associated metadata.
  * @public
  */
-Blockly.getClipboardInfo = Blockly.common.getClipboardInfo;
+Blockly.getClipboardInfo = Blockly.clipboard.getClipboardInfo;
 
 /**
  * Cached value for whether 3D is supported.
diff --git a/core/clipboard.js b/core/clipboard.js
index b93f92530..9f7097f71 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -22,29 +22,29 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 /**
  * Contents of the local clipboard.
- * @type {Element}
+ * @type {?Element}
  * @private
  */
 let xml = null;
 
 /**
  * Source of the local clipboard.
- * @type {WorkspaceSvg}
+ * @type {?WorkspaceSvg}
  * @private
  */
 let source = null;
 
 /**
  * Map of types to type counts for the clipboard object and descendants.
- * @type {Object}
+ * @type {?Object}
  * @private
  */
 let typeCounts = null;
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: Element, source: WorkspaceSvg, typeCounts: Object}} An object
- *     containing the clipboard contents and associated metadata.
+ * @return {{xml: ?Element, source: ?WorkspaceSvg, typeCounts: ?Object}} An
+ *     object containing the clipboard contents and associated metadata.
  */
 const getClipboardInfo = function() {
   return {xml: xml, source: source, typeCounts: typeCounts};

From 0a6893706f2c2a64b6865ab68c4bc62ce625a2ff Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:55:26 -0700
Subject: [PATCH 065/291] Migrate core/variable_model.js to named requires

---
 core/variable_model.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/variable_model.js b/core/variable_model.js
index ce4c37c66..74bc2b578 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -13,18 +13,18 @@
 goog.module('Blockly.VariableModel');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.VarCreate');
-goog.require('Blockly.utils');
-
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a variable model.
  * Holds information for the variable including name, ID, and type.
- * @param {!Blockly.Workspace} workspace The variable's workspace.
+ * @param {!Workspace} workspace The variable's workspace.
  * @param {string} name The name of the variable.  This is the user-visible name
  *     (e.g. 'my var' or '私の変数'), not the generated name.
  * @param {string=} opt_type The type of the variable like 'int' or 'string'.
@@ -38,7 +38,7 @@ goog.requireType('Blockly.Workspace');
 const VariableModel = function(workspace, name, opt_type, opt_id) {
   /**
    * The workspace the variable is in.
-   * @type {!Blockly.Workspace}
+   * @type {!Workspace}
    */
   this.workspace = workspace;
 
@@ -65,9 +65,9 @@ const VariableModel = function(workspace, name, opt_type, opt_id) {
    * @type {string}
    * @private
    */
-  this.id_ = opt_id || Blockly.utils.genUid();
+  this.id_ = opt_id || utils.genUid();
 
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(
+  Events.fire(new (Events.get(Events.VAR_CREATE))(
       this));
 };
 

From 6eb8667c3ccb5c9a4d613a881f0711a845cec533 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 12:55:46 -0700
Subject: [PATCH 066/291] clang-format core/variable_model.js

---
 core/variable_model.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/variable_model.js b/core/variable_model.js
index 74bc2b578..2f5936f4e 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -67,8 +67,7 @@ const VariableModel = function(workspace, name, opt_type, opt_id) {
    */
   this.id_ = opt_id || utils.genUid();
 
-  Events.fire(new (Events.get(Events.VAR_CREATE))(
-      this));
+  Events.fire(new (Events.get(Events.VAR_CREATE))(this));
 };
 
 /**

From 34042519f47492a9041e071556a18b8999858cbc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:00:44 -0700
Subject: [PATCH 067/291] Add regex lookarounds to check for require overlaps

---
 scripts/goog_module/convert-file.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 1c5b92fc8..4f433e428 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -151,7 +151,12 @@ getPropertiesAccessed() {
   # Detect if there was any overlap.
   if [[ -n "${requires_overlap}" ]]; then
     while read -r requires_overlap_prop; do
-      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/'"${requires_overlap_prop}"'//g')
+      # Replace any instances of $requires_overlap_prop. Includes regex
+      # lookarounds so that it does not simply match string contains.
+      # Ex: if $requires_overlap is "Svg", then it would update the list
+      # "isTargetInput mouseToSvg noEvent Svg" to
+      # "isTargetInput mouseToSvg noEvent " (note that mouseToSvg is unchanged).
+      properties_accessed=$(echo "${properties_accessed}" | perl -pe 's/(?<!\w)'"${requires_overlap_prop}"'(?!\w)//g')
     done <<<"${requires_overlap}"
   fi
 

From c74c1bf4165a77fa0578492717560b2f1907deec Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:18:15 -0700
Subject: [PATCH 068/291] wording update

---
 scripts/goog_module/convert-file.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/goog_module/convert-file.sh b/scripts/goog_module/convert-file.sh
index 4f433e428..4d6c13345 100755
--- a/scripts/goog_module/convert-file.sh
+++ b/scripts/goog_module/convert-file.sh
@@ -151,7 +151,7 @@ getPropertiesAccessed() {
   # Detect if there was any overlap.
   if [[ -n "${requires_overlap}" ]]; then
     while read -r requires_overlap_prop; do
-      # Replace any instances of $requires_overlap_prop. Includes regex
+      # Removes any instances of $requires_overlap_prop. Includes regex
       # lookarounds so that it does not simply match string contains.
       # Ex: if $requires_overlap is "Svg", then it would update the list
       # "isTargetInput mouseToSvg noEvent Svg" to

From b3bbd70280d2ddab3844ea918800c5c9922b056e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 29 Jul 2021 15:57:08 -0700
Subject: [PATCH 069/291] Migrate core/trashcan.js to goog.module

---
 core/trashcan.js | 195 ++++++++++++++++++++---------------------------
 tests/deps.js    |   2 +-
 2 files changed, 85 insertions(+), 112 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index dea20acd2..7771deba0 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Trashcan');
+goog.module('Blockly.Trashcan');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.ComponentManager');
@@ -46,8 +47,8 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @implements {Blockly.IPositionable}
  * @extends {Blockly.DeleteArea}
  */
-Blockly.Trashcan = function(workspace) {
-  Blockly.Trashcan.superClass_.constructor.call(this);
+const Trashcan = function(workspace) {
+  Trashcan.superClass_.constructor.call(this);
   /**
    * The workspace the trashcan sits in.
    * @type {!Blockly.WorkspaceSvg}
@@ -113,113 +114,85 @@ Blockly.Trashcan = function(workspace) {
   }
   this.workspace_.addChangeListener(this.onDelete_.bind(this));
 };
-Blockly.utils.object.inherits(Blockly.Trashcan, Blockly.DeleteArea);
+Blockly.utils.object.inherits(Trashcan, Blockly.DeleteArea);
 
 /**
  * Width of both the trash can and lid images.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.WIDTH_ = 47;
+const WIDTH = 47;
 
 /**
  * Height of the trashcan image (minus lid).
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.BODY_HEIGHT_ = 44;
+const BODY_HEIGHT = 44;
 
 /**
  * Height of the lid image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.LID_HEIGHT_ = 16;
+const LID_HEIGHT = 16;
 
 /**
  * Distance between trashcan and bottom or top edge of workspace.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.MARGIN_VERTICAL_ = 20;
+const MARGIN_VERTICAL = 20;
 
 /**
  * Distance between trashcan and right or left edge of workspace.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.MARGIN_HORIZONTAL_ = 20;
+const MARGIN_HORIZONTAL = 20;
 
 /**
  * Extent of hotspot on all sides beyond the size of the image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.MARGIN_HOTSPOT_ = 10;
+const MARGIN_HOTSPOT = 10;
 
 /**
  * Location of trashcan in sprite image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.SPRITE_LEFT_ = 0;
+const SPRITE_LEFT = 0;
 
 /**
  * Location of trashcan in sprite image.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.SPRITE_TOP_ = 32;
+const SPRITE_TOP = 32;
 
 /**
  * The openness of the lid when the trashcan contains blocks.
  *    (0.0 = closed, 1.0 = open)
- * @const {number}
- * @private
  */
-Blockly.Trashcan.prototype.HAS_BLOCKS_LID_ANGLE_ = 0.1;
+const HAS_BLOCKS_LID_ANGLE = 0.1;
 
 /**
  * The length of the lid open/close animation in milliseconds.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.ANIMATION_LENGTH_ = 80;
+const ANIMATION_LENGTH = 80;
 
 /**
  * The number of frames in the animation.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.ANIMATION_FRAMES_ = 4;
+const ANIMATION_FRAMES = 4;
 
 /**
  * The minimum (resting) opacity of the trashcan and lid.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.OPACITY_MIN_ = 0.4;
+const OPACITY_MIN = 0.4;
 
 /**
  * The maximum (hovered) opacity of the trashcan and lid.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.OPACITY_MAX_ = 0.8;
+const OPACITY_MAX = 0.8;
 
 /**
  * The maximum angle the trashcan lid can opens to. At the end of the open
  * animation the lid will be open to this angle.
- * @const {number}
- * @private
  */
-Blockly.Trashcan.MAX_LID_ANGLE_ = 45;
+const MAX_LID_ANGLE = 45;
 
 /**
  * Current open/close state of the lid.
  * @type {boolean}
  */
-Blockly.Trashcan.prototype.isLidOpen = false;
+Trashcan.prototype.isLidOpen = false;
 
 /**
  * The minimum openness of the lid. Used to indicate if the trashcan contains
@@ -227,62 +200,62 @@ Blockly.Trashcan.prototype.isLidOpen = false;
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.minOpenness_ = 0;
+Trashcan.prototype.minOpenness_ = 0;
 
 /**
  * The SVG group containing the trash can.
  * @type {SVGElement}
  * @private
  */
-Blockly.Trashcan.prototype.svgGroup_ = null;
+Trashcan.prototype.svgGroup_ = null;
 
 /**
  * The SVG image element of the trash can lid.
  * @type {SVGElement}
  * @private
  */
-Blockly.Trashcan.prototype.svgLid_ = null;
+Trashcan.prototype.svgLid_ = null;
 
 /**
  * Task ID of opening/closing animation.
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.lidTask_ = 0;
+Trashcan.prototype.lidTask_ = 0;
 
 /**
  * Current state of lid opening (0.0 = closed, 1.0 = open).
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.lidOpen_ = 0;
+Trashcan.prototype.lidOpen_ = 0;
 
 /**
  * Left coordinate of the trash can.
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.left_ = 0;
+Trashcan.prototype.left_ = 0;
 
 /**
  * Top coordinate of the trash can.
  * @type {number}
  * @private
  */
-Blockly.Trashcan.prototype.top_ = 0;
+Trashcan.prototype.top_ = 0;
 
 /**
  * Whether this has been initialized.
  * @type {boolean}
  * @private
  */
-Blockly.Trashcan.prototype.initialized_ = false;
+Trashcan.prototype.initialized_ = false;
 
 /**
  * Create the trash can elements.
  * @return {!SVGElement} The trash can's SVG group.
  */
-Blockly.Trashcan.prototype.createDom = function() {
+Trashcan.prototype.createDom = function() {
   /* Here's the markup that will be generated:
   <g class="blocklyTrash">
     <clippath id="blocklyTrashBodyClipPath837493">
@@ -309,17 +282,17 @@ Blockly.Trashcan.prototype.createDom = function() {
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
-        'width': this.WIDTH_,
-        'height': this.BODY_HEIGHT_,
-        'y': this.LID_HEIGHT_
+        'width': WIDTH,
+        'height': BODY_HEIGHT,
+        'y': LID_HEIGHT
       },
       clip);
   const body = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
-        'x': -this.SPRITE_LEFT_,
+        'x': -SPRITE_LEFT,
         'height': Blockly.internalConstants.SPRITE.height,
-        'y': -this.SPRITE_TOP_,
+        'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashBodyClipPath' + rnd + ')'
       },
       this.svgGroup_);
@@ -334,13 +307,13 @@ Blockly.Trashcan.prototype.createDom = function() {
       this.svgGroup_);
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
-      {'width': this.WIDTH_, 'height': this.LID_HEIGHT_}, clip);
+      {'width': WIDTH, 'height': LID_HEIGHT}, clip);
   this.svgLid_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.IMAGE, {
         'width': Blockly.internalConstants.SPRITE.width,
-        'x': -this.SPRITE_LEFT_,
+        'x': -SPRITE_LEFT,
         'height': Blockly.internalConstants.SPRITE.height,
-        'y': -this.SPRITE_TOP_,
+        'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashLidClipPath' + rnd + ')'
       },
       this.svgGroup_);
@@ -366,7 +339,7 @@ Blockly.Trashcan.prototype.createDom = function() {
 /**
  * Initializes the trash can.
  */
-Blockly.Trashcan.prototype.init = function() {
+Trashcan.prototype.init = function() {
   if (this.workspace_.options.maxTrashcanContents > 0) {
     Blockly.utils.dom.insertAfter(
         this.flyout.createDom(Blockly.utils.Svg.SVG),
@@ -392,7 +365,7 @@ Blockly.Trashcan.prototype.init = function() {
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.Trashcan.prototype.dispose = function() {
+Trashcan.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('trashcan');
   if (this.svgGroup_) {
     Blockly.utils.dom.removeNode(this.svgGroup_);
@@ -408,7 +381,7 @@ Blockly.Trashcan.prototype.dispose = function() {
  * @return {boolean} True if the trashcan has contents.
  * @private
  */
-Blockly.Trashcan.prototype.hasContents_ = function() {
+Trashcan.prototype.hasContents_ = function() {
   return !!this.contents_.length;
 };
 
@@ -416,14 +389,14 @@ Blockly.Trashcan.prototype.hasContents_ = function() {
  * Returns true if the trashcan contents-flyout is currently open.
  * @return {boolean} True if the trashcan contents-flyout is currently open.
  */
-Blockly.Trashcan.prototype.contentsIsOpen = function() {
+Trashcan.prototype.contentsIsOpen = function() {
   return this.flyout.isVisible();
 };
 
 /**
  * Opens the trashcan flyout.
  */
-Blockly.Trashcan.prototype.openFlyout = function() {
+Trashcan.prototype.openFlyout = function() {
   if (this.contentsIsOpen()) {
     return;
   }
@@ -435,7 +408,7 @@ Blockly.Trashcan.prototype.openFlyout = function() {
 /**
  * Closes the trashcan flyout.
  */
-Blockly.Trashcan.prototype.closeFlyout = function() {
+Trashcan.prototype.closeFlyout = function() {
   if (!this.contentsIsOpen()) {
     return;
   }
@@ -448,7 +421,7 @@ Blockly.Trashcan.prototype.closeFlyout = function() {
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *     Flyouts should not be closed if this is true.
  */
-Blockly.Trashcan.prototype.autoHide = function(onlyClosePopups) {
+Trashcan.prototype.autoHide = function(onlyClosePopups) {
   // For now the trashcan flyout always autocloses because it overlays the
   // trashcan UI (no trashcan to click to close it).
   if (!onlyClosePopups && this.flyout) {
@@ -460,7 +433,7 @@ Blockly.Trashcan.prototype.autoHide = function(onlyClosePopups) {
  * Empties the trashcan's contents. If the contents-flyout is currently open
  * it will be closed.
  */
-Blockly.Trashcan.prototype.emptyContents = function() {
+Trashcan.prototype.emptyContents = function() {
   if (!this.hasContents_()) {
     return;
   }
@@ -477,7 +450,7 @@ Blockly.Trashcan.prototype.emptyContents = function() {
  * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
-Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
+Trashcan.prototype.position = function(metrics, savedPositions) {
   // Not yet initialized.
   if (!this.initialized_) {
     return;
@@ -486,10 +459,10 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
   const cornerPosition =
       Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
 
-  const height = this.BODY_HEIGHT_ + this.LID_HEIGHT_;
+  const height = BODY_HEIGHT + LID_HEIGHT;
   const startRect = Blockly.uiPosition.getStartPositionRect(
-      cornerPosition, new Blockly.utils.Size(this.WIDTH_, height),
-      this.MARGIN_HORIZONTAL_, this.MARGIN_VERTICAL_, metrics, this.workspace_);
+      cornerPosition, new Blockly.utils.Size(WIDTH, height),
+      MARGIN_HORIZONTAL, MARGIN_VERTICAL, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
   const bumpDirection =
@@ -497,7 +470,7 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
           Blockly.uiPosition.bumpDirection.DOWN :
           Blockly.uiPosition.bumpDirection.UP;
   const positionRect = Blockly.uiPosition.bumpPositionRect(
-      startRect, this.MARGIN_VERTICAL_, bumpDirection, savedPositions);
+      startRect, MARGIN_VERTICAL, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
   this.left_ = positionRect.left;
@@ -511,9 +484,9 @@ Blockly.Trashcan.prototype.position = function(metrics, savedPositions) {
  * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
-Blockly.Trashcan.prototype.getBoundingRectangle = function() {
-  const bottom = this.top_ + this.BODY_HEIGHT_ + this.LID_HEIGHT_;
-  const right = this.left_ + this.WIDTH_;
+Trashcan.prototype.getBoundingRectangle = function() {
+  const bottom = this.top_ + BODY_HEIGHT + LID_HEIGHT;
+  const right = this.left_ + WIDTH;
   return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
 };
 
@@ -523,17 +496,17 @@ Blockly.Trashcan.prototype.getBoundingRectangle = function() {
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.Trashcan.prototype.getClientRect = function() {
+Trashcan.prototype.getClientRect = function() {
   if (!this.svgGroup_) {
     return null;
   }
 
   const trashRect = this.svgGroup_.getBoundingClientRect();
-  const top = trashRect.top + this.SPRITE_TOP_ - this.MARGIN_HOTSPOT_;
-  const bottom = top + this.LID_HEIGHT_ + this.BODY_HEIGHT_ +
-      2 * this.MARGIN_HOTSPOT_;
-  const left = trashRect.left + this.SPRITE_LEFT_ - this.MARGIN_HOTSPOT_;
-  const right = left + this.WIDTH_ + 2 * this.MARGIN_HOTSPOT_;
+  const top = trashRect.top + SPRITE_TOP - MARGIN_HOTSPOT;
+  const bottom = top + LID_HEIGHT + BODY_HEIGHT +
+      2 * MARGIN_HOTSPOT;
+  const left = trashRect.left + SPRITE_LEFT - MARGIN_HOTSPOT;
+  const right = left + WIDTH + 2 * MARGIN_HOTSPOT;
   return new Blockly.utils.Rect(top, bottom, left, right);
 };
 
@@ -544,7 +517,7 @@ Blockly.Trashcan.prototype.getClientRect = function() {
  *   dragged.
  * @override
  */
-Blockly.Trashcan.prototype.onDragOver = function(_dragElement) {
+Trashcan.prototype.onDragOver = function(_dragElement) {
   this.setLidOpen(this.wouldDelete_);
 };
 
@@ -554,7 +527,7 @@ Blockly.Trashcan.prototype.onDragOver = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Trashcan.prototype.onDragExit = function(_dragElement) {
+Trashcan.prototype.onDragExit = function(_dragElement) {
   this.setLidOpen(false);
 };
 
@@ -565,7 +538,7 @@ Blockly.Trashcan.prototype.onDragExit = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Trashcan.prototype.onDrop = function(_dragElement) {
+Trashcan.prototype.onDrop = function(_dragElement) {
   setTimeout(this.setLidOpen.bind(this, false), 100);
 };
 
@@ -574,7 +547,7 @@ Blockly.Trashcan.prototype.onDrop = function(_dragElement) {
  * @param {boolean} state True if open.
  * @package
  */
-Blockly.Trashcan.prototype.setLidOpen = function(state) {
+Trashcan.prototype.setLidOpen = function(state) {
   if (this.isLidOpen == state) {
     return;
   }
@@ -587,24 +560,22 @@ Blockly.Trashcan.prototype.setLidOpen = function(state) {
  * Rotate the lid open or closed by one step.  Then wait and recurse.
  * @private
  */
-Blockly.Trashcan.prototype.animateLid_ = function() {
-  const frames = Blockly.Trashcan.ANIMATION_FRAMES_;
+Trashcan.prototype.animateLid_ = function() {
+  const frames = ANIMATION_FRAMES;
 
   const delta = 1 / (frames + 1);
   this.lidOpen_ += this.isLidOpen ? delta : -delta;
   this.lidOpen_ = Math.min(Math.max(this.lidOpen_, this.minOpenness_), 1);
 
-  this.setLidAngle_(this.lidOpen_ * Blockly.Trashcan.MAX_LID_ANGLE_);
+  this.setLidAngle_(this.lidOpen_ * MAX_LID_ANGLE);
 
-  const minOpacity = Blockly.Trashcan.OPACITY_MIN_;
-  const maxOpacity = Blockly.Trashcan.OPACITY_MAX_;
   // Linear interpolation between min and max.
-  const opacity = minOpacity + this.lidOpen_ * (maxOpacity - minOpacity);
+  const opacity = OPACITY_MIN + this.lidOpen_ * (OPACITY_MAX - OPACITY_MIN);
   this.svgGroup_.style.opacity = opacity;
 
   if (this.lidOpen_ > this.minOpenness_ && this.lidOpen_ < 1) {
     this.lidTask_ = setTimeout(this.animateLid_.bind(this),
-        Blockly.Trashcan.ANIMATION_LENGTH_ / frames);
+        ANIMATION_LENGTH / frames);
   }
 };
 
@@ -613,14 +584,14 @@ Blockly.Trashcan.prototype.animateLid_ = function() {
  * @param {number} lidAngle The angle at which to set the lid.
  * @private
  */
-Blockly.Trashcan.prototype.setLidAngle_ = function(lidAngle) {
+Trashcan.prototype.setLidAngle_ = function(lidAngle) {
   const openAtRight =
       this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
   this.svgLid_.setAttribute('transform', 'rotate(' +
       (openAtRight ? -lidAngle : lidAngle) + ',' +
-      (openAtRight ? 4 : this.WIDTH_ - 4) + ',' +
-      (this.LID_HEIGHT_ - 2) + ')');
+      (openAtRight ? 4 : WIDTH - 4) + ',' +
+      (LID_HEIGHT - 2) + ')');
 };
 
 /**
@@ -630,10 +601,10 @@ Blockly.Trashcan.prototype.setLidAngle_ = function(lidAngle) {
  *     0 and 1.
  * @private
  */
-Blockly.Trashcan.prototype.setMinOpenness_ = function(newMin) {
+Trashcan.prototype.setMinOpenness_ = function(newMin) {
   this.minOpenness_ = newMin;
   if (!this.isLidOpen) {
-    this.setLidAngle_(newMin * Blockly.Trashcan.MAX_LID_ANGLE_);
+    this.setLidAngle_(newMin * MAX_LID_ANGLE);
   }
 };
 
@@ -641,14 +612,14 @@ Blockly.Trashcan.prototype.setMinOpenness_ = function(newMin) {
  * Flip the lid shut.
  * Called externally after a drag.
  */
-Blockly.Trashcan.prototype.closeLid = function() {
+Trashcan.prototype.closeLid = function() {
   this.setLidOpen(false);
 };
 
 /**
  * Inspect the contents of the trash.
  */
-Blockly.Trashcan.prototype.click = function() {
+Trashcan.prototype.click = function() {
   if (!this.hasContents_()) {
     return;
   }
@@ -660,7 +631,7 @@ Blockly.Trashcan.prototype.click = function() {
  * @param {boolean} trashcanOpen Whether the flyout is opening.
  * @private
  */
-Blockly.Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
+Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
   const uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
       trashcanOpen,this.workspace_.id);
   Blockly.Events.fire(uiEvent);
@@ -671,7 +642,7 @@ Blockly.Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
  * @param {!Event} e A mouse down event.
  * @private
  */
-Blockly.Trashcan.prototype.blockMouseDownWhenOpenable_ = function(e) {
+Trashcan.prototype.blockMouseDownWhenOpenable_ = function(e) {
   if (!this.contentsIsOpen() && this.hasContents_()) {
     e.stopPropagation();  // Don't start a workspace scroll.
   }
@@ -681,7 +652,7 @@ Blockly.Trashcan.prototype.blockMouseDownWhenOpenable_ = function(e) {
  * Indicate that the trashcan can be clicked (by opening it) if it has blocks.
  * @private
  */
-Blockly.Trashcan.prototype.mouseOver_ = function() {
+Trashcan.prototype.mouseOver_ = function() {
   if (this.hasContents_()) {
     this.setLidOpen(true);
   }
@@ -692,7 +663,7 @@ Blockly.Trashcan.prototype.mouseOver_ = function() {
  *    blocks).
  * @private
  */
-Blockly.Trashcan.prototype.mouseOut_ = function() {
+Trashcan.prototype.mouseOut_ = function() {
   // No need to do a .hasBlocks check here because if it doesn't the trashcan
   // won't be open in the first place, and setOpen won't run.
   this.setLidOpen(false);
@@ -703,7 +674,7 @@ Blockly.Trashcan.prototype.mouseOut_ = function() {
  * @param {!Blockly.Events.Abstract} event Workspace event.
  * @private
  */
-Blockly.Trashcan.prototype.onDelete_ = function(event) {
+Trashcan.prototype.onDelete_ = function(event) {
   if (this.workspace_.options.maxTrashcanContents <= 0) {
     return;
   }
@@ -720,7 +691,7 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
       this.contents_.pop();
     }
 
-    this.setMinOpenness_(this.HAS_BLOCKS_LID_ANGLE_);
+    this.setMinOpenness_(HAS_BLOCKS_LID_ANGLE);
   }
 };
 
@@ -733,7 +704,7 @@ Blockly.Trashcan.prototype.onDelete_ = function(event) {
  * attributes.
  * @private
  */
-Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
+Trashcan.prototype.cleanBlockXML_ = function(xml) {
   const xmlBlock = xml.cloneNode(true);
   let node = xmlBlock;
   while (node) {
@@ -772,3 +743,5 @@ Blockly.Trashcan.prototype.cleanBlockXML_ = function(xml) {
   }
   return Blockly.Xml.domToText(xmlBlock);
 };
+
+exports = Trashcan;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..ed128d55c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -173,7 +173,7 @@ goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem']
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});

From 787145acf46c6feae193b521477d25c402b0ebca Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:40:48 -0700
Subject: [PATCH 070/291] Migrate core/toolbox/collapsible_category.js to ES6
 const/let

---
 core/toolbox/collapsible_category.js | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 979931848..4bf907278 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -92,7 +92,8 @@ Blockly.CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
  * @override
  */
 Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
-  var cssConfig = Blockly.CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(this);
+  const cssConfig = Blockly.CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
+      this);
   cssConfig['contents'] = 'blocklyToolboxContents';
   return cssConfig;
 };
@@ -101,19 +102,20 @@ Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function()
  * @override
  */
 Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
-  var contents = categoryDef['contents'];
-  var prevIsFlyoutItem = true;
+  const contents = categoryDef['contents'];
+  let prevIsFlyoutItem = true;
 
   if (categoryDef['custom']) {
     this.flyoutItems_ = categoryDef['custom'];
   } else if (contents) {
-    for (var i = 0, itemDef; (itemDef = contents[i]); i++) {
+    for (let i = 0; i < contents.length; i++) {
+      const itemDef = contents[i];
       // Separators can exist as either a flyout item or a toolbox item so
       // decide where it goes based on the type of the previous item.
       if (!Blockly.registry.hasItem(Blockly.registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
           (itemDef['kind'].toLowerCase() == Blockly.ToolboxSeparator.registrationName &&
           prevIsFlyoutItem)) {
-        var flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+        const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
         this.flyoutItems_.push(flyoutItem);
         prevIsFlyoutItem = true;
       } else {
@@ -131,8 +133,8 @@ Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryD
  * @private
  */
 Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
-  var registryName = itemDef['kind'];
-  var categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
+  let registryName = itemDef['kind'];
+  const categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
 
   // Categories that are collapsible are created using a class registered under
   // a diffferent name.
@@ -140,9 +142,9 @@ Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemD
       Blockly.utils.toolbox.isCategoryCollapsible(categoryDef)) {
     registryName = Blockly.CollapsibleToolboxCategory.registrationName;
   }
-  var ToolboxItemClass = Blockly.registry.getClass(
+  const ToolboxItemClass = Blockly.registry.getClass(
       Blockly.registry.Type.TOOLBOX_ITEM, registryName);
-  var toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
+  const toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
   this.toolboxItems_.push(toolboxItem);
 };
 
@@ -162,7 +164,7 @@ Blockly.CollapsibleToolboxCategory.prototype.init = function() {
 Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
   Blockly.CollapsibleToolboxCategory.superClass_.createDom_.call(this);
 
-  var subCategories = this.getChildToolboxItems();
+  const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
   Blockly.utils.aria.setRole(this.subcategoriesDiv_,
       Blockly.utils.aria.Role.GROUP);
@@ -175,7 +177,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
  * @override
  */
 Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
-  var toolboxIcon = document.createElement('span');
+  const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
     toolboxIcon.style.visibility = 'visible';
@@ -192,13 +194,13 @@ Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
  * @protected
  */
 Blockly.CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
-  var contentsContainer = document.createElement('div');
+  const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
-  for (var i = 0; i < subcategories.length; i++) {
-    var newCategory = subcategories[i];
+  for (let i = 0; i < subcategories.length; i++) {
+    const newCategory = subcategories[i];
     newCategory.init();
-    var newCategoryDiv = newCategory.getDiv();
+    const newCategoryDiv = newCategory.getDiv();
     contentsContainer.appendChild(newCategoryDiv);
     if (newCategory.getClickTarget) {
       newCategory.getClickTarget().setAttribute('id', newCategory.getId());
@@ -236,7 +238,9 @@ Blockly.CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded)
  */
 Blockly.CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
   this.htmlDiv_.style.display = isVisible ? 'block' : 'none';
-  for (var i = 0, child; (child = this.getChildToolboxItems()[i]); i++) {
+  const childToolboxItems = this.getChildToolboxItems();
+  for (let i = 0; i < childToolboxItems.length; i++) {
+    const child = childToolboxItems[i];
     child.setVisible_(isVisible);
   }
   this.isHidden_ = !isVisible;

From 41b53c50cd4c0e0c83a1d6cb0a28a8a4173048ff Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:41:01 -0700
Subject: [PATCH 071/291] Migrate core/toolbox/collapsible_category.js to
 goog.module

---
 core/toolbox/collapsible_category.js | 55 +++++++++++++++-------------
 tests/deps.js                        |  2 +-
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 4bf907278..50c0a2d5d 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.CollapsibleToolboxCategory');
+goog.module('Blockly.CollapsibleToolboxCategory');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ICollapsibleToolboxItem');
 goog.require('Blockly.registry');
@@ -37,7 +38,7 @@ goog.requireType('Blockly.IToolboxItem');
  * @extends {Blockly.ToolboxCategory}
  * @implements {Blockly.ICollapsibleToolboxItem}
  */
-Blockly.CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
+const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   /**
    * Container for any child categories.
    * @type {?Element}
@@ -59,11 +60,11 @@ Blockly.CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent)
    */
   this.toolboxItems_ = [];
 
-  Blockly.CollapsibleToolboxCategory.superClass_.constructor.call(
+  CollapsibleToolboxCategory.superClass_.constructor.call(
       this, categoryDef, toolbox, opt_parent);
 };
 
-Blockly.utils.object.inherits(Blockly.CollapsibleToolboxCategory, Blockly.ToolboxCategory);
+Blockly.utils.object.inherits(CollapsibleToolboxCategory, Blockly.ToolboxCategory);
 
 /**
  * All the CSS class names that are used to create a collapsible
@@ -80,19 +81,19 @@ Blockly.utils.object.inherits(Blockly.CollapsibleToolboxCategory, Blockly.Toolbo
  *            contents:?string
  *          }}
  */
-Blockly.CollapsibleToolboxCategory.CssConfig;
+CollapsibleToolboxCategory.CssConfig;
 
 /**
  * Name used for registering a collapsible toolbox category.
  * @const {string}
  */
-Blockly.CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
+CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
-  const cssConfig = Blockly.CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
+CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
+  const cssConfig = CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
       this);
   cssConfig['contents'] = 'blocklyToolboxContents';
   return cssConfig;
@@ -101,7 +102,7 @@ Blockly.CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function()
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
+CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
   const contents = categoryDef['contents'];
   let prevIsFlyoutItem = true;
 
@@ -132,7 +133,7 @@ Blockly.CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryD
  *     to create a toolbox item.
  * @private
  */
-Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
+CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
   let registryName = itemDef['kind'];
   const categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
 
@@ -140,7 +141,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemD
   // a diffferent name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
       Blockly.utils.toolbox.isCategoryCollapsible(categoryDef)) {
-    registryName = Blockly.CollapsibleToolboxCategory.registrationName;
+    registryName = CollapsibleToolboxCategory.registrationName;
   }
   const ToolboxItemClass = Blockly.registry.getClass(
       Blockly.registry.Type.TOOLBOX_ITEM, registryName);
@@ -151,8 +152,8 @@ Blockly.CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemD
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.init = function() {
-  Blockly.CollapsibleToolboxCategory.superClass_.init.call(this);
+CollapsibleToolboxCategory.prototype.init = function() {
+  CollapsibleToolboxCategory.superClass_.init.call(this);
 
   this.setExpanded(this.toolboxItemDef_['expanded'] == 'true' ||
       this.toolboxItemDef_['expanded']);
@@ -161,8 +162,8 @@ Blockly.CollapsibleToolboxCategory.prototype.init = function() {
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
-  Blockly.CollapsibleToolboxCategory.superClass_.createDom_.call(this);
+CollapsibleToolboxCategory.prototype.createDom_ = function() {
+  CollapsibleToolboxCategory.superClass_.createDom_.call(this);
 
   const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
@@ -176,7 +177,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createDom_ = function() {
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
+CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
@@ -193,7 +194,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
-Blockly.CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
+CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
   const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
@@ -215,7 +216,7 @@ Blockly.CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(
  * @param {boolean} isExpanded True to expand the category, false to close.
  * @public
  */
-Blockly.CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
+CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
   if (this.expanded_ == isExpanded) {
     return;
   }
@@ -236,7 +237,7 @@ Blockly.CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded)
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
+CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
   this.htmlDiv_.style.display = isVisible ? 'block' : 'none';
   const childToolboxItems = this.getChildToolboxItems();
   for (let i = 0; i < childToolboxItems.length; i++) {
@@ -256,21 +257,21 @@ Blockly.CollapsibleToolboxCategory.prototype.setVisible_ = function(isVisible) {
  *     is collapsed.
  * @public
  */
-Blockly.CollapsibleToolboxCategory.prototype.isExpanded = function() {
+CollapsibleToolboxCategory.prototype.isExpanded = function() {
   return this.expanded_;
 };
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.isCollapsible = function() {
+CollapsibleToolboxCategory.prototype.isCollapsible = function() {
   return true;
 };
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.onClick = function(_e) {
+CollapsibleToolboxCategory.prototype.onClick = function(_e) {
   this.toggleExpanded();
 };
 
@@ -278,14 +279,14 @@ Blockly.CollapsibleToolboxCategory.prototype.onClick = function(_e) {
  * Toggles whether or not the category is expanded.
  * @public
  */
-Blockly.CollapsibleToolboxCategory.prototype.toggleExpanded = function() {
+CollapsibleToolboxCategory.prototype.toggleExpanded = function() {
   this.setExpanded(!this.expanded_);
 };
 
 /**
  * @override
  */
-Blockly.CollapsibleToolboxCategory.prototype.getDiv = function() {
+CollapsibleToolboxCategory.prototype.getDiv = function() {
   return this.htmlDiv_;
 };
 
@@ -293,10 +294,12 @@ Blockly.CollapsibleToolboxCategory.prototype.getDiv = function() {
  * Gets any children toolbox items. (ex. Gets the subcategories)
  * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
  */
-Blockly.CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
+CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
   return this.toolboxItems_;
 };
 
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
-    Blockly.CollapsibleToolboxCategory.registrationName, Blockly.CollapsibleToolboxCategory);
+    CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory);
+
+exports = CollapsibleToolboxCategory;
diff --git a/tests/deps.js b/tests/deps.js
index 20fb4e48e..46ca32e0a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -166,7 +166,7 @@ goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);

From d7a864a498677c2cf733b0845f86c17c88bfd6e3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:42:18 -0700
Subject: [PATCH 072/291] Migrate core/toolbox/collapsible_category.js named
 requires

---
 core/toolbox/collapsible_category.js | 71 ++++++++++++++--------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 50c0a2d5d..a35220fb8 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -13,30 +13,29 @@
 goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ICollapsibleToolboxItem');
-goog.require('Blockly.registry');
-goog.require('Blockly.ToolboxCategory');
-goog.require('Blockly.ToolboxItem');
-goog.require('Blockly.ToolboxSeparator');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.IToolboxItem');
+const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
+const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
+const aria = goog.require('Blockly.utils.aria');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
 
 
 /**
  * Class for a category in a toolbox that can be collapsed.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The information needed
+ * @param {!toolbox.CategoryInfo} categoryDef The information needed
  *     to create a category in the toolbox.
- * @param {!Blockly.IToolbox} toolbox The parent toolbox for the category.
- * @param {Blockly.ICollapsibleToolboxItem=} opt_parent The parent category or null if
+ * @param {!IToolbox} toolbox The parent toolbox for the category.
+ * @param {ICollapsibleToolboxItem=} opt_parent The parent category or null if
  *     the category does not have a parent.
  * @constructor
- * @extends {Blockly.ToolboxCategory}
- * @implements {Blockly.ICollapsibleToolboxItem}
+ * @extends {ToolboxCategory}
+ * @implements {ICollapsibleToolboxItem}
  */
 const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   /**
@@ -55,7 +54,7 @@ const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * The child toolbox items for this category.
-   * @type {!Array<!Blockly.ToolboxItem>}
+   * @type {!Array<!ToolboxItem>}
    * @protected
    */
   this.toolboxItems_ = [];
@@ -64,7 +63,7 @@ const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
       this, categoryDef, toolbox, opt_parent);
 };
 
-Blockly.utils.object.inherits(CollapsibleToolboxCategory, Blockly.ToolboxCategory);
+object.inherits(CollapsibleToolboxCategory, ToolboxCategory);
 
 /**
  * All the CSS class names that are used to create a collapsible
@@ -113,10 +112,10 @@ CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
       const itemDef = contents[i];
       // Separators can exist as either a flyout item or a toolbox item so
       // decide where it goes based on the type of the previous item.
-      if (!Blockly.registry.hasItem(Blockly.registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
-          (itemDef['kind'].toLowerCase() == Blockly.ToolboxSeparator.registrationName &&
+      if (!registry.hasItem(registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
+          (itemDef['kind'].toLowerCase() == ToolboxSeparator.registrationName &&
           prevIsFlyoutItem)) {
-        const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+        const flyoutItem = /** @type {toolbox.FlyoutItemInfo} */ (itemDef);
         this.flyoutItems_.push(flyoutItem);
         prevIsFlyoutItem = true;
       } else {
@@ -129,22 +128,22 @@ CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
 
 /**
  * Creates a toolbox item and adds it to the list of toolbox items.
- * @param {!Blockly.utils.toolbox.ToolboxItemInfo} itemDef The information needed
+ * @param {!toolbox.ToolboxItemInfo} itemDef The information needed
  *     to create a toolbox item.
  * @private
  */
 CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
   let registryName = itemDef['kind'];
-  const categoryDef = /** @type {!Blockly.utils.toolbox.CategoryInfo} */ (itemDef);
+  const categoryDef = /** @type {!toolbox.CategoryInfo} */ (itemDef);
 
   // Categories that are collapsible are created using a class registered under
   // a diffferent name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
-      Blockly.utils.toolbox.isCategoryCollapsible(categoryDef)) {
+      toolbox.isCategoryCollapsible(categoryDef)) {
     registryName = CollapsibleToolboxCategory.registrationName;
   }
-  const ToolboxItemClass = Blockly.registry.getClass(
-      Blockly.registry.Type.TOOLBOX_ITEM, registryName);
+  const ToolboxItemClass = registry.getClass(
+      registry.Type.TOOLBOX_ITEM, registryName);
   const toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
   this.toolboxItems_.push(toolboxItem);
 };
@@ -167,8 +166,8 @@ CollapsibleToolboxCategory.prototype.createDom_ = function() {
 
   const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
-  Blockly.utils.aria.setRole(this.subcategoriesDiv_,
-      Blockly.utils.aria.Role.GROUP);
+  aria.setRole(this.subcategoriesDiv_,
+      aria.Role.GROUP);
   this.htmlDiv_.appendChild(this.subcategoriesDiv_);
 
   return this.htmlDiv_;
@@ -180,7 +179,7 @@ CollapsibleToolboxCategory.prototype.createDom_ = function() {
 CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
-    Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
+    dom.addClass(toolboxIcon, this.cssConfig_['icon']);
     toolboxIcon.style.visibility = 'visible';
   }
 
@@ -190,13 +189,13 @@ CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
 
 /**
  * Create the DOM for all subcategories.
- * @param {!Array<!Blockly.ToolboxItem>} subcategories The subcategories.
+ * @param {!Array<!ToolboxItem>} subcategories The subcategories.
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
 CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
   const contentsContainer = document.createElement('div');
-  Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['contents']);
+  dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
   for (let i = 0; i < subcategories.length; i++) {
     const newCategory = subcategories[i];
@@ -228,8 +227,8 @@ CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
     this.subcategoriesDiv_.style.display = 'none';
     this.closeIcon_(this.iconDom_);
   }
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.EXPANDED, isExpanded);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.EXPANDED, isExpanded);
 
   this.parentToolbox_.handleToolboxItemResize();
 };
@@ -292,14 +291,14 @@ CollapsibleToolboxCategory.prototype.getDiv = function() {
 
 /**
  * Gets any children toolbox items. (ex. Gets the subcategories)
- * @return {!Array<!Blockly.IToolboxItem>} The child toolbox items.
+ * @return {!Array<!IToolboxItem>} The child toolbox items.
  */
 CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
   return this.toolboxItems_;
 };
 
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
+registry.register(registry.Type.TOOLBOX_ITEM,
     CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory);
 
 exports = CollapsibleToolboxCategory;

From c3521b7eb479781c371d5facd3837964ef4115d1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:42:23 -0700
Subject: [PATCH 073/291] clang-format core/toolbox/collapsible_category.js

---
 core/toolbox/collapsible_category.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index a35220fb8..fde610f0c 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -92,8 +92,8 @@ CollapsibleToolboxCategory.registrationName = 'collapsibleCategory';
  * @override
  */
 CollapsibleToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
-  const cssConfig = CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(
-      this);
+  const cssConfig =
+      CollapsibleToolboxCategory.superClass_.makeDefaultCssConfig_.call(this);
   cssConfig['contents'] = 'blocklyToolboxContents';
   return cssConfig;
 };
@@ -114,7 +114,7 @@ CollapsibleToolboxCategory.prototype.parseContents_ = function(categoryDef) {
       // decide where it goes based on the type of the previous item.
       if (!registry.hasItem(registry.Type.TOOLBOX_ITEM, itemDef['kind']) ||
           (itemDef['kind'].toLowerCase() == ToolboxSeparator.registrationName &&
-          prevIsFlyoutItem)) {
+           prevIsFlyoutItem)) {
         const flyoutItem = /** @type {toolbox.FlyoutItemInfo} */ (itemDef);
         this.flyoutItems_.push(flyoutItem);
         prevIsFlyoutItem = true;
@@ -142,8 +142,8 @@ CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
       toolbox.isCategoryCollapsible(categoryDef)) {
     registryName = CollapsibleToolboxCategory.registrationName;
   }
-  const ToolboxItemClass = registry.getClass(
-      registry.Type.TOOLBOX_ITEM, registryName);
+  const ToolboxItemClass =
+      registry.getClass(registry.Type.TOOLBOX_ITEM, registryName);
   const toolboxItem = new ToolboxItemClass(itemDef, this.parentToolbox_, this);
   this.toolboxItems_.push(toolboxItem);
 };
@@ -154,7 +154,8 @@ CollapsibleToolboxCategory.prototype.createToolboxItem_ = function(itemDef) {
 CollapsibleToolboxCategory.prototype.init = function() {
   CollapsibleToolboxCategory.superClass_.init.call(this);
 
-  this.setExpanded(this.toolboxItemDef_['expanded'] == 'true' ||
+  this.setExpanded(
+      this.toolboxItemDef_['expanded'] == 'true' ||
       this.toolboxItemDef_['expanded']);
 };
 
@@ -166,8 +167,7 @@ CollapsibleToolboxCategory.prototype.createDom_ = function() {
 
   const subCategories = this.getChildToolboxItems();
   this.subcategoriesDiv_ = this.createSubCategoriesDom_(subCategories);
-  aria.setRole(this.subcategoriesDiv_,
-      aria.Role.GROUP);
+  aria.setRole(this.subcategoriesDiv_, aria.Role.GROUP);
   this.htmlDiv_.appendChild(this.subcategoriesDiv_);
 
   return this.htmlDiv_;
@@ -193,7 +193,8 @@ CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
-CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(subcategories) {
+CollapsibleToolboxCategory.prototype.createSubCategoriesDom_ = function(
+    subcategories) {
   const contentsContainer = document.createElement('div');
   dom.addClass(contentsContainer, this.cssConfig_['contents']);
 
@@ -227,8 +228,8 @@ CollapsibleToolboxCategory.prototype.setExpanded = function(isExpanded) {
     this.subcategoriesDiv_.style.display = 'none';
     this.closeIcon_(this.iconDom_);
   }
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.EXPANDED, isExpanded);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.EXPANDED, isExpanded);
 
   this.parentToolbox_.handleToolboxItemResize();
 };
@@ -298,7 +299,8 @@ CollapsibleToolboxCategory.prototype.getChildToolboxItems = function() {
 };
 
 
-registry.register(registry.Type.TOOLBOX_ITEM,
-    CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory);
+registry.register(
+    registry.Type.TOOLBOX_ITEM, CollapsibleToolboxCategory.registrationName,
+    CollapsibleToolboxCategory);
 
 exports = CollapsibleToolboxCategory;

From 17bc528039beb9a6d11d2a3f66c3bdc107e883d4 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:52:03 -0700
Subject: [PATCH 074/291] Add eslint disable for requireType in
 core/toolbox/collapsible_category.js

---
 core/toolbox/collapsible_category.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index fde610f0c..bc6ea253d 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -14,7 +14,9 @@ goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
 const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');

From 7f5ec67860777ec680e61555e4b919ae079b52d2 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:50:38 -0700
Subject: [PATCH 075/291] Fix lint warnings in
 core/toolbox/collapsible_category.js

---
 core/toolbox/collapsible_category.js | 6 +++---
 tests/deps.js                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index bc6ea253d..ae243f1e6 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -13,13 +13,13 @@
 goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const ToolboxCategory = goog.require('Blockly.ToolboxCategory');
-const ToolboxItem = goog.require('Blockly.ToolboxItem');
 const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator');
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
@@ -56,7 +56,7 @@ const CollapsibleToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * The child toolbox items for this category.
-   * @type {!Array<!ToolboxItem>}
+   * @type {!Array<!IToolboxItem>}
    * @protected
    */
   this.toolboxItems_ = [];
@@ -191,7 +191,7 @@ CollapsibleToolboxCategory.prototype.createIconDom_ = function() {
 
 /**
  * Create the DOM for all subcategories.
- * @param {!Array<!ToolboxItem>} subcategories The subcategories.
+ * @param {!Array<!IToolboxItem>} subcategories The subcategories.
  * @return {!Element} The div holding all the subcategories.
  * @protected
  */
diff --git a/tests/deps.js b/tests/deps.js
index 46ca32e0a..613a2793d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -166,7 +166,7 @@ goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);

From 9f83ade1e7ba6413c6c32d7e0d623a4d36a64893 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:12:17 -0700
Subject: [PATCH 076/291] Migrate core/workspace_comment.js to ES6 const/let

---
 core/workspace_comment.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 5399dbe39..d71b60c60 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -185,7 +185,7 @@ Blockly.WorkspaceComment.prototype.getXY = function() {
  * @package
  */
 Blockly.WorkspaceComment.prototype.moveBy = function(dx, dy) {
-  var event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
   Blockly.Events.fire(event);
@@ -275,7 +275,7 @@ Blockly.WorkspaceComment.prototype.setContent = function(content) {
  * @package
  */
 Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
-  var element = this.toXml(opt_noId);
+  const element = this.toXml(opt_noId);
   element.setAttribute('x', Math.round(this.xy_.x));
   element.setAttribute('y', Math.round(this.xy_.y));
   element.setAttribute('h', this.height_);
@@ -292,7 +292,7 @@ Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
  * @package
  */
 Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
-  var commentElement = Blockly.utils.xml.createElement('comment');
+  const commentElement = Blockly.utils.xml.createElement('comment');
   if (!opt_noId) {
     commentElement.id = this.id;
   }
@@ -307,7 +307,7 @@ Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
  */
 Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
   if (Blockly.Events.isEnabled()) {
-    var existingGroup = Blockly.Events.getGroup();
+    const existingGroup = Blockly.Events.getGroup();
     if (!existingGroup) {
       Blockly.Events.setGroup(true);
     }
@@ -330,13 +330,13 @@ Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
  * @package
  */
 Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
-  var info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+  const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
 
-  var comment = new Blockly.WorkspaceComment(
+  const comment = new Blockly.WorkspaceComment(
       workspace, info.content, info.h, info.w, info.id);
 
-  var commentX = parseInt(xmlComment.getAttribute('x'), 10);
-  var commentY = parseInt(xmlComment.getAttribute('y'), 10);
+  const commentX = parseInt(xmlComment.getAttribute('x'), 10);
+  const commentY = parseInt(xmlComment.getAttribute('y'), 10);
   if (!isNaN(commentX) && !isNaN(commentY)) {
     comment.moveBy(commentX, commentY);
   }
@@ -353,8 +353,8 @@ Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
  * @package
  */
 Blockly.WorkspaceComment.parseAttributes = function(xml) {
-  var xmlH = xml.getAttribute('h');
-  var xmlW = xml.getAttribute('w');
+  const xmlH = xml.getAttribute('h');
+  const xmlW = xml.getAttribute('w');
 
   return {
     // @type {string}

From 2b6f5ba31a399d9a93711a6e8cb878480342dd4b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:12:28 -0700
Subject: [PATCH 077/291] Migrate core/workspace_comment.js to goog.module

---
 core/workspace_comment.js | 61 +++++++++++++++++++++------------------
 tests/deps.js             |  2 +-
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index d71b60c60..874877a89 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceComment');
+goog.module('Blockly.WorkspaceComment');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -25,6 +26,8 @@ goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.xml');
 
+goog.requireType('Blockly.Workspace');
+
 
 /**
  * Class for a workspace comment.
@@ -36,7 +39,7 @@ goog.require('Blockly.utils.xml');
  *     create a new ID.
  * @constructor
  */
-Blockly.WorkspaceComment = function(workspace, content, height, width, opt_id) {
+const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /** @type {string} */
   this.id = (opt_id && !workspace.getCommentById(opt_id)) ?
       opt_id : Blockly.utils.genUid();
@@ -106,14 +109,14 @@ Blockly.WorkspaceComment = function(workspace, content, height, width, opt_id) {
    */
   this.isComment = true;
 
-  Blockly.WorkspaceComment.fireCreateEvent(this);
+  WorkspaceComment.fireCreateEvent(this);
 };
 
 /**
  * Dispose of this comment.
  * @package
  */
-Blockly.WorkspaceComment.prototype.dispose = function() {
+WorkspaceComment.prototype.dispose = function() {
   if (!this.workspace) {
     // The comment has already been deleted.
     return;
@@ -137,7 +140,7 @@ Blockly.WorkspaceComment.prototype.dispose = function() {
  * @return {number} Comment height.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getHeight = function() {
+WorkspaceComment.prototype.getHeight = function() {
   return this.height_;
 };
 
@@ -146,7 +149,7 @@ Blockly.WorkspaceComment.prototype.getHeight = function() {
  * @param {number} height Comment height.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setHeight = function(height) {
+WorkspaceComment.prototype.setHeight = function(height) {
   this.height_ = height;
 };
 
@@ -155,7 +158,7 @@ Blockly.WorkspaceComment.prototype.setHeight = function(height) {
  * @return {number} Comment width.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getWidth = function() {
+WorkspaceComment.prototype.getWidth = function() {
   return this.width_;
 };
 
@@ -164,7 +167,7 @@ Blockly.WorkspaceComment.prototype.getWidth = function() {
  * @param {number} width comment width.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setWidth = function(width) {
+WorkspaceComment.prototype.setWidth = function(width) {
   this.width_ = width;
 };
 
@@ -174,7 +177,7 @@ Blockly.WorkspaceComment.prototype.setWidth = function(width) {
  *   This is not valid if the comment is currently being dragged.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getXY = function() {
+WorkspaceComment.prototype.getXY = function() {
   return new Blockly.utils.Coordinate(this.xy_.x, this.xy_.y);
 };
 
@@ -184,7 +187,7 @@ Blockly.WorkspaceComment.prototype.getXY = function() {
  * @param {number} dy Vertical offset, in workspace units.
  * @package
  */
-Blockly.WorkspaceComment.prototype.moveBy = function(dx, dy) {
+WorkspaceComment.prototype.moveBy = function(dx, dy) {
   const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
@@ -196,7 +199,7 @@ Blockly.WorkspaceComment.prototype.moveBy = function(dx, dy) {
  * @return {boolean} True if deletable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.isDeletable = function() {
+WorkspaceComment.prototype.isDeletable = function() {
   return this.deletable_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -206,7 +209,7 @@ Blockly.WorkspaceComment.prototype.isDeletable = function() {
  * @param {boolean} deletable True if deletable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setDeletable = function(deletable) {
+WorkspaceComment.prototype.setDeletable = function(deletable) {
   this.deletable_ = deletable;
 };
 
@@ -215,7 +218,7 @@ Blockly.WorkspaceComment.prototype.setDeletable = function(deletable) {
  * @return {boolean} True if movable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.isMovable = function() {
+WorkspaceComment.prototype.isMovable = function() {
   return this.movable_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -225,7 +228,7 @@ Blockly.WorkspaceComment.prototype.isMovable = function() {
  * @param {boolean} movable True if movable.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setMovable = function(movable) {
+WorkspaceComment.prototype.setMovable = function(movable) {
   this.movable_ = movable;
 };
 
@@ -233,7 +236,7 @@ Blockly.WorkspaceComment.prototype.setMovable = function(movable) {
  * Get whether this comment is editable or not.
  * @return {boolean} True if editable.
  */
-Blockly.WorkspaceComment.prototype.isEditable = function() {
+WorkspaceComment.prototype.isEditable = function() {
   return this.editable_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -242,7 +245,7 @@ Blockly.WorkspaceComment.prototype.isEditable = function() {
  * Set whether this comment is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.WorkspaceComment.prototype.setEditable = function(editable) {
+WorkspaceComment.prototype.setEditable = function(editable) {
   this.editable_ = editable;
 };
 
@@ -251,7 +254,7 @@ Blockly.WorkspaceComment.prototype.setEditable = function(editable) {
  * @return {string} Comment text.
  * @package
  */
-Blockly.WorkspaceComment.prototype.getContent = function() {
+WorkspaceComment.prototype.getContent = function() {
   return this.content_;
 };
 
@@ -260,7 +263,7 @@ Blockly.WorkspaceComment.prototype.getContent = function() {
  * @param {string} content Comment content.
  * @package
  */
-Blockly.WorkspaceComment.prototype.setContent = function(content) {
+WorkspaceComment.prototype.setContent = function(content) {
   if (this.content_ != content) {
     Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.COMMENT_CHANGE))(
         this, this.content_, content));
@@ -274,7 +277,7 @@ Blockly.WorkspaceComment.prototype.setContent = function(content) {
  * @return {!Element} Tree of XML elements.
  * @package
  */
-Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
+WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
   const element = this.toXml(opt_noId);
   element.setAttribute('x', Math.round(this.xy_.x));
   element.setAttribute('y', Math.round(this.xy_.y));
@@ -291,7 +294,7 @@ Blockly.WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
  * @return {!Element} Tree of XML elements.
  * @package
  */
-Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
+WorkspaceComment.prototype.toXml = function(opt_noId) {
   const commentElement = Blockly.utils.xml.createElement('comment');
   if (!opt_noId) {
     commentElement.id = this.id;
@@ -302,10 +305,10 @@ Blockly.WorkspaceComment.prototype.toXml = function(opt_noId) {
 
 /**
  * Fire a create event for the given workspace comment, if comments are enabled.
- * @param {!Blockly.WorkspaceComment} comment The comment that was just created.
+ * @param {!WorkspaceComment} comment The comment that was just created.
  * @package
  */
-Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
+WorkspaceComment.fireCreateEvent = function(comment) {
   if (Blockly.Events.isEnabled()) {
     const existingGroup = Blockly.Events.getGroup();
     if (!existingGroup) {
@@ -326,13 +329,13 @@ Blockly.WorkspaceComment.fireCreateEvent = function(comment) {
  * Decode an XML comment tag and create a comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
  * @param {!Blockly.Workspace} workspace The workspace.
- * @return {!Blockly.WorkspaceComment} The created workspace comment.
+ * @return {!WorkspaceComment} The created workspace comment.
  * @package
  */
-Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
-  const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+WorkspaceComment.fromXml = function(xmlComment, workspace) {
+  const info = WorkspaceComment.parseAttributes(xmlComment);
 
-  const comment = new Blockly.WorkspaceComment(
+  const comment = new WorkspaceComment(
       workspace, info.content, info.h, info.w, info.id);
 
   const commentX = parseInt(xmlComment.getAttribute('x'), 10);
@@ -341,7 +344,7 @@ Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
     comment.moveBy(commentX, commentY);
   }
 
-  Blockly.WorkspaceComment.fireCreateEvent(comment);
+  WorkspaceComment.fireCreateEvent(comment);
   return comment;
 };
 
@@ -352,7 +355,7 @@ Blockly.WorkspaceComment.fromXml = function(xmlComment, workspace) {
  *     object containing the id, size, position, and comment string.
  * @package
  */
-Blockly.WorkspaceComment.parseAttributes = function(xml) {
+WorkspaceComment.parseAttributes = function(xml) {
   const xmlH = xml.getAttribute('h');
   const xmlW = xml.getAttribute('w');
 
@@ -377,3 +380,5 @@ Blockly.WorkspaceComment.parseAttributes = function(xml) {
     content: xml.textContent
   };
 };
+
+exports = WorkspaceComment;
diff --git a/tests/deps.js b/tests/deps.js
index 613a2793d..f17d995b9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -203,7 +203,7 @@ goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubbl
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml']);
+goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);

From b159c382a0ddfe5466a7f919b03b8fcd0d57cd0e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:15:33 -0700
Subject: [PATCH 078/291] Migrate core/workspace_comment.js named requires

---
 core/workspace_comment.js | 54 +++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 874877a89..971cbd0a7 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -13,7 +13,12 @@
 goog.module('Blockly.WorkspaceComment');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const utils = goog.require('Blockly.utils');
+const xml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentChange');
 /** @suppress {extraRequire} */
@@ -22,16 +27,11 @@ goog.require('Blockly.Events.CommentCreate');
 goog.require('Blockly.Events.CommentDelete');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentMove');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.xml');
-
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a workspace comment.
- * @param {!Blockly.Workspace} workspace The block's workspace.
+ * @param {!Workspace} workspace The block's workspace.
  * @param {string} content The content of this workspace comment.
  * @param {number} height Height of the comment.
  * @param {number} width Width of the comment.
@@ -42,17 +42,17 @@ goog.requireType('Blockly.Workspace');
 const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /** @type {string} */
   this.id = (opt_id && !workspace.getCommentById(opt_id)) ?
-      opt_id : Blockly.utils.genUid();
+      opt_id : utils.genUid();
 
   workspace.addTopComment(this);
 
   /**
    * The comment's position in workspace units.  (0, 0) is at the workspace's
    * origin; scale does not change this value.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @protected
    */
-  this.xy_ = new Blockly.utils.Coordinate(0, 0);
+  this.xy_ = new Coordinate(0, 0);
 
   /**
    * The comment's height in workspace units.  Scale does not change this value.
@@ -69,7 +69,7 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   this.width_ = width;
 
   /**
-   * @type {!Blockly.Workspace}
+   * @type {!Workspace}
    */
   this.workspace = workspace;
 
@@ -122,9 +122,9 @@ WorkspaceComment.prototype.dispose = function() {
     return;
   }
 
-  if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(
-        new (Blockly.Events.get(Blockly.Events.COMMENT_DELETE))(this));
+  if (Events.isEnabled()) {
+    Events.fire(
+        new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
   // Remove from the list of top comments and the comment database.
@@ -173,12 +173,12 @@ WorkspaceComment.prototype.setWidth = function(width) {
 
 /**
  * Get stored location.
- * @return {!Blockly.utils.Coordinate} The comment's stored location.
+ * @return {!Coordinate} The comment's stored location.
  *   This is not valid if the comment is currently being dragged.
  * @package
  */
 WorkspaceComment.prototype.getXY = function() {
-  return new Blockly.utils.Coordinate(this.xy_.x, this.xy_.y);
+  return new Coordinate(this.xy_.x, this.xy_.y);
 };
 
 /**
@@ -188,10 +188,10 @@ WorkspaceComment.prototype.getXY = function() {
  * @package
  */
 WorkspaceComment.prototype.moveBy = function(dx, dy) {
-  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Events.get(Events.COMMENT_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -265,7 +265,7 @@ WorkspaceComment.prototype.getContent = function() {
  */
 WorkspaceComment.prototype.setContent = function(content) {
   if (this.content_ != content) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.COMMENT_CHANGE))(
+    Events.fire(new (Events.get(Events.COMMENT_CHANGE))(
         this, this.content_, content));
     this.content_ = content;
   }
@@ -295,7 +295,7 @@ WorkspaceComment.prototype.toXmlWithXY = function(opt_noId) {
  * @package
  */
 WorkspaceComment.prototype.toXml = function(opt_noId) {
-  const commentElement = Blockly.utils.xml.createElement('comment');
+  const commentElement = xml.createElement('comment');
   if (!opt_noId) {
     commentElement.id = this.id;
   }
@@ -309,17 +309,17 @@ WorkspaceComment.prototype.toXml = function(opt_noId) {
  * @package
  */
 WorkspaceComment.fireCreateEvent = function(comment) {
-  if (Blockly.Events.isEnabled()) {
-    const existingGroup = Blockly.Events.getGroup();
+  if (Events.isEnabled()) {
+    const existingGroup = Events.getGroup();
     if (!existingGroup) {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
     }
     try {
-      Blockly.Events.fire(
-          new (Blockly.Events.get(Blockly.Events.COMMENT_CREATE))(comment));
+      Events.fire(
+          new (Events.get(Events.COMMENT_CREATE))(comment));
     } finally {
       if (!existingGroup) {
-        Blockly.Events.setGroup(false);
+        Events.setGroup(false);
       }
     }
   }
@@ -328,7 +328,7 @@ WorkspaceComment.fireCreateEvent = function(comment) {
 /**
  * Decode an XML comment tag and create a comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @return {!WorkspaceComment} The created workspace comment.
  * @package
  */

From 568c5cb40f6af9d661d6965befa090a15535a721 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 26 Jul 2021 14:16:47 -0700
Subject: [PATCH 079/291] clang-format core/workspace_comment.js

---
 core/workspace_comment.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 971cbd0a7..8d9009f94 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -41,8 +41,8 @@ goog.require('Blockly.Events.CommentMove');
  */
 const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /** @type {string} */
-  this.id = (opt_id && !workspace.getCommentById(opt_id)) ?
-      opt_id : utils.genUid();
+  this.id =
+      (opt_id && !workspace.getCommentById(opt_id)) ? opt_id : utils.genUid();
 
   workspace.addTopComment(this);
 
@@ -123,8 +123,7 @@ WorkspaceComment.prototype.dispose = function() {
   }
 
   if (Events.isEnabled()) {
-    Events.fire(
-        new (Events.get(Events.COMMENT_DELETE))(this));
+    Events.fire(new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
   // Remove from the list of top comments and the comment database.
@@ -219,8 +218,7 @@ WorkspaceComment.prototype.setDeletable = function(deletable) {
  * @package
  */
 WorkspaceComment.prototype.isMovable = function() {
-  return this.movable_ &&
-      !(this.workspace && this.workspace.options.readOnly);
+  return this.movable_ && !(this.workspace && this.workspace.options.readOnly);
 };
 
 /**
@@ -237,8 +235,7 @@ WorkspaceComment.prototype.setMovable = function(movable) {
  * @return {boolean} True if editable.
  */
 WorkspaceComment.prototype.isEditable = function() {
-  return this.editable_ &&
-      !(this.workspace && this.workspace.options.readOnly);
+  return this.editable_ && !(this.workspace && this.workspace.options.readOnly);
 };
 
 /**
@@ -265,8 +262,8 @@ WorkspaceComment.prototype.getContent = function() {
  */
 WorkspaceComment.prototype.setContent = function(content) {
   if (this.content_ != content) {
-    Events.fire(new (Events.get(Events.COMMENT_CHANGE))(
-        this, this.content_, content));
+    Events.fire(
+        new (Events.get(Events.COMMENT_CHANGE))(this, this.content_, content));
     this.content_ = content;
   }
 };
@@ -315,8 +312,7 @@ WorkspaceComment.fireCreateEvent = function(comment) {
       Events.setGroup(true);
     }
     try {
-      Events.fire(
-          new (Events.get(Events.COMMENT_CREATE))(comment));
+      Events.fire(new (Events.get(Events.COMMENT_CREATE))(comment));
     } finally {
       if (!existingGroup) {
         Events.setGroup(false);
@@ -335,8 +331,8 @@ WorkspaceComment.fireCreateEvent = function(comment) {
 WorkspaceComment.fromXml = function(xmlComment, workspace) {
   const info = WorkspaceComment.parseAttributes(xmlComment);
 
-  const comment = new WorkspaceComment(
-      workspace, info.content, info.h, info.w, info.id);
+  const comment =
+      new WorkspaceComment(workspace, info.content, info.h, info.w, info.id);
 
   const commentX = parseInt(xmlComment.getAttribute('x'), 10);
   const commentY = parseInt(xmlComment.getAttribute('y'), 10);

From beff5e19bf5e8fab93a7fac6d5f76a34e6ee0c3b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:41:33 -0700
Subject: [PATCH 080/291] Combine workspace_comment_render_svg.js with
 workspace_comment_svg.js

---
 core/requires.js                           |   1 -
 core/workspace_comment_render_svg.js       | 463 ---------------------
 core/workspace_comment_svg.js              | 450 ++++++++++++++++++++
 tests/deps.js                              |   3 +-
 tests/playground.html                      |   1 -
 tests/playgrounds/advanced_playground.html |   1 -
 6 files changed, 451 insertions(+), 468 deletions(-)
 delete mode 100644 core/workspace_comment_render_svg.js

diff --git a/core/requires.js b/core/requires.js
index 2ca295441..cc67f564a 100644
--- a/core/requires.js
+++ b/core/requires.js
@@ -42,7 +42,6 @@ goog.require('Blockly.Trashcan');
 goog.require('Blockly.VariablesDynamic');
 // Only need to require these two if you're using workspace comments.
 // goog.require('Blockly.WorkspaceCommentSvg');
-// goog.require('Blockly.WorkspaceCommentSvg.render');
 // If zoom controls aren't required, then Blockly.inject's
 // "zoom"/"controls" configuration must be false.
 goog.require('Blockly.ZoomControls');
diff --git a/core/workspace_comment_render_svg.js b/core/workspace_comment_render_svg.js
deleted file mode 100644
index 5097f0c92..000000000
--- a/core/workspace_comment_render_svg.js
+++ /dev/null
@@ -1,463 +0,0 @@
-/**
- * @license
- * Copyright 2017 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Methods for rendering a workspace comment as SVG
- * @author fenichel@google.com (Rachel Fenichel)
- */
-'use strict';
-
-goog.provide('Blockly.WorkspaceCommentSvg.render');
-
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-
-
-/**
- * Size of the resize icon.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
-
-/**
- * Radius of the border around the comment.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
-
-/**
- * Offset from the foreignobject edge to the textarea edge.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
-
-/**
- * Offset from the top to make room for a top bar.
- * @type {number}
- * @const
- * @private
- */
-Blockly.WorkspaceCommentSvg.TOP_OFFSET = 10;
-
-/**
- * Returns a bounding box describing the dimensions of this comment.
- * @return {!{height: number, width: number}} Object with height and width
- *     properties in workspace units.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
-  return { width: this.getWidth(), height: this.getHeight() };
-};
-
-/**
- * Renders the workspace comment.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.render = function() {
-  if (this.rendered_) {
-    return;
-  }
-
-  var size = this.getHeightWidth();
-
-  // Add text area
-  this.createEditor_();
-  this.svgGroup_.appendChild(this.foreignObject_);
-
-  this.svgHandleTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
-      {
-        'class': 'blocklyCommentHandleTarget',
-        'x': 0,
-        'y': 0
-      });
-  this.svgGroup_.appendChild(this.svgHandleTarget_);
-  this.svgRectTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
-      {
-        'class': 'blocklyCommentTarget',
-        'x': 0,
-        'y': 0,
-        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
-      });
-  this.svgGroup_.appendChild(this.svgRectTarget_);
-
-  // Add the resize icon
-  this.addResizeDom_();
-  if (this.isDeletable()) {
-    // Add the delete icon
-    this.addDeleteDom_();
-  }
-
-  this.setSize_(size.width, size.height);
-
-  // Set the content
-  this.textarea_.value = this.content_;
-
-  this.rendered_ = true;
-
-  if (this.resizeGroup_) {
-    Blockly.browserEvents.conditionalBind(
-        this.resizeGroup_, 'mousedown', this, this.resizeMouseDown_);
-  }
-
-  if (this.isDeletable()) {
-    Blockly.browserEvents.conditionalBind(
-        this.deleteGroup_, 'mousedown', this, this.deleteMouseDown_);
-    Blockly.browserEvents.conditionalBind(
-        this.deleteGroup_, 'mouseout', this, this.deleteMouseOut_);
-    Blockly.browserEvents.conditionalBind(
-        this.deleteGroup_, 'mouseup', this, this.deleteMouseUp_);
-  }
-};
-
-/**
- * Create the text area for the comment.
- * @return {!Element} The top-level node of the editor.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
-  /* Create the editor.  Here's the markup that will be generated:
-    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
-      <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
-        <textarea xmlns="http://www.w3.org/1999/xhtml"
-            class="blocklyCommentTextarea"
-            style="height: 164px; width: 164px;"></textarea>
-      </body>
-    </foreignObject>
-  */
-  this.foreignObject_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FOREIGNOBJECT,
-      {
-        'x': 0,
-        'y': Blockly.WorkspaceCommentSvg.TOP_OFFSET,
-        'class': 'blocklyCommentForeignObject'
-      },
-      null);
-  var body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
-  body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
-  body.className = 'blocklyMinimalBody';
-  var textarea = document.createElementNS(Blockly.utils.dom.HTML_NS, 'textarea');
-  textarea.className = 'blocklyCommentTextarea';
-  textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
-  textarea.readOnly = !this.isEditable();
-  body.appendChild(textarea);
-  this.textarea_ = textarea;
-  this.foreignObject_.appendChild(body);
-  // Don't zoom with mousewheel.
-  Blockly.browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
-    e.stopPropagation();
-  });
-  Blockly.browserEvents.conditionalBind(
-      textarea, 'change', this,
-      function(
-          /* eslint-disable no-unused-vars */ e
-          /* eslint-enable no-unused-vars */) {
-        this.setContent(textarea.value);
-      });
-  return this.foreignObject_;
-};
-
-/**
- * Add the resize icon to the DOM
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
-  this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {
-        'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
-      },
-      this.svgGroup_);
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.POLYGON,
-      {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
-      this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'class': 'blocklyResizeLine',
-        'x1': resizeSize / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize / 3
-      }, this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'class': 'blocklyResizeLine',
-        'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize * 2 / 3
-      }, this.resizeGroup_);
-};
-
-/**
- * Add the delete icon to the DOM
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
-  this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {
-        'class': 'blocklyCommentDeleteIcon'
-      },
-      this.svgGroup_);
-  this.deleteIconBorder_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
-      {
-        'class': 'blocklyDeleteIconShape',
-        'r': '7',
-        'cx': '7.5',
-        'cy': '7.5'
-      },
-      this.deleteGroup_);
-  // x icon.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'x1': '5', 'y1': '10',
-        'x2': '10', 'y2': '5',
-        'stroke': '#fff',
-        'stroke-width': '2'
-      },
-      this.deleteGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
-      {
-        'x1': '5', 'y1': '5',
-        'x2': '10', 'y2': '10',
-        'stroke': '#fff',
-        'stroke-width': '2'
-      },
-      this.deleteGroup_);
-};
-
-/**
- * Handle a mouse-down on comment's resize corner.
- * @param {!Event} e Mouse down event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
-  this.unbindDragEvents_();
-  if (Blockly.utils.isRightButton(e)) {
-    // No right-click.
-    e.stopPropagation();
-    return;
-  }
-  // Left-click (or middle click)
-  this.workspace.startDrag(e, new Blockly.utils.Coordinate(
-    this.workspace.RTL ? -this.width_ : this.width_, this.height_));
-
-  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
-      document, 'mouseup', this, this.resizeMouseUp_);
-  this.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
-      document, 'mousemove', this, this.resizeMouseMove_);
-  Blockly.hideChaff();
-  // This event has been handled.  No need to bubble up to the document.
-  e.stopPropagation();
-};
-
-/**
- * Handle a mouse-down on comment's delete icon.
- * @param {!Event} e Mouse down event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
-  // Highlight the delete icon.
-  Blockly.utils.dom.addClass(
-      /** @type {!Element} */ (this.deleteIconBorder_),
-      'blocklyDeleteIconHighlighted');
-  // This event has been handled.  No need to bubble up to the document.
-  e.stopPropagation();
-};
-
-/**
- * Handle a mouse-out on comment's delete icon.
- * @param {!Event} _e Mouse out event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
-  // Restore highlight on the delete icon.
-  Blockly.utils.dom.removeClass(
-      /** @type {!Element} */ (this.deleteIconBorder_),
-      'blocklyDeleteIconHighlighted');
-};
-
-/**
- * Handle a mouse-up on comment's delete icon.
- * @param {!Event} e Mouse up event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
-  // Delete this comment.
-  this.dispose(true, true);
-  // This event has been handled.  No need to bubble up to the document.
-  e.stopPropagation();
-};
-
-/**
- * Stop binding to the global mouseup and mousemove events.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
-  if (this.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
-    this.onMouseUpWrapper_ = null;
-  }
-  if (this.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseMoveWrapper_);
-    this.onMouseMoveWrapper_ = null;
-  }
-};
-
-/**
- * Handle a mouse-up event while dragging a comment's border or resize handle.
- * @param {!Event} e Mouse up event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
-  Blockly.Touch.clearTouchIdentifier();
-  this.unbindDragEvents_();
-};
-
-/**
- * Resize this comment to follow the mouse.
- * @param {!Event} e Mouse move event.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
-  this.autoLayout_ = false;
-  var newXY = this.workspace.moveDrag(e);
-  this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
-};
-
-/**
- * Callback function triggered when the comment has resized.
- * Resize the text area accordingly.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
-  var size = this.getHeightWidth();
-  var topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
-  var textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
-
-  this.foreignObject_.setAttribute('width', size.width);
-  this.foreignObject_.setAttribute('height', size.height - topOffset);
-  if (this.RTL) {
-    this.foreignObject_.setAttribute('x', -size.width);
-  }
-  this.textarea_.style.width = (size.width - textOffset) + 'px';
-  this.textarea_.style.height = (size.height - textOffset - topOffset) + 'px';
-};
-
-/**
- * Set size
- * @param {number} width width of the container
- * @param {number} height height of the container
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
-  // Minimum size of a comment.
-  width = Math.max(width, 45);
-  height = Math.max(height, 20 + Blockly.WorkspaceCommentSvg.TOP_OFFSET);
-  this.width_ = width;
-  this.height_ = height;
-  this.svgRect_.setAttribute('width', width);
-  this.svgRect_.setAttribute('height', height);
-  this.svgRectTarget_.setAttribute('width', width);
-  this.svgRectTarget_.setAttribute('height', height);
-  this.svgHandleTarget_.setAttribute('width', width);
-  this.svgHandleTarget_.setAttribute('height',
-      Blockly.WorkspaceCommentSvg.TOP_OFFSET);
-  if (this.RTL) {
-    this.svgRect_.setAttribute('transform', 'scale(-1 1)');
-    this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
-  }
-
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
-  if (this.resizeGroup_) {
-    if (this.RTL) {
-      // Mirror the resize group.
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-        (-width + resizeSize) + ',' + (height - resizeSize) + ') scale(-1 1)');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-        (-width + resizeSize) + ',' + (-resizeSize) + ') scale(-1 1)');
-    } else {
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-        (width - resizeSize) + ',' +
-        (height - resizeSize) + ')');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-        (width - resizeSize) + ',' +
-        (-resizeSize) + ')');
-    }
-  }
-
-  // Allow the contents to resize.
-  this.resizeComment_();
-};
-
-/**
- * Dispose of any rendered comment components.
- * @private
- */
-Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
-  this.textarea_ = null;
-  this.foreignObject_ = null;
-  this.svgRectTarget_ = null;
-  this.svgHandleTarget_ = null;
-  this.disposed_ = true;
-};
-
-/**
- * Set the focus on the text area.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
-  var comment = this;
-  this.focused_ = true;
-  // Defer CSS changes.
-  setTimeout(function() {
-    if (comment.disposed_) {
-      return;
-    }
-    comment.textarea_.focus();
-    comment.addFocus();
-    Blockly.utils.dom.addClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.addClass(
-        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
-  }, 0);
-};
-
-/**
- * Remove focus from the text area.
- * @package
- */
-Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
-  var comment = this;
-  this.focused_ = false;
-  // Defer CSS changes.
-  setTimeout(function() {
-    if (comment.disposed_) {
-      return;
-    }
-
-    comment.textarea_.blur();
-    comment.removeFocus();
-    Blockly.utils.dom.removeClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.removeClass(
-        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
-  }, 0);
-};
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 401b840e1..84864422b 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -12,6 +12,9 @@
 
 goog.provide('Blockly.WorkspaceCommentSvg');
 
+goog.require('Blockly');
+goog.require('Blockly.browserEvents');
+goog.require('Blockly.ContextMenu');
 goog.require('Blockly.Css');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -22,6 +25,7 @@ goog.require('Blockly.Events.CommentDelete');
 goog.require('Blockly.Events.CommentMove');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Selected');
+goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
@@ -30,9 +34,11 @@ goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.Svg');
 goog.require('Blockly.WorkspaceComment');
 
+goog.requireType('Blockly.BlockDragSurfaceSvg');
 goog.requireType('Blockly.IBoundedElement');
 goog.requireType('Blockly.IBubble');
 goog.requireType('Blockly.ICopyable');
+goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -116,6 +122,38 @@ Blockly.utils.object.inherits(
  */
 Blockly.WorkspaceCommentSvg.DEFAULT_SIZE = 100;
 
+/**
+ * Size of the resize icon.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
+
+/**
+ * Radius of the border around the comment.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
+
+/**
+ * Offset from the foreignobject edge to the textarea edge.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
+
+/**
+ * Offset from the top to make room for a top bar.
+ * @type {number}
+ * @const
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.TOP_OFFSET = 10;
+
 /**
  * Dispose of this comment.
  * @package
@@ -646,6 +684,418 @@ Blockly.WorkspaceCommentSvg.prototype.toCopyData = function() {
   return {xml: this.toXmlWithXY(), source: this.workspace, typeCounts: null};
 };
 
+/**
+ * Returns a bounding box describing the dimensions of this comment.
+ * @return {!{height: number, width: number}} Object with height and width
+ *     properties in workspace units.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
+  return { width: this.getWidth(), height: this.getHeight() };
+};
+
+/**
+ * Renders the workspace comment.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.render = function() {
+  if (this.rendered_) {
+    return;
+  }
+
+  var size = this.getHeightWidth();
+
+  // Add text area
+  this.createEditor_();
+  this.svgGroup_.appendChild(this.foreignObject_);
+
+  this.svgHandleTarget_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.RECT,
+      {
+        'class': 'blocklyCommentHandleTarget',
+        'x': 0,
+        'y': 0
+      });
+  this.svgGroup_.appendChild(this.svgHandleTarget_);
+  this.svgRectTarget_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.RECT,
+      {
+        'class': 'blocklyCommentTarget',
+        'x': 0,
+        'y': 0,
+        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
+        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
+      });
+  this.svgGroup_.appendChild(this.svgRectTarget_);
+
+  // Add the resize icon
+  this.addResizeDom_();
+  if (this.isDeletable()) {
+    // Add the delete icon
+    this.addDeleteDom_();
+  }
+
+  this.setSize_(size.width, size.height);
+
+  // Set the content
+  this.textarea_.value = this.content_;
+
+  this.rendered_ = true;
+
+  if (this.resizeGroup_) {
+    Blockly.browserEvents.conditionalBind(
+        this.resizeGroup_, 'mousedown', this, this.resizeMouseDown_);
+  }
+
+  if (this.isDeletable()) {
+    Blockly.browserEvents.conditionalBind(
+        this.deleteGroup_, 'mousedown', this, this.deleteMouseDown_);
+    Blockly.browserEvents.conditionalBind(
+        this.deleteGroup_, 'mouseout', this, this.deleteMouseOut_);
+    Blockly.browserEvents.conditionalBind(
+        this.deleteGroup_, 'mouseup', this, this.deleteMouseUp_);
+  }
+};
+
+/**
+ * Create the text area for the comment.
+ * @return {!Element} The top-level node of the editor.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
+  /* Create the editor.  Here's the markup that will be generated:
+    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
+      <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
+        <textarea xmlns="http://www.w3.org/1999/xhtml"
+            class="blocklyCommentTextarea"
+            style="height: 164px; width: 164px;"></textarea>
+      </body>
+    </foreignObject>
+  */
+  this.foreignObject_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.FOREIGNOBJECT,
+      {
+        'x': 0,
+        'y': Blockly.WorkspaceCommentSvg.TOP_OFFSET,
+        'class': 'blocklyCommentForeignObject'
+      },
+      null);
+  var body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
+  body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
+  body.className = 'blocklyMinimalBody';
+  var textarea = document.createElementNS(Blockly.utils.dom.HTML_NS, 'textarea');
+  textarea.className = 'blocklyCommentTextarea';
+  textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
+  textarea.readOnly = !this.isEditable();
+  body.appendChild(textarea);
+  this.textarea_ = textarea;
+  this.foreignObject_.appendChild(body);
+  // Don't zoom with mousewheel.
+  Blockly.browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
+    e.stopPropagation();
+  });
+  Blockly.browserEvents.conditionalBind(
+      textarea, 'change', this,
+      function(
+          /* eslint-disable no-unused-vars */ e
+          /* eslint-enable no-unused-vars */) {
+        this.setContent(textarea.value);
+      });
+  return this.foreignObject_;
+};
+
+/**
+ * Add the resize icon to the DOM
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
+  this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.G,
+      {
+        'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
+      },
+      this.svgGroup_);
+  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.POLYGON,
+      {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
+      this.resizeGroup_);
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'class': 'blocklyResizeLine',
+        'x1': resizeSize / 3, 'y1': resizeSize - 1,
+        'x2': resizeSize - 1, 'y2': resizeSize / 3
+      }, this.resizeGroup_);
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'class': 'blocklyResizeLine',
+        'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
+        'x2': resizeSize - 1, 'y2': resizeSize * 2 / 3
+      }, this.resizeGroup_);
+};
+
+/**
+ * Add the delete icon to the DOM
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
+  this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.G,
+      {
+        'class': 'blocklyCommentDeleteIcon'
+      },
+      this.svgGroup_);
+  this.deleteIconBorder_ = Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.CIRCLE,
+      {
+        'class': 'blocklyDeleteIconShape',
+        'r': '7',
+        'cx': '7.5',
+        'cy': '7.5'
+      },
+      this.deleteGroup_);
+  // x icon.
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'x1': '5', 'y1': '10',
+        'x2': '10', 'y2': '5',
+        'stroke': '#fff',
+        'stroke-width': '2'
+      },
+      this.deleteGroup_);
+  Blockly.utils.dom.createSvgElement(
+      Blockly.utils.Svg.LINE,
+      {
+        'x1': '5', 'y1': '5',
+        'x2': '10', 'y2': '10',
+        'stroke': '#fff',
+        'stroke-width': '2'
+      },
+      this.deleteGroup_);
+};
+
+/**
+ * Handle a mouse-down on comment's resize corner.
+ * @param {!Event} e Mouse down event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
+  this.unbindDragEvents_();
+  if (Blockly.utils.isRightButton(e)) {
+    // No right-click.
+    e.stopPropagation();
+    return;
+  }
+  // Left-click (or middle click)
+  this.workspace.startDrag(e, new Blockly.utils.Coordinate(
+      this.workspace.RTL ? -this.width_ : this.width_, this.height_));
+
+  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+      document, 'mouseup', this, this.resizeMouseUp_);
+  this.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+      document, 'mousemove', this, this.resizeMouseMove_);
+  Blockly.hideChaff();
+  // This event has been handled.  No need to bubble up to the document.
+  e.stopPropagation();
+};
+
+/**
+ * Handle a mouse-down on comment's delete icon.
+ * @param {!Event} e Mouse down event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
+  // Highlight the delete icon.
+  Blockly.utils.dom.addClass(
+      /** @type {!Element} */ (this.deleteIconBorder_),
+      'blocklyDeleteIconHighlighted');
+  // This event has been handled.  No need to bubble up to the document.
+  e.stopPropagation();
+};
+
+/**
+ * Handle a mouse-out on comment's delete icon.
+ * @param {!Event} _e Mouse out event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
+  // Restore highlight on the delete icon.
+  Blockly.utils.dom.removeClass(
+      /** @type {!Element} */ (this.deleteIconBorder_),
+      'blocklyDeleteIconHighlighted');
+};
+
+/**
+ * Handle a mouse-up on comment's delete icon.
+ * @param {!Event} e Mouse up event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
+  // Delete this comment.
+  this.dispose(true, true);
+  // This event has been handled.  No need to bubble up to the document.
+  e.stopPropagation();
+};
+
+/**
+ * Stop binding to the global mouseup and mousemove events.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
+  if (this.onMouseUpWrapper_) {
+    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
+    this.onMouseUpWrapper_ = null;
+  }
+  if (this.onMouseMoveWrapper_) {
+    Blockly.browserEvents.unbind(this.onMouseMoveWrapper_);
+    this.onMouseMoveWrapper_ = null;
+  }
+};
+
+/**
+ * Handle a mouse-up event while dragging a comment's border or resize handle.
+ * @param {!Event} e Mouse up event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
+  Blockly.Touch.clearTouchIdentifier();
+  this.unbindDragEvents_();
+};
+
+/**
+ * Resize this comment to follow the mouse.
+ * @param {!Event} e Mouse move event.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
+  this.autoLayout_ = false;
+  var newXY = this.workspace.moveDrag(e);
+  this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
+};
+
+/**
+ * Callback function triggered when the comment has resized.
+ * Resize the text area accordingly.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
+  var size = this.getHeightWidth();
+  var topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
+  var textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+
+  this.foreignObject_.setAttribute('width', size.width);
+  this.foreignObject_.setAttribute('height', size.height - topOffset);
+  if (this.RTL) {
+    this.foreignObject_.setAttribute('x', -size.width);
+  }
+  this.textarea_.style.width = (size.width - textOffset) + 'px';
+  this.textarea_.style.height = (size.height - textOffset - topOffset) + 'px';
+};
+
+/**
+ * Set size
+ * @param {number} width width of the container
+ * @param {number} height height of the container
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
+  // Minimum size of a comment.
+  width = Math.max(width, 45);
+  height = Math.max(height, 20 + Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+  this.width_ = width;
+  this.height_ = height;
+  this.svgRect_.setAttribute('width', width);
+  this.svgRect_.setAttribute('height', height);
+  this.svgRectTarget_.setAttribute('width', width);
+  this.svgRectTarget_.setAttribute('height', height);
+  this.svgHandleTarget_.setAttribute('width', width);
+  this.svgHandleTarget_.setAttribute('height',
+      Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+  if (this.RTL) {
+    this.svgRect_.setAttribute('transform', 'scale(-1 1)');
+    this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
+  }
+
+  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  if (this.resizeGroup_) {
+    if (this.RTL) {
+      // Mirror the resize group.
+      this.resizeGroup_.setAttribute('transform', 'translate(' +
+          (-width + resizeSize) + ',' + (height - resizeSize) + ') scale(-1 1)');
+      this.deleteGroup_.setAttribute('transform', 'translate(' +
+          (-width + resizeSize) + ',' + (-resizeSize) + ') scale(-1 1)');
+    } else {
+      this.resizeGroup_.setAttribute('transform', 'translate(' +
+          (width - resizeSize) + ',' +
+          (height - resizeSize) + ')');
+      this.deleteGroup_.setAttribute('transform', 'translate(' +
+          (width - resizeSize) + ',' +
+          (-resizeSize) + ')');
+    }
+  }
+
+  // Allow the contents to resize.
+  this.resizeComment_();
+};
+
+/**
+ * Dispose of any rendered comment components.
+ * @private
+ */
+Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
+  this.textarea_ = null;
+  this.foreignObject_ = null;
+  this.svgRectTarget_ = null;
+  this.svgHandleTarget_ = null;
+  this.disposed_ = true;
+};
+
+/**
+ * Set the focus on the text area.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
+  var comment = this;
+  this.focused_ = true;
+  // Defer CSS changes.
+  setTimeout(function() {
+    if (comment.disposed_) {
+      return;
+    }
+    comment.textarea_.focus();
+    comment.addFocus();
+    Blockly.utils.dom.addClass(
+        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    Blockly.utils.dom.addClass(
+        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
+  }, 0);
+};
+
+/**
+ * Remove focus from the text area.
+ * @package
+ */
+Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
+  var comment = this;
+  this.focused_ = false;
+  // Defer CSS changes.
+  setTimeout(function() {
+    if (comment.disposed_) {
+      return;
+    }
+
+    comment.textarea_.blur();
+    comment.removeFocus();
+    Blockly.utils.dom.removeClass(
+        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    Blockly.utils.dom.removeClass(
+        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
+  }, 0);
+};
+
 /**
  * CSS for workspace comment.  See css.js for use.
  */
diff --git a/tests/deps.js b/tests/deps.js
index f17d995b9..a729ae7b9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,8 +204,7 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.u
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_render_svg.js', ['Blockly.WorkspaceCommentSvg.render'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.WorkspaceComment', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
diff --git a/tests/playground.html b/tests/playground.html
index 11179a0db..b53e76ea8 100644
--- a/tests/playground.html
+++ b/tests/playground.html
@@ -71,7 +71,6 @@
 <script>
 // Custom requires for the playground.
 goog.require('Blockly.WorkspaceCommentSvg');
-goog.require('Blockly.WorkspaceCommentSvg.render');
 </script>
 <script>
 'use strict';
diff --git a/tests/playgrounds/advanced_playground.html b/tests/playgrounds/advanced_playground.html
index 6be7c1e42..bd7b1b7fc 100644
--- a/tests/playgrounds/advanced_playground.html
+++ b/tests/playgrounds/advanced_playground.html
@@ -77,7 +77,6 @@ goog.require('Blockly.Themes.Zelos');
 
 // Other.
 goog.require('Blockly.WorkspaceCommentSvg');
-goog.require('Blockly.WorkspaceCommentSvg.render');
 </script>
 <script>
 'use strict';

From 4afb5580d71c878697039b9d02ff545f31c37c3a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:51:05 -0700
Subject: [PATCH 081/291] Migrate core/workspace_comment_svg.js to ES6
 const/let

---
 core/workspace_comment_svg.js | 80 ++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 84864422b..e1df37c4b 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -222,7 +222,7 @@ Blockly.WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
  * @private
  */
 Blockly.WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
-  var gesture = this.workspace.getGesture(e);
+  const gesture = this.workspace.getGesture(e);
   if (gesture) {
     gesture.handleBubbleStart(e, this);
   }
@@ -238,8 +238,8 @@ Blockly.WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
     return;
   }
   // Save the current workspace comment in a variable for use in closures.
-  var comment = this;
-  var menuOptions = [];
+  const comment = this;
+  const menuOptions = [];
 
   if (this.isDeletable() && this.isMovable()) {
     menuOptions.push(Blockly.ContextMenu.commentDuplicateOption(comment));
@@ -257,7 +257,7 @@ Blockly.WorkspaceCommentSvg.prototype.select = function() {
   if (Blockly.selected == this) {
     return;
   }
-  var oldId = null;
+  let oldId = null;
   if (Blockly.selected) {
     oldId = Blockly.selected.id;
     // Unselect any previously selected block.
@@ -268,7 +268,8 @@ Blockly.WorkspaceCommentSvg.prototype.select = function() {
       Blockly.Events.enable();
     }
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId, this.id,
+  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId,
+      this.id,
       this.workspace.id);
   Blockly.Events.fire(event);
   Blockly.selected = this;
@@ -283,7 +284,7 @@ Blockly.WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
+  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
       this.workspace.id);
   Blockly.Events.fire(event);
   Blockly.selected = null;
@@ -340,24 +341,24 @@ Blockly.WorkspaceCommentSvg.prototype.removeFocus = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
-  var x = 0;
-  var y = 0;
+  let x = 0;
+  let y = 0;
 
-  var dragSurfaceGroup =
+  const dragSurfaceGroup =
       this.useDragSurface_ ? this.workspace.blockDragSurface_.getGroup() : null;
 
-  var element = this.getSvgRoot();
+  let element = this.getSvgRoot();
   if (element) {
     do {
       // Loop through this comment and every parent.
-      var xy = Blockly.utils.getRelativeXY(element);
+      const xy = Blockly.utils.getRelativeXY(element);
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
       // the translation of the drag surface itself.
       if (this.useDragSurface_ &&
           this.workspace.blockDragSurface_.getCurrentBlock() == element) {
-        var surfaceTranslation =
+        const surfaceTranslation =
             this.workspace.blockDragSurface_.getSurfaceTranslation();
         x += surfaceTranslation.x;
         y += surfaceTranslation.y;
@@ -377,9 +378,9 @@ Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
-  var event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   // TODO: Do I need to look up the relative to surface XY position here?
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
   this.xy_ = new Blockly.utils.Coordinate(xy.x + dx, xy.y + dy);
   event.recordNew();
@@ -413,7 +414,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
   // is equal to the current relative-to-surface position,
   // to keep the position in sync as it move on/off the surface.
   // This is in workspace coordinates.
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.clearTransformAttributes_();
   this.workspace.blockDragSurface_.translateSurface(xy.x, xy.y);
   // Execute the move on the top-level SVG component
@@ -484,11 +485,12 @@ Blockly.WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
-  var blockXY = this.getRelativeToSurfaceXY();
-  var commentBounds = this.getHeightWidth();
-  var top = blockXY.y;
-  var bottom = blockXY.y + commentBounds.height;
-  var left, right;
+  const blockXY = this.getRelativeToSurfaceXY();
+  const commentBounds = this.getHeightWidth();
+  const top = blockXY.y;
+  const bottom = blockXY.y + commentBounds.height;
+  let left;
+  let right;
   if (this.RTL) {
     left = blockXY.x - commentBounds.width;
     // Add the width of the tab/puzzle piece knob to the x coordinate
@@ -545,7 +547,7 @@ Blockly.WorkspaceCommentSvg.prototype.setEditable = function(editable) {
  */
 Blockly.WorkspaceCommentSvg.prototype.setDragging = function(adding) {
   if (adding) {
-    var group = this.getSvgRoot();
+    const group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
     Blockly.utils.dom.addClass(
@@ -626,10 +628,11 @@ Blockly.WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
 Blockly.WorkspaceCommentSvg.fromXml = function(
     xmlComment, workspace, opt_wsWidth) {
   Blockly.Events.disable();
+  let comment;
   try {
-    var info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+    const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
 
-    var comment = new Blockly.WorkspaceCommentSvg(
+    comment = new Blockly.WorkspaceCommentSvg(
         workspace, info.content, info.h, info.w, info.id);
     if (workspace.rendered) {
       comment.initSvg(true);
@@ -639,7 +642,7 @@ Blockly.WorkspaceCommentSvg.fromXml = function(
     // rendered RTL workspace.
     if (!isNaN(info.x) && !isNaN(info.y)) {
       if (workspace.RTL) {
-        var wsWidth = opt_wsWidth || workspace.getWidth();
+        const wsWidth = opt_wsWidth || workspace.getWidth();
         comment.moveBy(wsWidth - info.x, info.y);
       } else {
         comment.moveBy(info.x, info.y);
@@ -660,13 +663,13 @@ Blockly.WorkspaceCommentSvg.fromXml = function(
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
-  var width;  // Not used in LTR.
+  let width;  // Not used in LTR.
   if (this.workspace.RTL) {
     // Here be performance dragons: This calls getMetrics().
     width = this.workspace.getWidth();
   }
-  var element = this.toXml(opt_noId);
-  var xy = this.getRelativeToSurfaceXY();
+  const element = this.toXml(opt_noId);
+  const xy = this.getRelativeToSurfaceXY();
   element.setAttribute(
       'x', Math.round(this.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
@@ -703,7 +706,7 @@ Blockly.WorkspaceCommentSvg.prototype.render = function() {
     return;
   }
 
-  var size = this.getHeightWidth();
+  const size = this.getHeightWidth();
 
   // Add text area
   this.createEditor_();
@@ -780,10 +783,11 @@ Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
         'class': 'blocklyCommentForeignObject'
       },
       null);
-  var body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
+  const body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
   body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
-  var textarea = document.createElementNS(Blockly.utils.dom.HTML_NS, 'textarea');
+  const textarea = document.createElementNS(Blockly.utils.dom.HTML_NS,
+      'textarea');
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
   textarea.readOnly = !this.isEditable();
@@ -815,7 +819,7 @@ Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
         'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
       },
       this.svgGroup_);
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.POLYGON,
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
@@ -972,7 +976,7 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
  */
 Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
   this.autoLayout_ = false;
-  var newXY = this.workspace.moveDrag(e);
+  const newXY = this.workspace.moveDrag(e);
   this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
 };
 
@@ -982,9 +986,9 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
  * @private
  */
 Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
-  var size = this.getHeightWidth();
-  var topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
-  var textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+  const size = this.getHeightWidth();
+  const topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
+  const textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
 
   this.foreignObject_.setAttribute('width', size.width);
   this.foreignObject_.setAttribute('height', size.height - topOffset);
@@ -1019,7 +1023,7 @@ Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
   }
 
-  var resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
@@ -1058,7 +1062,7 @@ Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
-  var comment = this;
+  const comment = this;
   this.focused_ = true;
   // Defer CSS changes.
   setTimeout(function() {
@@ -1079,7 +1083,7 @@ Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
  * @package
  */
 Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
-  var comment = this;
+  const comment = this;
   this.focused_ = false;
   // Defer CSS changes.
   setTimeout(function() {

From 0e5a4a947a1d89844a18b1663da5f7a756401142 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:51:18 -0700
Subject: [PATCH 082/291] Migrate core/workspace_comment_svg.js to goog.module

---
 core/workspace_comment_svg.js | 151 +++++++++++++++++-----------------
 tests/deps.js                 |   2 +-
 2 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index e1df37c4b..1127167ba 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceCommentSvg');
+goog.module('Blockly.WorkspaceCommentSvg');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly');
 goog.require('Blockly.browserEvents');
@@ -55,7 +56,7 @@ goog.requireType('Blockly.Workspace');
  * @implements {Blockly.ICopyable}
  * @constructor
  */
-Blockly.WorkspaceCommentSvg = function(
+const WorkspaceCommentSvg = function(
     workspace, content, height, width, opt_id) {
   /**
    * Mouse up event data.
@@ -85,8 +86,8 @@ Blockly.WorkspaceCommentSvg = function(
         'class': 'blocklyCommentRect',
         'x': 0,
         'y': 0,
-        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
+        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+        'ry': WorkspaceCommentSvg.BORDER_RADIUS
       });
   this.svgGroup_.appendChild(this.svgRect_);
 
@@ -106,13 +107,13 @@ Blockly.WorkspaceCommentSvg = function(
   this.useDragSurface_ =
       Blockly.utils.is3dSupported() && !!workspace.blockDragSurface_;
 
-  Blockly.WorkspaceCommentSvg.superClass_.constructor.call(
+  WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
 
   this.render();
 };
 Blockly.utils.object.inherits(
-    Blockly.WorkspaceCommentSvg, Blockly.WorkspaceComment);
+    WorkspaceCommentSvg, Blockly.WorkspaceComment);
 
 /**
  * The width and height to use to size a workspace comment when it is first
@@ -120,7 +121,7 @@ Blockly.utils.object.inherits(
  * @type {number}
  * @package
  */
-Blockly.WorkspaceCommentSvg.DEFAULT_SIZE = 100;
+WorkspaceCommentSvg.DEFAULT_SIZE = 100;
 
 /**
  * Size of the resize icon.
@@ -128,7 +129,7 @@ Blockly.WorkspaceCommentSvg.DEFAULT_SIZE = 100;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
+WorkspaceCommentSvg.RESIZE_SIZE = 8;
 
 /**
  * Radius of the border around the comment.
@@ -136,7 +137,7 @@ Blockly.WorkspaceCommentSvg.RESIZE_SIZE = 8;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
+WorkspaceCommentSvg.BORDER_RADIUS = 3;
 
 /**
  * Offset from the foreignobject edge to the textarea edge.
@@ -144,7 +145,7 @@ Blockly.WorkspaceCommentSvg.BORDER_RADIUS = 3;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
+WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
 
 /**
  * Offset from the top to make room for a top bar.
@@ -152,13 +153,13 @@ Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
  * @const
  * @private
  */
-Blockly.WorkspaceCommentSvg.TOP_OFFSET = 10;
+WorkspaceCommentSvg.TOP_OFFSET = 10;
 
 /**
  * Dispose of this comment.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.dispose = function() {
+WorkspaceCommentSvg.prototype.dispose = function() {
   if (!this.workspace) {
     // The comment has already been deleted.
     return;
@@ -182,7 +183,7 @@ Blockly.WorkspaceCommentSvg.prototype.dispose = function() {
   this.disposeInternal_();
 
   Blockly.Events.disable();
-  Blockly.WorkspaceCommentSvg.superClass_.dispose.call(this);
+  WorkspaceCommentSvg.superClass_.dispose.call(this);
   Blockly.Events.enable();
 };
 
@@ -194,7 +195,7 @@ Blockly.WorkspaceCommentSvg.prototype.dispose = function() {
  *
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
+WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
   if (!this.workspace.rendered) {
     throw TypeError('Workspace is headless.');
   }
@@ -221,7 +222,7 @@ Blockly.WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
  * @param {!Event} e Mouse down event or touch start event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
+WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
   const gesture = this.workspace.getGesture(e);
   if (gesture) {
     gesture.handleBubbleStart(e, this);
@@ -233,7 +234,7 @@ Blockly.WorkspaceCommentSvg.prototype.pathMouseDown_ = function(e) {
  * @param {!Event} e Mouse event.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
+WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
   if (this.workspace.options.readOnly) {
     return;
   }
@@ -253,7 +254,7 @@ Blockly.WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
  * Select this comment.  Highlight it visually.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.select = function() {
+WorkspaceCommentSvg.prototype.select = function() {
   if (Blockly.selected == this) {
     return;
   }
@@ -280,7 +281,7 @@ Blockly.WorkspaceCommentSvg.prototype.select = function() {
  * Unselect this comment.  Remove its highlighting.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.unselect = function() {
+WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
@@ -296,7 +297,7 @@ Blockly.WorkspaceCommentSvg.prototype.unselect = function() {
  * Select this comment.  Highlight it visually.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.addSelect = function() {
+WorkspaceCommentSvg.prototype.addSelect = function() {
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.setFocus();
@@ -306,7 +307,7 @@ Blockly.WorkspaceCommentSvg.prototype.addSelect = function() {
  * Unselect this comment.  Remove its highlighting.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.removeSelect = function() {
+WorkspaceCommentSvg.prototype.removeSelect = function() {
   Blockly.utils.dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.blurFocus();
@@ -316,7 +317,7 @@ Blockly.WorkspaceCommentSvg.prototype.removeSelect = function() {
  * Focus this comment.  Highlight it visually.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.addFocus = function() {
+WorkspaceCommentSvg.prototype.addFocus = function() {
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
@@ -325,7 +326,7 @@ Blockly.WorkspaceCommentSvg.prototype.addFocus = function() {
  * Unfocus this comment.  Remove its highlighting.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.removeFocus = function() {
+WorkspaceCommentSvg.prototype.removeFocus = function() {
   Blockly.utils.dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
@@ -340,7 +341,7 @@ Blockly.WorkspaceCommentSvg.prototype.removeFocus = function() {
  *     workspace coordinates.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
+WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
   let x = 0;
   let y = 0;
 
@@ -377,7 +378,7 @@ Blockly.WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
  * @param {number} dy Vertical offset, in workspace units.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
+WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
   const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
   // TODO: Do I need to look up the relative to surface XY position here?
   const xy = this.getRelativeToSurfaceXY();
@@ -395,7 +396,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
  * @param {number} y The y coordinate of the translation in workspace units.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.translate = function(x, y) {
+WorkspaceCommentSvg.prototype.translate = function(x, y) {
   this.xy_ = new Blockly.utils.Coordinate(x, y);
   this.getSvgRoot().setAttribute('transform', 'translate(' + x + ',' + y + ')');
 };
@@ -406,7 +407,7 @@ Blockly.WorkspaceCommentSvg.prototype.translate = function(x, y) {
  * setDragging(true).  Does nothing if useDragSurface_ is false.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
+WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
   if (!this.useDragSurface_) {
     return;
   }
@@ -429,7 +430,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
  *     on on the workspace canvas, in workspace coordinates.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
+WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
   if (!this.useDragSurface_) {
     return;
   }
@@ -447,7 +448,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
  *     workspace coordinates.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveDuringDrag = function(
+WorkspaceCommentSvg.prototype.moveDuringDrag = function(
     dragSurface, newLoc) {
   if (dragSurface) {
     dragSurface.translateSurface(newLoc.x, newLoc.y);
@@ -464,7 +465,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveDuringDrag = function(
  * @param {number} y The y position to move to.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.moveTo = function(x, y) {
+WorkspaceCommentSvg.prototype.moveTo = function(x, y) {
   this.translate(x, y);
 };
 
@@ -473,7 +474,7 @@ Blockly.WorkspaceCommentSvg.prototype.moveTo = function(x, y) {
  * Used when the comment is switching from 3d to 2d transform or vice versa.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
+WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
   this.getSvgRoot().removeAttribute('transform');
 };
 
@@ -484,7 +485,7 @@ Blockly.WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
  * @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
+WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
   const blockXY = this.getRelativeToSurfaceXY();
   const commentBounds = this.getHeightWidth();
   const top = blockXY.y;
@@ -509,7 +510,7 @@ Blockly.WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
  * Add or remove the UI indicating if this comment is movable or not.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.updateMovable = function() {
+WorkspaceCommentSvg.prototype.updateMovable = function() {
   if (this.isMovable()) {
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggable');
@@ -524,8 +525,8 @@ Blockly.WorkspaceCommentSvg.prototype.updateMovable = function() {
  * @param {boolean} movable True if movable.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setMovable = function(movable) {
-  Blockly.WorkspaceCommentSvg.superClass_.setMovable.call(this, movable);
+WorkspaceCommentSvg.prototype.setMovable = function(movable) {
+  WorkspaceCommentSvg.superClass_.setMovable.call(this, movable);
   this.updateMovable();
 };
 
@@ -533,8 +534,8 @@ Blockly.WorkspaceCommentSvg.prototype.setMovable = function(movable) {
  * Set whether this comment is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.WorkspaceCommentSvg.prototype.setEditable = function(editable) {
-  Blockly.WorkspaceCommentSvg.superClass_.setEditable.call(this, editable);
+WorkspaceCommentSvg.prototype.setEditable = function(editable) {
+  WorkspaceCommentSvg.superClass_.setEditable.call(this, editable);
   if (this.textarea_) {
     this.textarea_.readOnly = !editable;
   }
@@ -545,7 +546,7 @@ Blockly.WorkspaceCommentSvg.prototype.setEditable = function(editable) {
  * @param {boolean} adding True if adding, false if removing.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setDragging = function(adding) {
+WorkspaceCommentSvg.prototype.setDragging = function(adding) {
   if (adding) {
     const group = this.getSvgRoot();
     group.translate_ = '';
@@ -563,7 +564,7 @@ Blockly.WorkspaceCommentSvg.prototype.setDragging = function(adding) {
  * @return {!SVGElement} The root SVG node (probably a group).
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getSvgRoot = function() {
+WorkspaceCommentSvg.prototype.getSvgRoot = function() {
   return this.svgGroup_;
 };
 
@@ -572,7 +573,7 @@ Blockly.WorkspaceCommentSvg.prototype.getSvgRoot = function() {
  * @return {string} Comment text.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getContent = function() {
+WorkspaceCommentSvg.prototype.getContent = function() {
   return this.textarea_ ? this.textarea_.value : this.content_;
 };
 
@@ -581,8 +582,8 @@ Blockly.WorkspaceCommentSvg.prototype.getContent = function() {
  * @param {string} content Comment content.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setContent = function(content) {
-  Blockly.WorkspaceCommentSvg.superClass_.setContent.call(this, content);
+WorkspaceCommentSvg.prototype.setContent = function(content) {
+  WorkspaceCommentSvg.superClass_.setContent.call(this, content);
   if (this.textarea_) {
     this.textarea_.value = content;
   }
@@ -594,7 +595,7 @@ Blockly.WorkspaceCommentSvg.prototype.setContent = function(content) {
  *     otherwise.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
+WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
   if (enable) {
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggingDelete');
@@ -612,7 +613,7 @@ Blockly.WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
  *     otherwise.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
+WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
   // NOP for compatibility with the bubble dragger.
 };
 
@@ -622,17 +623,17 @@ Blockly.WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
  * @param {!Blockly.Workspace} workspace The workspace.
  * @param {number=} opt_wsWidth The width of the workspace, which is used to
  *     position comments correctly in RTL.
- * @return {!Blockly.WorkspaceCommentSvg} The created workspace comment.
+ * @return {!WorkspaceCommentSvg} The created workspace comment.
  * @package
  */
-Blockly.WorkspaceCommentSvg.fromXml = function(
+WorkspaceCommentSvg.fromXml = function(
     xmlComment, workspace, opt_wsWidth) {
   Blockly.Events.disable();
   let comment;
   try {
     const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
 
-    comment = new Blockly.WorkspaceCommentSvg(
+    comment = new WorkspaceCommentSvg(
         workspace, info.content, info.h, info.w, info.id);
     if (workspace.rendered) {
       comment.initSvg(true);
@@ -662,7 +663,7 @@ Blockly.WorkspaceCommentSvg.fromXml = function(
  * @return {!Element} Tree of XML elements.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
+WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
   let width;  // Not used in LTR.
   if (this.workspace.RTL) {
     // Here be performance dragons: This calls getMetrics().
@@ -683,7 +684,7 @@ Blockly.WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
  * @return {!Blockly.ICopyable.CopyData} Copy metadata.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.toCopyData = function() {
+WorkspaceCommentSvg.prototype.toCopyData = function() {
   return {xml: this.toXmlWithXY(), source: this.workspace, typeCounts: null};
 };
 
@@ -693,7 +694,7 @@ Blockly.WorkspaceCommentSvg.prototype.toCopyData = function() {
  *     properties in workspace units.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
+WorkspaceCommentSvg.prototype.getHeightWidth = function() {
   return { width: this.getWidth(), height: this.getHeight() };
 };
 
@@ -701,7 +702,7 @@ Blockly.WorkspaceCommentSvg.prototype.getHeightWidth = function() {
  * Renders the workspace comment.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.render = function() {
+WorkspaceCommentSvg.prototype.render = function() {
   if (this.rendered_) {
     return;
   }
@@ -726,8 +727,8 @@ Blockly.WorkspaceCommentSvg.prototype.render = function() {
         'class': 'blocklyCommentTarget',
         'x': 0,
         'y': 0,
-        'rx': Blockly.WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': Blockly.WorkspaceCommentSvg.BORDER_RADIUS
+        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+        'ry': WorkspaceCommentSvg.BORDER_RADIUS
       });
   this.svgGroup_.appendChild(this.svgRectTarget_);
 
@@ -765,7 +766,7 @@ Blockly.WorkspaceCommentSvg.prototype.render = function() {
  * @return {!Element} The top-level node of the editor.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
+WorkspaceCommentSvg.prototype.createEditor_ = function() {
   /* Create the editor.  Here's the markup that will be generated:
     <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
       <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
@@ -779,7 +780,7 @@ Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
       Blockly.utils.Svg.FOREIGNOBJECT,
       {
         'x': 0,
-        'y': Blockly.WorkspaceCommentSvg.TOP_OFFSET,
+        'y': WorkspaceCommentSvg.TOP_OFFSET,
         'class': 'blocklyCommentForeignObject'
       },
       null);
@@ -812,14 +813,14 @@ Blockly.WorkspaceCommentSvg.prototype.createEditor_ = function() {
  * Add the resize icon to the DOM
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
+WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
   this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {
         'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
       },
       this.svgGroup_);
-  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.POLYGON,
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
@@ -844,7 +845,7 @@ Blockly.WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
  * Add the delete icon to the DOM
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
+WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
   this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G,
       {
@@ -886,7 +887,7 @@ Blockly.WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
+WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
   this.unbindDragEvents_();
   if (Blockly.utils.isRightButton(e)) {
     // No right-click.
@@ -911,7 +912,7 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
+WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
   // Highlight the delete icon.
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
@@ -925,7 +926,7 @@ Blockly.WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
  * @param {!Event} _e Mouse out event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
+WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
   // Restore highlight on the delete icon.
   Blockly.utils.dom.removeClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
@@ -937,7 +938,7 @@ Blockly.WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
+WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
   // Delete this comment.
   this.dispose(true, true);
   // This event has been handled.  No need to bubble up to the document.
@@ -948,7 +949,7 @@ Blockly.WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
  * Stop binding to the global mouseup and mousemove events.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
+WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
   if (this.onMouseUpWrapper_) {
     Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
@@ -964,7 +965,7 @@ Blockly.WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
+WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
   Blockly.Touch.clearTouchIdentifier();
   this.unbindDragEvents_();
 };
@@ -974,7 +975,7 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
  * @param {!Event} e Mouse move event.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
+WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
   this.autoLayout_ = false;
   const newXY = this.workspace.moveDrag(e);
   this.setSize_(this.RTL ? -newXY.x : newXY.x, newXY.y);
@@ -985,10 +986,10 @@ Blockly.WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
  * Resize the text area accordingly.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
+WorkspaceCommentSvg.prototype.resizeComment_ = function() {
   const size = this.getHeightWidth();
-  const topOffset = Blockly.WorkspaceCommentSvg.TOP_OFFSET;
-  const textOffset = Blockly.WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+  const topOffset = WorkspaceCommentSvg.TOP_OFFSET;
+  const textOffset = WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
 
   this.foreignObject_.setAttribute('width', size.width);
   this.foreignObject_.setAttribute('height', size.height - topOffset);
@@ -1005,10 +1006,10 @@ Blockly.WorkspaceCommentSvg.prototype.resizeComment_ = function() {
  * @param {number} height height of the container
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
+WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   // Minimum size of a comment.
   width = Math.max(width, 45);
-  height = Math.max(height, 20 + Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+  height = Math.max(height, 20 + WorkspaceCommentSvg.TOP_OFFSET);
   this.width_ = width;
   this.height_ = height;
   this.svgRect_.setAttribute('width', width);
@@ -1017,13 +1018,13 @@ Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   this.svgRectTarget_.setAttribute('height', height);
   this.svgHandleTarget_.setAttribute('width', width);
   this.svgHandleTarget_.setAttribute('height',
-      Blockly.WorkspaceCommentSvg.TOP_OFFSET);
+      WorkspaceCommentSvg.TOP_OFFSET);
   if (this.RTL) {
     this.svgRect_.setAttribute('transform', 'scale(-1 1)');
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
   }
 
-  const resizeSize = Blockly.WorkspaceCommentSvg.RESIZE_SIZE;
+  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
@@ -1049,7 +1050,7 @@ Blockly.WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
  * Dispose of any rendered comment components.
  * @private
  */
-Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
+WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
   this.textarea_ = null;
   this.foreignObject_ = null;
   this.svgRectTarget_ = null;
@@ -1061,7 +1062,7 @@ Blockly.WorkspaceCommentSvg.prototype.disposeInternal_ = function() {
  * Set the focus on the text area.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
+WorkspaceCommentSvg.prototype.setFocus = function() {
   const comment = this;
   this.focused_ = true;
   // Defer CSS changes.
@@ -1082,7 +1083,7 @@ Blockly.WorkspaceCommentSvg.prototype.setFocus = function() {
  * Remove focus from the text area.
  * @package
  */
-Blockly.WorkspaceCommentSvg.prototype.blurFocus = function() {
+WorkspaceCommentSvg.prototype.blurFocus = function() {
   const comment = this;
   this.focused_ = false;
   // Defer CSS changes.
@@ -1166,3 +1167,5 @@ Blockly.Css.register([
   /* eslint-enable indent */
   // clang-format on
 ]);
+
+exports = WorkspaceCommentSvg;
diff --git a/tests/deps.js b/tests/deps.js
index a729ae7b9..6e85f213e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,7 +204,7 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.u
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});

From b8de423feaeb48f67530a669d820934496089f20 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:53:19 -0700
Subject: [PATCH 083/291] Migrate core/workspace_comment_svg.js named requires

---
 core/workspace_comment_svg.js | 245 +++++++++++++++++-----------------
 1 file changed, 122 insertions(+), 123 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 1127167ba..aa47c777a 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -13,11 +13,24 @@
 goog.module('Blockly.WorkspaceCommentSvg');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.ContextMenu');
-goog.require('Blockly.Css');
-goog.require('Blockly.Events');
+const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
+const Blockly = goog.require('Blockly');
+const ContextMenu = goog.require('Blockly.ContextMenu');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Css = goog.require('Blockly.Css');
+const Events = goog.require('Blockly.Events');
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
+const IBubble = goog.requireType('Blockly.IBubble');
+const ICopyable = goog.requireType('Blockly.ICopyable');
+const Rect = goog.require('Blockly.utils.Rect');
+const Svg = goog.require('Blockly.utils.Svg');
+const Touch = goog.require('Blockly.Touch');
+const Workspace = goog.requireType('Blockly.Workspace');
+const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.CommentCreate');
 /** @suppress {extraRequire} */
@@ -26,48 +39,34 @@ goog.require('Blockly.Events.CommentDelete');
 goog.require('Blockly.Events.CommentMove');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Selected');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.WorkspaceComment');
-
-goog.requireType('Blockly.BlockDragSurfaceSvg');
-goog.requireType('Blockly.IBoundedElement');
-goog.requireType('Blockly.IBubble');
-goog.requireType('Blockly.ICopyable');
-goog.requireType('Blockly.Workspace');
 
 
 /**
  * Class for a workspace comment's SVG representation.
- * @param {!Blockly.Workspace} workspace The block's workspace.
+ * @param {!Workspace} workspace The block's workspace.
  * @param {string} content The content of this workspace comment.
  * @param {number} height Height of the comment.
  * @param {number} width Width of the comment.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @extends {Blockly.WorkspaceComment}
- * @implements {Blockly.IBoundedElement}
- * @implements {Blockly.IBubble}
- * @implements {Blockly.ICopyable}
+ * @extends {WorkspaceComment}
+ * @implements {IBoundedElement}
+ * @implements {IBubble}
+ * @implements {ICopyable}
  * @constructor
  */
 const WorkspaceCommentSvg = function(
     workspace, content, height, width, opt_id) {
   /**
    * Mouse up event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * Mouse move event data.
-   * @type {?Blockly.browserEvents.Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseMoveWrapper_ = null;
@@ -77,12 +76,12 @@ const WorkspaceCommentSvg = function(
    * @type {!SVGElement}
    * @private
    */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {'class': 'blocklyComment'}, null);
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {'class': 'blocklyComment'}, null);
   this.svgGroup_.translate_ = '';
 
-  this.svgRect_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT, {
+  this.svgRect_ = dom.createSvgElement(
+      Svg.RECT, {
         'class': 'blocklyCommentRect',
         'x': 0,
         'y': 0,
@@ -105,15 +104,15 @@ const WorkspaceCommentSvg = function(
    * @private
    */
   this.useDragSurface_ =
-      Blockly.utils.is3dSupported() && !!workspace.blockDragSurface_;
+      utils.is3dSupported() && !!workspace.blockDragSurface_;
 
   WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
 
   this.render();
 };
-Blockly.utils.object.inherits(
-    WorkspaceCommentSvg, Blockly.WorkspaceComment);
+object.inherits(
+    WorkspaceCommentSvg, WorkspaceComment);
 
 /**
  * The width and height to use to size a workspace comment when it is first
@@ -170,21 +169,21 @@ WorkspaceCommentSvg.prototype.dispose = function() {
     this.workspace.cancelCurrentGesture();
   }
 
-  if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(
-        new (Blockly.Events.get(Blockly.Events.COMMENT_DELETE))(this));
+  if (Events.isEnabled()) {
+    Events.fire(
+        new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
-  Blockly.utils.dom.removeNode(this.svgGroup_);
+  dom.removeNode(this.svgGroup_);
   // Sever JavaScript to DOM connections.
   this.svgGroup_ = null;
   this.svgRect_ = null;
   // Dispose of any rendered components
   this.disposeInternal_();
 
-  Blockly.Events.disable();
+  Events.disable();
   WorkspaceCommentSvg.superClass_.dispose.call(this);
-  Blockly.Events.enable();
+  Events.enable();
 };
 
 /**
@@ -200,9 +199,9 @@ WorkspaceCommentSvg.prototype.initSvg = function(opt_noSelect) {
     throw TypeError('Workspace is headless.');
   }
   if (!this.workspace.options.readOnly && !this.eventsInit_) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgRectTarget_, 'mousedown', this, this.pathMouseDown_);
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgHandleTarget_, 'mousedown', this, this.pathMouseDown_);
   }
   this.eventsInit_ = true;
@@ -243,11 +242,11 @@ WorkspaceCommentSvg.prototype.showContextMenu = function(e) {
   const menuOptions = [];
 
   if (this.isDeletable() && this.isMovable()) {
-    menuOptions.push(Blockly.ContextMenu.commentDuplicateOption(comment));
-    menuOptions.push(Blockly.ContextMenu.commentDeleteOption(comment));
+    menuOptions.push(ContextMenu.commentDuplicateOption(comment));
+    menuOptions.push(ContextMenu.commentDeleteOption(comment));
   }
 
-  Blockly.ContextMenu.show(e, menuOptions, this.RTL);
+  ContextMenu.show(e, menuOptions, this.RTL);
 };
 
 /**
@@ -262,17 +261,17 @@ WorkspaceCommentSvg.prototype.select = function() {
   if (Blockly.selected) {
     oldId = Blockly.selected.id;
     // Unselect any previously selected block.
-    Blockly.Events.disable();
+    Events.disable();
     try {
       Blockly.selected.unselect();
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
   }
-  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId,
+  const event = new (Events.get(Events.SELECTED))(oldId,
       this.id,
       this.workspace.id);
-  Blockly.Events.fire(event);
+  Events.fire(event);
   Blockly.selected = this;
   this.addSelect();
 };
@@ -285,9 +284,9 @@ WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  const event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
+  const event = new (Events.get(Events.SELECTED))(this.id, null,
       this.workspace.id);
-  Blockly.Events.fire(event);
+  Events.fire(event);
   Blockly.selected = null;
   this.removeSelect();
   this.blurFocus();
@@ -298,7 +297,7 @@ WorkspaceCommentSvg.prototype.unselect = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.addSelect = function() {
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.setFocus();
 };
@@ -308,7 +307,7 @@ WorkspaceCommentSvg.prototype.addSelect = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.removeSelect = function() {
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklySelected');
   this.blurFocus();
 };
@@ -318,7 +317,7 @@ WorkspaceCommentSvg.prototype.removeSelect = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.addFocus = function() {
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
 
@@ -327,7 +326,7 @@ WorkspaceCommentSvg.prototype.addFocus = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.removeFocus = function() {
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!Element} */ (this.svgGroup_), 'blocklyFocused');
 };
 
@@ -337,7 +336,7 @@ WorkspaceCommentSvg.prototype.removeFocus = function() {
  * If the comment is on the workspace, (0, 0) is the origin of the workspace
  * coordinate system.
  * This does not change with workspace scale.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties in
+ * @return {!Coordinate} Object with .x and .y properties in
  *     workspace coordinates.
  * @package
  */
@@ -352,7 +351,7 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
   if (element) {
     do {
       // Loop through this comment and every parent.
-      const xy = Blockly.utils.getRelativeXY(element);
+      const xy = utils.getRelativeXY(element);
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
@@ -368,7 +367,7 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
     } while (element && element != this.workspace.getBubbleCanvas() &&
              element != dragSurfaceGroup);
   }
-  this.xy_ = new Blockly.utils.Coordinate(x, y);
+  this.xy_ = new Coordinate(x, y);
   return this.xy_;
 };
 
@@ -379,13 +378,13 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
-  const event = new (Blockly.Events.get(Blockly.Events.COMMENT_MOVE))(this);
+  const event = new (Events.get(Events.COMMENT_MOVE))(this);
   // TODO: Do I need to look up the relative to surface XY position here?
   const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
-  this.xy_ = new Blockly.utils.Coordinate(xy.x + dx, xy.y + dy);
+  this.xy_ = new Coordinate(xy.x + dx, xy.y + dy);
   event.recordNew();
-  Blockly.Events.fire(event);
+  Events.fire(event);
   this.workspace.resizeContents();
 };
 
@@ -397,7 +396,7 @@ WorkspaceCommentSvg.prototype.moveBy = function(dx, dy) {
  * @package
  */
 WorkspaceCommentSvg.prototype.translate = function(x, y) {
-  this.xy_ = new Blockly.utils.Coordinate(x, y);
+  this.xy_ = new Coordinate(x, y);
   this.getSvgRoot().setAttribute('transform', 'translate(' + x + ',' + y + ')');
 };
 
@@ -426,7 +425,7 @@ WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
  * Move this comment back to the workspace block canvas.
  * Generally should be called at the same time as setDragging(false).
  * Does nothing if useDragSurface_ is false.
- * @param {!Blockly.utils.Coordinate} newXY The position the comment should take
+ * @param {!Coordinate} newXY The position the comment should take
  *     on on the workspace canvas, in workspace coordinates.
  * @private
  */
@@ -442,9 +441,9 @@ WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
 /**
  * Move this comment during a drag, taking into account whether we are using a
  * drag surface to translate blocks.
- * @param {Blockly.BlockDragSurfaceSvg} dragSurface The surface that carries
+ * @param {BlockDragSurfaceSvg} dragSurface The surface that carries
  *     rendered items during a drag, or null if no drag surface is in use.
- * @param {!Blockly.utils.Coordinate} newLoc The location to translate to, in
+ * @param {!Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.
  * @package
  */
@@ -482,7 +481,7 @@ WorkspaceCommentSvg.prototype.clearTransformAttributes_ = function() {
  * Returns the coordinates of a bounding box describing the dimensions of this
  * comment.
  * Coordinate system: workspace coordinates.
- * @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
+ * @return {!Rect} Object with coordinates of the bounding box.
  * @package
  */
 WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
@@ -503,7 +502,7 @@ WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
     left = blockXY.x;
     right = blockXY.x + commentBounds.width;
   }
-  return new Blockly.utils.Rect(top, bottom, left, right);
+  return new Rect(top, bottom, left, right);
 };
 
 /**
@@ -512,10 +511,10 @@ WorkspaceCommentSvg.prototype.getBoundingRectangle = function() {
  */
 WorkspaceCommentSvg.prototype.updateMovable = function() {
   if (this.isMovable()) {
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggable');
   } else {
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggable');
   }
 };
@@ -551,10 +550,10 @@ WorkspaceCommentSvg.prototype.setDragging = function(adding) {
     const group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
 };
@@ -597,10 +596,10 @@ WorkspaceCommentSvg.prototype.setContent = function(content) {
  */
 WorkspaceCommentSvg.prototype.setDeleteStyle = function(enable) {
   if (enable) {
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggingDelete');
   } else {
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDraggingDelete');
   }
 };
@@ -620,7 +619,7 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
 /**
  * Decode an XML comment tag and create a rendered comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @param {number=} opt_wsWidth The width of the workspace, which is used to
  *     position comments correctly in RTL.
  * @return {!WorkspaceCommentSvg} The created workspace comment.
@@ -628,10 +627,10 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
  */
 WorkspaceCommentSvg.fromXml = function(
     xmlComment, workspace, opt_wsWidth) {
-  Blockly.Events.disable();
+  Events.disable();
   let comment;
   try {
-    const info = Blockly.WorkspaceComment.parseAttributes(xmlComment);
+    const info = WorkspaceComment.parseAttributes(xmlComment);
 
     comment = new WorkspaceCommentSvg(
         workspace, info.content, info.h, info.w, info.id);
@@ -650,9 +649,9 @@ WorkspaceCommentSvg.fromXml = function(
       }
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  Blockly.WorkspaceComment.fireCreateEvent(comment);
+  WorkspaceComment.fireCreateEvent(comment);
 
   return comment;
 };
@@ -681,7 +680,7 @@ WorkspaceCommentSvg.prototype.toXmlWithXY = function(opt_noId) {
 
 /**
  * Encode a comment for copying.
- * @return {!Blockly.ICopyable.CopyData} Copy metadata.
+ * @return {!ICopyable.CopyData} Copy metadata.
  * @package
  */
 WorkspaceCommentSvg.prototype.toCopyData = function() {
@@ -713,16 +712,16 @@ WorkspaceCommentSvg.prototype.render = function() {
   this.createEditor_();
   this.svgGroup_.appendChild(this.foreignObject_);
 
-  this.svgHandleTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.svgHandleTarget_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyCommentHandleTarget',
         'x': 0,
         'y': 0
       });
   this.svgGroup_.appendChild(this.svgHandleTarget_);
-  this.svgRectTarget_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.svgRectTarget_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyCommentTarget',
         'x': 0,
@@ -747,16 +746,16 @@ WorkspaceCommentSvg.prototype.render = function() {
   this.rendered_ = true;
 
   if (this.resizeGroup_) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.resizeGroup_, 'mousedown', this, this.resizeMouseDown_);
   }
 
   if (this.isDeletable()) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.deleteGroup_, 'mousedown', this, this.deleteMouseDown_);
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.deleteGroup_, 'mouseout', this, this.deleteMouseOut_);
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.deleteGroup_, 'mouseup', this, this.deleteMouseUp_);
   }
 };
@@ -776,18 +775,18 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
       </body>
     </foreignObject>
   */
-  this.foreignObject_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.FOREIGNOBJECT,
+  this.foreignObject_ = dom.createSvgElement(
+      Svg.FOREIGNOBJECT,
       {
         'x': 0,
         'y': WorkspaceCommentSvg.TOP_OFFSET,
         'class': 'blocklyCommentForeignObject'
       },
       null);
-  const body = document.createElementNS(Blockly.utils.dom.HTML_NS, 'body');
-  body.setAttribute('xmlns', Blockly.utils.dom.HTML_NS);
+  const body = document.createElementNS(dom.HTML_NS, 'body');
+  body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
-  const textarea = document.createElementNS(Blockly.utils.dom.HTML_NS,
+  const textarea = document.createElementNS(dom.HTML_NS,
       'textarea');
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
@@ -796,10 +795,10 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
   this.textarea_ = textarea;
   this.foreignObject_.appendChild(body);
   // Don't zoom with mousewheel.
-  Blockly.browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
+  browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
     e.stopPropagation();
   });
-  Blockly.browserEvents.conditionalBind(
+  browserEvents.conditionalBind(
       textarea, 'change', this,
       function(
           /* eslint-disable no-unused-vars */ e
@@ -814,26 +813,26 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
  * @private
  */
 WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
-  this.resizeGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.resizeGroup_ = dom.createSvgElement(
+      Svg.G,
       {
         'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
       },
       this.svgGroup_);
   const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.POLYGON,
+  dom.createSvgElement(
+      Svg.POLYGON,
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
       this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'class': 'blocklyResizeLine',
         'x1': resizeSize / 3, 'y1': resizeSize - 1,
         'x2': resizeSize - 1, 'y2': resizeSize / 3
       }, this.resizeGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'class': 'blocklyResizeLine',
         'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
@@ -846,14 +845,14 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
  * @private
  */
 WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
-  this.deleteGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.deleteGroup_ = dom.createSvgElement(
+      Svg.G,
       {
         'class': 'blocklyCommentDeleteIcon'
       },
       this.svgGroup_);
-  this.deleteIconBorder_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CIRCLE,
+  this.deleteIconBorder_ = dom.createSvgElement(
+      Svg.CIRCLE,
       {
         'class': 'blocklyDeleteIconShape',
         'r': '7',
@@ -862,8 +861,8 @@ WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
       },
       this.deleteGroup_);
   // x icon.
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'x1': '5', 'y1': '10',
         'x2': '10', 'y2': '5',
@@ -871,8 +870,8 @@ WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
         'stroke-width': '2'
       },
       this.deleteGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.LINE,
+  dom.createSvgElement(
+      Svg.LINE,
       {
         'x1': '5', 'y1': '5',
         'x2': '10', 'y2': '10',
@@ -889,18 +888,18 @@ WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
  */
 WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
   this.unbindDragEvents_();
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     // No right-click.
     e.stopPropagation();
     return;
   }
   // Left-click (or middle click)
-  this.workspace.startDrag(e, new Blockly.utils.Coordinate(
+  this.workspace.startDrag(e, new Coordinate(
       this.workspace.RTL ? -this.width_ : this.width_, this.height_));
 
-  this.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', this, this.resizeMouseUp_);
-  this.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', this, this.resizeMouseMove_);
   Blockly.hideChaff();
   // This event has been handled.  No need to bubble up to the document.
@@ -914,7 +913,7 @@ WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
  */
 WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
   // Highlight the delete icon.
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
       'blocklyDeleteIconHighlighted');
   // This event has been handled.  No need to bubble up to the document.
@@ -928,7 +927,7 @@ WorkspaceCommentSvg.prototype.deleteMouseDown_ = function(e) {
  */
 WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
   // Restore highlight on the delete icon.
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!Element} */ (this.deleteIconBorder_),
       'blocklyDeleteIconHighlighted');
 };
@@ -951,11 +950,11 @@ WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
  */
 WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
   if (this.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseUpWrapper_);
+    browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
   }
   if (this.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(this.onMouseMoveWrapper_);
+    browserEvents.unbind(this.onMouseMoveWrapper_);
     this.onMouseMoveWrapper_ = null;
   }
 };
@@ -966,7 +965,7 @@ WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
  * @private
  */
 WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
-  Blockly.Touch.clearTouchIdentifier();
+  Touch.clearTouchIdentifier();
   this.unbindDragEvents_();
 };
 
@@ -1072,9 +1071,9 @@ WorkspaceCommentSvg.prototype.setFocus = function() {
     }
     comment.textarea_.focus();
     comment.addFocus();
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.addClass(
+    dom.addClass(
         comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);
 };
@@ -1094,9 +1093,9 @@ WorkspaceCommentSvg.prototype.blurFocus = function() {
 
     comment.textarea_.blur();
     comment.removeFocus();
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    Blockly.utils.dom.removeClass(
+    dom.removeClass(
         comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);
 };
@@ -1104,7 +1103,7 @@ WorkspaceCommentSvg.prototype.blurFocus = function() {
 /**
  * CSS for workspace comment.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   // clang-format off
   /* eslint-disable indent */
   '.blocklyCommentForeignObject {',

From e8d1097a59d7a083b90cc9bdc4ca585a577e0a98 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 15:53:31 -0700
Subject: [PATCH 084/291] clang-format core/workspace_comment_svg.js

---
 core/workspace_comment_svg.js | 186 +++++++++++++++-------------------
 1 file changed, 84 insertions(+), 102 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index aa47c777a..0b5041648 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -76,18 +76,17 @@ const WorkspaceCommentSvg = function(
    * @type {!SVGElement}
    * @private
    */
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {'class': 'blocklyComment'}, null);
+  this.svgGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyComment'}, null);
   this.svgGroup_.translate_ = '';
 
-  this.svgRect_ = dom.createSvgElement(
-      Svg.RECT, {
-        'class': 'blocklyCommentRect',
-        'x': 0,
-        'y': 0,
-        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': WorkspaceCommentSvg.BORDER_RADIUS
-      });
+  this.svgRect_ = dom.createSvgElement(Svg.RECT, {
+    'class': 'blocklyCommentRect',
+    'x': 0,
+    'y': 0,
+    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+  });
   this.svgGroup_.appendChild(this.svgRect_);
 
   /**
@@ -103,16 +102,14 @@ const WorkspaceCommentSvg = function(
    * @type {boolean}
    * @private
    */
-  this.useDragSurface_ =
-      utils.is3dSupported() && !!workspace.blockDragSurface_;
+  this.useDragSurface_ = utils.is3dSupported() && !!workspace.blockDragSurface_;
 
   WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
 
   this.render();
 };
-object.inherits(
-    WorkspaceCommentSvg, WorkspaceComment);
+object.inherits(WorkspaceCommentSvg, WorkspaceComment);
 
 /**
  * The width and height to use to size a workspace comment when it is first
@@ -170,8 +167,7 @@ WorkspaceCommentSvg.prototype.dispose = function() {
   }
 
   if (Events.isEnabled()) {
-    Events.fire(
-        new (Events.get(Events.COMMENT_DELETE))(this));
+    Events.fire(new (Events.get(Events.COMMENT_DELETE))(this));
   }
 
   dom.removeNode(this.svgGroup_);
@@ -190,7 +186,8 @@ WorkspaceCommentSvg.prototype.dispose = function() {
  * Create and initialize the SVG representation of a workspace comment.
  * May be called more than once.
  *
- * @param {boolean=} opt_noSelect Text inside text area will be selected if false
+ * @param {boolean=} opt_noSelect Text inside text area will be selected if
+ *     false
  *
  * @package
  */
@@ -268,9 +265,8 @@ WorkspaceCommentSvg.prototype.select = function() {
       Events.enable();
     }
   }
-  const event = new (Events.get(Events.SELECTED))(oldId,
-      this.id,
-      this.workspace.id);
+  const event =
+      new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
   Events.fire(event);
   Blockly.selected = this;
   this.addSelect();
@@ -284,8 +280,8 @@ WorkspaceCommentSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  const event = new (Events.get(Events.SELECTED))(this.id, null,
-      this.workspace.id);
+  const event =
+      new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
   Events.fire(event);
   Blockly.selected = null;
   this.removeSelect();
@@ -447,8 +443,7 @@ WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
  *     workspace coordinates.
  * @package
  */
-WorkspaceCommentSvg.prototype.moveDuringDrag = function(
-    dragSurface, newLoc) {
+WorkspaceCommentSvg.prototype.moveDuringDrag = function(dragSurface, newLoc) {
   if (dragSurface) {
     dragSurface.translateSurface(newLoc.x, newLoc.y);
   } else {
@@ -625,8 +620,7 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
  * @return {!WorkspaceCommentSvg} The created workspace comment.
  * @package
  */
-WorkspaceCommentSvg.fromXml = function(
-    xmlComment, workspace, opt_wsWidth) {
+WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
   Events.disable();
   let comment;
   try {
@@ -694,7 +688,7 @@ WorkspaceCommentSvg.prototype.toCopyData = function() {
  * @package
  */
 WorkspaceCommentSvg.prototype.getHeightWidth = function() {
-  return { width: this.getWidth(), height: this.getHeight() };
+  return {width: this.getWidth(), height: this.getHeight()};
 };
 
 /**
@@ -713,22 +707,15 @@ WorkspaceCommentSvg.prototype.render = function() {
   this.svgGroup_.appendChild(this.foreignObject_);
 
   this.svgHandleTarget_ = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': 'blocklyCommentHandleTarget',
-        'x': 0,
-        'y': 0
-      });
+      Svg.RECT, {'class': 'blocklyCommentHandleTarget', 'x': 0, 'y': 0});
   this.svgGroup_.appendChild(this.svgHandleTarget_);
-  this.svgRectTarget_ = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': 'blocklyCommentTarget',
-        'x': 0,
-        'y': 0,
-        'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-        'ry': WorkspaceCommentSvg.BORDER_RADIUS
-      });
+  this.svgRectTarget_ = dom.createSvgElement(Svg.RECT, {
+    'class': 'blocklyCommentTarget',
+    'x': 0,
+    'y': 0,
+    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
+    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+  });
   this.svgGroup_.appendChild(this.svgRectTarget_);
 
   // Add the resize icon
@@ -767,17 +754,16 @@ WorkspaceCommentSvg.prototype.render = function() {
  */
 WorkspaceCommentSvg.prototype.createEditor_ = function() {
   /* Create the editor.  Here's the markup that will be generated:
-    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164" height="164">
-      <body xmlns="http://www.w3.org/1999/xhtml" class="blocklyMinimalBody">
-        <textarea xmlns="http://www.w3.org/1999/xhtml"
+    <foreignObject class="blocklyCommentForeignObject" x="0" y="10" width="164"
+    height="164"> <body xmlns="http://www.w3.org/1999/xhtml"
+    class="blocklyMinimalBody"> <textarea xmlns="http://www.w3.org/1999/xhtml"
             class="blocklyCommentTextarea"
             style="height: 164px; width: 164px;"></textarea>
       </body>
     </foreignObject>
   */
   this.foreignObject_ = dom.createSvgElement(
-      Svg.FOREIGNOBJECT,
-      {
+      Svg.FOREIGNOBJECT, {
         'x': 0,
         'y': WorkspaceCommentSvg.TOP_OFFSET,
         'class': 'blocklyCommentForeignObject'
@@ -786,8 +772,7 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
   const body = document.createElementNS(dom.HTML_NS, 'body');
   body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
-  const textarea = document.createElementNS(dom.HTML_NS,
-      'textarea');
+  const textarea = document.createElementNS(dom.HTML_NS, 'textarea');
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
   textarea.readOnly = !this.isEditable();
@@ -814,10 +799,7 @@ WorkspaceCommentSvg.prototype.createEditor_ = function() {
  */
 WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
   this.resizeGroup_ = dom.createSvgElement(
-      Svg.G,
-      {
-        'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'
-      },
+      Svg.G, {'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'},
       this.svgGroup_);
   const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   dom.createSvgElement(
@@ -825,19 +807,23 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
       {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
       this.resizeGroup_);
   dom.createSvgElement(
-      Svg.LINE,
-      {
+      Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize / 3
-      }, this.resizeGroup_);
+        'x1': resizeSize / 3,
+        'y1': resizeSize - 1,
+        'x2': resizeSize - 1,
+        'y2': resizeSize / 3
+      },
+      this.resizeGroup_);
   dom.createSvgElement(
-      Svg.LINE,
-      {
+      Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize * 2 / 3, 'y1': resizeSize - 1,
-        'x2': resizeSize - 1, 'y2': resizeSize * 2 / 3
-      }, this.resizeGroup_);
+        'x1': resizeSize * 2 / 3,
+        'y1': resizeSize - 1,
+        'x2': resizeSize - 1,
+        'y2': resizeSize * 2 / 3
+      },
+      this.resizeGroup_);
 };
 
 /**
@@ -846,35 +832,28 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
  */
 WorkspaceCommentSvg.prototype.addDeleteDom_ = function() {
   this.deleteGroup_ = dom.createSvgElement(
-      Svg.G,
-      {
-        'class': 'blocklyCommentDeleteIcon'
-      },
-      this.svgGroup_);
+      Svg.G, {'class': 'blocklyCommentDeleteIcon'}, this.svgGroup_);
   this.deleteIconBorder_ = dom.createSvgElement(
       Svg.CIRCLE,
-      {
-        'class': 'blocklyDeleteIconShape',
-        'r': '7',
-        'cx': '7.5',
-        'cy': '7.5'
-      },
+      {'class': 'blocklyDeleteIconShape', 'r': '7', 'cx': '7.5', 'cy': '7.5'},
       this.deleteGroup_);
   // x icon.
   dom.createSvgElement(
-      Svg.LINE,
-      {
-        'x1': '5', 'y1': '10',
-        'x2': '10', 'y2': '5',
+      Svg.LINE, {
+        'x1': '5',
+        'y1': '10',
+        'x2': '10',
+        'y2': '5',
         'stroke': '#fff',
         'stroke-width': '2'
       },
       this.deleteGroup_);
   dom.createSvgElement(
-      Svg.LINE,
-      {
-        'x1': '5', 'y1': '5',
-        'x2': '10', 'y2': '10',
+      Svg.LINE, {
+        'x1': '5',
+        'y1': '5',
+        'x2': '10',
+        'y2': '10',
         'stroke': '#fff',
         'stroke-width': '2'
       },
@@ -894,8 +873,10 @@ WorkspaceCommentSvg.prototype.resizeMouseDown_ = function(e) {
     return;
   }
   // Left-click (or middle click)
-  this.workspace.startDrag(e, new Coordinate(
-      this.workspace.RTL ? -this.width_ : this.width_, this.height_));
+  this.workspace.startDrag(
+      e,
+      new Coordinate(
+          this.workspace.RTL ? -this.width_ : this.width_, this.height_));
 
   this.onMouseUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', this, this.resizeMouseUp_);
@@ -1016,8 +997,7 @@ WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   this.svgRectTarget_.setAttribute('width', width);
   this.svgRectTarget_.setAttribute('height', height);
   this.svgHandleTarget_.setAttribute('width', width);
-  this.svgHandleTarget_.setAttribute('height',
-      WorkspaceCommentSvg.TOP_OFFSET);
+  this.svgHandleTarget_.setAttribute('height', WorkspaceCommentSvg.TOP_OFFSET);
   if (this.RTL) {
     this.svgRect_.setAttribute('transform', 'scale(-1 1)');
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
@@ -1027,17 +1007,22 @@ WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-          (-width + resizeSize) + ',' + (height - resizeSize) + ') scale(-1 1)');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-          (-width + resizeSize) + ',' + (-resizeSize) + ') scale(-1 1)');
+      this.resizeGroup_.setAttribute(
+          'transform',
+          'translate(' + (-width + resizeSize) + ',' + (height - resizeSize) +
+              ') scale(-1 1)');
+      this.deleteGroup_.setAttribute(
+          'transform',
+          'translate(' + (-width + resizeSize) + ',' + (-resizeSize) +
+              ') scale(-1 1)');
     } else {
-      this.resizeGroup_.setAttribute('transform', 'translate(' +
-          (width - resizeSize) + ',' +
-          (height - resizeSize) + ')');
-      this.deleteGroup_.setAttribute('transform', 'translate(' +
-          (width - resizeSize) + ',' +
-          (-resizeSize) + ')');
+      this.resizeGroup_.setAttribute(
+          'transform',
+          'translate(' + (width - resizeSize) + ',' + (height - resizeSize) +
+              ')');
+      this.deleteGroup_.setAttribute(
+          'transform',
+          'translate(' + (width - resizeSize) + ',' + (-resizeSize) + ')');
     }
   }
 
@@ -1071,10 +1056,8 @@ WorkspaceCommentSvg.prototype.setFocus = function() {
     }
     comment.textarea_.focus();
     comment.addFocus();
-    dom.addClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
-    dom.addClass(
-        comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
+    dom.addClass(comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    dom.addClass(comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);
 };
 
@@ -1093,8 +1076,7 @@ WorkspaceCommentSvg.prototype.blurFocus = function() {
 
     comment.textarea_.blur();
     comment.removeFocus();
-    dom.removeClass(
-        comment.svgRectTarget_, 'blocklyCommentTargetFocused');
+    dom.removeClass(comment.svgRectTarget_, 'blocklyCommentTargetFocused');
     dom.removeClass(
         comment.svgHandleTarget_, 'blocklyCommentHandleTargetFocused');
   }, 0);

From d985696bb5d14bb7841818207d49ec21f58060c3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:57:59 -0700
Subject: [PATCH 085/291] Update interfaces implemented to require from
 requireType and add eslint disable

---
 core/workspace_comment_svg.js | 11 ++++++++---
 tests/deps.js                 |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 0b5041648..dae62f573 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -13,18 +13,23 @@
 goog.module('Blockly.WorkspaceCommentSvg');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
 const Blockly = goog.require('Blockly');
 const ContextMenu = goog.require('Blockly.ContextMenu');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
-const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
-const IBubble = goog.requireType('Blockly.IBubble');
-const ICopyable = goog.requireType('Blockly.ICopyable');
+/* eslint-disable-next-line no-unused-vars */
+const IBoundedElement = goog.require('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const IBubble = goog.require('Blockly.IBubble');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.require('Blockly.ICopyable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
+/* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
 const browserEvents = goog.require('Blockly.browserEvents');
diff --git a/tests/deps.js b/tests/deps.js
index 6e85f213e..97b955145 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -204,7 +204,7 @@ goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.u
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});

From 4df6111b8e52bb74bd3312c8cc9e4dfa206fcd7b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 12:08:18 -0700
Subject: [PATCH 086/291] Update declaration of private consts in
 core/workspace_comment_svg.js

---
 core/workspace_comment_svg.js | 86 +++++++++++++++++------------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index dae62f573..5b54be75d 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -46,6 +46,30 @@ goog.require('Blockly.Events.CommentMove');
 goog.require('Blockly.Events.Selected');
 
 
+/**
+ * Size of the resize icon.
+ * @type {number}
+ * @const
+ * @private
+ */
+const RESIZE_SIZE = 8;
+
+/**
+ * Radius of the border around the comment.
+ * @type {number}
+ * @const
+ * @private
+ */
+const BORDER_RADIUS = 3;
+
+/**
+ * Offset from the foreignobject edge to the textarea edge.
+ * @type {number}
+ * @const
+ * @private
+ */
+const TEXTAREA_OFFSET = 2;
+
 /**
  * Class for a workspace comment's SVG representation.
  * @param {!Workspace} workspace The block's workspace.
@@ -89,8 +113,8 @@ const WorkspaceCommentSvg = function(
     'class': 'blocklyCommentRect',
     'x': 0,
     'y': 0,
-    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+    'rx': BORDER_RADIUS,
+    'ry': BORDER_RADIUS
   });
   this.svgGroup_.appendChild(this.svgRect_);
 
@@ -124,30 +148,6 @@ object.inherits(WorkspaceCommentSvg, WorkspaceComment);
  */
 WorkspaceCommentSvg.DEFAULT_SIZE = 100;
 
-/**
- * Size of the resize icon.
- * @type {number}
- * @const
- * @private
- */
-WorkspaceCommentSvg.RESIZE_SIZE = 8;
-
-/**
- * Radius of the border around the comment.
- * @type {number}
- * @const
- * @private
- */
-WorkspaceCommentSvg.BORDER_RADIUS = 3;
-
-/**
- * Offset from the foreignobject edge to the textarea edge.
- * @type {number}
- * @const
- * @private
- */
-WorkspaceCommentSvg.TEXTAREA_OFFSET = 2;
-
 /**
  * Offset from the top to make room for a top bar.
  * @type {number}
@@ -718,8 +718,8 @@ WorkspaceCommentSvg.prototype.render = function() {
     'class': 'blocklyCommentTarget',
     'x': 0,
     'y': 0,
-    'rx': WorkspaceCommentSvg.BORDER_RADIUS,
-    'ry': WorkspaceCommentSvg.BORDER_RADIUS
+    'rx': BORDER_RADIUS,
+    'ry': BORDER_RADIUS
   });
   this.svgGroup_.appendChild(this.svgRectTarget_);
 
@@ -806,27 +806,26 @@ WorkspaceCommentSvg.prototype.addResizeDom_ = function() {
   this.resizeGroup_ = dom.createSvgElement(
       Svg.G, {'class': this.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE'},
       this.svgGroup_);
-  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   dom.createSvgElement(
       Svg.POLYGON,
-      {'points': '0,x x,x x,0'.replace(/x/g, resizeSize.toString())},
+      {'points': '0,x x,x x,0'.replace(/x/g, RESIZE_SIZE.toString())},
       this.resizeGroup_);
   dom.createSvgElement(
       Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize / 3,
-        'y1': resizeSize - 1,
-        'x2': resizeSize - 1,
-        'y2': resizeSize / 3
+        'x1': RESIZE_SIZE / 3,
+        'y1': RESIZE_SIZE - 1,
+        'x2': RESIZE_SIZE - 1,
+        'y2': RESIZE_SIZE / 3
       },
       this.resizeGroup_);
   dom.createSvgElement(
       Svg.LINE, {
         'class': 'blocklyResizeLine',
-        'x1': resizeSize * 2 / 3,
-        'y1': resizeSize - 1,
-        'x2': resizeSize - 1,
-        'y2': resizeSize * 2 / 3
+        'x1': RESIZE_SIZE * 2 / 3,
+        'y1': RESIZE_SIZE - 1,
+        'x2': RESIZE_SIZE - 1,
+        'y2': RESIZE_SIZE * 2 / 3
       },
       this.resizeGroup_);
 };
@@ -974,7 +973,7 @@ WorkspaceCommentSvg.prototype.resizeMouseMove_ = function(e) {
 WorkspaceCommentSvg.prototype.resizeComment_ = function() {
   const size = this.getHeightWidth();
   const topOffset = WorkspaceCommentSvg.TOP_OFFSET;
-  const textOffset = WorkspaceCommentSvg.TEXTAREA_OFFSET * 2;
+  const textOffset = TEXTAREA_OFFSET * 2;
 
   this.foreignObject_.setAttribute('width', size.width);
   this.foreignObject_.setAttribute('height', size.height - topOffset);
@@ -1008,26 +1007,25 @@ WorkspaceCommentSvg.prototype.setSize_ = function(width, height) {
     this.svgRectTarget_.setAttribute('transform', 'scale(-1 1)');
   }
 
-  const resizeSize = WorkspaceCommentSvg.RESIZE_SIZE;
   if (this.resizeGroup_) {
     if (this.RTL) {
       // Mirror the resize group.
       this.resizeGroup_.setAttribute(
           'transform',
-          'translate(' + (-width + resizeSize) + ',' + (height - resizeSize) +
+          'translate(' + (-width + RESIZE_SIZE) + ',' + (height - RESIZE_SIZE) +
               ') scale(-1 1)');
       this.deleteGroup_.setAttribute(
           'transform',
-          'translate(' + (-width + resizeSize) + ',' + (-resizeSize) +
+          'translate(' + (-width + RESIZE_SIZE) + ',' + (-RESIZE_SIZE) +
               ') scale(-1 1)');
     } else {
       this.resizeGroup_.setAttribute(
           'transform',
-          'translate(' + (width - resizeSize) + ',' + (height - resizeSize) +
+          'translate(' + (width - RESIZE_SIZE) + ',' + (height - RESIZE_SIZE) +
               ')');
       this.deleteGroup_.setAttribute(
           'transform',
-          'translate(' + (width - resizeSize) + ',' + (-resizeSize) + ')');
+          'translate(' + (width - RESIZE_SIZE) + ',' + (-RESIZE_SIZE) + ')');
     }
   }
 

From 9b1deb8711fd0d4f226f0ccc8ab4ff46aea13fd6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:53:35 -0700
Subject: [PATCH 087/291] Remove unecessary private annotations

---
 core/workspace_comment_svg.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 5b54be75d..77e8c713d 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -50,7 +50,6 @@ goog.require('Blockly.Events.Selected');
  * Size of the resize icon.
  * @type {number}
  * @const
- * @private
  */
 const RESIZE_SIZE = 8;
 
@@ -58,7 +57,6 @@ const RESIZE_SIZE = 8;
  * Radius of the border around the comment.
  * @type {number}
  * @const
- * @private
  */
 const BORDER_RADIUS = 3;
 
@@ -66,7 +64,6 @@ const BORDER_RADIUS = 3;
  * Offset from the foreignobject edge to the textarea edge.
  * @type {number}
  * @const
- * @private
  */
 const TEXTAREA_OFFSET = 2;
 

From f7549f73a6c39f4136617bdfda33da496371236e Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 17:09:47 -0700
Subject: [PATCH 088/291] Use CopyData type

---
 core/blockly.js   |  8 -------
 core/clipboard.js | 53 ++++++++++++++---------------------------------
 2 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 9fae4e84a..91c643e39 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -92,14 +92,6 @@ Blockly.selected = null;
  */
 Blockly.draggingConnections = [];
 
-/**
- * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: ?Element, source: ?Blockly.WorkspaceSvg, typeCounts: ?Object}}
- *     An object containing the clipboard contents and associated metadata.
- * @public
- */
-Blockly.getClipboardInfo = Blockly.clipboard.getClipboardInfo;
-
 /**
  * Cached value for whether 3D is supported.
  * @type {?boolean}
diff --git a/core/clipboard.js b/core/clipboard.js
index 9f7097f71..c6a9bb8a0 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -16,38 +16,20 @@ goog.module.declareLegacyNamespace();
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
-/* eslint-disable-next-line no-unused-vars */
-const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
-
 
 /**
- * Contents of the local clipboard.
- * @type {?Element}
- * @private
+ * Metadata about the object that is currently on the clipboard.
+ * @type {?ICopyable.CopyData}
  */
-let xml = null;
-
-/**
- * Source of the local clipboard.
- * @type {?WorkspaceSvg}
- * @private
- */
-let source = null;
-
-/**
- * Map of types to type counts for the clipboard object and descendants.
- * @type {?Object}
- * @private
- */
-let typeCounts = null;
+let copyData = null;
 
 /**
  * Get the current contents of the clipboard and associated metadata.
- * @return {{xml: ?Element, source: ?WorkspaceSvg, typeCounts: ?Object}} An
+ * @return {?ICopyable.CopyData} An
  *     object containing the clipboard contents and associated metadata.
  */
 const getClipboardInfo = function() {
-  return {xml: xml, source: source, typeCounts: typeCounts};
+  return copyData;
 };
 exports.getClipboardInfo = getClipboardInfo;
 
@@ -56,12 +38,7 @@ exports.getClipboardInfo = getClipboardInfo;
  * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.
  */
 const copy = function(toCopy) {
-  var data = toCopy.toCopyData();
-  if (data) {
-    xml = data.xml;
-    source = data.source;
-    typeCounts = data.typeCounts;
-  }
+  copyData = toCopy.toCopyData();
 };
 /** @package */
 exports.copy = copy;
@@ -71,18 +48,19 @@ exports.copy = copy;
  * @return {boolean} True if the paste was successful, false otherwise.
  */
 const paste = function() {
-  if (!xml) {
+  if (!copyData.xml) {
     return false;
   }
   // Pasting always pastes to the main workspace, even if the copy
   // started in a flyout workspace.
-  var workspace = source;
+  var workspace = copyData.source;
   if (workspace.isFlyout) {
     workspace = workspace.targetWorkspace;
   }
-  if (typeCounts && workspace.isCapacityAvailable(typeCounts)) {
+  if (copyData.typeCounts &&
+      workspace.isCapacityAvailable(copyData.typeCounts)) {
     Events.setGroup(true);
-    workspace.paste(xml);
+    workspace.paste(copyData.xml);
     Events.setGroup(false);
     return true;
   }
@@ -98,16 +76,15 @@ exports.paste = paste;
  */
 const duplicate = function(toDuplicate) {
   // Save the clipboard.
-  const oldXml = xml;
-  const oldSource = source;
+  const oldCopyData = copyData;
 
   // Create a duplicate via a copy/paste operation.
   copy(toDuplicate);
-  toDuplicate.workspace.paste(xml);
+  // copy() replaced the value of copyData.
+  toDuplicate.workspace.paste(copyData.xml);
 
   // Restore the clipboard.
-  xml = oldXml;
-  source = oldSource;
+  copyData = oldCopyData;
 };
 /** @package */
 exports.duplicate = duplicate;

From f72c5cea805a3f4f02670b3e43f106b26721c86d Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 29 Jul 2021 17:19:57 -0700
Subject: [PATCH 089/291] Remove getClipboardInfo

---
 core/clipboard.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/core/clipboard.js b/core/clipboard.js
index c6a9bb8a0..9810836f9 100644
--- a/core/clipboard.js
+++ b/core/clipboard.js
@@ -23,16 +23,6 @@ const ICopyable = goog.requireType('Blockly.ICopyable');
  */
 let copyData = null;
 
-/**
- * Get the current contents of the clipboard and associated metadata.
- * @return {?ICopyable.CopyData} An
- *     object containing the clipboard contents and associated metadata.
- */
-const getClipboardInfo = function() {
-  return copyData;
-};
-exports.getClipboardInfo = getClipboardInfo;
-
 /**
  * Copy a block or workspace comment onto the local clipboard.
  * @param {!ICopyable} toCopy Block or Workspace Comment to be copied.

From 99dfd267f1937cdb1ac8a6c5e62dbc98109d3283 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 08:50:34 -0700
Subject: [PATCH 090/291] Migrate core/trashcan.js to named requires

---
 core/trashcan.js | 196 ++++++++++++++++++++++++-----------------------
 1 file changed, 102 insertions(+), 94 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index 7771deba0..85337ceef 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -13,45 +13,53 @@
 goog.module('Blockly.Trashcan');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.DeleteArea');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Blockly = goog.requireType('Blockly');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const DeleteArea = goog.require('Blockly.DeleteArea');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const IAutoHideable = goog.require('Blockly.IAutoHideable');
+/* eslint-disable-next-line no-unused-vars */
+const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+const IPositionable = goog.require('Blockly.IPositionable');
+/* eslint-disable-next-line no-unused-vars */
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
+const Options = goog.require('Blockly.Options');
+const Rect = goog.require('Blockly.utils.Rect');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const Xml = goog.require('Blockly.Xml');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const uiPosition = goog.require('Blockly.uiPosition');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.TrashcanOpen');
-goog.require('Blockly.IAutoHideable');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.IPositionable');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.uiPosition');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.IDraggable');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.utils.Rect');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a trash can.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to sit in.
+ * @param {!WorkspaceSvg} workspace The workspace to sit in.
  * @constructor
- * @implements {Blockly.IAutoHideable}
- * @implements {Blockly.IPositionable}
- * @extends {Blockly.DeleteArea}
+ * @implements {IAutoHideable}
+ * @implements {IPositionable}
+ * @extends {DeleteArea}
  */
 const Trashcan = function(workspace) {
   Trashcan.superClass_.constructor.call(this);
   /**
    * The workspace the trashcan sits in.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -72,7 +80,7 @@ const Trashcan = function(workspace) {
 
   /**
    * The trashcan flyout.
-   * @type {Blockly.IFlyout}
+   * @type {IFlyout}
    * @package
    */
   this.flyout = null;
@@ -81,7 +89,7 @@ const Trashcan = function(workspace) {
     return;
   }
   // Create flyout options.
-  const flyoutWorkspaceOptions = new Blockly.Options(
+  const flyoutWorkspaceOptions = new Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         'scrollbars': true,
@@ -97,24 +105,24 @@ const Trashcan = function(workspace) {
   // Create vertical or horizontal flyout.
   if (this.workspace_.horizontalLayout) {
     flyoutWorkspaceOptions.toolboxPosition =
-        this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
-        Blockly.utils.toolbox.Position.BOTTOM : Blockly.utils.toolbox.Position.TOP;
-    const HorizontalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
+        this.workspace_.toolboxPosition == toolbox.Position.TOP ?
+        toolbox.Position.BOTTOM : toolbox.Position.TOP;
+    const HorizontalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new HorizontalFlyout(flyoutWorkspaceOptions);
   } else {
     flyoutWorkspaceOptions.toolboxPosition =
-      this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ?
-        Blockly.utils.toolbox.Position.LEFT : Blockly.utils.toolbox.Position.RIGHT;
-    const VerticalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
+      this.workspace_.toolboxPosition == toolbox.Position.RIGHT ?
+        toolbox.Position.LEFT : toolbox.Position.RIGHT;
+    const VerticalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
         this.workspace_.options, true);
     this.flyout = new VerticalFlyout(flyoutWorkspaceOptions);
   }
   this.workspace_.addChangeListener(this.onDelete_.bind(this));
 };
-Blockly.utils.object.inherits(Trashcan, Blockly.DeleteArea);
+utils.object.inherits(Trashcan, DeleteArea);
 
 /**
  * Width of both the trash can and lid images.
@@ -270,68 +278,68 @@ Trashcan.prototype.createDom = function() {
         clip-path="url(#blocklyTrashLidClipPath837493)"></image>
   </g>
   */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G,
       {'class': 'blocklyTrash'}, null);
   let clip;
   const rnd = String(Math.random()).substring(2);
-  clip = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CLIPPATH,
+  clip = dom.createSvgElement(
+      Svg.CLIPPATH,
       {'id': 'blocklyTrashBodyClipPath' + rnd},
       this.svgGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {
         'width': WIDTH,
         'height': BODY_HEIGHT,
         'y': LID_HEIGHT
       },
       clip);
-  const body = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
-        'width': Blockly.internalConstants.SPRITE.width,
+  const body = dom.createSvgElement(
+      Svg.IMAGE, {
+        'width': internalConstants.SPRITE.width,
         'x': -SPRITE_LEFT,
-        'height': Blockly.internalConstants.SPRITE.height,
+        'height': internalConstants.SPRITE.height,
         'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashBodyClipPath' + rnd + ')'
       },
       this.svgGroup_);
   body.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      dom.XLINK_NS, 'xlink:href',
       this.workspace_.options.pathToMedia +
-          Blockly.internalConstants.SPRITE.url);
+          internalConstants.SPRITE.url);
 
-  clip = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.CLIPPATH,
+  clip = dom.createSvgElement(
+      Svg.CLIPPATH,
       {'id': 'blocklyTrashLidClipPath' + rnd},
       this.svgGroup_);
-  Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  dom.createSvgElement(
+      Svg.RECT,
       {'width': WIDTH, 'height': LID_HEIGHT}, clip);
-  this.svgLid_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.IMAGE, {
-        'width': Blockly.internalConstants.SPRITE.width,
+  this.svgLid_ = dom.createSvgElement(
+      Svg.IMAGE, {
+        'width': internalConstants.SPRITE.width,
         'x': -SPRITE_LEFT,
-        'height': Blockly.internalConstants.SPRITE.height,
+        'height': internalConstants.SPRITE.height,
         'y': -SPRITE_TOP,
         'clip-path': 'url(#blocklyTrashLidClipPath' + rnd + ')'
       },
       this.svgGroup_);
   this.svgLid_.setAttributeNS(
-      Blockly.utils.dom.XLINK_NS, 'xlink:href',
+      dom.XLINK_NS, 'xlink:href',
       this.workspace_.options.pathToMedia +
-          Blockly.internalConstants.SPRITE.url);
+          internalConstants.SPRITE.url);
 
   // bindEventWithChecks_ quashes events too aggressively. See:
   // https://groups.google.com/forum/#!topic/blockly/QF4yB9Wx00s
   // Using bindEventWithChecks_ for blocking mousedown causes issue in mobile.
   // See #4303
-  Blockly.browserEvents.bind(
+  browserEvents.bind(
       this.svgGroup_, 'mousedown', this, this.blockMouseDownWhenOpenable_);
-  Blockly.browserEvents.bind(this.svgGroup_, 'mouseup', this, this.click);
+  browserEvents.bind(this.svgGroup_, 'mouseup', this, this.click);
   // Bind to body instead of this.svgGroup_ so that we don't get lid jitters
-  Blockly.browserEvents.bind(body, 'mouseover', this, this.mouseOver_);
-  Blockly.browserEvents.bind(body, 'mouseout', this, this.mouseOut_);
+  browserEvents.bind(body, 'mouseover', this, this.mouseOver_);
+  browserEvents.bind(body, 'mouseout', this, this.mouseOut_);
   this.animateLid_();
   return this.svgGroup_;
 };
@@ -341,8 +349,8 @@ Trashcan.prototype.createDom = function() {
  */
 Trashcan.prototype.init = function() {
   if (this.workspace_.options.maxTrashcanContents > 0) {
-    Blockly.utils.dom.insertAfter(
-        this.flyout.createDom(Blockly.utils.Svg.SVG),
+    dom.insertAfter(
+        this.flyout.createDom(Svg.SVG),
         this.workspace_.getParentSvg());
     this.flyout.init(this.workspace_);
   }
@@ -350,10 +358,10 @@ Trashcan.prototype.init = function() {
     component: this,
     weight: 1,
     capabilities: [
-      Blockly.ComponentManager.Capability.AUTOHIDEABLE,
-      Blockly.ComponentManager.Capability.DELETE_AREA,
-      Blockly.ComponentManager.Capability.DRAG_TARGET,
-      Blockly.ComponentManager.Capability.POSITIONABLE
+      ComponentManager.Capability.AUTOHIDEABLE,
+      ComponentManager.Capability.DELETE_AREA,
+      ComponentManager.Capability.DRAG_TARGET,
+      ComponentManager.Capability.POSITIONABLE
     ]
   });
   this.initialized_ = true;
@@ -368,7 +376,7 @@ Trashcan.prototype.init = function() {
 Trashcan.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('trashcan');
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
     this.svgGroup_ = null;
   }
   this.svgLid_ = null;
@@ -400,7 +408,7 @@ Trashcan.prototype.openFlyout = function() {
   if (this.contentsIsOpen()) {
     return;
   }
-  const xml = this.contents_.map(Blockly.Xml.textToDom);
+  const xml = this.contents_.map(Xml.textToDom);
   this.flyout.show(xml);
   this.fireUiEvent_(true);
 };
@@ -446,8 +454,8 @@ Trashcan.prototype.emptyContents = function() {
  * Positions the trashcan.
  * It is positioned in the opposite corner to the corner the
  * categories/toolbox starts at.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
- * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
+ * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
+ * @param {!Array<!Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
 Trashcan.prototype.position = function(metrics, savedPositions) {
@@ -457,19 +465,19 @@ Trashcan.prototype.position = function(metrics, savedPositions) {
   }
 
   const cornerPosition =
-      Blockly.uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
+      uiPosition.getCornerOppositeToolbox(this.workspace_, metrics);
 
   const height = BODY_HEIGHT + LID_HEIGHT;
-  const startRect = Blockly.uiPosition.getStartPositionRect(
-      cornerPosition, new Blockly.utils.Size(WIDTH, height),
+  const startRect = uiPosition.getStartPositionRect(
+      cornerPosition, new utils.Size(WIDTH, height),
       MARGIN_HORIZONTAL, MARGIN_VERTICAL, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
   const bumpDirection =
-      verticalPosition === Blockly.uiPosition.verticalPosition.TOP ?
-          Blockly.uiPosition.bumpDirection.DOWN :
-          Blockly.uiPosition.bumpDirection.UP;
-  const positionRect = Blockly.uiPosition.bumpPositionRect(
+      verticalPosition === uiPosition.verticalPosition.TOP ?
+          uiPosition.bumpDirection.DOWN :
+          uiPosition.bumpDirection.UP;
+  const positionRect = uiPosition.bumpPositionRect(
       startRect, MARGIN_VERTICAL, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
@@ -481,19 +489,19 @@ Trashcan.prototype.position = function(metrics, savedPositions) {
 /**
  * Returns the bounding rectangle of the UI element in pixel units relative to
  * the Blockly injection div.
- * @return {?Blockly.utils.Rect} The UI elements’s bounding box. Null if
+ * @return {?Rect} The UI elements’s bounding box. Null if
  *   bounding box should be ignored by other UI elements.
  */
 Trashcan.prototype.getBoundingRectangle = function() {
   const bottom = this.top_ + BODY_HEIGHT + LID_HEIGHT;
   const right = this.left_ + WIDTH;
-  return new Blockly.utils.Rect(this.top_, bottom, this.left_, right);
+  return new Rect(this.top_, bottom, this.left_, right);
 };
 
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 Trashcan.prototype.getClientRect = function() {
@@ -507,13 +515,13 @@ Trashcan.prototype.getClientRect = function() {
       2 * MARGIN_HOTSPOT;
   const left = trashRect.left + SPRITE_LEFT - MARGIN_HOTSPOT;
   const right = left + WIDTH + 2 * MARGIN_HOTSPOT;
-  return new Blockly.utils.Rect(top, bottom, left, right);
+  return new Rect(top, bottom, left, right);
 };
 
 /**
  * Handles when a cursor with a block or bubble is dragged over this drag
  * target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -523,7 +531,7 @@ Trashcan.prototype.onDragOver = function(_dragElement) {
 
 /**
  * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -534,7 +542,7 @@ Trashcan.prototype.onDragExit = function(_dragElement) {
 /**
  * Handles when a block or bubble is dropped on this component.
  * Should not handle delete here.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -586,7 +594,7 @@ Trashcan.prototype.animateLid_ = function() {
  */
 Trashcan.prototype.setLidAngle_ = function(lidAngle) {
   const openAtRight =
-      this.workspace_.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT ||
+      this.workspace_.toolboxPosition == toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
   this.svgLid_.setAttribute('transform', 'rotate(' +
       (openAtRight ? -lidAngle : lidAngle) + ',' +
@@ -632,9 +640,9 @@ Trashcan.prototype.click = function() {
  * @private
  */
 Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
-  const uiEvent = new (Blockly.Events.get(Blockly.Events.TRASHCAN_OPEN))(
+  const uiEvent = new (Events.get(Events.TRASHCAN_OPEN))(
       trashcanOpen,this.workspace_.id);
-  Blockly.Events.fire(uiEvent);
+  Events.fire(uiEvent);
 };
 
 /**
@@ -671,7 +679,7 @@ Trashcan.prototype.mouseOut_ = function() {
 
 /**
  * Handle a BLOCK_DELETE event. Adds deleted blocks oldXml to the content array.
- * @param {!Blockly.Events.Abstract} event Workspace event.
+ * @param {!Abstract} event Workspace event.
  * @private
  */
 Trashcan.prototype.onDelete_ = function(event) {
@@ -679,7 +687,7 @@ Trashcan.prototype.onDelete_ = function(event) {
     return;
   }
   // Must check that the tagName exists since oldXml can be a DocumentFragment.
-  if (event.type == Blockly.Events.BLOCK_DELETE && event.oldXml.tagName &&
+  if (event.type == Events.BLOCK_DELETE && event.oldXml.tagName &&
       event.oldXml.tagName.toLowerCase() != 'shadow') {
     const cleanedXML = this.cleanBlockXML_(event.oldXml);
     if (this.contents_.indexOf(cleanedXML) != -1) {
@@ -741,7 +749,7 @@ Trashcan.prototype.cleanBlockXML_ = function(xml) {
     }
     node = nextNode;
   }
-  return Blockly.Xml.domToText(xmlBlock);
+  return Xml.domToText(xmlBlock);
 };
 
 exports = Trashcan;

From 8860db1fd2f531b1c308f873b209550e75c59ae1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 08:51:51 -0700
Subject: [PATCH 091/291] clang-format core/trashcan.js

---
 core/trashcan.js | 84 +++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 51 deletions(-)

diff --git a/core/trashcan.js b/core/trashcan.js
index 85337ceef..fb60ca3a1 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -106,18 +106,19 @@ const Trashcan = function(workspace) {
   if (this.workspace_.horizontalLayout) {
     flyoutWorkspaceOptions.toolboxPosition =
         this.workspace_.toolboxPosition == toolbox.Position.TOP ?
-        toolbox.Position.BOTTOM : toolbox.Position.TOP;
+        toolbox.Position.BOTTOM :
+        toolbox.Position.TOP;
     const HorizontalFlyout = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX,
-        this.workspace_.options, true);
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, this.workspace_.options,
+        true);
     this.flyout = new HorizontalFlyout(flyoutWorkspaceOptions);
   } else {
     flyoutWorkspaceOptions.toolboxPosition =
-      this.workspace_.toolboxPosition == toolbox.Position.RIGHT ?
-        toolbox.Position.LEFT : toolbox.Position.RIGHT;
+        this.workspace_.toolboxPosition == toolbox.Position.RIGHT ?
+        toolbox.Position.LEFT :
+        toolbox.Position.RIGHT;
     const VerticalFlyout = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_VERTICAL_TOOLBOX,
-        this.workspace_.options, true);
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, this.workspace_.options, true);
     this.flyout = new VerticalFlyout(flyoutWorkspaceOptions);
   }
   this.workspace_.addChangeListener(this.onDelete_.bind(this));
@@ -278,23 +279,13 @@ Trashcan.prototype.createDom = function() {
         clip-path="url(#blocklyTrashLidClipPath837493)"></image>
   </g>
   */
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G,
-      {'class': 'blocklyTrash'}, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {'class': 'blocklyTrash'}, null);
   let clip;
   const rnd = String(Math.random()).substring(2);
   clip = dom.createSvgElement(
-      Svg.CLIPPATH,
-      {'id': 'blocklyTrashBodyClipPath' + rnd},
-      this.svgGroup_);
+      Svg.CLIPPATH, {'id': 'blocklyTrashBodyClipPath' + rnd}, this.svgGroup_);
   dom.createSvgElement(
-      Svg.RECT,
-      {
-        'width': WIDTH,
-        'height': BODY_HEIGHT,
-        'y': LID_HEIGHT
-      },
-      clip);
+      Svg.RECT, {'width': WIDTH, 'height': BODY_HEIGHT, 'y': LID_HEIGHT}, clip);
   const body = dom.createSvgElement(
       Svg.IMAGE, {
         'width': internalConstants.SPRITE.width,
@@ -306,16 +297,11 @@ Trashcan.prototype.createDom = function() {
       this.svgGroup_);
   body.setAttributeNS(
       dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia +
-          internalConstants.SPRITE.url);
+      this.workspace_.options.pathToMedia + internalConstants.SPRITE.url);
 
   clip = dom.createSvgElement(
-      Svg.CLIPPATH,
-      {'id': 'blocklyTrashLidClipPath' + rnd},
-      this.svgGroup_);
-  dom.createSvgElement(
-      Svg.RECT,
-      {'width': WIDTH, 'height': LID_HEIGHT}, clip);
+      Svg.CLIPPATH, {'id': 'blocklyTrashLidClipPath' + rnd}, this.svgGroup_);
+  dom.createSvgElement(Svg.RECT, {'width': WIDTH, 'height': LID_HEIGHT}, clip);
   this.svgLid_ = dom.createSvgElement(
       Svg.IMAGE, {
         'width': internalConstants.SPRITE.width,
@@ -327,8 +313,7 @@ Trashcan.prototype.createDom = function() {
       this.svgGroup_);
   this.svgLid_.setAttributeNS(
       dom.XLINK_NS, 'xlink:href',
-      this.workspace_.options.pathToMedia +
-          internalConstants.SPRITE.url);
+      this.workspace_.options.pathToMedia + internalConstants.SPRITE.url);
 
   // bindEventWithChecks_ quashes events too aggressively. See:
   // https://groups.google.com/forum/#!topic/blockly/QF4yB9Wx00s
@@ -350,8 +335,7 @@ Trashcan.prototype.createDom = function() {
 Trashcan.prototype.init = function() {
   if (this.workspace_.options.maxTrashcanContents > 0) {
     dom.insertAfter(
-        this.flyout.createDom(Svg.SVG),
-        this.workspace_.getParentSvg());
+        this.flyout.createDom(Svg.SVG), this.workspace_.getParentSvg());
     this.flyout.init(this.workspace_);
   }
   this.workspace_.getComponentManager().addComponent({
@@ -469,21 +453,20 @@ Trashcan.prototype.position = function(metrics, savedPositions) {
 
   const height = BODY_HEIGHT + LID_HEIGHT;
   const startRect = uiPosition.getStartPositionRect(
-      cornerPosition, new utils.Size(WIDTH, height),
-      MARGIN_HORIZONTAL, MARGIN_VERTICAL, metrics, this.workspace_);
+      cornerPosition, new utils.Size(WIDTH, height), MARGIN_HORIZONTAL,
+      MARGIN_VERTICAL, metrics, this.workspace_);
 
   const verticalPosition = cornerPosition.vertical;
-  const bumpDirection =
-      verticalPosition === uiPosition.verticalPosition.TOP ?
-          uiPosition.bumpDirection.DOWN :
-          uiPosition.bumpDirection.UP;
+  const bumpDirection = verticalPosition === uiPosition.verticalPosition.TOP ?
+      uiPosition.bumpDirection.DOWN :
+      uiPosition.bumpDirection.UP;
   const positionRect = uiPosition.bumpPositionRect(
       startRect, MARGIN_VERTICAL, bumpDirection, savedPositions);
 
   this.top_ = positionRect.top;
   this.left_ = positionRect.left;
-  this.svgGroup_.setAttribute('transform',
-      'translate(' + this.left_ + ',' + this.top_ + ')');
+  this.svgGroup_.setAttribute(
+      'transform', 'translate(' + this.left_ + ',' + this.top_ + ')');
 };
 
 /**
@@ -511,8 +494,7 @@ Trashcan.prototype.getClientRect = function() {
 
   const trashRect = this.svgGroup_.getBoundingClientRect();
   const top = trashRect.top + SPRITE_TOP - MARGIN_HOTSPOT;
-  const bottom = top + LID_HEIGHT + BODY_HEIGHT +
-      2 * MARGIN_HOTSPOT;
+  const bottom = top + LID_HEIGHT + BODY_HEIGHT + 2 * MARGIN_HOTSPOT;
   const left = trashRect.left + SPRITE_LEFT - MARGIN_HOTSPOT;
   const right = left + WIDTH + 2 * MARGIN_HOTSPOT;
   return new Rect(top, bottom, left, right);
@@ -582,8 +564,8 @@ Trashcan.prototype.animateLid_ = function() {
   this.svgGroup_.style.opacity = opacity;
 
   if (this.lidOpen_ > this.minOpenness_ && this.lidOpen_ < 1) {
-    this.lidTask_ = setTimeout(this.animateLid_.bind(this),
-        ANIMATION_LENGTH / frames);
+    this.lidTask_ =
+        setTimeout(this.animateLid_.bind(this), ANIMATION_LENGTH / frames);
   }
 };
 
@@ -596,10 +578,10 @@ Trashcan.prototype.setLidAngle_ = function(lidAngle) {
   const openAtRight =
       this.workspace_.toolboxPosition == toolbox.Position.RIGHT ||
       (this.workspace_.horizontalLayout && this.workspace_.RTL);
-  this.svgLid_.setAttribute('transform', 'rotate(' +
-      (openAtRight ? -lidAngle : lidAngle) + ',' +
-      (openAtRight ? 4 : WIDTH - 4) + ',' +
-      (LID_HEIGHT - 2) + ')');
+  this.svgLid_.setAttribute(
+      'transform',
+      'rotate(' + (openAtRight ? -lidAngle : lidAngle) + ',' +
+          (openAtRight ? 4 : WIDTH - 4) + ',' + (LID_HEIGHT - 2) + ')');
 };
 
 /**
@@ -640,8 +622,8 @@ Trashcan.prototype.click = function() {
  * @private
  */
 Trashcan.prototype.fireUiEvent_ = function(trashcanOpen) {
-  const uiEvent = new (Events.get(Events.TRASHCAN_OPEN))(
-      trashcanOpen,this.workspace_.id);
+  const uiEvent =
+      new (Events.get(Events.TRASHCAN_OPEN))(trashcanOpen, this.workspace_.id);
   Events.fire(uiEvent);
 };
 
@@ -695,7 +677,7 @@ Trashcan.prototype.onDelete_ = function(event) {
     }
     this.contents_.unshift(cleanedXML);
     while (this.contents_.length >
-        this.workspace_.options.maxTrashcanContents) {
+           this.workspace_.options.maxTrashcanContents) {
       this.contents_.pop();
     }
 

From 800f8784fd87a49cf52f8cbe40df5346861e6cdb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:33:51 -0700
Subject: [PATCH 092/291] Fix eslint warning from dom.js

---
 core/utils/dom.js | 3 ++-
 tests/deps.js     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/utils/dom.js b/core/utils/dom.js
index 5ec684acf..f226cf406 100644
--- a/core/utils/dom.js
+++ b/core/utils/dom.js
@@ -19,7 +19,8 @@
 goog.module('Blockly.utils.dom');
 goog.module.declareLegacyNamespace();
 
-const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Svg = goog.requireType('Blockly.utils.Svg');
 const userAgent = goog.require('Blockly.utils.userAgent');
 
 
diff --git a/tests/deps.js b/tests/deps.js
index 1bb9bf742..cea1839b0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -179,7 +179,7 @@ goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/coordinate.js', ['Blockly.utils.Coordinate'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/deprecation.js', ['Blockly.utils.deprecation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.Svg', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/utils/dom.js', ['Blockly.utils.dom'], ['Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/global.js', ['Blockly.utils.global'], []);
 goog.addDependency('../../core/utils/idgenerator.js', ['Blockly.utils.IdGenerator'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils/keycodes.js', ['Blockly.utils.KeyCodes'], [], {'lang': 'es6', 'module': 'goog'});

From a86f1484d228790868f9830038ca96f3c6ed798d Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 20:27:41 -0700
Subject: [PATCH 093/291] Move main workspace to a new file, common.js

---
 core/blockly.js | 20 +++++++++++---------
 core/common.js  | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/deps.js   |  5 +++++
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 core/common.js

diff --git a/core/blockly.js b/core/blockly.js
index 91c643e39..0b6011e07 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -18,6 +18,7 @@ goog.provide('Blockly');
 
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.clipboard');
+goog.require('Blockly.common');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
@@ -72,12 +73,15 @@ goog.requireType('Blockly.Workspace');
  */
 Blockly.VERSION = 'uncompiled';
 
-/**
- * The main workspace most recently used.
- * Set by Blockly.WorkspaceSvg.prototype.markFocused
- * @type {Blockly.Workspace}
- */
-Blockly.mainWorkspace = null;
+// Add a getter and setter pair for Blockly.mainWorkspace, for legacy reasons.
+Object.defineProperty(Blockly, 'mainWorkspace', {
+  set: function(x) {
+    Blockly.common.setMainWorkspace(x);
+  },
+  get: function() {
+    return Blockly.common.getMainWorkspace();
+  }
+});
 
 /**
  * Currently selected block.
@@ -266,9 +270,7 @@ Blockly.hideChaff = function(opt_onlyClosePopups) {
  * Blockly instances on a page.
  * @return {!Blockly.Workspace} The main workspace.
  */
-Blockly.getMainWorkspace = function() {
-  return /** @type {!Blockly.Workspace} */ (Blockly.mainWorkspace);
-};
+Blockly.getMainWorkspace = Blockly.common.getMainWorkspace;
 
 /**
  * Wrapper to window.alert() that app developers may override to
diff --git a/core/common.js b/core/common.js
new file mode 100644
index 000000000..d9a6b9638
--- /dev/null
+++ b/core/common.js
@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright 2021 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Common functions used both internally and externally, but which
+ * must not be at the top level to avoid circular dependencies.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.module('Blockly.common');
+goog.module.declareLegacyNamespace();
+
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+
+
+/**
+ * The main workspace most recently used.
+ * Set by Blockly.WorkspaceSvg.prototype.markFocused
+ * @type {!Workspace}
+ */
+let mainWorkspace;
+
+/**
+ * Returns the last used top level workspace (based on focus).  Try not to use
+ * this function, particularly if there are multiple Blockly instances on a
+ * page.
+ * @return {!Workspace} The main workspace.
+ */
+const getMainWorkspace = function() {
+  return mainWorkspace;
+};
+exports.getMainWorkspace = getMainWorkspace;
+
+/**
+ * Sets last used main workspace.
+ * @param {!Workspace} workspace The most recently used top level workspace.
+ */
+const setMainWorkspace = function(workspace) {
+  mainWorkspace = workspace;
+};
+exports.setMainWorkspace = setMainWorkspace;
diff --git a/tests/deps.js b/tests/deps.js
index b0c73600a..c83f1782a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,13 +12,18 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations']
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+<<<<<<< HEAD
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+=======
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+>>>>>>> 2c0751ed (Move main workspace to a new file, common.js)
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});

From 2e30bbe7ce1be467672d03bedc7d716bee7b4db3 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 20:51:46 -0700
Subject: [PATCH 094/291] Update uses of mainWorkspace in core

---
 core/blockly.js       |  4 ++--
 core/dropdowndiv.js   |  5 +++--
 core/generator.js     |  4 ++--
 core/gesture.js       |  2 +-
 core/inject.js        |  7 ++++---
 core/widgetdiv.js     |  5 +++--
 core/workspace_svg.js |  3 ++-
 tests/deps.js         | 10 +++++-----
 8 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 0b6011e07..7ad87be94 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -177,7 +177,7 @@ Blockly.svgResize = function(workspace) {
 // TODO (https://github.com/google/blockly/issues/1998) handle cases where there
 // are multiple workspaces and non-main workspaces are able to accept input.
 Blockly.onKeyDown = function(e) {
-  var mainWorkspace = Blockly.mainWorkspace;
+  var mainWorkspace = Blockly.common.getMainWorkspace();
   if (!mainWorkspace) {
     return;
   }
@@ -256,7 +256,7 @@ Blockly.hideChaff = function(opt_onlyClosePopups) {
   Blockly.DropDownDiv.hideWithoutAnimation();
 
   var onlyClosePopups = !!opt_onlyClosePopups;
-  var workspace = Blockly.getMainWorkspace();
+  var workspace = Blockly.common.getMainWorkspace();
   var autoHideables = workspace.getComponentManager().getComponents(
       Blockly.ComponentManager.Capability.AUTOHIDEABLE, true);
   autoHideables.forEach(function(autoHideable) {
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 68698371e..bf5eddb69 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -15,6 +15,7 @@
 
 goog.provide('Blockly.DropDownDiv');
 
+goog.require('Blockly.common');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.math');
 goog.require('Blockly.utils.Rect');
@@ -381,7 +382,7 @@ Blockly.DropDownDiv.show = function(owner, rtl, primaryX, primaryY,
   div.style.direction = rtl ? 'rtl' : 'ltr';
 
   var mainWorkspace =
-    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.getMainWorkspace());
+    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
   Blockly.DropDownDiv.rendererClassName_ =
       mainWorkspace.getRenderer().getClassName();
   Blockly.DropDownDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
@@ -694,7 +695,7 @@ Blockly.DropDownDiv.hideWithoutAnimation = function() {
     Blockly.DropDownDiv.themeClassName_ = '';
   }
   (/** @type {!Blockly.WorkspaceSvg} */ (
-    Blockly.getMainWorkspace())).markFocused();
+    Blockly.common.getMainWorkspace())).markFocused();
 };
 
 /**
diff --git a/core/generator.js b/core/generator.js
index 112c2f8a1..ecff99c09 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -16,13 +16,13 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
+const common = goog.require('Blockly.common');
 /* eslint-disable-next-line no-unused-vars */
 const Names = goog.requireType('Blockly.Names');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 const internalConstants = goog.require('Blockly.internalConstants');
 const deprecation = goog.require('Blockly.utils.deprecation');
-const {getMainWorkspace} = goog.require('Blockly');
 
 
 /**
@@ -98,7 +98,7 @@ Generator.prototype.workspaceToCode = function(workspace) {
   if (!workspace) {
     // Backwards compatibility from before there could be multiple workspaces.
     console.warn('No workspace specified in workspaceToCode call.  Guessing.');
-    workspace = getMainWorkspace();
+    workspace = common.getMainWorkspace();
   }
   let code = [];
   this.init(workspace);
diff --git a/core/gesture.js b/core/gesture.js
index a1ef6ca91..5d77d4e0a 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -115,7 +115,7 @@ const Gesture = function(e, creatorWorkspace) {
   /**
    * The workspace that the gesture started on.  There may be multiple
    * workspaces on a page; this is more accurate than using
-   * Blockly.getMainWorkspace().
+   * Blockly.common.getMainWorkspace().
    * @type {WorkspaceSvg}
    * @protected
    */
diff --git a/core/inject.js b/core/inject.js
index 0b7590824..6bb3e6077 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -14,6 +14,7 @@ goog.provide('Blockly.inject');
 
 goog.require('Blockly.BlockDragSurfaceSvg');
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.Css');
 goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Events');
@@ -77,12 +78,12 @@ Blockly.inject = function(container, opt_options) {
   Blockly.init_(workspace);
 
   // Keep focus on the first workspace so entering keyboard navigation looks correct.
-  Blockly.mainWorkspace = workspace;
+  Blockly.common.setMainWorkspace(workspace);
 
   Blockly.svgResize(workspace);
 
   subContainer.addEventListener('focusin', function() {
-    Blockly.mainWorkspace = workspace;
+    Blockly.common.setMainWorkspace(workspace);
   });
 
   return workspace;
@@ -439,7 +440,7 @@ Blockly.inject.bindDocumentEvents_ = function() {
           window, 'orientationchange', document, function() {
             // TODO (#397): Fix for multiple Blockly workspaces.
             Blockly.svgResize(/** @type {!Blockly.WorkspaceSvg} */
-                (Blockly.getMainWorkspace()));
+                (Blockly.common.getMainWorkspace()));
           });
     }
   }
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 316e78b61..8b7de7dac 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -18,6 +18,7 @@
  */
 goog.provide('Blockly.WidgetDiv');
 
+goog.require('Blockly.common');
 goog.require('Blockly.utils.dom');
 
 goog.requireType('Blockly.utils.Rect');
@@ -85,7 +86,7 @@ Blockly.WidgetDiv.show = function(newOwner, rtl, dispose) {
   div.style.direction = rtl ? 'rtl' : 'ltr';
   div.style.display = 'block';
   var mainWorkspace =
-    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.getMainWorkspace());
+    /** @type {!Blockly.WorkspaceSvg} */ (Blockly.common.getMainWorkspace());
   Blockly.WidgetDiv.rendererClassName_ =
       mainWorkspace.getRenderer().getClassName();
   Blockly.WidgetDiv.themeClassName_ = mainWorkspace.getTheme().getClassName();
@@ -119,7 +120,7 @@ Blockly.WidgetDiv.hide = function() {
     Blockly.WidgetDiv.themeClassName_ = '';
   }
   (/** @type {!Blockly.WorkspaceSvg} */ (
-    Blockly.getMainWorkspace())).markFocused();
+    Blockly.common.getMainWorkspace())).markFocused();
 };
 
 /**
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 1c3cee44f..81536d5e6 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -15,6 +15,7 @@ goog.provide('Blockly.WorkspaceSvg');
 goog.require('Blockly.blockRendering');
 goog.require('Blockly.BlockSvg');
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.ConnectionDB');
 goog.require('Blockly.ContextMenu');
@@ -1953,7 +1954,7 @@ Blockly.WorkspaceSvg.prototype.markFocused = function() {
   if (this.options.parentWorkspace) {
     this.options.parentWorkspace.markFocused();
   } else {
-    Blockly.mainWorkspace = this;
+    Blockly.common.setMainWorkspace(this);
     // We call e.preventDefault in many event handlers which means we
     // need to explicitly grab focus (e.g from a textarea) because
     // the browser will not do it for us.  How to do this is browser dependent.
diff --git a/tests/deps.js b/tests/deps.js
index c83f1782a..b460273f4 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -36,7 +36,7 @@ goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRe
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
+goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
@@ -71,11 +71,11 @@ goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly',
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/generator.js', ['Blockly.Generator'], ['Blockly.common', 'Blockly.internalConstants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.BlockDragger', 'Blockly.BubbleDragger', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.WorkspaceDragger', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
@@ -206,14 +206,14 @@ goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
+goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From dc4fd5987596e69981c3af3031d7ab81884e8a04 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 28 Jul 2021 20:53:37 -0700
Subject: [PATCH 095/291] Reorder requires

---
 core/generator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/generator.js b/core/generator.js
index ecff99c09..9984f186f 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -16,13 +16,13 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
-const common = goog.require('Blockly.common');
 /* eslint-disable-next-line no-unused-vars */
 const Names = goog.requireType('Blockly.Names');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
-const internalConstants = goog.require('Blockly.internalConstants');
+const common = goog.require('Blockly.common');
 const deprecation = goog.require('Blockly.utils.deprecation');
+const internalConstants = goog.require('Blockly.internalConstants');
 
 
 /**

From 9bd97e51318c5cfcddfc4a9e4e3487c29befc3a5 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 11:34:18 -0700
Subject: [PATCH 096/291] Rebuild

---
 tests/deps.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/deps.js b/tests/deps.js
index b460273f4..0b767b0b9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -12,11 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations']
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
-<<<<<<< HEAD
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
-=======
-goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
->>>>>>> 2c0751ed (Move main workspace to a new file, common.js)
+goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);

From 6faf3dbc46f581391ae5eff73283587c3fa9a808 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:25:50 -0700
Subject: [PATCH 097/291] Migrate core/variables_dynamic.js to ES6 const/let

---
 core/variables_dynamic.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 630064eeb..4dfeec4b3 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -41,8 +41,8 @@ Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour = function(button) {
  * @return {!Array<!Element>} Array of XML elements.
  */
 Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
-  var xmlList = [];
-  var button = document.createElement('button');
+  let xmlList = [];
+  let button = document.createElement('button');
   button.setAttribute('text', Blockly.Msg['NEW_STRING_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_STRING');
   xmlList.push(button);
@@ -63,7 +63,7 @@ Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
       Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour);
 
 
-  var blockList = Blockly.VariablesDynamic.flyoutCategoryBlocks(workspace);
+  const blockList = Blockly.VariablesDynamic.flyoutCategoryBlocks(workspace);
   xmlList = xmlList.concat(blockList);
   return xmlList;
 };
@@ -74,13 +74,13 @@ Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
  * @return {!Array<!Element>} Array of XML block elements.
  */
 Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
-  var variableModelList = workspace.getAllVariables();
+  const variableModelList = workspace.getAllVariables();
 
-  var xmlList = [];
+  const xmlList = [];
   if (variableModelList.length > 0) {
     if (Blockly.Blocks['variables_set_dynamic']) {
-      var firstVariable = variableModelList[variableModelList.length - 1];
-      var block = Blockly.utils.xml.createElement('block');
+      const firstVariable = variableModelList[variableModelList.length - 1];
+      const block = Blockly.utils.xml.createElement('block');
       block.setAttribute('type', 'variables_set_dynamic');
       block.setAttribute('gap', 24);
       block.appendChild(
@@ -89,8 +89,8 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
     }
     if (Blockly.Blocks['variables_get_dynamic']) {
       variableModelList.sort(Blockly.VariableModel.compareByName);
-      for (var i = 0, variable; (variable = variableModelList[i]); i++) {
-        var block = Blockly.utils.xml.createElement('block');
+      for (let i = 0, variable; (variable = variableModelList[i]); i++) {
+        const block = Blockly.utils.xml.createElement('block');
         block.setAttribute('type', 'variables_get_dynamic');
         block.setAttribute('gap', 8);
         block.appendChild(Blockly.Variables.generateVariableFieldDom(variable));

From 99b8abfeb2f7141a83b0853b85ed95004aee53fb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:29:15 -0700
Subject: [PATCH 098/291] Migrate core/variables_dynamic.js to goog.module

---
 core/variables_dynamic.js | 29 +++++++++++++++++++----------
 tests/deps.js             |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 4dfeec4b3..6b855c06f 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.VariablesDynamic');
+goog.module('Blockly.VariablesDynamic');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Blocks');
 goog.require('Blockly.Msg');
@@ -22,25 +23,31 @@ goog.require('Blockly.Variables');
 goog.requireType('Blockly.Workspace');
 
 
-Blockly.VariablesDynamic.onCreateVariableButtonClick_String = function(button) {
+const onCreateVariableButtonClick_String = function(button) {
   Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'String');
 };
-Blockly.VariablesDynamic.onCreateVariableButtonClick_Number = function(button) {
+exports.onCreateVariableButtonClick_String = onCreateVariableButtonClick_String;
+
+const onCreateVariableButtonClick_Number = function(button) {
   Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Number');
 };
-Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour = function(button) {
+exports.onCreateVariableButtonClick_Number = onCreateVariableButtonClick_Number;
+
+const onCreateVariableButtonClick_Colour = function(button) {
   Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Colour');
 };
+exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
+
 /**
  * Construct the elements (blocks and button) required by the flyout for the
  * variable category.
  * @param {!Blockly.Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML elements.
  */
-Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
+const flyoutCategory = function(workspace) {
   let xmlList = [];
   let button = document.createElement('button');
   button.setAttribute('text', Blockly.Msg['NEW_STRING_VARIABLE']);
@@ -56,24 +63,25 @@ Blockly.VariablesDynamic.flyoutCategory = function(workspace) {
   xmlList.push(button);
 
   workspace.registerButtonCallback('CREATE_VARIABLE_STRING',
-      Blockly.VariablesDynamic.onCreateVariableButtonClick_String);
+      onCreateVariableButtonClick_String);
   workspace.registerButtonCallback('CREATE_VARIABLE_NUMBER',
-      Blockly.VariablesDynamic.onCreateVariableButtonClick_Number);
+      onCreateVariableButtonClick_Number);
   workspace.registerButtonCallback('CREATE_VARIABLE_COLOUR',
-      Blockly.VariablesDynamic.onCreateVariableButtonClick_Colour);
+      onCreateVariableButtonClick_Colour);
 
 
-  const blockList = Blockly.VariablesDynamic.flyoutCategoryBlocks(workspace);
+  const blockList = flyoutCategoryBlocks(workspace);
   xmlList = xmlList.concat(blockList);
   return xmlList;
 };
+exports.flyoutCategory = flyoutCategory;
 
 /**
  * Construct the blocks required by the flyout for the variable category.
  * @param {!Blockly.Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML block elements.
  */
-Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
+const flyoutCategoryBlocks = function(workspace) {
   const variableModelList = workspace.getAllVariables();
 
   const xmlList = [];
@@ -100,3 +108,4 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
   }
   return xmlList;
 };
+exports.flyoutCategoryBlocks = flyoutCategoryBlocks;
diff --git a/tests/deps.js b/tests/deps.js
index b0c73600a..ac9faa543 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -199,7 +199,7 @@ goog.addDependency('../../core/utils/xml.js', ['Blockly.utils.xml'], []);
 goog.addDependency('../../core/variable_map.js', ['Blockly.VariableMap'], ['Blockly.Events', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename', 'Blockly.Msg', 'Blockly.utils', 'Blockly.utils.object']);
 goog.addDependency('../../core/variable_model.js', ['Blockly.VariableModel'], ['Blockly.Events', 'Blockly.Events.VarCreate', 'Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.xml']);
-goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml']);
+goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.utils.dom']);
 goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);

From 8ded269a15c46094206c7e233d933e3e90fdf4c3 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:32:01 -0700
Subject: [PATCH 099/291] Migrate core/variables_dynamic.js to named requires

---
 core/variables_dynamic.js | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index 6b855c06f..bc70dd16e 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -14,29 +14,29 @@
 goog.module('Blockly.VariablesDynamic');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Blocks');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.VariableModel');
-goog.require('Blockly.Variables');
-
-goog.requireType('Blockly.Workspace');
+const Blocks = goog.require('Blockly.Blocks');
+const Msg = goog.require('Blockly.Msg');
+const VariableModel = goog.require('Blockly.VariableModel');
+const Variables = goog.require('Blockly.Variables');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const xml = goog.require('Blockly.utils.xml');
 
 
 const onCreateVariableButtonClick_String = function(button) {
-  Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
+  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'String');
 };
 exports.onCreateVariableButtonClick_String = onCreateVariableButtonClick_String;
 
 const onCreateVariableButtonClick_Number = function(button) {
-  Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
+  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Number');
 };
 exports.onCreateVariableButtonClick_Number = onCreateVariableButtonClick_Number;
 
 const onCreateVariableButtonClick_Colour = function(button) {
-  Blockly.Variables.createVariableButtonHandler(button.getTargetWorkspace(),
+  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
       undefined, 'Colour');
 };
 exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
@@ -44,21 +44,21 @@ exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
 /**
  * Construct the elements (blocks and button) required by the flyout for the
  * variable category.
- * @param {!Blockly.Workspace} workspace The workspace containing variables.
+ * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML elements.
  */
 const flyoutCategory = function(workspace) {
   let xmlList = [];
   let button = document.createElement('button');
-  button.setAttribute('text', Blockly.Msg['NEW_STRING_VARIABLE']);
+  button.setAttribute('text', Msg['NEW_STRING_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_STRING');
   xmlList.push(button);
   button = document.createElement('button');
-  button.setAttribute('text', Blockly.Msg['NEW_NUMBER_VARIABLE']);
+  button.setAttribute('text', Msg['NEW_NUMBER_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_NUMBER');
   xmlList.push(button);
   button = document.createElement('button');
-  button.setAttribute('text', Blockly.Msg['NEW_COLOUR_VARIABLE']);
+  button.setAttribute('text', Msg['NEW_COLOUR_VARIABLE']);
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_COLOUR');
   xmlList.push(button);
 
@@ -78,7 +78,7 @@ exports.flyoutCategory = flyoutCategory;
 
 /**
  * Construct the blocks required by the flyout for the variable category.
- * @param {!Blockly.Workspace} workspace The workspace containing variables.
+ * @param {!Workspace} workspace The workspace containing variables.
  * @return {!Array<!Element>} Array of XML block elements.
  */
 const flyoutCategoryBlocks = function(workspace) {
@@ -86,22 +86,22 @@ const flyoutCategoryBlocks = function(workspace) {
 
   const xmlList = [];
   if (variableModelList.length > 0) {
-    if (Blockly.Blocks['variables_set_dynamic']) {
+    if (Blocks['variables_set_dynamic']) {
       const firstVariable = variableModelList[variableModelList.length - 1];
-      const block = Blockly.utils.xml.createElement('block');
+      const block = xml.createElement('block');
       block.setAttribute('type', 'variables_set_dynamic');
       block.setAttribute('gap', 24);
       block.appendChild(
-          Blockly.Variables.generateVariableFieldDom(firstVariable));
+          Variables.generateVariableFieldDom(firstVariable));
       xmlList.push(block);
     }
-    if (Blockly.Blocks['variables_get_dynamic']) {
-      variableModelList.sort(Blockly.VariableModel.compareByName);
+    if (Blocks['variables_get_dynamic']) {
+      variableModelList.sort(VariableModel.compareByName);
       for (let i = 0, variable; (variable = variableModelList[i]); i++) {
-        const block = Blockly.utils.xml.createElement('block');
+        const block = xml.createElement('block');
         block.setAttribute('type', 'variables_get_dynamic');
         block.setAttribute('gap', 8);
-        block.appendChild(Blockly.Variables.generateVariableFieldDom(variable));
+        block.appendChild(Variables.generateVariableFieldDom(variable));
         xmlList.push(block);
       }
     }

From ad66c531bd635bd0c5799225183cd49f05e8afad Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 30 Jul 2021 12:32:38 -0700
Subject: [PATCH 100/291] clang-format core/variables_dynamic.js

---
 core/variables_dynamic.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js
index bc70dd16e..e982d733e 100644
--- a/core/variables_dynamic.js
+++ b/core/variables_dynamic.js
@@ -24,20 +24,20 @@ const xml = goog.require('Blockly.utils.xml');
 
 
 const onCreateVariableButtonClick_String = function(button) {
-  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
-      undefined, 'String');
+  Variables.createVariableButtonHandler(
+      button.getTargetWorkspace(), undefined, 'String');
 };
 exports.onCreateVariableButtonClick_String = onCreateVariableButtonClick_String;
 
 const onCreateVariableButtonClick_Number = function(button) {
-  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
-      undefined, 'Number');
+  Variables.createVariableButtonHandler(
+      button.getTargetWorkspace(), undefined, 'Number');
 };
 exports.onCreateVariableButtonClick_Number = onCreateVariableButtonClick_Number;
 
 const onCreateVariableButtonClick_Colour = function(button) {
-  Variables.createVariableButtonHandler(button.getTargetWorkspace(),
-      undefined, 'Colour');
+  Variables.createVariableButtonHandler(
+      button.getTargetWorkspace(), undefined, 'Colour');
 };
 exports.onCreateVariableButtonClick_Colour = onCreateVariableButtonClick_Colour;
 
@@ -62,12 +62,12 @@ const flyoutCategory = function(workspace) {
   button.setAttribute('callbackKey', 'CREATE_VARIABLE_COLOUR');
   xmlList.push(button);
 
-  workspace.registerButtonCallback('CREATE_VARIABLE_STRING',
-      onCreateVariableButtonClick_String);
-  workspace.registerButtonCallback('CREATE_VARIABLE_NUMBER',
-      onCreateVariableButtonClick_Number);
-  workspace.registerButtonCallback('CREATE_VARIABLE_COLOUR',
-      onCreateVariableButtonClick_Colour);
+  workspace.registerButtonCallback(
+      'CREATE_VARIABLE_STRING', onCreateVariableButtonClick_String);
+  workspace.registerButtonCallback(
+      'CREATE_VARIABLE_NUMBER', onCreateVariableButtonClick_Number);
+  workspace.registerButtonCallback(
+      'CREATE_VARIABLE_COLOUR', onCreateVariableButtonClick_Colour);
 
 
   const blockList = flyoutCategoryBlocks(workspace);
@@ -91,8 +91,7 @@ const flyoutCategoryBlocks = function(workspace) {
       const block = xml.createElement('block');
       block.setAttribute('type', 'variables_set_dynamic');
       block.setAttribute('gap', 24);
-      block.appendChild(
-          Variables.generateVariableFieldDom(firstVariable));
+      block.appendChild(Variables.generateVariableFieldDom(firstVariable));
       xmlList.push(block);
     }
     if (Blocks['variables_get_dynamic']) {

From 3aae7ffbde2a161b8ee60aa7bd3bcf78e054b0f8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:22:37 -0700
Subject: [PATCH 101/291] Migrate core/renderers/common/i_path_object.js to
 goog.module

---
 core/renderers/common/i_path_object.js | 41 ++++++++++++++------------
 tests/deps.js                          |  2 +-
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 6a7dfc2b7..01a279e03 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -12,7 +12,8 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.IPathObject');
+goog.module('Blockly.blockRendering.IPathObject');
+goog.module.declareLegacyNamespace();
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -26,46 +27,46 @@ goog.requireType('Blockly.Theme');
  *     constants.
  * @interface
  */
-Blockly.blockRendering.IPathObject = function(_root, _constants) {};
+const IPathObject = function(_root, _constants) {};
 
 /**
  * The primary path of the block.
  * @type {!SVGElement}
  */
-Blockly.blockRendering.IPathObject.prototype.svgPath;
+IPathObject.prototype.svgPath;
 
 /**
  * The renderer's constant provider.
  * @type {!Blockly.blockRendering.ConstantProvider}
  */
-Blockly.blockRendering.IPathObject.prototype.constants;
+IPathObject.prototype.constants;
 
 /**
  * The primary path of the block.
  * @type {!Blockly.Theme.BlockStyle}
  */
-Blockly.blockRendering.IPathObject.prototype.style;
+IPathObject.prototype.style;
 
 /**
  * Holds the cursors SVG element when the cursor is attached to the block.
  * This is null if there is no cursor on the block.
  * @type {SVGElement}
  */
-Blockly.blockRendering.IPathObject.prototype.cursorSvg;
+IPathObject.prototype.cursorSvg;
 
 /**
  * Holds the markers SVG element when the marker is attached to the block.
  * This is null if there is no marker on the block.
  * @type {SVGElement}
  */
-Blockly.blockRendering.IPathObject.prototype.markerSvg;
+IPathObject.prototype.markerSvg;
 
 /**
  * Set the path generated by the renderer onto the respective SVG element.
  * @param {string} pathString The path.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setPath;
+IPathObject.prototype.setPath;
 
 /**
  * Apply the stored colours to the block's path, taking into account whether
@@ -73,20 +74,20 @@ Blockly.blockRendering.IPathObject.prototype.setPath;
  * @param {!Blockly.Block} block The source block.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.applyColour;
+IPathObject.prototype.applyColour;
 
 /**
  * Update the style.
  * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setStyle;
+IPathObject.prototype.setStyle;
 
 /**
  * Flip the SVG paths in RTL.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.flipRTL;
+IPathObject.prototype.flipRTL;
 
 /**
  * Add the cursor SVG to this block's SVG group.
@@ -94,7 +95,7 @@ Blockly.blockRendering.IPathObject.prototype.flipRTL;
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setCursorSvg;
+IPathObject.prototype.setCursorSvg;
 
 /**
  * Add the marker SVG to this block's SVG group.
@@ -102,7 +103,7 @@ Blockly.blockRendering.IPathObject.prototype.setCursorSvg;
  *     block SVG group.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.setMarkerSvg;
+IPathObject.prototype.setMarkerSvg;
 
 /**
  * Set whether the block shows a highlight or not.  Block highlighting is
@@ -110,14 +111,14 @@ Blockly.blockRendering.IPathObject.prototype.setMarkerSvg;
  * @param {boolean} highlighted True if highlighted.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateHighlighted;
+IPathObject.prototype.updateHighlighted;
 
 /**
  * Add or remove styling showing that a block is selected.
  * @param {boolean} enable True if selection is enabled, false otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateSelected;
+IPathObject.prototype.updateSelected;
 
 /**
  * Add or remove styling showing that a block is dragged over a delete area.
@@ -125,7 +126,7 @@ Blockly.blockRendering.IPathObject.prototype.updateSelected;
  *     area, false otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateDraggingDelete;
+IPathObject.prototype.updateDraggingDelete;
 
 /**
  * Add or remove styling showing that a block is an insertion marker.
@@ -133,14 +134,14 @@ Blockly.blockRendering.IPathObject.prototype.updateDraggingDelete;
  *     otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateInsertionMarker;
+IPathObject.prototype.updateInsertionMarker;
 
 /**
  * Add or remove styling showing that a block is movable.
  * @param {boolean} enable True if the block is movable, false otherwise.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateMovable;
+IPathObject.prototype.updateMovable;
 
 /**
  * Add or remove styling that shows that if the dragging block is dropped, this
@@ -149,4 +150,6 @@ Blockly.blockRendering.IPathObject.prototype.updateMovable;
  * @param {boolean} enable True if styling should be added.
  * @package
  */
-Blockly.blockRendering.IPathObject.prototype.updateReplacementFade;
+IPathObject.prototype.updateReplacementFade;
+
+exports = IPathObject;
diff --git a/tests/deps.js b/tests/deps.js
index 3eaba3083..64c88377b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -125,7 +125,7 @@ goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.b
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
+goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 31b10f1489013df91b6ba81dd61e85385987f420 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:22:44 -0700
Subject: [PATCH 102/291] Migrate core/renderers/common/i_path_object.js named
 requires

---
 core/renderers/common/i_path_object.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 01a279e03..84e25b6ed 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -15,15 +15,15 @@
 goog.module('Blockly.blockRendering.IPathObject');
 goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Theme');
+const Block = goog.requireType('Blockly.Block');
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Theme = goog.requireType('Blockly.Theme');
 
 
 /**
  * An interface for a block's path object.
  * @param {!SVGElement} _root The root SVG element.
- * @param {!Blockly.blockRendering.ConstantProvider} _constants The renderer's
+ * @param {!ConstantProvider} _constants The renderer's
  *     constants.
  * @interface
  */
@@ -37,13 +37,13 @@ IPathObject.prototype.svgPath;
 
 /**
  * The renderer's constant provider.
- * @type {!Blockly.blockRendering.ConstantProvider}
+ * @type {!ConstantProvider}
  */
 IPathObject.prototype.constants;
 
 /**
  * The primary path of the block.
- * @type {!Blockly.Theme.BlockStyle}
+ * @type {!Theme.BlockStyle}
  */
 IPathObject.prototype.style;
 
@@ -71,14 +71,14 @@ IPathObject.prototype.setPath;
 /**
  * Apply the stored colours to the block's path, taking into account whether
  * the paths belong to a shadow block.
- * @param {!Blockly.Block} block The source block.
+ * @param {!Block} block The source block.
  * @package
  */
 IPathObject.prototype.applyColour;
 
 /**
  * Update the style.
- * @param {!Blockly.Theme.BlockStyle} blockStyle The block style to use.
+ * @param {!Theme.BlockStyle} blockStyle The block style to use.
  * @package
  */
 IPathObject.prototype.setStyle;

From 03de38c41af1745476d3045ef2aefd99a5922ec7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:07:04 -0700
Subject: [PATCH 103/291] Add eslint disable

---
 core/renderers/common/i_path_object.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 84e25b6ed..0b0362ff3 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -15,7 +15,9 @@
 goog.module('Blockly.blockRendering.IPathObject');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 const Theme = goog.requireType('Blockly.Theme');
 

From bf831dd83e098460cdfb080690d14b796468c066 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:52:54 -0700
Subject: [PATCH 104/291] Migrate core/workspace_dragger.js to ES6 const/let

---
 core/workspace_dragger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index 3ad07a20e..a0a6eef16 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -96,7 +96,7 @@ Blockly.WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
  * @package
  */
 Blockly.WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
-  var newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
+  const newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
 
   if (this.horizontalScrollEnabled_ && this.verticalScrollEnabled_) {
     this.workspace_.scroll(newXY.x, newXY.y);

From 423fa02e8f4ff8fe655073c13279a5506775cecb Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:54:59 -0700
Subject: [PATCH 105/291] Migrate core/workspace_dragger.js to goog.module

---
 core/workspace_dragger.js | 15 +++++++++------
 tests/deps.js             |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index a0a6eef16..90aade9f3 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceDragger');
+goog.module('Blockly.WorkspaceDragger');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.Coordinate');
 
@@ -26,7 +27,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {!Blockly.WorkspaceSvg} workspace The workspace to drag.
  * @constructor
  */
-Blockly.WorkspaceDragger = function(workspace) {
+const WorkspaceDragger = function(workspace) {
   /**
    * @type {!Blockly.WorkspaceSvg}
    * @private
@@ -62,7 +63,7 @@ Blockly.WorkspaceDragger = function(workspace) {
  * @package
  * @suppress {checkTypes}
  */
-Blockly.WorkspaceDragger.prototype.dispose = function() {
+WorkspaceDragger.prototype.dispose = function() {
   this.workspace_ = null;
 };
 
@@ -70,7 +71,7 @@ Blockly.WorkspaceDragger.prototype.dispose = function() {
  * Start dragging the workspace.
  * @package
  */
-Blockly.WorkspaceDragger.prototype.startDrag = function() {
+WorkspaceDragger.prototype.startDrag = function() {
   if (Blockly.selected) {
     Blockly.selected.unselect();
   }
@@ -83,7 +84,7 @@ Blockly.WorkspaceDragger.prototype.startDrag = function() {
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
-Blockly.WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
+WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
   // Make sure everything is up to date.
   this.drag(currentDragDeltaXY);
   this.workspace_.resetDragSurface();
@@ -95,7 +96,7 @@ Blockly.WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
-Blockly.WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
+WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
   const newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
 
   if (this.horizontalScrollEnabled_ && this.verticalScrollEnabled_) {
@@ -108,3 +109,5 @@ Blockly.WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
     throw new TypeError('Invalid state.');
   }
 };
+
+exports = WorkspaceDragger;
diff --git a/tests/deps.js b/tests/deps.js
index 64c88377b..bd2e81f5b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -208,7 +208,7 @@ goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'],
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate']);
+goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 75a98e6204042079fc32a2d8e64267677fb9940d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:56:08 -0700
Subject: [PATCH 106/291] Migrate core/workspace_dragger.js named requires

---
 core/workspace_dragger.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index 90aade9f3..f936a3eb5 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -13,9 +13,11 @@
 goog.module('Blockly.WorkspaceDragger');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.Coordinate');
-
-goog.requireType('Blockly.WorkspaceSvg');
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
@@ -24,12 +26,12 @@ goog.requireType('Blockly.WorkspaceSvg');
  * Note that the workspace itself manages whether or not it has a drag surface
  * and how to do translations based on that.  This simply passes the right
  * commands based on events.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace to drag.
+ * @param {!WorkspaceSvg} workspace The workspace to drag.
  * @constructor
  */
 const WorkspaceDragger = function(workspace) {
   /**
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -51,10 +53,10 @@ const WorkspaceDragger = function(workspace) {
   /**
    * The scroll position of the workspace at the beginning of the drag.
    * Coordinate system: pixel coordinates.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @protected
    */
-  this.startScrollXY_ = new Blockly.utils.Coordinate(
+  this.startScrollXY_ = new Coordinate(
       workspace.scrollX, workspace.scrollY);
 };
 
@@ -80,7 +82,7 @@ WorkspaceDragger.prototype.startDrag = function() {
 
 /**
  * Finish dragging the workspace and put everything back where it belongs.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
@@ -92,12 +94,12 @@ WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
 
 /**
  * Move the workspace based on the most recent mouse movements.
- * @param {!Blockly.utils.Coordinate} currentDragDeltaXY How far the pointer has
+ * @param {!Coordinate} currentDragDeltaXY How far the pointer has
  *     moved from the position at the start of the drag, in pixel coordinates.
  * @package
  */
 WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
-  const newXY = Blockly.utils.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
+  const newXY = Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
 
   if (this.horizontalScrollEnabled_ && this.verticalScrollEnabled_) {
     this.workspace_.scroll(newXY.x, newXY.y);

From b7b428919bab2b1179966dd62d2c0021213198f5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:56:13 -0700
Subject: [PATCH 107/291] clang-format core/workspace_dragger.js

---
 core/workspace_dragger.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index f936a3eb5..0b056a3f3 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -56,8 +56,7 @@ const WorkspaceDragger = function(workspace) {
    * @type {!Coordinate}
    * @protected
    */
-  this.startScrollXY_ = new Coordinate(
-      workspace.scrollX, workspace.scrollY);
+  this.startScrollXY_ = new Coordinate(workspace.scrollX, workspace.scrollY);
 };
 
 /**

From 2ccf3cb17d5486531996607c29aaec3268596921 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:50:44 -0700
Subject: [PATCH 108/291] Migrate core/browser_events.js to ES6 const/let

---
 core/browser_events.js | 46 ++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 3a251637b..6cc9dda80 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -47,13 +47,14 @@ Blockly.browserEvents.Data;
 Blockly.browserEvents.conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
     opt_noPreventDefault) {
-  var handled = false;
-  var wrapFunc = function(e) {
-    var captureIdentifier = !opt_noCaptureIdentifier;
+  const handled = false;
+  const wrapFunc = function (e) {
+    const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
     // will hand back an array with one element, which we're fine handling.
-    var events = Blockly.Touch.splitEventByTouches(e);
-    for (var i = 0, event; (event = events[i]); i++) {
+    const events = Blockly.Touch.splitEventByTouches(e);
+    for (let i = 0; i < events.length; i++) {
+      const event = events[i];
       if (captureIdentifier && !Blockly.Touch.shouldHandleEvent(event)) {
         continue;
       }
@@ -67,10 +68,11 @@ Blockly.browserEvents.conditionalBind = function(
     }
   };
 
-  var bindData = [];
+  const bindData = [];
   if (Blockly.utils.global['PointerEvent'] &&
       (name in Blockly.Touch.TOUCH_MAP)) {
-    for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+      const type = Blockly.Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -80,16 +82,17 @@ Blockly.browserEvents.conditionalBind = function(
 
     // Add equivalent touch event.
     if (name in Blockly.Touch.TOUCH_MAP) {
-      var touchWrapFunc = function(e) {
+      const touchWrapFunc = function (e) {
         wrapFunc(e);
         // Calling preventDefault stops the browser from scrolling/zooming the
         // page.
-        var preventDef = !opt_noPreventDefault;
+        const preventDef = !opt_noPreventDefault;
         if (handled && preventDef) {
           e.preventDefault();
         }
       };
-      for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+        const type = Blockly.Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }
@@ -113,7 +116,7 @@ Blockly.browserEvents.conditionalBind = function(
  * @public
  */
 Blockly.browserEvents.bind = function(node, name, thisObject, func) {
-  var wrapFunc = function(e) {
+  const wrapFunc = function (e) {
     if (thisObject) {
       func.call(thisObject, e);
     } else {
@@ -121,10 +124,11 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
     }
   };
 
-  var bindData = [];
+  const bindData = [];
   if (Blockly.utils.global['PointerEvent'] &&
       (name in Blockly.Touch.TOUCH_MAP)) {
-    for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+      const type = Blockly.Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -134,11 +138,11 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
 
     // Add equivalent touch event.
     if (name in Blockly.Touch.TOUCH_MAP) {
-      var touchWrapFunc = function(e) {
+      const touchWrapFunc = function (e) {
         // Punt on multitouch events.
         if (e.changedTouches && e.changedTouches.length == 1) {
           // Map the touch event's properties to the event.
-          var touchPoint = e.changedTouches[0];
+          const touchPoint = e.changedTouches[0];
           e.clientX = touchPoint.clientX;
           e.clientY = touchPoint.clientY;
         }
@@ -147,7 +151,8 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
         // Stop the browser from scrolling/zooming the page.
         e.preventDefault();
       };
-      for (var i = 0, type; (type = Blockly.Touch.TOUCH_MAP[name][i]); i++) {
+      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
+        const type = Blockly.Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }
@@ -164,11 +169,12 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
  * @public
  */
 Blockly.browserEvents.unbind = function(bindData) {
+  let func;
   while (bindData.length) {
-    var bindDatum = bindData.pop();
-    var node = bindDatum[0];
-    var name = bindDatum[1];
-    var func = bindDatum[2];
+    const bindDatum = bindData.pop();
+    const node = bindDatum[0];
+    const name = bindDatum[1];
+    func = bindDatum[2];
     node.removeEventListener(name, func, false);
   }
   return func;

From b28591fa5f3ff3962f807f08ede151401852d4af Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:50:58 -0700
Subject: [PATCH 109/291] Migrate core/browser_events.js to goog.module

---
 core/browser_events.js | 27 ++++++++++++++++-----------
 tests/deps.js          |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 6cc9dda80..9134cc57e 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.browserEvents');
+goog.module('Blockly.browserEvents');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils.global');
@@ -18,11 +19,12 @@ goog.require('Blockly.utils.global');
 
 /**
  * Blockly opaque event data used to unbind events when using
- * `Blockly.browserEvents.bind` and
- * `Blockly.browserEvents.conditionalBind`.
+ * `bind` and
+ * `conditionalBind`.
  * @typedef {!Array<!Array>}
  */
-Blockly.browserEvents.Data;
+let Data;
+exports.Data = Data;
 
 /**
  * Bind an event handler that can be ignored if it is not part of the active
@@ -40,14 +42,14 @@ Blockly.browserEvents.Data;
  *     should prevent the default handler.  False by default.  If
  *     opt_noPreventDefault is provided, opt_noCaptureIdentifier must also be
  *     provided.
- * @return {!Blockly.browserEvents.Data} Opaque data that can be passed to
+ * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
  * @public
  */
-Blockly.browserEvents.conditionalBind = function(
+const conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
     opt_noPreventDefault) {
-  const handled = false;
+  let handled = false;
   const wrapFunc = function (e) {
     const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
@@ -100,6 +102,7 @@ Blockly.browserEvents.conditionalBind = function(
   }
   return bindData;
 };
+exports.conditionalBind = conditionalBind;
 
 
 /**
@@ -111,11 +114,11 @@ Blockly.browserEvents.conditionalBind = function(
  * @param {string} name Event name to listen to (e.g. 'mousedown').
  * @param {?Object} thisObject The value of 'this' in the function.
  * @param {!Function} func Function to call when event is triggered.
- * @return {!Blockly.browserEvents.Data} Opaque data that can be passed to
+ * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
  * @public
  */
-Blockly.browserEvents.bind = function(node, name, thisObject, func) {
+const bind = function(node, name, thisObject, func) {
   const wrapFunc = function (e) {
     if (thisObject) {
       func.call(thisObject, e);
@@ -160,15 +163,16 @@ Blockly.browserEvents.bind = function(node, name, thisObject, func) {
   }
   return bindData;
 };
+exports.bind = bind;
 
 /**
  * Unbind one or more events event from a function call.
- * @param {!Blockly.browserEvents.Data} bindData Opaque data from bindEvent_.
+ * @param {!Data} bindData Opaque data from bindEvent_.
  *     This list is emptied during the course of calling this function.
  * @return {!Function} The function call.
  * @public
  */
-Blockly.browserEvents.unbind = function(bindData) {
+const unbind = function(bindData) {
   let func;
   while (bindData.length) {
     const bindDatum = bindData.pop();
@@ -179,3 +183,4 @@ Blockly.browserEvents.unbind = function(bindData) {
   }
   return func;
 };
+exports.unbind = unbind;
diff --git a/tests/deps.js b/tests/deps.js
index bd2e81f5b..abf82c44d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -14,7 +14,7 @@ goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Bl
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global']);
+goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});

From bd5c6864d6ccaf360e5ca5031b42c239f93a8351 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:57:24 -0700
Subject: [PATCH 110/291] Migrate core/browser_events.js named requires

---
 core/browser_events.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 9134cc57e..c5168a707 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -13,8 +13,8 @@
 goog.module('Blockly.browserEvents');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils.global');
+const Touch = goog.require('Blockly.Touch');
+const global = goog.require('Blockly.utils.global');
 
 
 /**
@@ -54,13 +54,13 @@ const conditionalBind = function(
     const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
     // will hand back an array with one element, which we're fine handling.
-    const events = Blockly.Touch.splitEventByTouches(e);
+    const events = Touch.splitEventByTouches(e);
     for (let i = 0; i < events.length; i++) {
       const event = events[i];
-      if (captureIdentifier && !Blockly.Touch.shouldHandleEvent(event)) {
+      if (captureIdentifier && !Touch.shouldHandleEvent(event)) {
         continue;
       }
-      Blockly.Touch.setClientFromTouch(event);
+      Touch.setClientFromTouch(event);
       if (thisObject) {
         func.call(thisObject, event);
       } else {
@@ -71,10 +71,10 @@ const conditionalBind = function(
   };
 
   const bindData = [];
-  if (Blockly.utils.global['PointerEvent'] &&
-      (name in Blockly.Touch.TOUCH_MAP)) {
-    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-      const type = Blockly.Touch.TOUCH_MAP[name][i];
+  if (global['PointerEvent'] &&
+      (name in Touch.TOUCH_MAP)) {
+    for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+      const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -83,7 +83,7 @@ const conditionalBind = function(
     bindData.push([node, name, wrapFunc]);
 
     // Add equivalent touch event.
-    if (name in Blockly.Touch.TOUCH_MAP) {
+    if (name in Touch.TOUCH_MAP) {
       const touchWrapFunc = function (e) {
         wrapFunc(e);
         // Calling preventDefault stops the browser from scrolling/zooming the
@@ -93,8 +93,8 @@ const conditionalBind = function(
           e.preventDefault();
         }
       };
-      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-        const type = Blockly.Touch.TOUCH_MAP[name][i];
+      for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+        const type = Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }
@@ -128,10 +128,10 @@ const bind = function(node, name, thisObject, func) {
   };
 
   const bindData = [];
-  if (Blockly.utils.global['PointerEvent'] &&
-      (name in Blockly.Touch.TOUCH_MAP)) {
-    for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-      const type = Blockly.Touch.TOUCH_MAP[name][i];
+  if (global['PointerEvent'] &&
+      (name in Touch.TOUCH_MAP)) {
+    for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+      const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
     }
@@ -140,7 +140,7 @@ const bind = function(node, name, thisObject, func) {
     bindData.push([node, name, wrapFunc]);
 
     // Add equivalent touch event.
-    if (name in Blockly.Touch.TOUCH_MAP) {
+    if (name in Touch.TOUCH_MAP) {
       const touchWrapFunc = function (e) {
         // Punt on multitouch events.
         if (e.changedTouches && e.changedTouches.length == 1) {
@@ -154,8 +154,8 @@ const bind = function(node, name, thisObject, func) {
         // Stop the browser from scrolling/zooming the page.
         e.preventDefault();
       };
-      for (let i = 0; i < Blockly.Touch.TOUCH_MAP[name].length; i++) {
-        const type = Blockly.Touch.TOUCH_MAP[name][i];
+      for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
+        const type = Touch.TOUCH_MAP[name][i];
         node.addEventListener(type, touchWrapFunc, false);
         bindData.push([node, type, touchWrapFunc]);
       }

From 96f8b1d482749296c0864393b8a18185eb4fe446 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 12:57:34 -0700
Subject: [PATCH 111/291] clang-format core/browser_events.js

---
 core/browser_events.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index c5168a707..91e84f914 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -50,7 +50,7 @@ const conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
     opt_noPreventDefault) {
   let handled = false;
-  const wrapFunc = function (e) {
+  const wrapFunc = function(e) {
     const captureIdentifier = !opt_noCaptureIdentifier;
     // Handle each touch point separately.  If the event was a mouse event, this
     // will hand back an array with one element, which we're fine handling.
@@ -71,8 +71,7 @@ const conditionalBind = function(
   };
 
   const bindData = [];
-  if (global['PointerEvent'] &&
-      (name in Touch.TOUCH_MAP)) {
+  if (global['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
     for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
       const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
@@ -84,7 +83,7 @@ const conditionalBind = function(
 
     // Add equivalent touch event.
     if (name in Touch.TOUCH_MAP) {
-      const touchWrapFunc = function (e) {
+      const touchWrapFunc = function(e) {
         wrapFunc(e);
         // Calling preventDefault stops the browser from scrolling/zooming the
         // page.
@@ -119,7 +118,7 @@ exports.conditionalBind = conditionalBind;
  * @public
  */
 const bind = function(node, name, thisObject, func) {
-  const wrapFunc = function (e) {
+  const wrapFunc = function(e) {
     if (thisObject) {
       func.call(thisObject, e);
     } else {
@@ -128,8 +127,7 @@ const bind = function(node, name, thisObject, func) {
   };
 
   const bindData = [];
-  if (global['PointerEvent'] &&
-      (name in Touch.TOUCH_MAP)) {
+  if (global['PointerEvent'] && (name in Touch.TOUCH_MAP)) {
     for (let i = 0; i < Touch.TOUCH_MAP[name].length; i++) {
       const type = Touch.TOUCH_MAP[name][i];
       node.addEventListener(type, wrapFunc, false);
@@ -141,7 +139,7 @@ const bind = function(node, name, thisObject, func) {
 
     // Add equivalent touch event.
     if (name in Touch.TOUCH_MAP) {
-      const touchWrapFunc = function (e) {
+      const touchWrapFunc = function(e) {
         // Punt on multitouch events.
         if (e.changedTouches && e.changedTouches.length == 1) {
           // Map the touch event's properties to the event.

From 2d6ec617fe6bb1ca41e72e1147caaa91cbce0d0b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:27:12 -0700
Subject: [PATCH 112/291] Address PR comments

---
 core/browser_events.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/browser_events.js b/core/browser_events.js
index 91e84f914..b7ce3a61e 100644
--- a/core/browser_events.js
+++ b/core/browser_events.js
@@ -19,8 +19,7 @@ const global = goog.require('Blockly.utils.global');
 
 /**
  * Blockly opaque event data used to unbind events when using
- * `bind` and
- * `conditionalBind`.
+ * `bind` and `conditionalBind`.
  * @typedef {!Array<!Array>}
  */
 let Data;
@@ -44,7 +43,6 @@ exports.Data = Data;
  *     provided.
  * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
- * @public
  */
 const conditionalBind = function(
     node, name, thisObject, func, opt_noCaptureIdentifier,
@@ -115,7 +113,6 @@ exports.conditionalBind = conditionalBind;
  * @param {!Function} func Function to call when event is triggered.
  * @return {!Data} Opaque data that can be passed to
  *     unbindEvent_.
- * @public
  */
 const bind = function(node, name, thisObject, func) {
   const wrapFunc = function(e) {
@@ -168,7 +165,6 @@ exports.bind = bind;
  * @param {!Data} bindData Opaque data from bindEvent_.
  *     This list is emptied during the course of calling this function.
  * @return {!Function} The function call.
- * @public
  */
 const unbind = function(bindData) {
   let func;

From 8f54b7832f92c3792ecee529d3ff459978e1f881 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 17:04:30 -0700
Subject: [PATCH 113/291] Migrate core/contextmenu_items.js to ES6 const/let

---
 core/contextmenu_items.js | 245 ++++++++++++++++++++++----------------
 1 file changed, 144 insertions(+), 101 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index e985a8e5c..10eee45c7 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -28,17 +28,19 @@ goog.requireType('Blockly.BlockSvg');
 /** Option to undo previous action. */
 Blockly.ContextMenuItems.registerUndo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var undoOption = {
-    displayText: function() {
+  const undoOption = {
+    displayText: function () {
       return Blockly.Msg['UNDO'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.getUndoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.workspace.undo(false);
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -51,15 +53,19 @@ Blockly.ContextMenuItems.registerUndo = function() {
 /** Option to redo previous action. */
 Blockly.ContextMenuItems.registerRedo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var redoOption = {
-    displayText: function() { return Blockly.Msg['REDO']; },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const redoOption = {
+    displayText: function () {
+      return Blockly.Msg['REDO'];
+    },
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.getRedoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.workspace.undo(true);
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -72,11 +78,12 @@ Blockly.ContextMenuItems.registerRedo = function() {
 /** Option to clean up blocks. */
 Blockly.ContextMenuItems.registerCleanup = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var cleanOption = {
-    displayText: function() {
+  const cleanOption = {
+    displayText: function () {
       return Blockly.Msg['CLEAN_UP'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.isMovable()) {
         if (scope.workspace.getTopBlocks(false).length > 1) {
           return 'enabled';
@@ -85,7 +92,8 @@ Blockly.ContextMenuItems.registerCleanup = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.workspace.cleanUp();
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -102,10 +110,10 @@ Blockly.ContextMenuItems.registerCleanup = function() {
  * @private
  */
 Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
-  var DELAY = 10;
-  var ms = 0;
-  for (var i = 0; i < topBlocks.length; i++) {
-    var block = topBlocks[i];
+  const DELAY = 10;
+  let ms = 0;
+  for (let i = 0; i < topBlocks.length; i++) {
+    let block = topBlocks[i];
     while (block) {
       setTimeout(block.setCollapsed.bind(block, shouldCollapse), ms);
       block = block.getNextBlock();
@@ -117,15 +125,16 @@ Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
 /** Option to collapse all blocks. */
 Blockly.ContextMenuItems.registerCollapse = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var collapseOption = {
-    displayText:  function() {
+  const collapseOption = {
+    displayText: function () {
       return Blockly.Msg['COLLAPSE_ALL'];
     },
-    preconditionFn:  function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.options.collapse) {
-        var topBlocks = scope.workspace.getTopBlocks(false);
-        for (var i = 0; i < topBlocks.length; i++) {
-          var block = topBlocks[i];
+        const topBlocks = scope.workspace.getTopBlocks(false);
+        for (let i = 0; i < topBlocks.length; i++) {
+          let block = topBlocks[i];
           while (block) {
             if (!block.isCollapsed()) {
               return 'enabled';
@@ -137,12 +146,14 @@ Blockly.ContextMenuItems.registerCollapse = function() {
       }
       return 'hidden';
     },
-    callback:  function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      Blockly.ContextMenuItems.toggleOption_(true, scope.workspace.getTopBlocks(true));
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      Blockly.ContextMenuItems.toggleOption_(true,
+          scope.workspace.getTopBlocks(true));
     },
-    scopeType:  Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
-    id:  'collapseWorkspace',
-    weight:  4,
+    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    id: 'collapseWorkspace',
+    weight: 4,
   };
   Blockly.ContextMenuRegistry.registry.register(collapseOption);
 };
@@ -150,15 +161,16 @@ Blockly.ContextMenuItems.registerCollapse = function() {
 /** Option to expand all blocks. */
 Blockly.ContextMenuItems.registerExpand = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var expandOption = {
-    displayText: function() {
+  const expandOption = {
+    displayText: function () {
       return Blockly.Msg['EXPAND_ALL'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.workspace.options.collapse) {
-        var topBlocks = scope.workspace.getTopBlocks(false);
-        for (var i = 0; i < topBlocks.length; i++) {
-          var block = topBlocks[i];
+        const topBlocks = scope.workspace.getTopBlocks(false);
+        for (let i = 0; i < topBlocks.length; i++) {
+          let block = topBlocks[i];
           while (block) {
             if (block.isCollapsed()) {
               return 'enabled';
@@ -170,8 +182,10 @@ Blockly.ContextMenuItems.registerExpand = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      Blockly.ContextMenuItems.toggleOption_(false, scope.workspace.getTopBlocks(true));
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      Blockly.ContextMenuItems.toggleOption_(false,
+          scope.workspace.getTopBlocks(true));
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'expandWorkspace',
@@ -191,9 +205,9 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
-    var children =  /* eslint-disable-next-line indent */
+    const children =  /* eslint-disable-next-line indent */
         /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
-    for (var i = 0; i < children.length; i++) {
+    for (let i = 0; i < children.length; i++) {
       Blockly.ContextMenuItems.addDeletableBlocks_(children[i], deleteList);
     }
   }
@@ -206,9 +220,9 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
  * @private
  */
 Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
-  var deleteList = [];
-  var topBlocks = workspace.getTopBlocks(true);
-  for (var i = 0; i < topBlocks.length; i++) {
+  const deleteList = [];
+  const topBlocks = workspace.getTopBlocks(true);
+  for (let i = 0; i < topBlocks.length; i++) {
     Blockly.ContextMenuItems.addDeletableBlocks_(topBlocks[i], deleteList);
   }
   return deleteList;
@@ -220,9 +234,9 @@ Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
  * @private
  */
 Blockly.ContextMenuItems.deleteNext_ = function(deleteList, eventGroup) {
-  var DELAY = 10;
+  const DELAY = 10;
   Blockly.Events.setGroup(eventGroup);
-  var block = deleteList.shift();
+  const block = deleteList.shift();
   if (block) {
     if (block.workspace) {
       block.dispose(false, true);
@@ -237,42 +251,49 @@ Blockly.ContextMenuItems.deleteNext_ = function(deleteList, eventGroup) {
 /** Option to delete all blocks. */
 Blockly.ContextMenuItems.registerDeleteAll = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var deleteOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const deleteOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.workspace) {
         return;
       }
-      var deletableBlocksLength =
+      const deletableBlocksLength =
           Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
         return Blockly.Msg['DELETE_BLOCK'];
       } else {
-        return Blockly.Msg['DELETE_X_BLOCKS'].replace('%1', String(deletableBlocksLength));
+        return Blockly.Msg['DELETE_X_BLOCKS'].replace('%1',
+            String(deletableBlocksLength));
       }
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.workspace) {
         return;
       }
-      var deletableBlocksLength =
-         Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
+      const deletableBlocksLength =
+          Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.workspace) {
         return;
       }
       scope.workspace.cancelCurrentGesture();
-      var deletableBlocks = Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace);
-      var eventGroup = Blockly.utils.genUid();
+      const deletableBlocks = Blockly.ContextMenuItems.getDeletableBlocks_(
+          scope.workspace);
+      const eventGroup = Blockly.utils.genUid();
       if (deletableBlocks.length < 2) {
         Blockly.ContextMenuItems.deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
-            Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1', deletableBlocks.length),
-            function(ok) {
+            Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1',
+                deletableBlocks.length),
+            function (ok) {
               if (ok) {
-                Blockly.ContextMenuItems.deleteNext_(deletableBlocks, eventGroup);
+                Blockly.ContextMenuItems.deleteNext_(deletableBlocks,
+                    eventGroup);
               }
             });
       }
@@ -300,12 +321,13 @@ Blockly.ContextMenuItems.registerWorkspaceOptions_ = function() {
 /** Option to duplicate a block. */
 Blockly.ContextMenuItems.registerDuplicate = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var duplicateOption = {
-    displayText: function() {
+  const duplicateOption = {
+    displayText: function () {
       return Blockly.Msg['DUPLICATE_BLOCK'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       if (!block.isInFlyout && block.isDeletable() && block.isMovable()) {
         if (block.isDuplicatable()) {
           return 'enabled';
@@ -314,7 +336,8 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.block) {
         Blockly.clipboard.duplicate(scope.block);
       }
@@ -329,8 +352,9 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
 /** Option to add or remove block-level comment. */
 Blockly.ContextMenuItems.registerComment = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var commentOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const commentOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (scope.block.getCommentIcon()) {
         // If there's already a comment,  option is to remove.
         return Blockly.Msg['REMOVE_COMMENT'];
@@ -338,17 +362,20 @@ Blockly.ContextMenuItems.registerComment = function() {
       // If there's no comment yet, option is to add.
       return Blockly.Msg['ADD_COMMENT'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       // IE doesn't support necessary features for comment editing.
-      if (!Blockly.utils.userAgent.IE && !block.isInFlyout && block.workspace.options.comments &&
-        !block.isCollapsed() && block.isEditable()) {
+      if (!Blockly.utils.userAgent.IE && !block.isInFlyout
+          && block.workspace.options.comments &&
+          !block.isCollapsed() && block.isEditable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       if (block.getCommentIcon()) {
         block.setCommentText(null);
       } else {
@@ -365,15 +392,17 @@ Blockly.ContextMenuItems.registerComment = function() {
 /** Option to inline variables. */
 Blockly.ContextMenuItems.registerInline = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var inlineOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const inlineOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       return (scope.block.getInputsInline()) ?
           Blockly.Msg['EXTERNAL_INPUTS'] : Blockly.Msg['INLINE_INPUTS'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       if (!block.isInFlyout && block.isMovable() && !block.isCollapsed()) {
-        for (var i = 1; i < block.inputList.length; i++) {
+        for (let i = 1; i < block.inputList.length; i++) {
           // Only display this option if there are two value or dummy inputs next to each other.
           if (block.inputList[i - 1].type != Blockly.inputTypes.STATEMENT &&
               block.inputList[i].type != Blockly.inputTypes.STATEMENT) {
@@ -383,7 +412,8 @@ Blockly.ContextMenuItems.registerInline = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.block.setInputsInline(!scope.block.getInputsInline());
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
@@ -396,19 +426,23 @@ Blockly.ContextMenuItems.registerInline = function() {
 /** Option to collapse or expand a block. */
 Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var collapseExpandOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const collapseExpandOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       return scope.block.isCollapsed() ?
           Blockly.Msg['EXPAND_BLOCK'] : Blockly.Msg['COLLAPSE_BLOCK'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      if (!block.isInFlyout && block.isMovable() && block.workspace.options.collapse) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      if (!block.isInFlyout && block.isMovable()
+          && block.workspace.options.collapse) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.block.setCollapsed(!scope.block.isCollapsed());
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
@@ -421,14 +455,17 @@ Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
 /** Option to disable or enable a block. */
 Blockly.ContextMenuItems.registerDisable = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var disableOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+  const disableOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       return (scope.block.isEnabled()) ?
           Blockly.Msg['DISABLE_BLOCK'] : Blockly.Msg['ENABLE_BLOCK'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      if (!block.isInFlyout && block.workspace.options.disable && block.isEditable()) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      if (!block.isInFlyout && block.workspace.options.disable
+          && block.isEditable()) {
         if (block.getInheritedDisabled()) {
           return 'disabled';
         }
@@ -436,9 +473,10 @@ Blockly.ContextMenuItems.registerDisable = function() {
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      var group = Blockly.Events.getGroup();
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      const group = Blockly.Events.getGroup();
       if (!group) {
         Blockly.Events.setGroup(true);
       }
@@ -457,12 +495,13 @@ Blockly.ContextMenuItems.registerDisable = function() {
 /** Option to delete a block. */
 Blockly.ContextMenuItems.registerDelete = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var deleteOption = {
-    displayText: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
+  const deleteOption = {
+    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
       // Count the number of blocks that are nested in this block.
-      var descendantCount = block.getDescendants(false).length;
-      var nextBlock = block.getNextBlock();
+      let descendantCount = block.getDescendants(false).length;
+      const nextBlock = block.getNextBlock();
       if (nextBlock) {
         // Blocks in the current stack would survive this block's deletion.
         descendantCount -= nextBlock.getDescendants(false).length;
@@ -470,13 +509,15 @@ Blockly.ContextMenuItems.registerDelete = function() {
       return (descendantCount == 1) ? Blockly.Msg['DELETE_BLOCK'] :
           Blockly.Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       if (!scope.block.isInFlyout && scope.block.isDeletable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       Blockly.Events.setGroup(true);
       if (scope.block) {
         Blockly.deleteBlock(scope.block);
@@ -493,20 +534,22 @@ Blockly.ContextMenuItems.registerDelete = function() {
 /** Option to open help for a block. */
 Blockly.ContextMenuItems.registerHelp = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
-  var helpOption = {
-    displayText: function() {
+  const helpOption = {
+    displayText: function () {
       return Blockly.Msg['HELP'];
     },
-    preconditionFn: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
-      var block = scope.block;
-      var url = (typeof block.helpUrl == 'function') ?
+    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
+      const block = scope.block;
+      const url = (typeof block.helpUrl == 'function') ?
           block.helpUrl() : block.helpUrl;
       if (url) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function(/** @type {!Blockly.ContextMenuRegistry.Scope} */ scope) {
+    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+        scope) {
       scope.block.showHelp();
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,

From 246bacd11703ee9fe275c95d058060099b111ab3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 20 Jul 2021 17:05:08 -0700
Subject: [PATCH 114/291] Migrate core/contextmenu_items.js to goog.module

---
 core/contextmenu_items.js | 120 ++++++++++++++++++++++----------------
 tests/deps.js             |   2 +-
 2 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 10eee45c7..c894c989a 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -14,19 +14,23 @@
  * @name Blockly.ContextMenuItems
  * @namespace
  */
-goog.provide('Blockly.ContextMenuItems');
+goog.module('Blockly.ContextMenuItems');
+goog.module.declareLegacyNamespace();
+
+goog.require('Blockly');
 goog.require('Blockly.clipboard');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenuRegistry');
 goog.require('Blockly.Events');
 goog.require('Blockly.inputTypes');
-
+goog.require('Blockly.Msg');
+goog.require('Blockly.utils');
+goog.require('Blockly.utils.userAgent');
+goog.requireType('Blockly.WorkspaceSvg');
 goog.requireType('Blockly.BlockSvg');
 
 
 /** Option to undo previous action. */
-Blockly.ContextMenuItems.registerUndo = function() {
+const registerUndo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const undoOption = {
     displayText: function () {
@@ -49,9 +53,10 @@ Blockly.ContextMenuItems.registerUndo = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(undoOption);
 };
+exports.registerUndo = registerUndo;
 
 /** Option to redo previous action. */
-Blockly.ContextMenuItems.registerRedo = function() {
+const registerRedo = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const redoOption = {
     displayText: function () {
@@ -74,9 +79,10 @@ Blockly.ContextMenuItems.registerRedo = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(redoOption);
 };
+exports.registerRedo = registerRedo;
 
 /** Option to clean up blocks. */
-Blockly.ContextMenuItems.registerCleanup = function() {
+const registerCleanup = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const cleanOption = {
     displayText: function () {
@@ -102,6 +108,7 @@ Blockly.ContextMenuItems.registerCleanup = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(cleanOption);
 };
+exports.registerCleanup = registerCleanup;
 
 /**
  * Creates a callback to collapse or expand top blocks.
@@ -109,7 +116,7 @@ Blockly.ContextMenuItems.registerCleanup = function() {
  * @param {!Array<Blockly.BlockSvg>} topBlocks Top blocks in the workspace.
  * @private
  */
-Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
+const toggleOption_ = function(shouldCollapse, topBlocks) {
   const DELAY = 10;
   let ms = 0;
   for (let i = 0; i < topBlocks.length; i++) {
@@ -123,7 +130,7 @@ Blockly.ContextMenuItems.toggleOption_ = function(shouldCollapse, topBlocks) {
 };
 
 /** Option to collapse all blocks. */
-Blockly.ContextMenuItems.registerCollapse = function() {
+const registerCollapse = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const collapseOption = {
     displayText: function () {
@@ -148,7 +155,7 @@ Blockly.ContextMenuItems.registerCollapse = function() {
     },
     callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
         scope) {
-      Blockly.ContextMenuItems.toggleOption_(true,
+      toggleOption_(true,
           scope.workspace.getTopBlocks(true));
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -157,9 +164,10 @@ Blockly.ContextMenuItems.registerCollapse = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(collapseOption);
 };
+exports.registerCollapse = registerCollapse;
 
 /** Option to expand all blocks. */
-Blockly.ContextMenuItems.registerExpand = function() {
+const registerExpand = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const expandOption = {
     displayText: function () {
@@ -184,7 +192,7 @@ Blockly.ContextMenuItems.registerExpand = function() {
     },
     callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
         scope) {
-      Blockly.ContextMenuItems.toggleOption_(false,
+      toggleOption_(false,
           scope.workspace.getTopBlocks(true));
     },
     scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -193,6 +201,7 @@ Blockly.ContextMenuItems.registerExpand = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(expandOption);
 };
+exports.registerExpand = registerExpand;
 
 /**
  * Adds a block and its children to a list of deletable blocks.
@@ -201,14 +210,14 @@ Blockly.ContextMenuItems.registerExpand = function() {
  *    modifed in place with the given block and its descendants.
  * @private
  */
-Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
+const addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
     const children =  /* eslint-disable-next-line indent */
         /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
     for (let i = 0; i < children.length; i++) {
-      Blockly.ContextMenuItems.addDeletableBlocks_(children[i], deleteList);
+      addDeletableBlocks_(children[i], deleteList);
     }
   }
 };
@@ -219,11 +228,11 @@ Blockly.ContextMenuItems.addDeletableBlocks_ = function(block, deleteList) {
  * @return {!Array<!Blockly.BlockSvg>} list of blocks to delete.
  * @private
  */
-Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
+const getDeletableBlocks_ = function(workspace) {
   const deleteList = [];
   const topBlocks = workspace.getTopBlocks(true);
   for (let i = 0; i < topBlocks.length; i++) {
-    Blockly.ContextMenuItems.addDeletableBlocks_(topBlocks[i], deleteList);
+    addDeletableBlocks_(topBlocks[i], deleteList);
   }
   return deleteList;
 };
@@ -233,23 +242,23 @@ Blockly.ContextMenuItems.getDeletableBlocks_ = function(workspace) {
  * @param {string} eventGroup event group ID with which all delete events should be associated.
  * @private
  */
-Blockly.ContextMenuItems.deleteNext_ = function(deleteList, eventGroup) {
+const deleteNext_ = function(deleteList, eventGroup) {
   const DELAY = 10;
   Blockly.Events.setGroup(eventGroup);
   const block = deleteList.shift();
   if (block) {
     if (block.workspace) {
       block.dispose(false, true);
-      setTimeout(Blockly.ContextMenuItems.deleteNext_, DELAY, deleteList, eventGroup);
+      setTimeout(deleteNext_, DELAY, deleteList, eventGroup);
     } else {
-      Blockly.ContextMenuItems.deleteNext_(deleteList, eventGroup);
+      deleteNext_(deleteList, eventGroup);
     }
   }
   Blockly.Events.setGroup(false);
 };
 
 /** Option to delete all blocks. */
-Blockly.ContextMenuItems.registerDeleteAll = function() {
+const registerDeleteAll = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -258,7 +267,7 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
         return;
       }
       const deletableBlocksLength =
-          Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
+          getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
         return Blockly.Msg['DELETE_BLOCK'];
       } else {
@@ -272,7 +281,7 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
         return;
       }
       const deletableBlocksLength =
-          Blockly.ContextMenuItems.getDeletableBlocks_(scope.workspace).length;
+          getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
     callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -281,18 +290,18 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
         return;
       }
       scope.workspace.cancelCurrentGesture();
-      const deletableBlocks = Blockly.ContextMenuItems.getDeletableBlocks_(
+      const deletableBlocks = getDeletableBlocks_(
           scope.workspace);
       const eventGroup = Blockly.utils.genUid();
       if (deletableBlocks.length < 2) {
-        Blockly.ContextMenuItems.deleteNext_(deletableBlocks, eventGroup);
+        deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
             Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1',
                 deletableBlocks.length),
             function (ok) {
               if (ok) {
-                Blockly.ContextMenuItems.deleteNext_(deletableBlocks,
+                deleteNext_(deletableBlocks,
                     eventGroup);
               }
             });
@@ -304,22 +313,23 @@ Blockly.ContextMenuItems.registerDeleteAll = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(deleteOption);
 };
+exports.registerDeleteAll = registerDeleteAll;
 
 /**
  * Registers all workspace-scoped context menu items.
  * @private
  */
-Blockly.ContextMenuItems.registerWorkspaceOptions_ = function() {
-  Blockly.ContextMenuItems.registerUndo();
-  Blockly.ContextMenuItems.registerRedo();
-  Blockly.ContextMenuItems.registerCleanup();
-  Blockly.ContextMenuItems.registerCollapse();
-  Blockly.ContextMenuItems.registerExpand();
-  Blockly.ContextMenuItems.registerDeleteAll();
+const registerWorkspaceOptions_ = function() {
+  registerUndo();
+  registerRedo();
+  registerCleanup();
+  registerCollapse();
+  registerExpand();
+  registerDeleteAll();
 };
 
 /** Option to duplicate a block. */
-Blockly.ContextMenuItems.registerDuplicate = function() {
+const registerDuplicate = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const duplicateOption = {
     displayText: function () {
@@ -348,9 +358,10 @@ Blockly.ContextMenuItems.registerDuplicate = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(duplicateOption);
 };
+exports.registerDuplicate = registerDuplicate;
 
 /** Option to add or remove block-level comment. */
-Blockly.ContextMenuItems.registerComment = function() {
+const registerComment = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const commentOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -388,9 +399,10 @@ Blockly.ContextMenuItems.registerComment = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(commentOption);
 };
+exports.registerComment = registerComment;
 
 /** Option to inline variables. */
-Blockly.ContextMenuItems.registerInline = function() {
+const registerInline = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const inlineOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -422,9 +434,10 @@ Blockly.ContextMenuItems.registerInline = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(inlineOption);
 };
+exports.registerInline = registerInline;
 
 /** Option to collapse or expand a block. */
-Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
+const registerCollapseExpandBlock = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const collapseExpandOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -451,9 +464,10 @@ Blockly.ContextMenuItems.registerCollapseExpandBlock = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(collapseExpandOption);
 };
+exports.registerCollapseExpandBlock = registerCollapseExpandBlock;
 
 /** Option to disable or enable a block. */
-Blockly.ContextMenuItems.registerDisable = function() {
+const registerDisable = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const disableOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -491,9 +505,10 @@ Blockly.ContextMenuItems.registerDisable = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(disableOption);
 };
+exports.registerDisable = registerDisable;
 
 /** Option to delete a block. */
-Blockly.ContextMenuItems.registerDelete = function() {
+const registerDelete = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
     displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
@@ -530,9 +545,10 @@ Blockly.ContextMenuItems.registerDelete = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(deleteOption);
 };
+exports.registerDelete = registerDelete;
 
 /** Option to open help for a block. */
-Blockly.ContextMenuItems.registerHelp = function() {
+const registerHelp = function() {
   /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
   const helpOption = {
     displayText: function () {
@@ -558,19 +574,20 @@ Blockly.ContextMenuItems.registerHelp = function() {
   };
   Blockly.ContextMenuRegistry.registry.register(helpOption);
 };
+exports.registerHelp = registerHelp;
 
 /**
  * Registers all block-scoped context menu items.
  * @private
  */
-Blockly.ContextMenuItems.registerBlockOptions_ = function() {
-  Blockly.ContextMenuItems.registerDuplicate();
-  Blockly.ContextMenuItems.registerComment();
-  Blockly.ContextMenuItems.registerInline();
-  Blockly.ContextMenuItems.registerCollapseExpandBlock();
-  Blockly.ContextMenuItems.registerDisable();
-  Blockly.ContextMenuItems.registerDelete();
-  Blockly.ContextMenuItems.registerHelp();
+const registerBlockOptions_ = function() {
+  registerDuplicate();
+  registerComment();
+  registerInline();
+  registerCollapseExpandBlock();
+  registerDisable();
+  registerDelete();
+  registerHelp();
 };
 
 /**
@@ -578,9 +595,10 @@ Blockly.ContextMenuItems.registerBlockOptions_ = function() {
  * ContextMenuRegistry.
  * @package
  */
-Blockly.ContextMenuItems.registerDefaultOptions = function() {
-  Blockly.ContextMenuItems.registerWorkspaceOptions_();
-  Blockly.ContextMenuItems.registerBlockOptions_();
+const registerDefaultOptions = function() {
+  registerWorkspaceOptions_();
+  registerBlockOptions_();
 };
+exports.registerDefaultOptions = registerDefaultOptions;
 
-Blockly.ContextMenuItems.registerDefaultOptions();
+registerDefaultOptions();
diff --git a/tests/deps.js b/tests/deps.js
index abf82c44d..07f8193b2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -27,7 +27,7 @@ goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Bl
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.clipboard', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From d54f46a280f47458c2c66942c46a0d1cbdc7bb76 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 18:16:16 -0700
Subject: [PATCH 115/291] Migrate core/contextmenu_items.js named requires

---
 core/contextmenu_items.js | 240 +++++++++++++++++++-------------------
 1 file changed, 119 insertions(+), 121 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index c894c989a..99cf79e9c 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -10,85 +10,83 @@
  */
 'use strict';
 
-/**
- * @name Blockly.ContextMenuItems
- * @namespace
- */
 goog.module('Blockly.ContextMenuItems');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.clipboard');
-goog.require('Blockly.ContextMenuRegistry');
-goog.require('Blockly.Events');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.userAgent');
-goog.requireType('Blockly.WorkspaceSvg');
-goog.requireType('Blockly.BlockSvg');
+const Blockly = goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
+const Events = goog.require('Blockly.Events');
+const Msg = goog.require('Blockly.Msg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const clipboard = goog.require('Blockly.clipboard');
+const inputTypes = goog.require('Blockly.inputTypes');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
 
 
 /** Option to undo previous action. */
 const registerUndo = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const undoOption = {
     displayText: function () {
-      return Blockly.Msg['UNDO'];
+      return Msg['UNDO'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.getUndoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.workspace.undo(false);
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'undoWorkspace',
     weight: 1,
   };
-  Blockly.ContextMenuRegistry.registry.register(undoOption);
+  ContextMenuRegistry.registry.register(undoOption);
 };
 exports.registerUndo = registerUndo;
 
 /** Option to redo previous action. */
 const registerRedo = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const redoOption = {
     displayText: function () {
-      return Blockly.Msg['REDO'];
+      return Msg['REDO'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.getRedoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.workspace.undo(true);
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'redoWorkspace',
     weight: 2,
   };
-  Blockly.ContextMenuRegistry.registry.register(redoOption);
+  ContextMenuRegistry.registry.register(redoOption);
 };
 exports.registerRedo = registerRedo;
 
 /** Option to clean up blocks. */
 const registerCleanup = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const cleanOption = {
     displayText: function () {
-      return Blockly.Msg['CLEAN_UP'];
+      return Msg['CLEAN_UP'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.isMovable()) {
         if (scope.workspace.getTopBlocks(false).length > 1) {
@@ -98,22 +96,22 @@ const registerCleanup = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.workspace.cleanUp();
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'cleanWorkspace',
     weight: 3,
   };
-  Blockly.ContextMenuRegistry.registry.register(cleanOption);
+  ContextMenuRegistry.registry.register(cleanOption);
 };
 exports.registerCleanup = registerCleanup;
 
 /**
  * Creates a callback to collapse or expand top blocks.
  * @param {boolean} shouldCollapse Whether a block should collapse.
- * @param {!Array<Blockly.BlockSvg>} topBlocks Top blocks in the workspace.
+ * @param {!Array<BlockSvg>} topBlocks Top blocks in the workspace.
  * @private
  */
 const toggleOption_ = function(shouldCollapse, topBlocks) {
@@ -131,12 +129,12 @@ const toggleOption_ = function(shouldCollapse, topBlocks) {
 
 /** Option to collapse all blocks. */
 const registerCollapse = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseOption = {
     displayText: function () {
-      return Blockly.Msg['COLLAPSE_ALL'];
+      return Msg['COLLAPSE_ALL'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
@@ -153,27 +151,27 @@ const registerCollapse = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       toggleOption_(true,
           scope.workspace.getTopBlocks(true));
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'collapseWorkspace',
     weight: 4,
   };
-  Blockly.ContextMenuRegistry.registry.register(collapseOption);
+  ContextMenuRegistry.registry.register(collapseOption);
 };
 exports.registerCollapse = registerCollapse;
 
 /** Option to expand all blocks. */
 const registerExpand = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const expandOption = {
     displayText: function () {
-      return Blockly.Msg['EXPAND_ALL'];
+      return Msg['EXPAND_ALL'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
@@ -190,23 +188,23 @@ const registerExpand = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       toggleOption_(false,
           scope.workspace.getTopBlocks(true));
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'expandWorkspace',
     weight: 5,
   };
-  Blockly.ContextMenuRegistry.registry.register(expandOption);
+  ContextMenuRegistry.registry.register(expandOption);
 };
 exports.registerExpand = registerExpand;
 
 /**
  * Adds a block and its children to a list of deletable blocks.
- * @param {!Blockly.BlockSvg} block to delete.
- * @param {!Array<!Blockly.BlockSvg>} deleteList list of blocks that can be deleted. This will be
+ * @param {!BlockSvg} block to delete.
+ * @param {!Array<!BlockSvg>} deleteList list of blocks that can be deleted. This will be
  *    modifed in place with the given block and its descendants.
  * @private
  */
@@ -215,7 +213,7 @@ const addDeletableBlocks_ = function(block, deleteList) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
     const children =  /* eslint-disable-next-line indent */
-        /** @type {!Array<!Blockly.BlockSvg>} */ (block.getChildren(false));
+        /** @type {!Array<!BlockSvg>} */ (block.getChildren(false));
     for (let i = 0; i < children.length; i++) {
       addDeletableBlocks_(children[i], deleteList);
     }
@@ -224,8 +222,8 @@ const addDeletableBlocks_ = function(block, deleteList) {
 
 /**
  * Constructs a list of blocks that can be deleted in the given workspace.
- * @param {!Blockly.WorkspaceSvg} workspace to delete all blocks from.
- * @return {!Array<!Blockly.BlockSvg>} list of blocks to delete.
+ * @param {!WorkspaceSvg} workspace to delete all blocks from.
+ * @return {!Array<!BlockSvg>} list of blocks to delete.
  * @private
  */
 const getDeletableBlocks_ = function(workspace) {
@@ -238,13 +236,13 @@ const getDeletableBlocks_ = function(workspace) {
 };
 
 /** Deletes the given blocks. Used to delete all blocks in the workspace.
- * @param {!Array<!Blockly.BlockSvg>} deleteList list of blocks to delete.
+ * @param {!Array<!BlockSvg>} deleteList list of blocks to delete.
  * @param {string} eventGroup event group ID with which all delete events should be associated.
  * @private
  */
 const deleteNext_ = function(deleteList, eventGroup) {
   const DELAY = 10;
-  Blockly.Events.setGroup(eventGroup);
+  Events.setGroup(eventGroup);
   const block = deleteList.shift();
   if (block) {
     if (block.workspace) {
@@ -254,14 +252,14 @@ const deleteNext_ = function(deleteList, eventGroup) {
       deleteNext_(deleteList, eventGroup);
     }
   }
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
 };
 
 /** Option to delete all blocks. */
 const registerDeleteAll = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.workspace) {
         return;
@@ -269,13 +267,13 @@ const registerDeleteAll = function() {
       const deletableBlocksLength =
           getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
-        return Blockly.Msg['DELETE_BLOCK'];
+        return Msg['DELETE_BLOCK'];
       } else {
-        return Blockly.Msg['DELETE_X_BLOCKS'].replace('%1',
+        return Msg['DELETE_X_BLOCKS'].replace('%1',
             String(deletableBlocksLength));
       }
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.workspace) {
         return;
@@ -284,7 +282,7 @@ const registerDeleteAll = function() {
           getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.workspace) {
         return;
@@ -292,12 +290,12 @@ const registerDeleteAll = function() {
       scope.workspace.cancelCurrentGesture();
       const deletableBlocks = getDeletableBlocks_(
           scope.workspace);
-      const eventGroup = Blockly.utils.genUid();
+      const eventGroup = utils.genUid();
       if (deletableBlocks.length < 2) {
         deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
-            Blockly.Msg['DELETE_ALL_BLOCKS'].replace('%1',
+            Msg['DELETE_ALL_BLOCKS'].replace('%1',
                 deletableBlocks.length),
             function (ok) {
               if (ok) {
@@ -307,11 +305,11 @@ const registerDeleteAll = function() {
             });
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.WORKSPACE,
+    scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'workspaceDelete',
     weight: 6,
   };
-  Blockly.ContextMenuRegistry.registry.register(deleteOption);
+  ContextMenuRegistry.registry.register(deleteOption);
 };
 exports.registerDeleteAll = registerDeleteAll;
 
@@ -330,12 +328,12 @@ const registerWorkspaceOptions_ = function() {
 
 /** Option to duplicate a block. */
 const registerDuplicate = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const duplicateOption = {
     displayText: function () {
-      return Blockly.Msg['DUPLICATE_BLOCK'];
+      return Msg['DUPLICATE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isDeletable() && block.isMovable()) {
@@ -346,45 +344,45 @@ const registerDuplicate = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.block) {
-        Blockly.clipboard.duplicate(scope.block);
+        clipboard.duplicate(scope.block);
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockDuplicate',
     weight: 1,
   };
-  Blockly.ContextMenuRegistry.registry.register(duplicateOption);
+  ContextMenuRegistry.registry.register(duplicateOption);
 };
 exports.registerDuplicate = registerDuplicate;
 
 /** Option to add or remove block-level comment. */
 const registerComment = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const commentOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (scope.block.getCommentIcon()) {
         // If there's already a comment,  option is to remove.
-        return Blockly.Msg['REMOVE_COMMENT'];
+        return Msg['REMOVE_COMMENT'];
       }
       // If there's no comment yet, option is to add.
-      return Blockly.Msg['ADD_COMMENT'];
+      return Msg['ADD_COMMENT'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       // IE doesn't support necessary features for comment editing.
-      if (!Blockly.utils.userAgent.IE && !block.isInFlyout
+      if (!userAgent.IE && !block.isInFlyout
           && block.workspace.options.comments &&
           !block.isCollapsed() && block.isEditable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (block.getCommentIcon()) {
@@ -393,59 +391,59 @@ const registerComment = function() {
         block.setCommentText('');
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockComment',
     weight: 2,
   };
-  Blockly.ContextMenuRegistry.registry.register(commentOption);
+  ContextMenuRegistry.registry.register(commentOption);
 };
 exports.registerComment = registerComment;
 
 /** Option to inline variables. */
 const registerInline = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const inlineOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       return (scope.block.getInputsInline()) ?
-          Blockly.Msg['EXTERNAL_INPUTS'] : Blockly.Msg['INLINE_INPUTS'];
+          Msg['EXTERNAL_INPUTS'] : Msg['INLINE_INPUTS'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isMovable() && !block.isCollapsed()) {
         for (let i = 1; i < block.inputList.length; i++) {
           // Only display this option if there are two value or dummy inputs next to each other.
-          if (block.inputList[i - 1].type != Blockly.inputTypes.STATEMENT &&
-              block.inputList[i].type != Blockly.inputTypes.STATEMENT) {
+          if (block.inputList[i - 1].type != inputTypes.STATEMENT &&
+              block.inputList[i].type != inputTypes.STATEMENT) {
             return 'enabled';
           }
         }
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.block.setInputsInline(!scope.block.getInputsInline());
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockInline',
     weight: 3,
   };
-  Blockly.ContextMenuRegistry.registry.register(inlineOption);
+  ContextMenuRegistry.registry.register(inlineOption);
 };
 exports.registerInline = registerInline;
 
 /** Option to collapse or expand a block. */
 const registerCollapseExpandBlock = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseExpandOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       return scope.block.isCollapsed() ?
-          Blockly.Msg['EXPAND_BLOCK'] : Blockly.Msg['COLLAPSE_BLOCK'];
+          Msg['EXPAND_BLOCK'] : Msg['COLLAPSE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isMovable()
@@ -454,28 +452,28 @@ const registerCollapseExpandBlock = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.block.setCollapsed(!scope.block.isCollapsed());
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockCollapseExpand',
     weight: 4,
   };
-  Blockly.ContextMenuRegistry.registry.register(collapseExpandOption);
+  ContextMenuRegistry.registry.register(collapseExpandOption);
 };
 exports.registerCollapseExpandBlock = registerCollapseExpandBlock;
 
 /** Option to disable or enable a block. */
 const registerDisable = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const disableOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       return (scope.block.isEnabled()) ?
-          Blockly.Msg['DISABLE_BLOCK'] : Blockly.Msg['ENABLE_BLOCK'];
+          Msg['DISABLE_BLOCK'] : Msg['ENABLE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.workspace.options.disable
@@ -487,31 +485,31 @@ const registerDisable = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
-      const group = Blockly.Events.getGroup();
+      const group = Events.getGroup();
       if (!group) {
-        Blockly.Events.setGroup(true);
+        Events.setGroup(true);
       }
       block.setEnabled(!block.isEnabled());
       if (!group) {
-        Blockly.Events.setGroup(false);
+        Events.setGroup(false);
       }
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockDisable',
     weight: 5,
   };
-  Blockly.ContextMenuRegistry.registry.register(disableOption);
+  ContextMenuRegistry.registry.register(disableOption);
 };
 exports.registerDisable = registerDisable;
 
 /** Option to delete a block. */
 const registerDelete = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       // Count the number of blocks that are nested in this block.
@@ -521,40 +519,40 @@ const registerDelete = function() {
         // Blocks in the current stack would survive this block's deletion.
         descendantCount -= nextBlock.getDescendants(false).length;
       }
-      return (descendantCount == 1) ? Blockly.Msg['DELETE_BLOCK'] :
-          Blockly.Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
+      return (descendantCount == 1) ? Msg['DELETE_BLOCK'] :
+          Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       if (!scope.block.isInFlyout && scope.block.isDeletable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
       if (scope.block) {
         Blockly.deleteBlock(scope.block);
       }
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockDelete',
     weight: 6,
   };
-  Blockly.ContextMenuRegistry.registry.register(deleteOption);
+  ContextMenuRegistry.registry.register(deleteOption);
 };
 exports.registerDelete = registerDelete;
 
 /** Option to open help for a block. */
 const registerHelp = function() {
-  /** @type {!Blockly.ContextMenuRegistry.RegistryItem} */
+  /** @type {!ContextMenuRegistry.RegistryItem} */
   const helpOption = {
     displayText: function () {
-      return Blockly.Msg['HELP'];
+      return Msg['HELP'];
     },
-    preconditionFn: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       const block = scope.block;
       const url = (typeof block.helpUrl == 'function') ?
@@ -564,15 +562,15 @@ const registerHelp = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!Blockly.ContextMenuRegistry.Scope} */
+    callback: function (/** @type {!ContextMenuRegistry.Scope} */
         scope) {
       scope.block.showHelp();
     },
-    scopeType: Blockly.ContextMenuRegistry.ScopeType.BLOCK,
+    scopeType: ContextMenuRegistry.ScopeType.BLOCK,
     id: 'blockHelp',
     weight: 7,
   };
-  Blockly.ContextMenuRegistry.registry.register(helpOption);
+  ContextMenuRegistry.registry.register(helpOption);
 };
 exports.registerHelp = registerHelp;
 

From d4543374d64c65e7d4bf1de7c3d6d9648d0979f6 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 18:17:08 -0700
Subject: [PATCH 116/291] clang-format core/contextmenu_items.js

---
 core/contextmenu_items.js | 220 +++++++++++++++++++-------------------
 1 file changed, 109 insertions(+), 111 deletions(-)

diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js
index 99cf79e9c..35cb5eddc 100644
--- a/core/contextmenu_items.js
+++ b/core/contextmenu_items.js
@@ -31,18 +31,18 @@ const utils = goog.require('Blockly.utils');
 const registerUndo = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const undoOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['UNDO'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.getUndoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.workspace.undo(false);
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -57,18 +57,18 @@ exports.registerUndo = registerUndo;
 const registerRedo = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const redoOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['REDO'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.getRedoStack().length > 0) {
         return 'enabled';
       }
       return 'disabled';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.workspace.undo(true);
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -83,11 +83,11 @@ exports.registerRedo = registerRedo;
 const registerCleanup = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const cleanOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['CLEAN_UP'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.isMovable()) {
         if (scope.workspace.getTopBlocks(false).length > 1) {
           return 'enabled';
@@ -96,8 +96,8 @@ const registerCleanup = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.workspace.cleanUp();
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
@@ -131,11 +131,11 @@ const toggleOption_ = function(shouldCollapse, topBlocks) {
 const registerCollapse = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['COLLAPSE_ALL'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
         for (let i = 0; i < topBlocks.length; i++) {
@@ -151,10 +151,9 @@ const registerCollapse = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      toggleOption_(true,
-          scope.workspace.getTopBlocks(true));
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
+      toggleOption_(true, scope.workspace.getTopBlocks(true));
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'collapseWorkspace',
@@ -168,11 +167,11 @@ exports.registerCollapse = registerCollapse;
 const registerExpand = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const expandOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['EXPAND_ALL'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (scope.workspace.options.collapse) {
         const topBlocks = scope.workspace.getTopBlocks(false);
         for (let i = 0; i < topBlocks.length; i++) {
@@ -188,10 +187,9 @@ const registerExpand = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      toggleOption_(false,
-          scope.workspace.getTopBlocks(true));
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
+      toggleOption_(false, scope.workspace.getTopBlocks(true));
     },
     scopeType: ContextMenuRegistry.ScopeType.WORKSPACE,
     id: 'expandWorkspace',
@@ -204,7 +202,8 @@ exports.registerExpand = registerExpand;
 /**
  * Adds a block and its children to a list of deletable blocks.
  * @param {!BlockSvg} block to delete.
- * @param {!Array<!BlockSvg>} deleteList list of blocks that can be deleted. This will be
+ * @param {!Array<!BlockSvg>} deleteList list of blocks that can be deleted.
+ *     This will be
  *    modifed in place with the given block and its descendants.
  * @private
  */
@@ -212,7 +211,7 @@ const addDeletableBlocks_ = function(block, deleteList) {
   if (block.isDeletable()) {
     Array.prototype.push.apply(deleteList, block.getDescendants(false));
   } else {
-    const children =  /* eslint-disable-next-line indent */
+    const children = /* eslint-disable-next-line indent */
         /** @type {!Array<!BlockSvg>} */ (block.getChildren(false));
     for (let i = 0; i < children.length; i++) {
       addDeletableBlocks_(children[i], deleteList);
@@ -235,9 +234,11 @@ const getDeletableBlocks_ = function(workspace) {
   return deleteList;
 };
 
-/** Deletes the given blocks. Used to delete all blocks in the workspace.
+/**
+ * Deletes the given blocks. Used to delete all blocks in the workspace.
  * @param {!Array<!BlockSvg>} deleteList list of blocks to delete.
- * @param {string} eventGroup event group ID with which all delete events should be associated.
+ * @param {string} eventGroup event group ID with which all delete events should
+ *     be associated.
  * @private
  */
 const deleteNext_ = function(deleteList, eventGroup) {
@@ -259,48 +260,43 @@ const deleteNext_ = function(deleteList, eventGroup) {
 const registerDeleteAll = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
       if (!scope.workspace) {
         return;
       }
-      const deletableBlocksLength =
-          getDeletableBlocks_(scope.workspace).length;
+      const deletableBlocksLength = getDeletableBlocks_(scope.workspace).length;
       if (deletableBlocksLength == 1) {
         return Msg['DELETE_BLOCK'];
       } else {
-        return Msg['DELETE_X_BLOCKS'].replace('%1',
-            String(deletableBlocksLength));
+        return Msg['DELETE_X_BLOCKS'].replace(
+            '%1', String(deletableBlocksLength));
       }
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (!scope.workspace) {
         return;
       }
-      const deletableBlocksLength =
-          getDeletableBlocks_(scope.workspace).length;
+      const deletableBlocksLength = getDeletableBlocks_(scope.workspace).length;
       return deletableBlocksLength > 0 ? 'enabled' : 'disabled';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       if (!scope.workspace) {
         return;
       }
       scope.workspace.cancelCurrentGesture();
-      const deletableBlocks = getDeletableBlocks_(
-          scope.workspace);
+      const deletableBlocks = getDeletableBlocks_(scope.workspace);
       const eventGroup = utils.genUid();
       if (deletableBlocks.length < 2) {
         deleteNext_(deletableBlocks, eventGroup);
       } else {
         Blockly.confirm(
-            Msg['DELETE_ALL_BLOCKS'].replace('%1',
-                deletableBlocks.length),
-            function (ok) {
+            Msg['DELETE_ALL_BLOCKS'].replace('%1', deletableBlocks.length),
+            function(ok) {
               if (ok) {
-                deleteNext_(deletableBlocks,
-                    eventGroup);
+                deleteNext_(deletableBlocks, eventGroup);
               }
             });
       }
@@ -330,11 +326,11 @@ const registerWorkspaceOptions_ = function() {
 const registerDuplicate = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const duplicateOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['DUPLICATE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isDeletable() && block.isMovable()) {
         if (block.isDuplicatable()) {
@@ -344,8 +340,8 @@ const registerDuplicate = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       if (scope.block) {
         clipboard.duplicate(scope.block);
       }
@@ -362,8 +358,8 @@ exports.registerDuplicate = registerDuplicate;
 const registerComment = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const commentOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
       if (scope.block.getCommentIcon()) {
         // If there's already a comment,  option is to remove.
         return Msg['REMOVE_COMMENT'];
@@ -371,19 +367,19 @@ const registerComment = function() {
       // If there's no comment yet, option is to add.
       return Msg['ADD_COMMENT'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
       // IE doesn't support necessary features for comment editing.
-      if (!userAgent.IE && !block.isInFlyout
-          && block.workspace.options.comments &&
-          !block.isCollapsed() && block.isEditable()) {
+      if (!userAgent.IE && !block.isInFlyout &&
+          block.workspace.options.comments && !block.isCollapsed() &&
+          block.isEditable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       const block = scope.block;
       if (block.getCommentIcon()) {
         block.setCommentText(null);
@@ -403,17 +399,18 @@ exports.registerComment = registerComment;
 const registerInline = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const inlineOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      return (scope.block.getInputsInline()) ?
-          Msg['EXTERNAL_INPUTS'] : Msg['INLINE_INPUTS'];
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
+      return (scope.block.getInputsInline()) ? Msg['EXTERNAL_INPUTS'] :
+                                               Msg['INLINE_INPUTS'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
       if (!block.isInFlyout && block.isMovable() && !block.isCollapsed()) {
         for (let i = 1; i < block.inputList.length; i++) {
-          // Only display this option if there are two value or dummy inputs next to each other.
+          // Only display this option if there are two value or dummy inputs
+          // next to each other.
           if (block.inputList[i - 1].type != inputTypes.STATEMENT &&
               block.inputList[i].type != inputTypes.STATEMENT) {
             return 'enabled';
@@ -422,8 +419,8 @@ const registerInline = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.block.setInputsInline(!scope.block.getInputsInline());
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
@@ -438,22 +435,22 @@ exports.registerInline = registerInline;
 const registerCollapseExpandBlock = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const collapseExpandOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      return scope.block.isCollapsed() ?
-          Msg['EXPAND_BLOCK'] : Msg['COLLAPSE_BLOCK'];
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
+      return scope.block.isCollapsed() ? Msg['EXPAND_BLOCK'] :
+                                         Msg['COLLAPSE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
-      if (!block.isInFlyout && block.isMovable()
-          && block.workspace.options.collapse) {
+      if (!block.isInFlyout && block.isMovable() &&
+          block.workspace.options.collapse) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.block.setCollapsed(!scope.block.isCollapsed());
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
@@ -468,16 +465,16 @@ exports.registerCollapseExpandBlock = registerCollapseExpandBlock;
 const registerDisable = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const disableOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
-      return (scope.block.isEnabled()) ?
-          Msg['DISABLE_BLOCK'] : Msg['ENABLE_BLOCK'];
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
+      return (scope.block.isEnabled()) ? Msg['DISABLE_BLOCK'] :
+                                         Msg['ENABLE_BLOCK'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
-      if (!block.isInFlyout && block.workspace.options.disable
-          && block.isEditable()) {
+      if (!block.isInFlyout && block.workspace.options.disable &&
+          block.isEditable()) {
         if (block.getInheritedDisabled()) {
           return 'disabled';
         }
@@ -485,8 +482,8 @@ const registerDisable = function() {
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       const block = scope.block;
       const group = Events.getGroup();
       if (!group) {
@@ -509,8 +506,8 @@ exports.registerDisable = registerDisable;
 const registerDelete = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const deleteOption = {
-    displayText: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    displayText: function(/** @type {!ContextMenuRegistry.Scope} */
+                          scope) {
       const block = scope.block;
       // Count the number of blocks that are nested in this block.
       let descendantCount = block.getDescendants(false).length;
@@ -519,18 +516,19 @@ const registerDelete = function() {
         // Blocks in the current stack would survive this block's deletion.
         descendantCount -= nextBlock.getDescendants(false).length;
       }
-      return (descendantCount == 1) ? Msg['DELETE_BLOCK'] :
+      return (descendantCount == 1) ?
+          Msg['DELETE_BLOCK'] :
           Msg['DELETE_X_BLOCKS'].replace('%1', String(descendantCount));
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       if (!scope.block.isInFlyout && scope.block.isDeletable()) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       Events.setGroup(true);
       if (scope.block) {
         Blockly.deleteBlock(scope.block);
@@ -549,21 +547,21 @@ exports.registerDelete = registerDelete;
 const registerHelp = function() {
   /** @type {!ContextMenuRegistry.RegistryItem} */
   const helpOption = {
-    displayText: function () {
+    displayText: function() {
       return Msg['HELP'];
     },
-    preconditionFn: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    preconditionFn: function(/** @type {!ContextMenuRegistry.Scope} */
+                             scope) {
       const block = scope.block;
-      const url = (typeof block.helpUrl == 'function') ?
-          block.helpUrl() : block.helpUrl;
+      const url = (typeof block.helpUrl == 'function') ? block.helpUrl() :
+                                                         block.helpUrl;
       if (url) {
         return 'enabled';
       }
       return 'hidden';
     },
-    callback: function (/** @type {!ContextMenuRegistry.Scope} */
-        scope) {
+    callback: function(/** @type {!ContextMenuRegistry.Scope} */
+                       scope) {
       scope.block.showHelp();
     },
     scopeType: ContextMenuRegistry.ScopeType.BLOCK,
@@ -589,8 +587,8 @@ const registerBlockOptions_ = function() {
 };
 
 /**
- * Registers all default context menu items. This should be called once per instance of
- * ContextMenuRegistry.
+ * Registers all default context menu items. This should be called once per
+ * instance of ContextMenuRegistry.
  * @package
  */
 const registerDefaultOptions = function() {

From 3d8a79fe962ecaa705139374c82dedd2b6a6a299 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:42:53 -0700
Subject: [PATCH 117/291] Add missing eslint disable to
 core/renderers/common/i_path_object.js

---
 core/renderers/common/i_path_object.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js
index 0b0362ff3..1a8deb11e 100644
--- a/core/renderers/common/i_path_object.js
+++ b/core/renderers/common/i_path_object.js
@@ -19,6 +19,7 @@ goog.module.declareLegacyNamespace();
 const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
 
 

From 4b2e48134036b0369dda00a322335b688a9910ee Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:32:53 -0700
Subject: [PATCH 118/291] Split core/scrollbar.js into 2 files

---
 core/scrollbar.js      | 304 +--------------------------------------
 core/scrollbar_pair.js | 319 +++++++++++++++++++++++++++++++++++++++++
 tests/deps.js          |   3 +-
 3 files changed, 323 insertions(+), 303 deletions(-)
 create mode 100644 core/scrollbar_pair.js

diff --git a/core/scrollbar.js b/core/scrollbar.js
index aab3852f2..25bdef776 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -5,16 +5,14 @@
  */
 
 /**
- * @fileoverview Library for creating scrollbars.
+ * @fileoverview Object representing a scrollbar.
  * @author fraser@google.com (Neil Fraser)
  */
 'use strict';
 
 goog.provide('Blockly.Scrollbar');
-goog.provide('Blockly.ScrollbarPair');
 
 goog.require('Blockly.browserEvents');
-goog.require('Blockly.Events');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
@@ -30,304 +28,6 @@ goog.requireType('Blockly.WorkspaceSvg');
  * scrollbar is in a mutator.
  */
 
-/**
- * Class for a pair of scrollbars.  Horizontal and vertical.
- * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbars to.
- * @param {boolean=} addHorizontal Whether to add a horizontal scrollbar.
- *    Defaults to true.
- * @param {boolean=} addVertical Whether to add a vertical scrollbar. Defaults
- *    to true.
- * @param {string=} opt_class A class to be applied to these scrollbars.
- * @param {number=} opt_margin The margin to apply to these scrollbars.
- * @constructor
- */
-Blockly.ScrollbarPair = function(
-    workspace, addHorizontal, addVertical, opt_class, opt_margin) {
-  /**
-   * The workspace this scrollbar pair is bound to.
-   * @type {!Blockly.WorkspaceSvg}
-   * @private
-   */
-  this.workspace_ = workspace;
-
-  addHorizontal = addHorizontal === undefined ? true : addHorizontal;
-  addVertical = addVertical === undefined ? true : addVertical;
-  var isPair = addHorizontal && addVertical;
-
-  if (addHorizontal) {
-    this.hScroll = new Blockly.Scrollbar(
-        workspace, true, isPair, opt_class, opt_margin);
-  }
-  if (addVertical) {
-    this.vScroll = new Blockly.Scrollbar(
-        workspace, false, isPair, opt_class, opt_margin);
-  }
-
-  if (isPair) {
-    this.corner_ = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
-        {
-          'height': Blockly.Scrollbar.scrollbarThickness,
-          'width': Blockly.Scrollbar.scrollbarThickness,
-          'class': 'blocklyScrollbarBackground'
-        },
-        null);
-    Blockly.utils.dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
-  }
-
-  /**
-   * Previously recorded metrics from the workspace.
-   * @type {?Blockly.utils.Metrics}
-   * @private
-   */
-  this.oldHostMetrics_ = null;
-};
-
-/**
- * Dispose of this pair of scrollbars.
- * Unlink from all DOM elements to prevent memory leaks.
- * @suppress {checkTypes}
- */
-Blockly.ScrollbarPair.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.corner_);
-  this.corner_ = null;
-  this.workspace_ = null;
-  this.oldHostMetrics_ = null;
-  if (this.hScroll) {
-    this.hScroll.dispose();
-    this.hScroll = null;
-  }
-  if (this.vScroll) {
-    this.vScroll.dispose();
-    this.vScroll = null;
-  }
-};
-
-/**
- * Recalculate both of the scrollbars' locations and lengths.
- * Also reposition the corner rectangle.
- */
-Blockly.ScrollbarPair.prototype.resize = function() {
-  // Look up the host metrics once, and use for both scrollbars.
-  var hostMetrics = this.workspace_.getMetrics();
-  if (!hostMetrics) {
-    // Host element is likely not visible.
-    return;
-  }
-
-  // Only change the scrollbars if there has been a change in metrics.
-  var resizeH = false;
-  var resizeV = false;
-  if (!this.oldHostMetrics_ ||
-      this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
-      this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
-      this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop ||
-      this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
-    // The window has been resized or repositioned.
-    resizeH = true;
-    resizeV = true;
-  } else {
-    // Has the content been resized or moved?
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.scrollWidth != hostMetrics.scrollWidth ||
-        this.oldHostMetrics_.viewLeft != hostMetrics.viewLeft ||
-        this.oldHostMetrics_.scrollLeft != hostMetrics.scrollLeft) {
-      resizeH = true;
-    }
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.scrollHeight != hostMetrics.scrollHeight ||
-        this.oldHostMetrics_.viewTop != hostMetrics.viewTop ||
-        this.oldHostMetrics_.scrollTop != hostMetrics.scrollTop) {
-      resizeV = true;
-    }
-  }
-
-  if (resizeH || resizeV) {
-    try {
-      Blockly.Events.disable();
-      if (this.hScroll && resizeH) {
-        this.hScroll.resize(hostMetrics);
-      }
-      if (this.vScroll && resizeV) {
-        this.vScroll.resize(hostMetrics);
-      }
-    } finally {
-      Blockly.Events.enable();
-    }
-    this.workspace_.maybeFireViewportChangeEvent();
-  }
-
-  if (this.hScroll && this.vScroll) {
-    // Reposition the corner square.
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
-        this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
-      this.corner_.setAttribute('x', this.vScroll.position.x);
-    }
-    if (!this.oldHostMetrics_ ||
-        this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
-        this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop) {
-      this.corner_.setAttribute('y', this.hScroll.position.y);
-    }
-  }
-
-  // Cache the current metrics to potentially short-cut the next resize event.
-  this.oldHostMetrics_ = hostMetrics;
-};
-
-/**
- * Returns whether scrolling horizontally is enabled.
- * @return {boolean} True if horizontal scroll is enabled.
- */
-Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
-  return !!this.hScroll;
-};
-
-/**
- * Returns whether scrolling vertically is enabled.
- * @return {boolean} True if vertical scroll is enabled.
- */
-Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
-  return !!this.vScroll;
-};
-
-/**
- * Record the origin of the workspace that the scrollbar is in, in pixels
- * relative to the injection div origin. This is for times when the scrollbar is
- * used in an object whose origin isn't the same as the main workspace
- * (e.g. in a flyout.)
- * @param {number} x The x coordinate of the scrollbar's origin, in CSS pixels.
- * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
- * @package
- */
-Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
-  if (this.hScroll) {
-    this.hScroll.setOrigin(x, y);
-  }
-  if (this.vScroll) {
-    this.vScroll.setOrigin(x, y);
-  }
-};
-
-/**
- * Set the handles of both scrollbars.
- * @param {number} x The horizontal content displacement, relative to the view
- *    in pixels.
- * @param {number} y The vertical content displacement, relative to the view in
- *    pixels.
- * @param {boolean} updateMetrics Whether to update metrics on this set call.
- *    Defaults to true.
- */
-Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
-  // This function is equivalent to:
-  //   this.hScroll.set(x);
-  //   this.vScroll.set(y);
-  // However, that calls setMetrics twice which causes a chain of
-  // getAttribute->setAttribute->getAttribute resulting in an extra layout pass.
-  // Combining them speeds up rendering.
-  if (this.hScroll) {
-    this.hScroll.set(x, false);
-  }
-  if (this.vScroll) {
-    this.vScroll.set(y, false);
-  }
-
-  if (updateMetrics || updateMetrics === undefined) {
-    // Update metrics.
-    var xyRatio = {};
-    if (this.hScroll) {
-      xyRatio.x = this.hScroll.getRatio_();
-    }
-    if (this.vScroll) {
-      xyRatio.y = this.vScroll.getRatio_();
-    }
-    this.workspace_.setMetrics(xyRatio);
-  }
-};
-
-/**
- * Set the handle of the horizontal scrollbar to be at a certain position in
- *    CSS pixels relative to its parents.
- * @param {number} x Horizontal scroll value.
- */
-Blockly.ScrollbarPair.prototype.setX = function(x) {
-  if (this.hScroll) {
-    this.hScroll.set(x, true);
-  }
-};
-
-/**
- * Set the handle of the vertical scrollbar to be at a certain position in
- *    CSS pixels relative to its parents.
- * @param {number} y Vertical scroll value.
- */
-Blockly.ScrollbarPair.prototype.setY = function(y) {
-  if (this.vScroll) {
-    this.vScroll.set(y, true);
-  }
-};
-
-/**
- * Set whether this scrollbar's container is visible.
- * @param {boolean} visible Whether the container is visible.
- */
-Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
-  if (this.hScroll) {
-    this.hScroll.setContainerVisible(visible);
-  }
-  if (this.vScroll) {
-    this.vScroll.setContainerVisible(visible);
-  }
-};
-
-/**
- * If any of the scrollbars are visible. Non-paired scrollbars may disappear
- * when they aren't needed.
- * @return {boolean} True if visible.
- */
-Blockly.ScrollbarPair.prototype.isVisible = function() {
-  var isVisible = false;
-  if (this.hScroll) {
-    isVisible = this.hScroll.isVisible();
-  }
-  if (this.vScroll) {
-    isVisible = isVisible || this.vScroll.isVisible();
-  }
-  return isVisible;
-};
-
-/**
- * Recalculates the scrollbars' locations within their path and length.
- * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
- *     the required dimensions, possibly fetched from the host object.
- */
-Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
-  if (this.hScroll) {
-    this.hScroll.resizeContentHorizontal(hostMetrics);
-  }
-  if (this.vScroll) {
-    this.vScroll.resizeContentVertical(hostMetrics);
-  }
-};
-
-/**
- * Recalculates the scrollbars' locations on the screen and path length.
- * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
- *     the required dimensions, possibly fetched from the host object.
- */
-Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
-  if (this.hScroll) {
-    this.hScroll.resizeViewHorizontal(hostMetrics);
-  }
-  if (this.vScroll) {
-    this.vScroll.resizeViewVertical(hostMetrics);
-  }
-};
-
-// --------------------------------------------------------------------
-
 /**
  * Class for a pure SVG scrollbar.
  * This technique offers a scrollbar that is guaranteed to work, but may not
@@ -1094,7 +794,7 @@ Blockly.Scrollbar.prototype.cleanUp_ = function() {
 /**
  * Helper to calculate the ratio of handle position to scrollbar view size.
  * @return {number} Ratio.
- * @protected
+ * @package
  */
 Blockly.Scrollbar.prototype.getRatio_ = function() {
   var scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
new file mode 100644
index 000000000..3caf986e7
--- /dev/null
+++ b/core/scrollbar_pair.js
@@ -0,0 +1,319 @@
+/**
+ * @license
+ * Copyright 2011 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object representing a pair of scrollbars.
+ * @author fraser@google.com (Neil Fraser)
+ */
+'use strict';
+
+goog.provide('Blockly.ScrollbarPair');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Scrollbar');
+goog.require('Blockly.utils');
+goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.Metrics');
+goog.require('Blockly.utils.Svg');
+
+goog.requireType('Blockly.WorkspaceSvg');
+
+
+/**
+ * Class for a pair of scrollbars.  Horizontal and vertical.
+ * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbars to.
+ * @param {boolean=} addHorizontal Whether to add a horizontal scrollbar.
+ *    Defaults to true.
+ * @param {boolean=} addVertical Whether to add a vertical scrollbar. Defaults
+ *    to true.
+ * @param {string=} opt_class A class to be applied to these scrollbars.
+ * @param {number=} opt_margin The margin to apply to these scrollbars.
+ * @constructor
+ */
+Blockly.ScrollbarPair = function(
+    workspace, addHorizontal, addVertical, opt_class, opt_margin) {
+  /**
+   * The workspace this scrollbar pair is bound to.
+   * @type {!Blockly.WorkspaceSvg}
+   * @private
+   */
+  this.workspace_ = workspace;
+
+  addHorizontal = addHorizontal === undefined ? true : addHorizontal;
+  addVertical = addVertical === undefined ? true : addVertical;
+  var isPair = addHorizontal && addVertical;
+
+  if (addHorizontal) {
+    this.hScroll = new Blockly.Scrollbar(
+        workspace, true, isPair, opt_class, opt_margin);
+  }
+  if (addVertical) {
+    this.vScroll = new Blockly.Scrollbar(
+        workspace, false, isPair, opt_class, opt_margin);
+  }
+
+  if (isPair) {
+    this.corner_ = Blockly.utils.dom.createSvgElement(
+        Blockly.utils.Svg.RECT,
+        {
+          'height': Blockly.Scrollbar.scrollbarThickness,
+          'width': Blockly.Scrollbar.scrollbarThickness,
+          'class': 'blocklyScrollbarBackground'
+        },
+        null);
+    Blockly.utils.dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
+  }
+
+  /**
+   * Previously recorded metrics from the workspace.
+   * @type {?Blockly.utils.Metrics}
+   * @private
+   */
+  this.oldHostMetrics_ = null;
+};
+
+/**
+ * Dispose of this pair of scrollbars.
+ * Unlink from all DOM elements to prevent memory leaks.
+ * @suppress {checkTypes}
+ */
+Blockly.ScrollbarPair.prototype.dispose = function() {
+  Blockly.utils.dom.removeNode(this.corner_);
+  this.corner_ = null;
+  this.workspace_ = null;
+  this.oldHostMetrics_ = null;
+  if (this.hScroll) {
+    this.hScroll.dispose();
+    this.hScroll = null;
+  }
+  if (this.vScroll) {
+    this.vScroll.dispose();
+    this.vScroll = null;
+  }
+};
+
+/**
+ * Recalculate both of the scrollbars' locations and lengths.
+ * Also reposition the corner rectangle.
+ */
+Blockly.ScrollbarPair.prototype.resize = function() {
+  // Look up the host metrics once, and use for both scrollbars.
+  var hostMetrics = this.workspace_.getMetrics();
+  if (!hostMetrics) {
+    // Host element is likely not visible.
+    return;
+  }
+
+  // Only change the scrollbars if there has been a change in metrics.
+  var resizeH = false;
+  var resizeV = false;
+  if (!this.oldHostMetrics_ ||
+      this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
+      this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
+      this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop ||
+      this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
+    // The window has been resized or repositioned.
+    resizeH = true;
+    resizeV = true;
+  } else {
+    // Has the content been resized or moved?
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.scrollWidth != hostMetrics.scrollWidth ||
+        this.oldHostMetrics_.viewLeft != hostMetrics.viewLeft ||
+        this.oldHostMetrics_.scrollLeft != hostMetrics.scrollLeft) {
+      resizeH = true;
+    }
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.scrollHeight != hostMetrics.scrollHeight ||
+        this.oldHostMetrics_.viewTop != hostMetrics.viewTop ||
+        this.oldHostMetrics_.scrollTop != hostMetrics.scrollTop) {
+      resizeV = true;
+    }
+  }
+
+  if (resizeH || resizeV) {
+    try {
+      Blockly.Events.disable();
+      if (this.hScroll && resizeH) {
+        this.hScroll.resize(hostMetrics);
+      }
+      if (this.vScroll && resizeV) {
+        this.vScroll.resize(hostMetrics);
+      }
+    } finally {
+      Blockly.Events.enable();
+    }
+    this.workspace_.maybeFireViewportChangeEvent();
+  }
+
+  if (this.hScroll && this.vScroll) {
+    // Reposition the corner square.
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
+        this.oldHostMetrics_.absoluteLeft != hostMetrics.absoluteLeft) {
+      this.corner_.setAttribute('x', this.vScroll.position.x);
+    }
+    if (!this.oldHostMetrics_ ||
+        this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
+        this.oldHostMetrics_.absoluteTop != hostMetrics.absoluteTop) {
+      this.corner_.setAttribute('y', this.hScroll.position.y);
+    }
+  }
+
+  // Cache the current metrics to potentially short-cut the next resize event.
+  this.oldHostMetrics_ = hostMetrics;
+};
+
+/**
+ * Returns whether scrolling horizontally is enabled.
+ * @return {boolean} True if horizontal scroll is enabled.
+ */
+Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
+  return !!this.hScroll;
+};
+
+/**
+ * Returns whether scrolling vertically is enabled.
+ * @return {boolean} True if vertical scroll is enabled.
+ */
+Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
+  return !!this.vScroll;
+};
+
+/**
+ * Record the origin of the workspace that the scrollbar is in, in pixels
+ * relative to the injection div origin. This is for times when the scrollbar is
+ * used in an object whose origin isn't the same as the main workspace
+ * (e.g. in a flyout.)
+ * @param {number} x The x coordinate of the scrollbar's origin, in CSS pixels.
+ * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
+ * @package
+ */
+Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
+  if (this.hScroll) {
+    this.hScroll.setOrigin(x, y);
+  }
+  if (this.vScroll) {
+    this.vScroll.setOrigin(x, y);
+  }
+};
+
+/**
+ * Set the handles of both scrollbars.
+ * @param {number} x The horizontal content displacement, relative to the view
+ *    in pixels.
+ * @param {number} y The vertical content displacement, relative to the view in
+ *    pixels.
+ * @param {boolean} updateMetrics Whether to update metrics on this set call.
+ *    Defaults to true.
+ */
+Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
+  // This function is equivalent to:
+  //   this.hScroll.set(x);
+  //   this.vScroll.set(y);
+  // However, that calls setMetrics twice which causes a chain of
+  // getAttribute->setAttribute->getAttribute resulting in an extra layout pass.
+  // Combining them speeds up rendering.
+  if (this.hScroll) {
+    this.hScroll.set(x, false);
+  }
+  if (this.vScroll) {
+    this.vScroll.set(y, false);
+  }
+
+  if (updateMetrics || updateMetrics === undefined) {
+    // Update metrics.
+    var xyRatio = {};
+    if (this.hScroll) {
+      xyRatio.x = this.hScroll.getRatio_();
+    }
+    if (this.vScroll) {
+      xyRatio.y = this.vScroll.getRatio_();
+    }
+    this.workspace_.setMetrics(xyRatio);
+  }
+};
+
+/**
+ * Set the handle of the horizontal scrollbar to be at a certain position in
+ *    CSS pixels relative to its parents.
+ * @param {number} x Horizontal scroll value.
+ */
+Blockly.ScrollbarPair.prototype.setX = function(x) {
+  if (this.hScroll) {
+    this.hScroll.set(x, true);
+  }
+};
+
+/**
+ * Set the handle of the vertical scrollbar to be at a certain position in
+ *    CSS pixels relative to its parents.
+ * @param {number} y Vertical scroll value.
+ */
+Blockly.ScrollbarPair.prototype.setY = function(y) {
+  if (this.vScroll) {
+    this.vScroll.set(y, true);
+  }
+};
+
+/**
+ * Set whether this scrollbar's container is visible.
+ * @param {boolean} visible Whether the container is visible.
+ */
+Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
+  if (this.hScroll) {
+    this.hScroll.setContainerVisible(visible);
+  }
+  if (this.vScroll) {
+    this.vScroll.setContainerVisible(visible);
+  }
+};
+
+/**
+ * If any of the scrollbars are visible. Non-paired scrollbars may disappear
+ * when they aren't needed.
+ * @return {boolean} True if visible.
+ */
+Blockly.ScrollbarPair.prototype.isVisible = function() {
+  var isVisible = false;
+  if (this.hScroll) {
+    isVisible = this.hScroll.isVisible();
+  }
+  if (this.vScroll) {
+    isVisible = isVisible || this.vScroll.isVisible();
+  }
+  return isVisible;
+};
+
+/**
+ * Recalculates the scrollbars' locations within their path and length.
+ * This should be called when the contents of the workspace have changed.
+ * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ *     the required dimensions, possibly fetched from the host object.
+ */
+Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
+  if (this.hScroll) {
+    this.hScroll.resizeContentHorizontal(hostMetrics);
+  }
+  if (this.vScroll) {
+    this.vScroll.resizeContentVertical(hostMetrics);
+  }
+};
+
+/**
+ * Recalculates the scrollbars' locations on the screen and path length.
+ * This should be called when the layout or size of the window has changed.
+ * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ *     the required dimensions, possibly fetched from the host object.
+ */
+Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
+  if (this.hScroll) {
+    this.hScroll.resizeViewHorizontal(hostMetrics);
+  }
+  if (this.vScroll) {
+    this.vScroll.resizeViewVertical(hostMetrics);
+  }
+};
diff --git a/tests/deps.js b/tests/deps.js
index 07f8193b2..c03fb93f0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,7 +160,8 @@ goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.z
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar', 'Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 308d03bd5011990be0da6de996bf22bf4dda60e1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:24:11 -0700
Subject: [PATCH 119/291] Migrate core/scrollbar.js and core/scrollbar_pair.js
 to ES6 const/let

---
 core/scrollbar.js      | 84 +++++++++++++++++++++---------------------
 core/scrollbar_pair.js | 12 +++---
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 25bdef776..45f7e17e6 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -93,7 +93,7 @@ Blockly.Scrollbar = function(
   this.position = new Blockly.utils.Coordinate(0, 0);
 
   // Store the thickness in a temp variable for readability.
-  var scrollbarThickness = Blockly.Scrollbar.scrollbarThickness;
+  const scrollbarThickness = Blockly.Scrollbar.scrollbarThickness;
   if (horizontal) {
     this.svgBackground_.setAttribute('height', scrollbarThickness);
     this.outerSvg_.setAttribute('height', scrollbarThickness);
@@ -111,7 +111,7 @@ Blockly.Scrollbar = function(
     this.lengthAttribute_ = 'height';
     this.positionAttribute_ = 'y';
   }
-  var scrollbar = this;
+  const scrollbar = this;
   this.onMouseDownBarWrapper_ = Blockly.browserEvents.conditionalBind(
       this.svgBackground_, 'mousedown', scrollbar, scrollbar.onMouseDownBar_);
   this.onMouseDownHandleWrapper_ = Blockly.browserEvents.conditionalBind(
@@ -318,9 +318,9 @@ Blockly.Scrollbar.prototype.setPosition = function(x, y) {
   this.position.x = x;
   this.position.y = y;
 
-  var tempX = this.position.x + this.origin_.x;
-  var tempY = this.position.y + this.origin_.y;
-  var transform = 'translate(' + tempX + 'px,' + tempY + 'px)';
+  const tempX = this.position.x + this.origin_.x;
+  const tempY = this.position.y + this.origin_.y;
+  const transform = 'translate(' + tempX + 'px,' + tempY + 'px)';
   Blockly.utils.dom.setCssTransform(this.outerSvg_, transform);
 };
 
@@ -332,7 +332,7 @@ Blockly.Scrollbar.prototype.setPosition = function(x, y) {
  */
 Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
   // Determine the location, height and width of the host element.
-  var hostMetrics = opt_metrics;
+  let hostMetrics = opt_metrics;
   if (!hostMetrics) {
     hostMetrics = this.workspace_.getMetrics();
     if (!hostMetrics) {
@@ -397,21 +397,21 @@ Blockly.Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  */
 Blockly.Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
-  var viewSize = hostMetrics.viewWidth - this.margin_ * 2;
+  let viewSize = hostMetrics.viewWidth - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
     viewSize -= Blockly.Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
-  var xCoordinate =
+  let xCoordinate =
       hostMetrics.absoluteLeft + this.margin_;
   if (this.pair_ && this.workspace_.RTL) {
     xCoordinate += Blockly.Scrollbar.scrollbarThickness;
   }
 
   // Horizontal toolbar should always be just above the bottom of the workspace.
-  var yCoordinate = hostMetrics.absoluteTop + hostMetrics.viewHeight -
+  const yCoordinate = hostMetrics.absoluteTop + hostMetrics.viewHeight -
       Blockly.Scrollbar.scrollbarThickness - this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
 
@@ -445,7 +445,7 @@ Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
   }
 
   // Resize the handle.
-  var handleLength =
+  let handleLength =
       this.scrollbarLength_ * hostMetrics.viewWidth / hostMetrics.scrollWidth;
   handleLength = this.constrainHandleLength_(handleLength);
   this.setHandleLength_(handleLength);
@@ -459,13 +459,13 @@ Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
   //     then viewLeft = scrollLeft + scrollWidth - viewWidth
   //     then the offset should be max offset
 
-  var maxScrollDistance = hostMetrics.scrollWidth - hostMetrics.viewWidth;
-  var contentDisplacement = hostMetrics.viewLeft - hostMetrics.scrollLeft;
+  const maxScrollDistance = hostMetrics.scrollWidth - hostMetrics.viewWidth;
+  const contentDisplacement = hostMetrics.viewLeft - hostMetrics.scrollLeft;
   // Percent of content to the left of our current position.
-  var offsetRatio = contentDisplacement / maxScrollDistance;
+  const offsetRatio = contentDisplacement / maxScrollDistance;
   // Area available to scroll * percent to the left
-  var maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
-  var handleOffset = maxHandleOffset * offsetRatio;
+  const maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
+  let handleOffset = maxHandleOffset * offsetRatio;
   handleOffset = this.constrainHandlePosition_(handleOffset);
   this.setHandlePosition(handleOffset);
 
@@ -494,19 +494,19 @@ Blockly.Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  */
 Blockly.Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
-  var viewSize = hostMetrics.viewHeight - this.margin_ * 2;
+  let viewSize = hostMetrics.viewHeight - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
     viewSize -= Blockly.Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
-  var xCoordinate = this.workspace_.RTL ?
+  const xCoordinate = this.workspace_.RTL ?
       hostMetrics.absoluteLeft + this.margin_ :
       hostMetrics.absoluteLeft + hostMetrics.viewWidth -
       Blockly.Scrollbar.scrollbarThickness - this.margin_;
 
-  var yCoordinate = hostMetrics.absoluteTop + this.margin_;
+  const yCoordinate = hostMetrics.absoluteTop + this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
 
   // If the view has been resized, a content resize will also be necessary.  The
@@ -539,7 +539,7 @@ Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
   }
 
   // Resize the handle.
-  var handleLength =
+  let handleLength =
       this.scrollbarLength_ * hostMetrics.viewHeight / hostMetrics.scrollHeight;
   handleLength = this.constrainHandleLength_(handleLength);
   this.setHandleLength_(handleLength);
@@ -553,13 +553,13 @@ Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
   //     then viewTop = scrollTop + scrollHeight - viewHeight
   //     then the offset should be max offset
 
-  var maxScrollDistance = hostMetrics.scrollHeight - hostMetrics.viewHeight;
-  var contentDisplacement = hostMetrics.viewTop - hostMetrics.scrollTop;
+  const maxScrollDistance = hostMetrics.scrollHeight - hostMetrics.viewHeight;
+  const contentDisplacement = hostMetrics.viewTop - hostMetrics.scrollTop;
   // Percent of content to the left of our current position.
-  var offsetRatio = contentDisplacement / maxScrollDistance;
+  const offsetRatio = contentDisplacement / maxScrollDistance;
   // Area available to scroll * percent to the left
-  var maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
-  var handleOffset = maxHandleOffset * offsetRatio;
+  const maxHandleOffset = this.scrollbarLength_ - this.handleLength_;
+  let handleOffset = maxHandleOffset * offsetRatio;
   handleOffset = this.constrainHandlePosition_(handleOffset);
   this.setHandlePosition(handleOffset);
 
@@ -582,7 +582,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
     </g>
   </svg>
   */
-  var className = 'blocklyScrollbar' +
+  let className = 'blocklyScrollbar' +
       (this.horizontal_ ? 'Horizontal' : 'Vertical');
   if (opt_class) {
     className += ' ' + opt_class;
@@ -595,7 +595,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
       Blockly.utils.Svg.RECT, {
         'class': 'blocklyScrollbarBackground'
       }, this.svgGroup_);
-  var radius = Math.floor((Blockly.Scrollbar.scrollbarThickness - 5) / 2);
+  const radius = Math.floor((Blockly.Scrollbar.scrollbarThickness - 5) / 2);
   this.svgHandle_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
@@ -627,7 +627,7 @@ Blockly.Scrollbar.prototype.isVisible = function() {
  * @param {boolean} visible Whether the container is visible
  */
 Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
-  var visibilityChanged = (visible != this.containerVisible_);
+  const visibilityChanged = (visible != this.containerVisible_);
 
   this.containerVisible_ = visible;
   if (visibilityChanged) {
@@ -641,7 +641,7 @@ Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
  * @param {boolean} visible True if visible.
  */
 Blockly.Scrollbar.prototype.setVisible = function(visible) {
-  var visibilityChanged = (visible != this.isVisible());
+  const visibilityChanged = (visible != this.isVisible());
 
   // Ideally this would also apply to scrollbar pairs, but that's a bigger
   // headache (due to interactions with the corner square).
@@ -661,7 +661,7 @@ Blockly.Scrollbar.prototype.setVisible = function(visible) {
  * because it is not necessarily our parent in the DOM.
  */
 Blockly.Scrollbar.prototype.updateDisplay_ = function() {
-  var show = true;
+  let show = true;
   // Check whether our parent/container is visible.
   if (!this.containerVisible_) {
     show = false;
@@ -691,16 +691,16 @@ Blockly.Scrollbar.prototype.onMouseDownBar_ = function(e) {
     e.stopPropagation();
     return;
   }
-  var mouseXY = Blockly.utils.mouseToSvg(e,
+  const mouseXY = Blockly.utils.mouseToSvg(e,
       this.workspace_.getParentSvg(),
       this.workspace_.getInverseScreenCTM());
-  var mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
+  const mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
 
-  var handleXY = Blockly.utils.getInjectionDivXY_(this.svgHandle_);
-  var handleStart = this.horizontal_ ? handleXY.x : handleXY.y;
-  var handlePosition = this.handlePosition_;
+  const handleXY = Blockly.utils.getInjectionDivXY_(this.svgHandle_);
+  const handleStart = this.horizontal_ ? handleXY.x : handleXY.y;
+  let handlePosition = this.handlePosition_;
 
-  var pageLength = this.handleLength_ * 0.95;
+  const pageLength = this.handleLength_ * 0.95;
   if (mouseLocation <= handleStart) {
     // Decrease the scrollbar's value by a page.
     handlePosition -= pageLength;
@@ -755,9 +755,9 @@ Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
  * @private
  */
 Blockly.Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
-  var currentMouse = this.horizontal_ ? e.clientX : e.clientY;
-  var mouseDelta = currentMouse - this.startDragMouse_;
-  var handlePosition = this.startDragHandle + mouseDelta;
+  const currentMouse = this.horizontal_ ? e.clientX : e.clientY;
+  const mouseDelta = currentMouse - this.startDragMouse_;
+  const handlePosition = this.startDragHandle + mouseDelta;
   // Position the bar.
   this.setHandlePosition(this.constrainHandlePosition_(handlePosition));
   this.updateMetrics_();
@@ -797,8 +797,8 @@ Blockly.Scrollbar.prototype.cleanUp_ = function() {
  * @package
  */
 Blockly.Scrollbar.prototype.getRatio_ = function() {
-  var scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
-  var ratio = this.handlePosition_ / scrollHandleRange;
+  const scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
+  let ratio = this.handlePosition_ / scrollHandleRange;
   if (isNaN(ratio)) {
     ratio = 0;
   }
@@ -811,8 +811,8 @@ Blockly.Scrollbar.prototype.getRatio_ = function() {
  * @private
  */
 Blockly.Scrollbar.prototype.updateMetrics_ = function() {
-  var ratio = this.getRatio_();
-  var xyRatio = {};
+  const ratio = this.getRatio_();
+  const xyRatio = {};
   if (this.horizontal_) {
     xyRatio.x = ratio;
   } else {
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 3caf986e7..7f7aa0ee2 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -44,7 +44,7 @@ Blockly.ScrollbarPair = function(
 
   addHorizontal = addHorizontal === undefined ? true : addHorizontal;
   addVertical = addVertical === undefined ? true : addVertical;
-  var isPair = addHorizontal && addVertical;
+  const isPair = addHorizontal && addVertical;
 
   if (addHorizontal) {
     this.hScroll = new Blockly.Scrollbar(
@@ -101,15 +101,15 @@ Blockly.ScrollbarPair.prototype.dispose = function() {
  */
 Blockly.ScrollbarPair.prototype.resize = function() {
   // Look up the host metrics once, and use for both scrollbars.
-  var hostMetrics = this.workspace_.getMetrics();
+  const hostMetrics = this.workspace_.getMetrics();
   if (!hostMetrics) {
     // Host element is likely not visible.
     return;
   }
 
   // Only change the scrollbars if there has been a change in metrics.
-  var resizeH = false;
-  var resizeV = false;
+  let resizeH = false;
+  let resizeV = false;
   if (!this.oldHostMetrics_ ||
       this.oldHostMetrics_.viewWidth != hostMetrics.viewWidth ||
       this.oldHostMetrics_.viewHeight != hostMetrics.viewHeight ||
@@ -226,7 +226,7 @@ Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
 
   if (updateMetrics || updateMetrics === undefined) {
     // Update metrics.
-    var xyRatio = {};
+    const xyRatio = {};
     if (this.hScroll) {
       xyRatio.x = this.hScroll.getRatio_();
     }
@@ -278,7 +278,7 @@ Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
  * @return {boolean} True if visible.
  */
 Blockly.ScrollbarPair.prototype.isVisible = function() {
-  var isVisible = false;
+  let isVisible = false;
   if (this.hScroll) {
     isVisible = this.hScroll.isVisible();
   }

From 5bbc49c21a6c923cfbc6c37533c96594a312f737 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:42:36 -0700
Subject: [PATCH 120/291] Migrate core/scrollbar.js and core/scrollbar_pair.js
 to goog.module

---
 core/scrollbar.js      | 123 +++++++++++++++++++++--------------------
 core/scrollbar_pair.js |  31 ++++++-----
 tests/deps.js          |   4 +-
 3 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 45f7e17e6..2ad6bb348 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -10,8 +10,11 @@
  */
 'use strict';
 
-goog.provide('Blockly.Scrollbar');
+goog.module('Blockly.Scrollbar');
+goog.module.declareLegacyNamespace();
 
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
@@ -39,7 +42,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {number=} opt_margin The margin to apply to this scrollbar.
  * @constructor
  */
-Blockly.Scrollbar = function(
+const Scrollbar = function(
     workspace, horizontal, opt_pair, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar is bound to.
@@ -67,7 +70,7 @@ Blockly.Scrollbar = function(
    * @private
    */
   this.margin_ = (opt_margin !== undefined) ?
-      opt_margin : Blockly.Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
+      opt_margin : Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
   /**
    * Previously recorded metrics from the workspace.
    * @type {?Blockly.utils.Metrics}
@@ -93,7 +96,7 @@ Blockly.Scrollbar = function(
   this.position = new Blockly.utils.Coordinate(0, 0);
 
   // Store the thickness in a temp variable for readability.
-  const scrollbarThickness = Blockly.Scrollbar.scrollbarThickness;
+  const scrollbarThickness = Scrollbar.scrollbarThickness;
   if (horizontal) {
     this.svgBackground_.setAttribute('height', scrollbarThickness);
     this.outerSvg_.setAttribute('height', scrollbarThickness);
@@ -125,7 +128,7 @@ Blockly.Scrollbar = function(
  * @type {Blockly.utils.Coordinate}
  * @private
  */
-Blockly.Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
+Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
 
 /**
  * The position of the mouse along this scrollbar's major axis at the start of
@@ -136,7 +139,7 @@ Blockly.Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.startDragMouse_ = 0;
+Scrollbar.prototype.startDragMouse_ = 0;
 
 /**
  * The length of the scrollbars (including the handle and the background), in
@@ -145,14 +148,14 @@ Blockly.Scrollbar.prototype.startDragMouse_ = 0;
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.scrollbarLength_ = 0;
+Scrollbar.prototype.scrollbarLength_ = 0;
 
 /**
  * The length of the scrollbar handle in CSS pixels.
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.handleLength_ = 0;
+Scrollbar.prototype.handleLength_ = 0;
 
 /**
  * The offset of the start of the handle from the scrollbar position, in CSS
@@ -160,29 +163,29 @@ Blockly.Scrollbar.prototype.handleLength_ = 0;
  * @type {number}
  * @private
  */
-Blockly.Scrollbar.prototype.handlePosition_ = 0;
+Scrollbar.prototype.handlePosition_ = 0;
 
 /**
  * Whether the scrollbar handle is visible.
  * @type {boolean}
  * @private
  */
-Blockly.Scrollbar.prototype.isVisible_ = true;
+Scrollbar.prototype.isVisible_ = true;
 
 /**
  * Whether the workspace containing this scrollbar is visible.
  * @type {boolean}
  * @private
  */
-Blockly.Scrollbar.prototype.containerVisible_ = true;
+Scrollbar.prototype.containerVisible_ = true;
 
 /**
  * Width of vertical scrollbar or height of horizontal scrollbar in CSS pixels.
  * Scrollbars should be larger on touch devices.
  */
-Blockly.Scrollbar.scrollbarThickness = 15;
+Scrollbar.scrollbarThickness = 15;
 if (Blockly.Touch.TOUCH_ENABLED) {
-  Blockly.Scrollbar.scrollbarThickness = 25;
+  Scrollbar.scrollbarThickness = 25;
 }
 
 /**
@@ -192,7 +195,7 @@ if (Blockly.Touch.TOUCH_ENABLED) {
  * @const
  * @package
  */
-Blockly.Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
+Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
 
 
 /**
@@ -203,7 +206,7 @@ Blockly.Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
  * @return {boolean} Whether the two sets of metrics are equivalent.
  * @private
  */
-Blockly.Scrollbar.metricsAreEquivalent_ = function(first, second) {
+Scrollbar.metricsAreEquivalent_ = function(first, second) {
   return (first.viewWidth == second.viewWidth &&
       first.viewHeight == second.viewHeight &&
       first.viewLeft == second.viewLeft &&
@@ -221,7 +224,7 @@ Blockly.Scrollbar.metricsAreEquivalent_ = function(first, second) {
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.Scrollbar.prototype.dispose = function() {
+Scrollbar.prototype.dispose = function() {
   this.cleanUp_();
   Blockly.browserEvents.unbind(this.onMouseDownBarWrapper_);
   this.onMouseDownBarWrapper_ = null;
@@ -246,7 +249,7 @@ Blockly.Scrollbar.prototype.dispose = function() {
  * @return {number} Constrained value, in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.constrainHandleLength_ = function(value) {
+Scrollbar.prototype.constrainHandleLength_ = function(value) {
   if (value <= 0 || isNaN(value)) {
     value = 0;
   } else {
@@ -261,7 +264,7 @@ Blockly.Scrollbar.prototype.constrainHandleLength_ = function(value) {
  * @param {number} newLength The new scrollbar handle length in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.setHandleLength_ = function(newLength) {
+Scrollbar.prototype.setHandleLength_ = function(newLength) {
   this.handleLength_ = newLength;
   this.svgHandle_.setAttribute(this.lengthAttribute_, this.handleLength_);
 };
@@ -273,7 +276,7 @@ Blockly.Scrollbar.prototype.setHandleLength_ = function(newLength) {
  * @return {number} Constrained value, in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.constrainHandlePosition_ = function(value) {
+Scrollbar.prototype.constrainHandlePosition_ = function(value) {
   if (value <= 0 || isNaN(value)) {
     value = 0;
   } else {
@@ -290,7 +293,7 @@ Blockly.Scrollbar.prototype.constrainHandlePosition_ = function(value) {
  * change the SVG attribute accordingly.
  * @param {number} newPosition The new scrollbar handle offset in CSS pixels.
  */
-Blockly.Scrollbar.prototype.setHandlePosition = function(newPosition) {
+Scrollbar.prototype.setHandlePosition = function(newPosition) {
   this.handlePosition_ = newPosition;
   this.svgHandle_.setAttribute(this.positionAttribute_, this.handlePosition_);
 };
@@ -301,7 +304,7 @@ Blockly.Scrollbar.prototype.setHandlePosition = function(newPosition) {
  * @param {number} newSize The new scrollbar background length in CSS pixels.
  * @private
  */
-Blockly.Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
+Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
   this.scrollbarLength_ = newSize;
   this.outerSvg_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
   this.svgBackground_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
@@ -314,7 +317,7 @@ Blockly.Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
  * @param {number} y The new y coordinate.
  * @package
  */
-Blockly.Scrollbar.prototype.setPosition = function(x, y) {
+Scrollbar.prototype.setPosition = function(x, y) {
   this.position.x = x;
   this.position.y = y;
 
@@ -330,7 +333,7 @@ Blockly.Scrollbar.prototype.setPosition = function(x, y) {
  *     describing all the required dimensions.  If not provided, it will be
  *     fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
+Scrollbar.prototype.resize = function(opt_metrics) {
   // Determine the location, height and width of the host element.
   let hostMetrics = opt_metrics;
   if (!hostMetrics) {
@@ -341,7 +344,7 @@ Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
     }
   }
 
-  if (this.oldHostMetrics_ && Blockly.Scrollbar.metricsAreEquivalent_(
+  if (this.oldHostMetrics_ && Scrollbar.metricsAreEquivalent_(
       hostMetrics, this.oldHostMetrics_)) {
     return;
   }
@@ -366,7 +369,7 @@ Blockly.Scrollbar.prototype.resize = function(opt_metrics) {
  * @return {boolean} Whether a resizeView is necessary.
  * @private
  */
-Blockly.Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
+Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
   if (!this.oldHostMetrics_) {
     return true;
   }
@@ -382,7 +385,7 @@ Blockly.Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
-Blockly.Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
+Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
   if (this.requiresViewResize_(hostMetrics)) {
     this.resizeViewHorizontal(hostMetrics);
   } else {
@@ -396,23 +399,23 @@ Blockly.Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
+Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
   let viewSize = hostMetrics.viewWidth - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
-    viewSize -= Blockly.Scrollbar.scrollbarThickness;
+    viewSize -= Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
   let xCoordinate =
       hostMetrics.absoluteLeft + this.margin_;
   if (this.pair_ && this.workspace_.RTL) {
-    xCoordinate += Blockly.Scrollbar.scrollbarThickness;
+    xCoordinate += Scrollbar.scrollbarThickness;
   }
 
   // Horizontal toolbar should always be just above the bottom of the workspace.
   const yCoordinate = hostMetrics.absoluteTop + hostMetrics.viewHeight -
-      Blockly.Scrollbar.scrollbarThickness - this.margin_;
+      Scrollbar.scrollbarThickness - this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
 
   // If the view has been resized, a content resize will also be necessary.
@@ -426,7 +429,7 @@ Blockly.Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
+Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
   if (hostMetrics.viewWidth >= hostMetrics.scrollWidth) {
     // viewWidth is often greater than scrollWidth in flyouts and
     // non-scrollable workspaces.
@@ -479,7 +482,7 @@ Blockly.Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
-Blockly.Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
+Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
   if (this.requiresViewResize_(hostMetrics)) {
     this.resizeViewVertical(hostMetrics);
   } else {
@@ -493,18 +496,18 @@ Blockly.Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
+Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
   let viewSize = hostMetrics.viewHeight - this.margin_ * 2;
   if (this.pair_) {
     // Shorten the scrollbar to make room for the corner square.
-    viewSize -= Blockly.Scrollbar.scrollbarThickness;
+    viewSize -= Scrollbar.scrollbarThickness;
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
   const xCoordinate = this.workspace_.RTL ?
       hostMetrics.absoluteLeft + this.margin_ :
       hostMetrics.absoluteLeft + hostMetrics.viewWidth -
-      Blockly.Scrollbar.scrollbarThickness - this.margin_;
+      Scrollbar.scrollbarThickness - this.margin_;
 
   const yCoordinate = hostMetrics.absoluteTop + this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
@@ -520,7 +523,7 @@ Blockly.Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
+Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
   if (hostMetrics.viewHeight >= hostMetrics.scrollHeight) {
     // viewHeight is often greater than scrollHeight in flyouts and
     // non-scrollable workspaces.
@@ -573,7 +576,7 @@ Blockly.Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
  * @param {string=} opt_class A class to be applied to this scrollbar.
  * @private
  */
-Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
+Scrollbar.prototype.createDom_ = function(opt_class) {
   /* Create the following DOM:
   <svg class="blocklyScrollbarHorizontal  optionalClass">
     <g>
@@ -595,7 +598,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
       Blockly.utils.Svg.RECT, {
         'class': 'blocklyScrollbarBackground'
       }, this.svgGroup_);
-  const radius = Math.floor((Blockly.Scrollbar.scrollbarThickness - 5) / 2);
+  const radius = Math.floor((Scrollbar.scrollbarThickness - 5) / 2);
   this.svgHandle_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.RECT,
       {
@@ -617,7 +620,7 @@ Blockly.Scrollbar.prototype.createDom_ = function(opt_class) {
  * needed.
  * @return {boolean} True if visible.
  */
-Blockly.Scrollbar.prototype.isVisible = function() {
+Scrollbar.prototype.isVisible = function() {
   return this.isVisible_;
 };
 
@@ -626,7 +629,7 @@ Blockly.Scrollbar.prototype.isVisible = function() {
  * display accordingly if visibility has changed.
  * @param {boolean} visible Whether the container is visible
  */
-Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
+Scrollbar.prototype.setContainerVisible = function(visible) {
   const visibilityChanged = (visible != this.containerVisible_);
 
   this.containerVisible_ = visible;
@@ -640,7 +643,7 @@ Blockly.Scrollbar.prototype.setContainerVisible = function(visible) {
  * Only applies to non-paired scrollbars.
  * @param {boolean} visible True if visible.
  */
-Blockly.Scrollbar.prototype.setVisible = function(visible) {
+Scrollbar.prototype.setVisible = function(visible) {
   const visibilityChanged = (visible != this.isVisible());
 
   // Ideally this would also apply to scrollbar pairs, but that's a bigger
@@ -660,7 +663,7 @@ Blockly.Scrollbar.prototype.setVisible = function(visible) {
  * We cannot rely on the containing workspace being hidden to hide us
  * because it is not necessarily our parent in the DOM.
  */
-Blockly.Scrollbar.prototype.updateDisplay_ = function() {
+Scrollbar.prototype.updateDisplay_ = function() {
   let show = true;
   // Check whether our parent/container is visible.
   if (!this.containerVisible_) {
@@ -681,7 +684,7 @@ Blockly.Scrollbar.prototype.updateDisplay_ = function() {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseDownBar_ = function(e) {
+Scrollbar.prototype.onMouseDownBar_ = function(e) {
   this.workspace_.markFocused();
   Blockly.Touch.clearTouchIdentifier();  // This is really a click.
   this.cleanUp_();
@@ -722,7 +725,7 @@ Blockly.Scrollbar.prototype.onMouseDownBar_ = function(e) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
+Scrollbar.prototype.onMouseDownHandle_ = function(e) {
   this.workspace_.markFocused();
   this.cleanUp_();
   if (Blockly.utils.isRightButton(e)) {
@@ -741,9 +744,9 @@ Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
 
   // Record the current mouse position.
   this.startDragMouse_ = this.horizontal_ ? e.clientX : e.clientY;
-  Blockly.Scrollbar.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
       document, 'mouseup', this, this.onMouseUpHandle_);
-  Blockly.Scrollbar.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
       document, 'mousemove', this, this.onMouseMoveHandle_);
   e.stopPropagation();
   e.preventDefault();
@@ -754,7 +757,7 @@ Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
  * @param {!Event} e Mouse up event.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
+Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
   const currentMouse = this.horizontal_ ? e.clientX : e.clientY;
   const mouseDelta = currentMouse - this.startDragMouse_;
   const handlePosition = this.startDragHandle + mouseDelta;
@@ -767,7 +770,7 @@ Blockly.Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
  * Release the scrollbar handle and reset state accordingly.
  * @private
  */
-Blockly.Scrollbar.prototype.onMouseUpHandle_ = function() {
+Scrollbar.prototype.onMouseUpHandle_ = function() {
   // Tell the workspace to clean up now that the workspace is done moving.
   this.workspace_.resetDragSurface();
   Blockly.Touch.clearTouchIdentifier();
@@ -779,15 +782,15 @@ Blockly.Scrollbar.prototype.onMouseUpHandle_ = function() {
  * wrap up loose ends associated with the scrollbar.
  * @private
  */
-Blockly.Scrollbar.prototype.cleanUp_ = function() {
+Scrollbar.prototype.cleanUp_ = function() {
   Blockly.hideChaff(true);
-  if (Blockly.Scrollbar.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(Blockly.Scrollbar.onMouseUpWrapper_);
-    Blockly.Scrollbar.onMouseUpWrapper_ = null;
+  if (Scrollbar.onMouseUpWrapper_) {
+    Blockly.browserEvents.unbind(Scrollbar.onMouseUpWrapper_);
+    Scrollbar.onMouseUpWrapper_ = null;
   }
-  if (Blockly.Scrollbar.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(Blockly.Scrollbar.onMouseMoveWrapper_);
-    Blockly.Scrollbar.onMouseMoveWrapper_ = null;
+  if (Scrollbar.onMouseMoveWrapper_) {
+    Blockly.browserEvents.unbind(Scrollbar.onMouseMoveWrapper_);
+    Scrollbar.onMouseMoveWrapper_ = null;
   }
 };
 
@@ -796,7 +799,7 @@ Blockly.Scrollbar.prototype.cleanUp_ = function() {
  * @return {number} Ratio.
  * @package
  */
-Blockly.Scrollbar.prototype.getRatio_ = function() {
+Scrollbar.prototype.getRatio_ = function() {
   const scrollHandleRange = this.scrollbarLength_ - this.handleLength_;
   let ratio = this.handlePosition_ / scrollHandleRange;
   if (isNaN(ratio)) {
@@ -810,7 +813,7 @@ Blockly.Scrollbar.prototype.getRatio_ = function() {
  * moved.
  * @private
  */
-Blockly.Scrollbar.prototype.updateMetrics_ = function() {
+Scrollbar.prototype.updateMetrics_ = function() {
   const ratio = this.getRatio_();
   const xyRatio = {};
   if (this.horizontal_) {
@@ -828,7 +831,7 @@ Blockly.Scrollbar.prototype.updateMetrics_ = function() {
  * @param {boolean=} updateMetrics Whether to update metrics on this set call.
  *    Defaults to true.
  */
-Blockly.Scrollbar.prototype.set = function(value, updateMetrics) {
+Scrollbar.prototype.set = function(value, updateMetrics) {
   this.setHandlePosition(this.constrainHandlePosition_(value * this.ratio));
   if (updateMetrics || updateMetrics === undefined) {
     this.updateMetrics_();
@@ -843,6 +846,8 @@ Blockly.Scrollbar.prototype.set = function(value, updateMetrics) {
  * @param {number} x The x coordinate of the scrollbar's origin, in CSS pixels.
  * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
  */
-Blockly.Scrollbar.prototype.setOrigin = function(x, y) {
+Scrollbar.prototype.setOrigin = function(x, y) {
   this.origin_ = new Blockly.utils.Coordinate(x, y);
 };
+
+exports = Scrollbar;
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 7f7aa0ee2..ce402b19d 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.ScrollbarPair');
+goog.module('Blockly.ScrollbarPair');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Scrollbar');
@@ -33,7 +34,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {number=} opt_margin The margin to apply to these scrollbars.
  * @constructor
  */
-Blockly.ScrollbarPair = function(
+const ScrollbarPair = function(
     workspace, addHorizontal, addVertical, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar pair is bound to.
@@ -80,7 +81,7 @@ Blockly.ScrollbarPair = function(
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.ScrollbarPair.prototype.dispose = function() {
+ScrollbarPair.prototype.dispose = function() {
   Blockly.utils.dom.removeNode(this.corner_);
   this.corner_ = null;
   this.workspace_ = null;
@@ -99,7 +100,7 @@ Blockly.ScrollbarPair.prototype.dispose = function() {
  * Recalculate both of the scrollbars' locations and lengths.
  * Also reposition the corner rectangle.
  */
-Blockly.ScrollbarPair.prototype.resize = function() {
+ScrollbarPair.prototype.resize = function() {
   // Look up the host metrics once, and use for both scrollbars.
   const hostMetrics = this.workspace_.getMetrics();
   if (!hostMetrics) {
@@ -171,7 +172,7 @@ Blockly.ScrollbarPair.prototype.resize = function() {
  * Returns whether scrolling horizontally is enabled.
  * @return {boolean} True if horizontal scroll is enabled.
  */
-Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
+ScrollbarPair.prototype.canScrollHorizontally = function() {
   return !!this.hScroll;
 };
 
@@ -179,7 +180,7 @@ Blockly.ScrollbarPair.prototype.canScrollHorizontally = function() {
  * Returns whether scrolling vertically is enabled.
  * @return {boolean} True if vertical scroll is enabled.
  */
-Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
+ScrollbarPair.prototype.canScrollVertically = function() {
   return !!this.vScroll;
 };
 
@@ -192,7 +193,7 @@ Blockly.ScrollbarPair.prototype.canScrollVertically = function() {
  * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
  * @package
  */
-Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
+ScrollbarPair.prototype.setOrigin = function(x, y) {
   if (this.hScroll) {
     this.hScroll.setOrigin(x, y);
   }
@@ -210,7 +211,7 @@ Blockly.ScrollbarPair.prototype.setOrigin = function(x, y) {
  * @param {boolean} updateMetrics Whether to update metrics on this set call.
  *    Defaults to true.
  */
-Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
+ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
   // This function is equivalent to:
   //   this.hScroll.set(x);
   //   this.vScroll.set(y);
@@ -242,7 +243,7 @@ Blockly.ScrollbarPair.prototype.set = function(x, y, updateMetrics) {
  *    CSS pixels relative to its parents.
  * @param {number} x Horizontal scroll value.
  */
-Blockly.ScrollbarPair.prototype.setX = function(x) {
+ScrollbarPair.prototype.setX = function(x) {
   if (this.hScroll) {
     this.hScroll.set(x, true);
   }
@@ -253,7 +254,7 @@ Blockly.ScrollbarPair.prototype.setX = function(x) {
  *    CSS pixels relative to its parents.
  * @param {number} y Vertical scroll value.
  */
-Blockly.ScrollbarPair.prototype.setY = function(y) {
+ScrollbarPair.prototype.setY = function(y) {
   if (this.vScroll) {
     this.vScroll.set(y, true);
   }
@@ -263,7 +264,7 @@ Blockly.ScrollbarPair.prototype.setY = function(y) {
  * Set whether this scrollbar's container is visible.
  * @param {boolean} visible Whether the container is visible.
  */
-Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
+ScrollbarPair.prototype.setContainerVisible = function(visible) {
   if (this.hScroll) {
     this.hScroll.setContainerVisible(visible);
   }
@@ -277,7 +278,7 @@ Blockly.ScrollbarPair.prototype.setContainerVisible = function(visible) {
  * when they aren't needed.
  * @return {boolean} True if visible.
  */
-Blockly.ScrollbarPair.prototype.isVisible = function() {
+ScrollbarPair.prototype.isVisible = function() {
   let isVisible = false;
   if (this.hScroll) {
     isVisible = this.hScroll.isVisible();
@@ -294,7 +295,7 @@ Blockly.ScrollbarPair.prototype.isVisible = function() {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
+ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
   if (this.hScroll) {
     this.hScroll.resizeContentHorizontal(hostMetrics);
   }
@@ -309,7 +310,7 @@ Blockly.ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
  * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
-Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
+ScrollbarPair.prototype.resizeView = function(hostMetrics) {
   if (this.hScroll) {
     this.hScroll.resizeViewHorizontal(hostMetrics);
   }
@@ -317,3 +318,5 @@ Blockly.ScrollbarPair.prototype.resizeView = function(hostMetrics) {
     this.vScroll.resizeViewVertical(hostMetrics);
   }
 };
+
+exports = ScrollbarPair;
diff --git a/tests/deps.js b/tests/deps.js
index c03fb93f0..16445324c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,8 +160,8 @@ goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.z
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From cb4231683093b3dfb74cd2aa081026ed5fb9c668 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:43:54 -0700
Subject: [PATCH 121/291] Migrate core/scrollbar.js and core/scrollbar_pair.js
 named requires

---
 core/scrollbar.js      | 106 ++++++++++++++++++++---------------------
 core/scrollbar_pair.js |  45 +++++++++--------
 2 files changed, 75 insertions(+), 76 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 2ad6bb348..912fb3c41 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -15,15 +15,15 @@ goog.module.declareLegacyNamespace();
 
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Metrics');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.WorkspaceSvg');
+const Touch = goog.require('Blockly.Touch');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Metrics = goog.require('Blockly.utils.Metrics');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -35,7 +35,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * Class for a pure SVG scrollbar.
  * This technique offers a scrollbar that is guaranteed to work, but may not
  * look or behave like the system's scrollbars.
- * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbar to.
+ * @param {!WorkspaceSvg} workspace Workspace to bind the scrollbar to.
  * @param {boolean} horizontal True if horizontal, false if vertical.
  * @param {boolean=} opt_pair True if scrollbar is part of a horiz/vert pair.
  * @param {string=} opt_class A class to be applied to this scrollbar.
@@ -46,7 +46,7 @@ const Scrollbar = function(
     workspace, horizontal, opt_pair, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar is bound to.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -73,7 +73,7 @@ const Scrollbar = function(
       opt_margin : Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
   /**
    * Previously recorded metrics from the workspace.
-   * @type {?Blockly.utils.Metrics}
+   * @type {?Metrics}
    * @private
    */
   this.oldHostMetrics_ = null;
@@ -90,10 +90,10 @@ const Scrollbar = function(
    * The upper left corner of the scrollbar's SVG group in CSS pixels relative
    * to the scrollbar's origin.  This is usually relative to the injection div
    * origin.
-   * @type {Blockly.utils.Coordinate}
+   * @type {Coordinate}
    * @package
    */
-  this.position = new Blockly.utils.Coordinate(0, 0);
+  this.position = new Coordinate(0, 0);
 
   // Store the thickness in a temp variable for readability.
   const scrollbarThickness = Scrollbar.scrollbarThickness;
@@ -115,9 +115,9 @@ const Scrollbar = function(
     this.positionAttribute_ = 'y';
   }
   const scrollbar = this;
-  this.onMouseDownBarWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseDownBarWrapper_ = browserEvents.conditionalBind(
       this.svgBackground_, 'mousedown', scrollbar, scrollbar.onMouseDownBar_);
-  this.onMouseDownHandleWrapper_ = Blockly.browserEvents.conditionalBind(
+  this.onMouseDownHandleWrapper_ = browserEvents.conditionalBind(
       this.svgHandle_, 'mousedown', scrollbar, scrollbar.onMouseDownHandle_);
 };
 
@@ -125,10 +125,10 @@ const Scrollbar = function(
  * The location of the origin of the workspace that the scrollbar is in,
  * measured in CSS pixels relative to the injection div origin.  This is usually
  * (0, 0).  When the scrollbar is in a flyout it may have a different origin.
- * @type {Blockly.utils.Coordinate}
+ * @type {Coordinate}
  * @private
  */
-Scrollbar.prototype.origin_ = new Blockly.utils.Coordinate(0, 0);
+Scrollbar.prototype.origin_ = new Coordinate(0, 0);
 
 /**
  * The position of the mouse along this scrollbar's major axis at the start of
@@ -184,7 +184,7 @@ Scrollbar.prototype.containerVisible_ = true;
  * Scrollbars should be larger on touch devices.
  */
 Scrollbar.scrollbarThickness = 15;
-if (Blockly.Touch.TOUCH_ENABLED) {
+if (Touch.TOUCH_ENABLED) {
   Scrollbar.scrollbarThickness = 25;
 }
 
@@ -199,9 +199,9 @@ Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
 
 
 /**
- * @param {!Blockly.utils.Metrics} first An object containing computed
+ * @param {!Metrics} first An object containing computed
  *     measurements of a workspace.
- * @param {!Blockly.utils.Metrics} second Another object containing computed
+ * @param {!Metrics} second Another object containing computed
  *     measurements of a workspace.
  * @return {boolean} Whether the two sets of metrics are equivalent.
  * @private
@@ -226,12 +226,12 @@ Scrollbar.metricsAreEquivalent_ = function(first, second) {
  */
 Scrollbar.prototype.dispose = function() {
   this.cleanUp_();
-  Blockly.browserEvents.unbind(this.onMouseDownBarWrapper_);
+  browserEvents.unbind(this.onMouseDownBarWrapper_);
   this.onMouseDownBarWrapper_ = null;
-  Blockly.browserEvents.unbind(this.onMouseDownHandleWrapper_);
+  browserEvents.unbind(this.onMouseDownHandleWrapper_);
   this.onMouseDownHandleWrapper_ = null;
 
-  Blockly.utils.dom.removeNode(this.outerSvg_);
+  dom.removeNode(this.outerSvg_);
   this.outerSvg_ = null;
   this.svgGroup_ = null;
   this.svgBackground_ = null;
@@ -324,12 +324,12 @@ Scrollbar.prototype.setPosition = function(x, y) {
   const tempX = this.position.x + this.origin_.x;
   const tempY = this.position.y + this.origin_.y;
   const transform = 'translate(' + tempX + 'px,' + tempY + 'px)';
-  Blockly.utils.dom.setCssTransform(this.outerSvg_, transform);
+  dom.setCssTransform(this.outerSvg_, transform);
 };
 
 /**
  * Recalculate the scrollbar's location and its length.
- * @param {Blockly.utils.Metrics=} opt_metrics A data structure of from the
+ * @param {Metrics=} opt_metrics A data structure of from the
  *     describing all the required dimensions.  If not provided, it will be
  *     fetched from the host object.
  */
@@ -364,7 +364,7 @@ Scrollbar.prototype.resize = function(opt_metrics) {
 /**
  * Returns whether the a resizeView is necessary by comparing the passed
  * hostMetrics with cached old host metrics.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  * @return {boolean} Whether a resizeView is necessary.
  * @private
@@ -381,7 +381,7 @@ Scrollbar.prototype.requiresViewResize_ = function(hostMetrics) {
 
 /**
  * Recalculate a horizontal scrollbar's location and length.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
@@ -396,7 +396,7 @@ Scrollbar.prototype.resizeHorizontal_ = function(hostMetrics) {
 /**
  * Recalculate a horizontal scrollbar's location on the screen and path length.
  * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
@@ -426,7 +426,7 @@ Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
 /**
  * Recalculate a horizontal scrollbar's location within its path and length.
  * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
@@ -478,7 +478,7 @@ Scrollbar.prototype.resizeContentHorizontal = function(hostMetrics) {
 
 /**
  * Recalculate a vertical scrollbar's location and length.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  * @private
  */
@@ -493,7 +493,7 @@ Scrollbar.prototype.resizeVertical_ = function(hostMetrics) {
 /**
  * Recalculate a vertical scrollbar's location on the screen and path length.
  * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
@@ -520,7 +520,7 @@ Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
 /**
  * Recalculate a vertical scrollbar's location within its path and length.
  * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 Scrollbar.prototype.resizeContentVertical = function(hostMetrics) {
@@ -590,17 +590,17 @@ Scrollbar.prototype.createDom_ = function(opt_class) {
   if (opt_class) {
     className += ' ' + opt_class;
   }
-  this.outerSvg_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG, {'class': className}, null);
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {}, this.outerSvg_);
-  this.svgBackground_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT, {
+  this.outerSvg_ = dom.createSvgElement(
+      Svg.SVG, {'class': className}, null);
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {}, this.outerSvg_);
+  this.svgBackground_ = dom.createSvgElement(
+      Svg.RECT, {
         'class': 'blocklyScrollbarBackground'
       }, this.svgGroup_);
   const radius = Math.floor((Scrollbar.scrollbarThickness - 5) / 2);
-  this.svgHandle_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.svgHandle_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyScrollbarHandle',
         'rx': radius,
@@ -611,7 +611,7 @@ Scrollbar.prototype.createDom_ = function(opt_class) {
       this.svgHandle_, 'scrollbarColour', 'fill');
   this.workspace_.getThemeManager().subscribe(
       this.svgHandle_, 'scrollbarOpacity', 'fill-opacity');
-  Blockly.utils.dom.insertAfter(this.outerSvg_,
+  dom.insertAfter(this.outerSvg_,
       this.workspace_.getParentSvg());
 };
 
@@ -686,20 +686,20 @@ Scrollbar.prototype.updateDisplay_ = function() {
  */
 Scrollbar.prototype.onMouseDownBar_ = function(e) {
   this.workspace_.markFocused();
-  Blockly.Touch.clearTouchIdentifier();  // This is really a click.
+  Touch.clearTouchIdentifier();  // This is really a click.
   this.cleanUp_();
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     // Right-click.
     // Scrollbars have no context menu.
     e.stopPropagation();
     return;
   }
-  const mouseXY = Blockly.utils.mouseToSvg(e,
+  const mouseXY = utils.mouseToSvg(e,
       this.workspace_.getParentSvg(),
       this.workspace_.getInverseScreenCTM());
   const mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
 
-  const handleXY = Blockly.utils.getInjectionDivXY_(this.svgHandle_);
+  const handleXY = utils.getInjectionDivXY_(this.svgHandle_);
   const handleStart = this.horizontal_ ? handleXY.x : handleXY.y;
   let handlePosition = this.handlePosition_;
 
@@ -728,7 +728,7 @@ Scrollbar.prototype.onMouseDownBar_ = function(e) {
 Scrollbar.prototype.onMouseDownHandle_ = function(e) {
   this.workspace_.markFocused();
   this.cleanUp_();
-  if (Blockly.utils.isRightButton(e)) {
+  if (utils.isRightButton(e)) {
     // Right-click.
     // Scrollbars have no context menu.
     e.stopPropagation();
@@ -744,9 +744,9 @@ Scrollbar.prototype.onMouseDownHandle_ = function(e) {
 
   // Record the current mouse position.
   this.startDragMouse_ = this.horizontal_ ? e.clientX : e.clientY;
-  Scrollbar.onMouseUpWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseUpWrapper_ = browserEvents.conditionalBind(
       document, 'mouseup', this, this.onMouseUpHandle_);
-  Scrollbar.onMouseMoveWrapper_ = Blockly.browserEvents.conditionalBind(
+  Scrollbar.onMouseMoveWrapper_ = browserEvents.conditionalBind(
       document, 'mousemove', this, this.onMouseMoveHandle_);
   e.stopPropagation();
   e.preventDefault();
@@ -773,7 +773,7 @@ Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
 Scrollbar.prototype.onMouseUpHandle_ = function() {
   // Tell the workspace to clean up now that the workspace is done moving.
   this.workspace_.resetDragSurface();
-  Blockly.Touch.clearTouchIdentifier();
+  Touch.clearTouchIdentifier();
   this.cleanUp_();
 };
 
@@ -785,11 +785,11 @@ Scrollbar.prototype.onMouseUpHandle_ = function() {
 Scrollbar.prototype.cleanUp_ = function() {
   Blockly.hideChaff(true);
   if (Scrollbar.onMouseUpWrapper_) {
-    Blockly.browserEvents.unbind(Scrollbar.onMouseUpWrapper_);
+    browserEvents.unbind(Scrollbar.onMouseUpWrapper_);
     Scrollbar.onMouseUpWrapper_ = null;
   }
   if (Scrollbar.onMouseMoveWrapper_) {
-    Blockly.browserEvents.unbind(Scrollbar.onMouseMoveWrapper_);
+    browserEvents.unbind(Scrollbar.onMouseMoveWrapper_);
     Scrollbar.onMouseMoveWrapper_ = null;
   }
 };
@@ -847,7 +847,7 @@ Scrollbar.prototype.set = function(value, updateMetrics) {
  * @param {number} y The y coordinate of the scrollbar's origin, in CSS pixels.
  */
 Scrollbar.prototype.setOrigin = function(x, y) {
-  this.origin_ = new Blockly.utils.Coordinate(x, y);
+  this.origin_ = new Coordinate(x, y);
 };
 
 exports = Scrollbar;
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index ce402b19d..67aafbbec 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -13,19 +13,18 @@
 goog.module('Blockly.ScrollbarPair');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Scrollbar');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Metrics');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.WorkspaceSvg');
+const Events = goog.require('Blockly.Events');
+const Metrics = goog.require('Blockly.utils.Metrics');
+const Scrollbar = goog.require('Blockly.Scrollbar');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const dom = goog.require('Blockly.utils.dom');
 
 
 /**
  * Class for a pair of scrollbars.  Horizontal and vertical.
- * @param {!Blockly.WorkspaceSvg} workspace Workspace to bind the scrollbars to.
+ * @param {!WorkspaceSvg} workspace Workspace to bind the scrollbars to.
  * @param {boolean=} addHorizontal Whether to add a horizontal scrollbar.
  *    Defaults to true.
  * @param {boolean=} addVertical Whether to add a vertical scrollbar. Defaults
@@ -38,7 +37,7 @@ const ScrollbarPair = function(
     workspace, addHorizontal, addVertical, opt_class, opt_margin) {
   /**
    * The workspace this scrollbar pair is bound to.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
@@ -48,29 +47,29 @@ const ScrollbarPair = function(
   const isPair = addHorizontal && addVertical;
 
   if (addHorizontal) {
-    this.hScroll = new Blockly.Scrollbar(
+    this.hScroll = new Scrollbar(
         workspace, true, isPair, opt_class, opt_margin);
   }
   if (addVertical) {
-    this.vScroll = new Blockly.Scrollbar(
+    this.vScroll = new Scrollbar(
         workspace, false, isPair, opt_class, opt_margin);
   }
 
   if (isPair) {
-    this.corner_ = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    this.corner_ = dom.createSvgElement(
+        Svg.RECT,
         {
-          'height': Blockly.Scrollbar.scrollbarThickness,
-          'width': Blockly.Scrollbar.scrollbarThickness,
+          'height': Scrollbar.scrollbarThickness,
+          'width': Scrollbar.scrollbarThickness,
           'class': 'blocklyScrollbarBackground'
         },
         null);
-    Blockly.utils.dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
+    dom.insertAfter(this.corner_, workspace.getBubbleCanvas());
   }
 
   /**
    * Previously recorded metrics from the workspace.
-   * @type {?Blockly.utils.Metrics}
+   * @type {?Metrics}
    * @private
    */
   this.oldHostMetrics_ = null;
@@ -82,7 +81,7 @@ const ScrollbarPair = function(
  * @suppress {checkTypes}
  */
 ScrollbarPair.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.corner_);
+  dom.removeNode(this.corner_);
   this.corner_ = null;
   this.workspace_ = null;
   this.oldHostMetrics_ = null;
@@ -137,7 +136,7 @@ ScrollbarPair.prototype.resize = function() {
 
   if (resizeH || resizeV) {
     try {
-      Blockly.Events.disable();
+      Events.disable();
       if (this.hScroll && resizeH) {
         this.hScroll.resize(hostMetrics);
       }
@@ -145,7 +144,7 @@ ScrollbarPair.prototype.resize = function() {
         this.vScroll.resize(hostMetrics);
       }
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
     this.workspace_.maybeFireViewportChangeEvent();
   }
@@ -292,7 +291,7 @@ ScrollbarPair.prototype.isVisible = function() {
 /**
  * Recalculates the scrollbars' locations within their path and length.
  * This should be called when the contents of the workspace have changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
@@ -307,7 +306,7 @@ ScrollbarPair.prototype.resizeContent = function(hostMetrics) {
 /**
  * Recalculates the scrollbars' locations on the screen and path length.
  * This should be called when the layout or size of the window has changed.
- * @param {!Blockly.utils.Metrics} hostMetrics A data structure describing all
+ * @param {!Metrics} hostMetrics A data structure describing all
  *     the required dimensions, possibly fetched from the host object.
  */
 ScrollbarPair.prototype.resizeView = function(hostMetrics) {

From 0367b9845f816f79a2d92d01b80ca6eeda4a0faa Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:44:34 -0700
Subject: [PATCH 122/291] clang-format core/scrollbar.js and
 core/scrollbar_pair.js

---
 core/scrollbar.js      | 50 +++++++++++++++++-------------------------
 core/scrollbar_pair.js | 11 +++++-----
 2 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 912fb3c41..2f93e2162 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -70,7 +70,8 @@ const Scrollbar = function(
    * @private
    */
   this.margin_ = (opt_margin !== undefined) ?
-      opt_margin : Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
+      opt_margin :
+      Scrollbar.DEFAULT_SCROLLBAR_MARGIN;
   /**
    * Previously recorded metrics from the workspace.
    * @type {?Metrics}
@@ -207,10 +208,10 @@ Scrollbar.DEFAULT_SCROLLBAR_MARGIN = 0.5;
  * @private
  */
 Scrollbar.metricsAreEquivalent_ = function(first, second) {
-  return (first.viewWidth == second.viewWidth &&
+  return (
+      first.viewWidth == second.viewWidth &&
       first.viewHeight == second.viewHeight &&
-      first.viewLeft == second.viewLeft &&
-      first.viewTop == second.viewTop &&
+      first.viewLeft == second.viewLeft && first.viewTop == second.viewTop &&
       first.absoluteTop == second.absoluteTop &&
       first.absoluteLeft == second.absoluteLeft &&
       first.scrollWidth == second.scrollWidth &&
@@ -307,7 +308,8 @@ Scrollbar.prototype.setHandlePosition = function(newPosition) {
 Scrollbar.prototype.setScrollbarLength_ = function(newSize) {
   this.scrollbarLength_ = newSize;
   this.outerSvg_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
-  this.svgBackground_.setAttribute(this.lengthAttribute_, this.scrollbarLength_);
+  this.svgBackground_.setAttribute(
+      this.lengthAttribute_, this.scrollbarLength_);
 };
 
 /**
@@ -344,8 +346,8 @@ Scrollbar.prototype.resize = function(opt_metrics) {
     }
   }
 
-  if (this.oldHostMetrics_ && Scrollbar.metricsAreEquivalent_(
-      hostMetrics, this.oldHostMetrics_)) {
+  if (this.oldHostMetrics_ &&
+      Scrollbar.metricsAreEquivalent_(hostMetrics, this.oldHostMetrics_)) {
     return;
   }
 
@@ -407,8 +409,7 @@ Scrollbar.prototype.resizeViewHorizontal = function(hostMetrics) {
   }
   this.setScrollbarLength_(Math.max(0, viewSize));
 
-  let xCoordinate =
-      hostMetrics.absoluteLeft + this.margin_;
+  let xCoordinate = hostMetrics.absoluteLeft + this.margin_;
   if (this.pair_ && this.workspace_.RTL) {
     xCoordinate += Scrollbar.scrollbarThickness;
   }
@@ -507,7 +508,7 @@ Scrollbar.prototype.resizeViewVertical = function(hostMetrics) {
   const xCoordinate = this.workspace_.RTL ?
       hostMetrics.absoluteLeft + this.margin_ :
       hostMetrics.absoluteLeft + hostMetrics.viewWidth -
-      Scrollbar.scrollbarThickness - this.margin_;
+          Scrollbar.scrollbarThickness - this.margin_;
 
   const yCoordinate = hostMetrics.absoluteTop + this.margin_;
   this.setPosition(xCoordinate, yCoordinate);
@@ -585,34 +586,24 @@ Scrollbar.prototype.createDom_ = function(opt_class) {
     </g>
   </svg>
   */
-  let className = 'blocklyScrollbar' +
-      (this.horizontal_ ? 'Horizontal' : 'Vertical');
+  let className =
+      'blocklyScrollbar' + (this.horizontal_ ? 'Horizontal' : 'Vertical');
   if (opt_class) {
     className += ' ' + opt_class;
   }
-  this.outerSvg_ = dom.createSvgElement(
-      Svg.SVG, {'class': className}, null);
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {}, this.outerSvg_);
+  this.outerSvg_ = dom.createSvgElement(Svg.SVG, {'class': className}, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {}, this.outerSvg_);
   this.svgBackground_ = dom.createSvgElement(
-      Svg.RECT, {
-        'class': 'blocklyScrollbarBackground'
-      }, this.svgGroup_);
+      Svg.RECT, {'class': 'blocklyScrollbarBackground'}, this.svgGroup_);
   const radius = Math.floor((Scrollbar.scrollbarThickness - 5) / 2);
   this.svgHandle_ = dom.createSvgElement(
-      Svg.RECT,
-      {
-        'class': 'blocklyScrollbarHandle',
-        'rx': radius,
-        'ry': radius
-      },
+      Svg.RECT, {'class': 'blocklyScrollbarHandle', 'rx': radius, 'ry': radius},
       this.svgGroup_);
   this.workspace_.getThemeManager().subscribe(
       this.svgHandle_, 'scrollbarColour', 'fill');
   this.workspace_.getThemeManager().subscribe(
       this.svgHandle_, 'scrollbarOpacity', 'fill-opacity');
-  dom.insertAfter(this.outerSvg_,
-      this.workspace_.getParentSvg());
+  dom.insertAfter(this.outerSvg_, this.workspace_.getParentSvg());
 };
 
 /**
@@ -694,9 +685,8 @@ Scrollbar.prototype.onMouseDownBar_ = function(e) {
     e.stopPropagation();
     return;
   }
-  const mouseXY = utils.mouseToSvg(e,
-      this.workspace_.getParentSvg(),
-      this.workspace_.getInverseScreenCTM());
+  const mouseXY = utils.mouseToSvg(
+      e, this.workspace_.getParentSvg(), this.workspace_.getInverseScreenCTM());
   const mouseLocation = this.horizontal_ ? mouseXY.x : mouseXY.y;
 
   const handleXY = utils.getInjectionDivXY_(this.svgHandle_);
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 67aafbbec..7c98164e5 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -47,18 +47,17 @@ const ScrollbarPair = function(
   const isPair = addHorizontal && addVertical;
 
   if (addHorizontal) {
-    this.hScroll = new Scrollbar(
-        workspace, true, isPair, opt_class, opt_margin);
+    this.hScroll =
+        new Scrollbar(workspace, true, isPair, opt_class, opt_margin);
   }
   if (addVertical) {
-    this.vScroll = new Scrollbar(
-        workspace, false, isPair, opt_class, opt_margin);
+    this.vScroll =
+        new Scrollbar(workspace, false, isPair, opt_class, opt_margin);
   }
 
   if (isPair) {
     this.corner_ = dom.createSvgElement(
-        Svg.RECT,
-        {
+        Svg.RECT, {
           'height': Scrollbar.scrollbarThickness,
           'width': Scrollbar.scrollbarThickness,
           'class': 'blocklyScrollbarBackground'

From 540088f25fe409ba6903c1cb1d1d2eeb744d3655 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 15:47:51 -0700
Subject: [PATCH 123/291] Update require to requireType

---
 core/scrollbar.js      | 3 ++-
 core/scrollbar_pair.js | 3 ++-
 tests/deps.js          | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/scrollbar.js b/core/scrollbar.js
index 2f93e2162..9877d8201 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -17,7 +17,8 @@ goog.module.declareLegacyNamespace();
 // goog.require('Blockly');
 const Touch = goog.require('Blockly.Touch');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const Metrics = goog.require('Blockly.utils.Metrics');
+/* eslint-disable-next-line no-unused-vars */
+const Metrics = goog.requireType('Blockly.utils.Metrics');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 7c98164e5..2b240f276 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -14,7 +14,8 @@ goog.module('Blockly.ScrollbarPair');
 goog.module.declareLegacyNamespace();
 
 const Events = goog.require('Blockly.Events');
-const Metrics = goog.require('Blockly.utils.Metrics');
+/* eslint-disable-next-line no-unused-vars */
+const Metrics = goog.requireType('Blockly.utils.Metrics');
 const Scrollbar = goog.require('Blockly.Scrollbar');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/tests/deps.js b/tests/deps.js
index 16445324c..d4eac1200 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -160,8 +160,8 @@ goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.z
 goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider']);
 goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
-goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils', 'Blockly.utils.Metrics', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From af3f04b508dc7ad2e0434269312222aa2ea55ab3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 11:06:55 -0700
Subject: [PATCH 124/291] Migrate core/toolbox/toolbox_item.js to goog.module

---
 core/toolbox/toolbox_item.js | 24 ++++++++++++++----------
 tests/deps.js                |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index febc0a068..e34290eb6 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -10,12 +10,14 @@
  */
 'use strict';
 
-goog.provide('Blockly.ToolboxItem');
+goog.module('Blockly.ToolboxItem');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.IToolboxItem');
 
 goog.requireType('Blockly.ICollapsibleToolboxItem');
 goog.requireType('Blockly.IToolbox');
+goog.require('Blockly.utils.IdGenerator');
 goog.requireType('Blockly.utils.toolbox');
 goog.requireType('Blockly.WorkspaceSvg');
 
@@ -30,7 +32,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @implements {Blockly.IToolboxItem}
  */
-Blockly.ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
+const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
 
   /**
    * The id for the category.
@@ -81,7 +83,7 @@ Blockly.ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
  * on the info object.
  * @public
  */
-Blockly.ToolboxItem.prototype.init = function() {
+ToolboxItem.prototype.init = function() {
   // No-op by default.
 };
 
@@ -90,7 +92,7 @@ Blockly.ToolboxItem.prototype.init = function() {
  * @return {?Element} The div for the toolbox item.
  * @public
  */
-Blockly.ToolboxItem.prototype.getDiv = function() {
+ToolboxItem.prototype.getDiv = function() {
   return null;
 };
 
@@ -99,7 +101,7 @@ Blockly.ToolboxItem.prototype.getDiv = function() {
  * @return {string} The ID for the toolbox item.
  * @public
  */
-Blockly.ToolboxItem.prototype.getId = function() {
+ToolboxItem.prototype.getId = function() {
   return this.id_;
 };
 
@@ -109,7 +111,7 @@ Blockly.ToolboxItem.prototype.getId = function() {
  *     this toolbox item is not nested.
  * @public
  */
-Blockly.ToolboxItem.prototype.getParent = function() {
+ToolboxItem.prototype.getParent = function() {
   return null;
 };
 
@@ -118,7 +120,7 @@ Blockly.ToolboxItem.prototype.getParent = function() {
  * @return {number} The nested level of the category.
  * @package
  */
-Blockly.ToolboxItem.prototype.getLevel = function() {
+ToolboxItem.prototype.getLevel = function() {
   return this.level_;
 };
 
@@ -127,7 +129,7 @@ Blockly.ToolboxItem.prototype.getLevel = function() {
  * @return {boolean} True if the toolbox item can be selected.
  * @public
  */
-Blockly.ToolboxItem.prototype.isSelectable = function() {
+ToolboxItem.prototype.isSelectable = function() {
   return false;
 };
 
@@ -136,7 +138,7 @@ Blockly.ToolboxItem.prototype.isSelectable = function() {
  * @return {boolean} True if the toolbox item is collapsible.
  * @public
  */
-Blockly.ToolboxItem.prototype.isCollapsible = function() {
+ToolboxItem.prototype.isCollapsible = function() {
   return false;
 };
 
@@ -144,5 +146,7 @@ Blockly.ToolboxItem.prototype.isCollapsible = function() {
  * Dispose of this toolbox item. No-op by default.
  * @public
  */
-Blockly.ToolboxItem.prototype.dispose = function() {
+ToolboxItem.prototype.dispose = function() {
 };
+
+exports = ToolboxItem;
diff --git a/tests/deps.js b/tests/deps.js
index d4eac1200..1e9ef54f4 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -172,7 +172,7 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);

From 65608065eaeda3bab616bba7c22f0fde677d9216 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 11:10:19 -0700
Subject: [PATCH 125/291] Migrate core/toolbox/toolbox_item.js named requires

---
 core/toolbox/toolbox_item.js | 37 +++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index e34290eb6..f2cb3b711 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -13,24 +13,27 @@
 goog.module('Blockly.ToolboxItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.IToolboxItem');
-
-goog.requireType('Blockly.ICollapsibleToolboxItem');
-goog.requireType('Blockly.IToolbox');
-goog.require('Blockly.utils.IdGenerator');
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+const IdGenerator = goog.require('Blockly.utils.IdGenerator');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const toolbox = goog.requireType('Blockly.utils.toolbox');
+/* eslint-disable-next-line no-unused-vars */
 
 
 /**
  * Class for an item in the toolbox.
- * @param {!Blockly.utils.toolbox.ToolboxItemInfo} toolboxItemDef The JSON defining the
+ * @param {!toolbox.ToolboxItemInfo} toolboxItemDef The JSON defining the
  *     toolbox item.
- * @param {!Blockly.IToolbox} toolbox The toolbox that holds the toolbox item.
- * @param {Blockly.ICollapsibleToolboxItem=} opt_parent The parent toolbox item
+ * @param {!IToolbox} toolbox The toolbox that holds the toolbox item.
+ * @param {ICollapsibleToolboxItem=} opt_parent The parent toolbox item
  *     or null if the category does not have a parent.
  * @constructor
- * @implements {Blockly.IToolboxItem}
+ * @implements {IToolboxItem}
  */
 const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
 
@@ -39,11 +42,11 @@ const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
    * @type {string}
    * @protected
    */
-  this.id_ = toolboxItemDef['toolboxitemid'] || Blockly.utils.IdGenerator.getNextUniqueId();
+  this.id_ = toolboxItemDef['toolboxitemid'] || IdGenerator.getNextUniqueId();
 
   /**
    * The parent of the category.
-   * @type {?Blockly.ICollapsibleToolboxItem}
+   * @type {?ICollapsibleToolboxItem}
    * @protected
    */
   this.parent_ = opt_parent || null;
@@ -57,21 +60,21 @@ const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
 
   /**
    * The JSON definition of the toolbox item.
-   * @type {!Blockly.utils.toolbox.ToolboxItemInfo}
+   * @type {!toolbox.ToolboxItemInfo}
    * @protected
    */
   this.toolboxItemDef_ = toolboxItemDef;
 
   /**
    * The toolbox this category belongs to.
-   * @type {!Blockly.IToolbox}
+   * @type {!IToolbox}
    * @protected
    */
   this.parentToolbox_ = toolbox;
 
   /**
    * The workspace of the parent toolbox.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @protected
    */
   this.workspace_ = this.parentToolbox_.getWorkspace();
@@ -107,7 +110,7 @@ ToolboxItem.prototype.getId = function() {
 
 /**
  * Gets the parent if the toolbox item is nested.
- * @return {?Blockly.IToolboxItem} The parent toolbox item, or null if
+ * @return {?IToolboxItem} The parent toolbox item, or null if
  *     this toolbox item is not nested.
  * @public
  */

From 759638812436961f015f511678d95cd8ad0d1dfc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 11:10:25 -0700
Subject: [PATCH 126/291] clang-format core/toolbox/toolbox_item.js

---
 core/toolbox/toolbox_item.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index f2cb3b711..be7ba37fb 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -36,7 +36,6 @@ const toolbox = goog.requireType('Blockly.utils.toolbox');
  * @implements {IToolboxItem}
  */
 const ToolboxItem = function(toolboxItemDef, toolbox, opt_parent) {
-
   /**
    * The id for the category.
    * @type {string}
@@ -149,7 +148,6 @@ ToolboxItem.prototype.isCollapsible = function() {
  * Dispose of this toolbox item. No-op by default.
  * @public
  */
-ToolboxItem.prototype.dispose = function() {
-};
+ToolboxItem.prototype.dispose = function() {};
 
 exports = ToolboxItem;

From 4eed760a1986d0d0c935ccf6422b9b660e45c6d9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:40:56 -0700
Subject: [PATCH 127/291] Fix eslint disable lines

---
 core/toolbox/toolbox_item.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index be7ba37fb..0fdbfd424 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -18,11 +18,12 @@ const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxIte
 const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.require('Blockly.IToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
-/* eslint-disable-next-line no-unused-vars */
 
 
 /**

From 0b16c9da9ad2f8e806171a595430c436e86e058b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:48:54 -0700
Subject: [PATCH 128/291] Remove extra eslint disable from core/gesture.js

---
 core/gesture.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/gesture.js b/core/gesture.js
index 5d77d4e0a..ae01b62cc 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -20,7 +20,6 @@ goog.module.declareLegacyNamespace();
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const BubbleDragger = goog.require('Blockly.BubbleDragger');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-/* eslint-disable-next-line no-unused-vars */
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');

From 92df3900741e7b80d68f3483de08bada1d59f0c1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:19:57 -0700
Subject: [PATCH 129/291] Migrate core/events/events_viewport.js to ES6
 const/let

---
 core/events/events_viewport.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 6d857cd67..552c709f0 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -77,7 +77,7 @@ Blockly.Events.ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.ViewportChange.prototype.toJson = function() {
-  var json = Blockly.Events.ViewportChange.superClass_.toJson.call(this);
+  const json = Blockly.Events.ViewportChange.superClass_.toJson.call(this);
   json['viewTop'] = this.viewTop;
   json['viewLeft'] = this.viewLeft;
   json['scale'] = this.scale;

From 2294eb9a282b465dd5fbab670d853ce6ea387975 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:22:04 -0700
Subject: [PATCH 130/291] Migrate core/events/events_viewport.js to goog.module

---
 core/events/events_viewport.js | 23 +++++++++++++----------
 tests/deps.js                  |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 552c709f0..4cca81050 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.ViewportChange');
+goog.module('Blockly.Events.ViewportChange');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -33,9 +34,9 @@ goog.require('Blockly.utils.object');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.ViewportChange = function(opt_top, opt_left, opt_scale,
+const ViewportChange = function(opt_top, opt_left, opt_scale,
     opt_workspaceId, opt_oldScale) {
-  Blockly.Events.ViewportChange.superClass_.constructor.call(this, opt_workspaceId);
+  ViewportChange.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * Top-edge of the visible portion of the workspace, relative to the workspace
@@ -63,21 +64,21 @@ Blockly.Events.ViewportChange = function(opt_top, opt_left, opt_scale,
    */
   this.oldScale = opt_oldScale;
 };
-Blockly.utils.object.inherits(Blockly.Events.ViewportChange,
+Blockly.utils.object.inherits(ViewportChange,
     Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
+ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.ViewportChange.prototype.toJson = function() {
-  const json = Blockly.Events.ViewportChange.superClass_.toJson.call(this);
+ViewportChange.prototype.toJson = function() {
+  const json = ViewportChange.superClass_.toJson.call(this);
   json['viewTop'] = this.viewTop;
   json['viewLeft'] = this.viewLeft;
   json['scale'] = this.scale;
@@ -89,8 +90,8 @@ Blockly.Events.ViewportChange.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.ViewportChange.prototype.fromJson = function(json) {
-  Blockly.Events.ViewportChange.superClass_.fromJson.call(this, json);
+ViewportChange.prototype.fromJson = function(json) {
+  ViewportChange.superClass_.fromJson.call(this, json);
   this.viewTop = json['viewTop'];
   this.viewLeft = json['viewLeft'];
   this.scale = json['scale'];
@@ -98,4 +99,6 @@ Blockly.Events.ViewportChange.prototype.fromJson = function(json) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VIEWPORT_CHANGE, Blockly.Events.ViewportChange);
+    Blockly.Events.VIEWPORT_CHANGE, ViewportChange);
+
+exports = ViewportChange;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..3b2de8ffa 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -44,7 +44,7 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});

From 38a459f5b4aecdce19fe4a11e752b27a51fea803 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:35:39 -0700
Subject: [PATCH 131/291] Migrate core/events/events_viewport.js to named
 requires

---
 core/events/events_viewport.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 4cca81050..29af11802 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.Events.ViewportChange');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -31,7 +31,7 @@ goog.require('Blockly.utils.object');
  *    Undefined for a blank event.
  * @param {number=} opt_oldScale The old scale of the workspace. Undefined for a
  *    blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const ViewportChange = function(opt_top, opt_left, opt_scale,
@@ -64,14 +64,14 @@ const ViewportChange = function(opt_top, opt_left, opt_scale,
    */
   this.oldScale = opt_oldScale;
 };
-Blockly.utils.object.inherits(ViewportChange,
-    Blockly.Events.UiBase);
+object.inherits(ViewportChange,
+    UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE;
+ViewportChange.prototype.type = Events.VIEWPORT_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -98,7 +98,7 @@ ViewportChange.prototype.fromJson = function(json) {
   this.oldScale = json['oldScale'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VIEWPORT_CHANGE, ViewportChange);
+registry.register(registry.Type.EVENT,
+    Events.VIEWPORT_CHANGE, ViewportChange);
 
 exports = ViewportChange;

From d3ad80f654a33f66869d098a2c5d4e608f2a1977 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:36:01 -0700
Subject: [PATCH 132/291] clang-format core/events/events_viewport.js

---
 core/events/events_viewport.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index 29af11802..2cfd94a7f 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -34,8 +34,8 @@ const registry = goog.require('Blockly.registry');
  * @extends {UiBase}
  * @constructor
  */
-const ViewportChange = function(opt_top, opt_left, opt_scale,
-    opt_workspaceId, opt_oldScale) {
+const ViewportChange = function(
+    opt_top, opt_left, opt_scale, opt_workspaceId, opt_oldScale) {
   ViewportChange.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
@@ -64,8 +64,7 @@ const ViewportChange = function(opt_top, opt_left, opt_scale,
    */
   this.oldScale = opt_oldScale;
 };
-object.inherits(ViewportChange,
-    UiBase);
+object.inherits(ViewportChange, UiBase);
 
 /**
  * Type of this event.
@@ -98,7 +97,6 @@ ViewportChange.prototype.fromJson = function(json) {
   this.oldScale = json['oldScale'];
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VIEWPORT_CHANGE, ViewportChange);
+registry.register(registry.Type.EVENT, Events.VIEWPORT_CHANGE, ViewportChange);
 
 exports = ViewportChange;

From 412d8101767449b40248cf38736db077b8c9ccd6 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:52:24 -0700
Subject: [PATCH 133/291] Migrate core/events/events_toolbox_item_select.js to
 ES6 const/let

---
 core/events/events_toolbox_item_select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index a7dbb5305..694e24d5d 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -59,7 +59,7 @@ Blockly.Events.ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SE
  * @return {!Object} JSON representation.
  */
 Blockly.Events.ToolboxItemSelect.prototype.toJson = function() {
-  var json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this);
+  const json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this);
   json['oldItem'] = this.oldItem;
   json['newItem'] = this.newItem;
   return json;

From 7e9ee2d1c1f3bf6225d9570e629e9a0958086ae9 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:52:43 -0700
Subject: [PATCH 134/291] Migrate core/events/events_toolbox_item_select.js to
 goog.module

---
 core/events/events_toolbox_item_select.js | 23 +++++++++++++----------
 tests/deps.js                             |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index 694e24d5d..ec587ad92 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.ToolboxItemSelect');
+goog.module('Blockly.Events.ToolboxItemSelect');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -29,9 +30,9 @@ goog.require('Blockly.utils.object');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.ToolboxItemSelect = function(opt_oldItem, opt_newItem,
+const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
     opt_workspaceId) {
-  Blockly.Events.ToolboxItemSelect.superClass_.constructor.call(
+  ToolboxItemSelect.superClass_.constructor.call(
       this, opt_workspaceId);
 
   /**
@@ -46,20 +47,20 @@ Blockly.Events.ToolboxItemSelect = function(opt_oldItem, opt_newItem,
    */
   this.newItem = opt_newItem;
 };
-Blockly.utils.object.inherits(Blockly.Events.ToolboxItemSelect, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(ToolboxItemSelect, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT;
+ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.ToolboxItemSelect.prototype.toJson = function() {
-  const json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this);
+ToolboxItemSelect.prototype.toJson = function() {
+  const json = ToolboxItemSelect.superClass_.toJson.call(this);
   json['oldItem'] = this.oldItem;
   json['newItem'] = this.newItem;
   return json;
@@ -69,11 +70,13 @@ Blockly.Events.ToolboxItemSelect.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.ToolboxItemSelect.prototype.fromJson = function(json) {
-  Blockly.Events.ToolboxItemSelect.superClass_.fromJson.call(this, json);
+ToolboxItemSelect.prototype.fromJson = function(json) {
+  ToolboxItemSelect.superClass_.fromJson.call(this, json);
   this.oldItem = json['oldItem'];
   this.newItem = json['newItem'];
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.TOOLBOX_ITEM_SELECT, Blockly.Events.ToolboxItemSelect);
+    Blockly.Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
+
+exports = ToolboxItemSelect;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..c5dd33a1d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -42,7 +42,7 @@ goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click']
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);

From df71e638303c274fa0f87551c02231a8ac4469ff Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:53:12 -0700
Subject: [PATCH 135/291] Migrate core/events/events_toolbox_item_select.js to
 named requires

---
 core/events/events_toolbox_item_select.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index ec587ad92..0ef7111f8 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -13,10 +13,10 @@
 goog.module('Blockly.Events.ToolboxItemSelect');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -27,7 +27,7 @@ goog.require('Blockly.utils.object');
  *    a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
@@ -47,13 +47,13 @@ const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
    */
   this.newItem = opt_newItem;
 };
-Blockly.utils.object.inherits(ToolboxItemSelect, Blockly.Events.UiBase);
+object.inherits(ToolboxItemSelect, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT;
+ToolboxItemSelect.prototype.type = Events.TOOLBOX_ITEM_SELECT;
 
 /**
  * Encode the event as JSON.
@@ -76,7 +76,7 @@ ToolboxItemSelect.prototype.fromJson = function(json) {
   this.newItem = json['newItem'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
+registry.register(registry.Type.EVENT,
+    Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
 
 exports = ToolboxItemSelect;

From bee144fae2a081ad99c073b8f9786d05285b0338 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 09:53:38 -0700
Subject: [PATCH 136/291] clang-format
 core/events/events_toolbox_item_select.js

---
 core/events/events_toolbox_item_select.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index 0ef7111f8..0fddaf4e9 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -30,10 +30,8 @@ const registry = goog.require('Blockly.registry');
  * @extends {UiBase}
  * @constructor
  */
-const ToolboxItemSelect = function(opt_oldItem, opt_newItem,
-    opt_workspaceId) {
-  ToolboxItemSelect.superClass_.constructor.call(
-      this, opt_workspaceId);
+const ToolboxItemSelect = function(opt_oldItem, opt_newItem, opt_workspaceId) {
+  ToolboxItemSelect.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * The previously selected toolbox item.
@@ -76,7 +74,7 @@ ToolboxItemSelect.prototype.fromJson = function(json) {
   this.newItem = json['newItem'];
 };
 
-registry.register(registry.Type.EVENT,
-    Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
+registry.register(
+    registry.Type.EVENT, Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);
 
 exports = ToolboxItemSelect;

From 2e545c677bd238f799938a8ce160a6cb0630d4d6 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 10:17:38 -0700
Subject: [PATCH 137/291] Update build artifact sizes in check_metadata.sh

---
 tests/scripts/check_metadata.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/scripts/check_metadata.sh b/tests/scripts/check_metadata.sh
index a35257c8e..188678c3b 100755
--- a/tests/scripts/check_metadata.sh
+++ b/tests/scripts/check_metadata.sh
@@ -25,7 +25,8 @@ readonly BUILD_DIR='build'
 # Q4 2020	4.20201217.0	653624
 # Q1 2021	5.20210325.0	653957
 # Q2 2021	6.20210701.0	664497
-readonly BLOCKLY_SIZE_EXPECTED=664497
+# Q3 2021	6.20210701.0	731695
+readonly BLOCKLY_SIZE_EXPECTED=731695
 
 # Size of blocks_compressed.js
 # Q2 2019	2.20190722.0	75618
@@ -37,6 +38,7 @@ readonly BLOCKLY_SIZE_EXPECTED=664497
 # Q4 2020	4.20201217.0	76693
 # Q1 2021	5.20210325.0	76693
 # Q2 2021	6.20210701.0	76669
+# Q3 2021	6.20210701.0	76669
 readonly BLOCKS_SIZE_EXPECTED=76669
 
 # Size of blockly_compressed.js.gz
@@ -49,7 +51,8 @@ readonly BLOCKS_SIZE_EXPECTED=76669
 # Q4 2020	4.20201217.0	138115
 # Q1 2021	5.20210325.0	136118
 # Q2 2021	6.20210701.0	142112
-readonly BLOCKLY_GZ_SIZE_EXPECTED=142112
+# Q3 2021	6.20210701.0	147476
+readonly BLOCKLY_GZ_SIZE_EXPECTED=147476
 
 # Size of blocks_compressed.js.gz
 # Q2 2019	2.20190722.0	14552
@@ -61,7 +64,8 @@ readonly BLOCKLY_GZ_SIZE_EXPECTED=142112
 # Q4 2020	4.20201217.0	15224
 # Q1 2021	5.20210325.0	15285
 # Q2 2021	6.20210701.0	15275
-readonly BLOCKS_GZ_SIZE_EXPECTED=15275
+# Q3 2021	6.20210701.0	15284
+readonly BLOCKS_GZ_SIZE_EXPECTED=15284
 
 # ANSI colors
 readonly BOLD_GREEN='\033[1;32m'

From 98dd332fda2f62f72a10bb125a1c430d42b40143 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 10:34:32 -0700
Subject: [PATCH 138/291] Add comment about root cause of build artifact size
 change

---
 tests/scripts/check_metadata.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/scripts/check_metadata.sh b/tests/scripts/check_metadata.sh
index 188678c3b..642be7191 100755
--- a/tests/scripts/check_metadata.sh
+++ b/tests/scripts/check_metadata.sh
@@ -25,7 +25,7 @@ readonly BUILD_DIR='build'
 # Q4 2020	4.20201217.0	653624
 # Q1 2021	5.20210325.0	653957
 # Q2 2021	6.20210701.0	664497
-# Q3 2021	6.20210701.0	731695
+# Q3 2021	6.20210701.0	731695 (mid-quarter goog.module conversion change)
 readonly BLOCKLY_SIZE_EXPECTED=731695
 
 # Size of blocks_compressed.js
@@ -51,7 +51,7 @@ readonly BLOCKS_SIZE_EXPECTED=76669
 # Q4 2020	4.20201217.0	138115
 # Q1 2021	5.20210325.0	136118
 # Q2 2021	6.20210701.0	142112
-# Q3 2021	6.20210701.0	147476
+# Q3 2021	6.20210701.0	147476 (mid-quarter goog.module conversion change)
 readonly BLOCKLY_GZ_SIZE_EXPECTED=147476
 
 # Size of blocks_compressed.js.gz

From 8c2a469931a733c973a3ab4fde4f31b23fd62420 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:04:40 -0700
Subject: [PATCH 139/291] Migrate core/events/events_marker_move.js to ES6
 const/let

---
 core/events/events_marker_move.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index ab839daff..acb28a66b 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -37,7 +37,7 @@ goog.requireType('Blockly.Workspace');
  */
 Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
     opt_newNode) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  let workspaceId = opt_block ? opt_block.workspace.id : undefined;
   if (opt_newNode && opt_newNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
     workspaceId =
         (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
@@ -81,7 +81,7 @@ Blockly.Events.MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.MarkerMove.prototype.toJson = function() {
-  var json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
+  const json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
   json['isCursor'] = this.isCursor;
   json['blockId'] = this.blockId;
   json['oldNode'] = this.oldNode;

From cf97c1c15f9e92357d29e57732d838f3ac7c27d5 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:08:51 -0700
Subject: [PATCH 140/291] Migrate core/events/events_marker_move.js to
 goog.module

---
 core/events/events_marker_move.js | 23 +++++++++++++----------
 tests/deps.js                     |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index acb28a66b..e85b5fd07 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.MarkerMove');
+goog.module('Blockly.Events.MarkerMove');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -35,14 +36,14 @@ goog.requireType('Blockly.Workspace');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
+const MarkerMove = function(opt_block, isCursor, opt_oldNode,
     opt_newNode) {
   let workspaceId = opt_block ? opt_block.workspace.id : undefined;
   if (opt_newNode && opt_newNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
     workspaceId =
         (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
   }
-  Blockly.Events.MarkerMove.superClass_.constructor.call(this, workspaceId);
+  MarkerMove.superClass_.constructor.call(this, workspaceId);
 
   /**
    * The workspace identifier for this event.
@@ -68,20 +69,20 @@ Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
    */
   this.isCursor = isCursor;
 };
-Blockly.utils.object.inherits(Blockly.Events.MarkerMove, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(MarkerMove, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
+MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.toJson = function() {
-  const json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
+MarkerMove.prototype.toJson = function() {
+  const json = MarkerMove.superClass_.toJson.call(this);
   json['isCursor'] = this.isCursor;
   json['blockId'] = this.blockId;
   json['oldNode'] = this.oldNode;
@@ -93,8 +94,8 @@ Blockly.Events.MarkerMove.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.fromJson = function(json) {
-  Blockly.Events.MarkerMove.superClass_.fromJson.call(this, json);
+MarkerMove.prototype.fromJson = function(json) {
+  MarkerMove.superClass_.fromJson.call(this, json);
   this.isCursor = json['isCursor'];
   this.blockId = json['blockId'];
   this.oldNode = json['oldNode'];
@@ -102,4 +103,6 @@ Blockly.Events.MarkerMove.prototype.fromJson = function(json) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.MARKER_MOVE, Blockly.Events.MarkerMove);
+    Blockly.Events.MARKER_MOVE, MarkerMove);
+
+exports = MarkerMove;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..7cb45f9bd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -39,7 +39,7 @@ goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abst
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From b9af6677e851bb194e38c06ba5fa9d09602cee8d Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:14:52 -0700
Subject: [PATCH 141/291] Migrate core/events/events_marker_move.js to named
 requires

---
 core/events/events_marker_move.js | 41 ++++++++++++++++---------------
 tests/deps.js                     |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index e85b5fd07..e4c0f2f9c 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -13,35 +13,36 @@
 goog.module('Blockly.Events.MarkerMove');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.ASTNode');
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Workspace');
+const ASTNode = goog.require('Blockly.ASTNode');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a marker move event.
- * @param {?Blockly.Block=} opt_block The affected block. Null if current node
+ * @param {?Block=} opt_block The affected block. Null if current node
  *    is of type workspace. Undefined for a blank event.
  * @param {boolean=} isCursor Whether this is a cursor event. Undefined for a
  *    blank event.
- * @param {?Blockly.ASTNode=} opt_oldNode The old node the marker used to be on.
+ * @param {?ASTNode=} opt_oldNode The old node the marker used to be on.
  *    Undefined for a blank event.
- * @param {!Blockly.ASTNode=} opt_newNode The new node the marker is now on.
+ * @param {!ASTNode=} opt_newNode The new node the marker is now on.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const MarkerMove = function(opt_block, isCursor, opt_oldNode,
     opt_newNode) {
   let workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  if (opt_newNode && opt_newNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
+  if (opt_newNode && opt_newNode.getType() == ASTNode.types.WORKSPACE) {
     workspaceId =
-        (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
+        (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
   }
   MarkerMove.superClass_.constructor.call(this, workspaceId);
 
@@ -53,13 +54,13 @@ const MarkerMove = function(opt_block, isCursor, opt_oldNode,
 
   /**
    * The old node the marker used to be on.
-   * @type {?Blockly.ASTNode|undefined}
+   * @type {?ASTNode|undefined}
    */
   this.oldNode = opt_oldNode;
 
   /**
    * The new node the  marker is now on.
-   * @type {Blockly.ASTNode|undefined}
+   * @type {ASTNode|undefined}
    */
   this.newNode = opt_newNode;
 
@@ -69,13 +70,13 @@ const MarkerMove = function(opt_block, isCursor, opt_oldNode,
    */
   this.isCursor = isCursor;
 };
-Blockly.utils.object.inherits(MarkerMove, Blockly.Events.UiBase);
+object.inherits(MarkerMove, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
+MarkerMove.prototype.type = Events.MARKER_MOVE;
 
 /**
  * Encode the event as JSON.
@@ -102,7 +103,7 @@ MarkerMove.prototype.fromJson = function(json) {
   this.newNode = json['newNode'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.MARKER_MOVE, MarkerMove);
+registry.register(registry.Type.EVENT,
+    Events.MARKER_MOVE, MarkerMove);
 
 exports = MarkerMove;
diff --git a/tests/deps.js b/tests/deps.js
index 7cb45f9bd..cdb39710c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -39,7 +39,7 @@ goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abst
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From 3f83a8f600ea130d9ff1340fd163d4bbcde48150 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:15:11 -0700
Subject: [PATCH 142/291] clang-format core/events/events_marker_move.js

---
 core/events/events_marker_move.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index e4c0f2f9c..2d0e0957b 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -37,12 +37,10 @@ const registry = goog.require('Blockly.registry');
  * @extends {UiBase}
  * @constructor
  */
-const MarkerMove = function(opt_block, isCursor, opt_oldNode,
-    opt_newNode) {
+const MarkerMove = function(opt_block, isCursor, opt_oldNode, opt_newNode) {
   let workspaceId = opt_block ? opt_block.workspace.id : undefined;
   if (opt_newNode && opt_newNode.getType() == ASTNode.types.WORKSPACE) {
-    workspaceId =
-        (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
+    workspaceId = (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
   }
   MarkerMove.superClass_.constructor.call(this, workspaceId);
 
@@ -103,7 +101,6 @@ MarkerMove.prototype.fromJson = function(json) {
   this.newNode = json['newNode'];
 };
 
-registry.register(registry.Type.EVENT,
-    Events.MARKER_MOVE, MarkerMove);
+registry.register(registry.Type.EVENT, Events.MARKER_MOVE, MarkerMove);
 
 exports = MarkerMove;

From 0dde319291c1d5dea3e580bdd0b9fceff3c3b70e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:22:32 -0700
Subject: [PATCH 143/291] Migrate core/events/events_click.js to ES6 const/let

---
 core/events/events_click.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index ea46b0a76..19775c41e 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -33,7 +33,7 @@ goog.requireType('Blockly.Block');
  * @constructor
  */
 Blockly.Events.Click = function(opt_block, opt_workspaceId, opt_targetType) {
-  var workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
+  const workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
   Blockly.Events.Click.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
@@ -56,7 +56,7 @@ Blockly.Events.Click.prototype.type = Blockly.Events.CLICK;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.Click.prototype.toJson = function() {
-  var json = Blockly.Events.Click.superClass_.toJson.call(this);
+  const json = Blockly.Events.Click.superClass_.toJson.call(this);
   json['targetType'] = this.targetType;
   if (this.blockId) {
     json['blockId'] = this.blockId;

From 31fc78393f004e3b361f92275205010b867b8cfe Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:24:28 -0700
Subject: [PATCH 144/291] Migrate core/events/events_click.js to goog.module

---
 core/events/events_click.js | 23 +++++++++++++----------
 tests/deps.js               |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index 19775c41e..a19ee6b75 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Click');
+goog.module('Blockly.Events.Click');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -32,9 +33,9 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.Click = function(opt_block, opt_workspaceId, opt_targetType) {
+const Click = function(opt_block, opt_workspaceId, opt_targetType) {
   const workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
-  Blockly.Events.Click.superClass_.constructor.call(this, workspaceId);
+  Click.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
   /**
@@ -43,20 +44,20 @@ Blockly.Events.Click = function(opt_block, opt_workspaceId, opt_targetType) {
    */
   this.targetType = opt_targetType;
 };
-Blockly.utils.object.inherits(Blockly.Events.Click, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(Click, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.Click.prototype.type = Blockly.Events.CLICK;
+Click.prototype.type = Blockly.Events.CLICK;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Click.prototype.toJson = function() {
-  const json = Blockly.Events.Click.superClass_.toJson.call(this);
+Click.prototype.toJson = function() {
+  const json = Click.superClass_.toJson.call(this);
   json['targetType'] = this.targetType;
   if (this.blockId) {
     json['blockId'] = this.blockId;
@@ -68,11 +69,13 @@ Blockly.Events.Click.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Click.prototype.fromJson = function(json) {
-  Blockly.Events.Click.superClass_.fromJson.call(this, json);
+Click.prototype.fromJson = function(json) {
+  Click.superClass_.fromJson.call(this, json);
   this.targetType = json['targetType'];
   this.blockId = json['blockId'];
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CLICK,
-    Blockly.Events.Click);
+    Click);
+
+exports = Click;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..4ddac911b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -38,7 +38,7 @@ goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From 0abdb821d87745b2d5b280e5a202c9920b8f27d4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:26:57 -0700
Subject: [PATCH 145/291] Migrate core/events/events_click.js to named requires

---
 core/events/events_click.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index a19ee6b75..27628ebb9 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -13,24 +13,23 @@
 goog.module('Blockly.Events.Click');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
-
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 /**
  * Class for a click event.
- * @param {?Blockly.Block=} opt_block The affected block. Null for click events
+ * @param {?Block=} opt_block The affected block. Null for click events
  *    that do not have an associated block (i.e. workspace click). Undefined
  *    for a blank event.
  * @param {?string=} opt_workspaceId The workspace identifier for this event.
  *    Not used if block is passed. Undefined for a blank event.
  * @param {string=} opt_targetType The type of element targeted by this click
  *    event. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
 const Click = function(opt_block, opt_workspaceId, opt_targetType) {
@@ -44,13 +43,13 @@ const Click = function(opt_block, opt_workspaceId, opt_targetType) {
    */
   this.targetType = opt_targetType;
 };
-Blockly.utils.object.inherits(Click, Blockly.Events.UiBase);
+object.inherits(Click, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Click.prototype.type = Blockly.Events.CLICK;
+Click.prototype.type = Events.CLICK;
 
 /**
  * Encode the event as JSON.
@@ -75,7 +74,7 @@ Click.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CLICK,
+registry.register(registry.Type.EVENT, Events.CLICK,
     Click);
 
 exports = Click;

From 6662718440f1ed0e4f1c3695cc51fa1d9789bf0b Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:27:17 -0700
Subject: [PATCH 146/291] clang-format core/events/events_click.js

---
 core/events/events_click.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/events/events_click.js b/core/events/events_click.js
index 27628ebb9..521f87763 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -74,7 +74,6 @@ Click.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-registry.register(registry.Type.EVENT, Events.CLICK,
-    Click);
+registry.register(registry.Type.EVENT, Events.CLICK, Click);
 
 exports = Click;

From d1191fb7b5712f59ca9cf743121846505ce3b2ce Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:39:56 -0700
Subject: [PATCH 147/291] Migrate core/positionable_helpers.js to ES6 const/let

---
 core/positionable_helpers.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 3dc52e50c..fb33f177f 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -80,8 +80,8 @@ Blockly.uiPosition.getStartPositionRect = function(
     position, size, horizontalPadding,
     verticalPadding, metrics, workspace) {
   // Horizontal positioning.
-  var left = 0;
-  var hasVerticalScrollbar =
+  let left = 0;
+  const hasVerticalScrollbar =
       workspace.scrollbar && workspace.scrollbar.canScrollVertically();
   if (position.horizontal ===
       Blockly.uiPosition.horizontalPosition.LEFT) {
@@ -97,7 +97,7 @@ Blockly.uiPosition.getStartPositionRect = function(
     }
   }
   // Vertical positioning.
-  var top = 0;
+  let top = 0;
   if (position.vertical ===
       Blockly.uiPosition.verticalPosition.TOP) {
     top = metrics.absoluteMetrics.top + verticalPadding;
@@ -124,15 +124,15 @@ Blockly.uiPosition.getStartPositionRect = function(
  * @package
  */
 Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
-  var leftCorner =
+  const leftCorner =
       metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
-  var topCorner =
+  const topCorner =
       metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM;
-  var horizontalPosition = leftCorner ?
+  const horizontalPosition = leftCorner ?
       Blockly.uiPosition.horizontalPosition.LEFT :
       Blockly.uiPosition.horizontalPosition.RIGHT;
-  var verticalPosition = topCorner ?
+  const verticalPosition = topCorner ?
       Blockly.uiPosition.verticalPosition.TOP :
       Blockly.uiPosition.verticalPosition.BOTTOM;
   return {
@@ -156,14 +156,15 @@ Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
  */
 Blockly.uiPosition.bumpPositionRect = function(
     startRect, margin, bumpDirection, savedPositions) {
-  var top = startRect.top;
-  var left = startRect.left;
-  var width = startRect.right - startRect.left;
-  var height = startRect.bottom - startRect.top;
+  let top = startRect.top;
+  const left = startRect.left;
+  const width = startRect.right - startRect.left;
+  const height = startRect.bottom - startRect.top;
 
   // Check for collision and bump if needed.
-  var boundingRect = startRect;
-  for (var i = 0, otherEl; (otherEl = savedPositions[i]); i++) {
+  let boundingRect = startRect;
+  for (let i = 0; i < savedPositions.length; i++) {
+    const otherEl = savedPositions[i];
     if (boundingRect.intersects(otherEl)) {
       if (bumpDirection === Blockly.uiPosition.bumpDirection.UP) {
         top = otherEl.top - height - margin;

From 1d72126e1d8ad255574e501a5d306868e8f83f08 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 23 Jul 2021 19:43:56 -0700
Subject: [PATCH 148/291] Migrate core/positionable_helpers.js to goog.module

---
 core/positionable_helpers.js | 74 ++++++++++++++++++++----------------
 tests/deps.js                |  2 +-
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index fb33f177f..9ca1d0759 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -10,62 +10,68 @@
  */
 'use strict';
 
-goog.provide('Blockly.uiPosition');
+goog.module('Blockly.uiPosition');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Scrollbar');
 goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.toolbox');
 
 goog.requireType('Blockly.MetricsManager');
+goog.requireType('Blockly.utils.Size');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Enum for vertical positioning.
  * @enum {number}
- * @package
  */
-Blockly.uiPosition.verticalPosition = {
+const verticalPosition = {
   TOP: 0,
   BOTTOM: 1
 };
+/** @package */
+exports.verticalPosition = verticalPosition;
 
 /**
  * Enum for horizontal positioning.
  * @enum {number}
- * @package
  */
-Blockly.uiPosition.horizontalPosition = {
+const horizontalPosition = {
   LEFT: 0,
   RIGHT: 1
 };
+/** @package */
+exports.horizontalPosition = horizontalPosition;
 
 /**
  * An object defining a horizontal and vertical positioning.
  * @typedef {{
- *   horizontal: !Blockly.uiPosition.horizontalPosition,
- *   vertical: !Blockly.uiPosition.verticalPosition
+ *   horizontal: !horizontalPosition,
+ *   vertical: !verticalPosition
  * }}
- * @package
  */
-Blockly.uiPosition.Position;
+let Position;
+/** @package */
+exports.Position = Position;
 
 /**
  * Enum for bump rules to use for dealing with collisions.
  * @enum {number}
- * @package
  */
-Blockly.uiPosition.bumpDirection = {
+const bumpDirection = {
   UP: 0,
   DOWN: 1
 };
+/** @package */
+exports.bumpDirection = bumpDirection;
 
 /**
  * Returns a rectangle representing reasonable position for where to place a UI
  * element of the specified size given the restraints and locations of the
  * scrollbars. This method does not take into account any already placed UI
  * elements.
- * @param {!Blockly.uiPosition.Position} position The starting
+ * @param {!Position} position The starting
  *    horizontal and vertical position.
  * @param {!Blockly.utils.Size} size the size of the UI element to get a start
  *    position for.
@@ -74,9 +80,8 @@ Blockly.uiPosition.bumpDirection = {
  * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace UI metrics.
  * @param {!Blockly.WorkspaceSvg} workspace The workspace.
  * @return {!Blockly.utils.Rect} The suggested start position.
- * @package
  */
-Blockly.uiPosition.getStartPositionRect = function(
+const getStartPositionRect = function(
     position, size, horizontalPadding,
     verticalPadding, metrics, workspace) {
   // Horizontal positioning.
@@ -84,7 +89,7 @@ Blockly.uiPosition.getStartPositionRect = function(
   const hasVerticalScrollbar =
       workspace.scrollbar && workspace.scrollbar.canScrollVertically();
   if (position.horizontal ===
-      Blockly.uiPosition.horizontalPosition.LEFT) {
+      horizontalPosition.LEFT) {
     left = metrics.absoluteMetrics.left + horizontalPadding;
     if (hasVerticalScrollbar && workspace.RTL) {
       left += Blockly.Scrollbar.scrollbarThickness;
@@ -99,7 +104,7 @@ Blockly.uiPosition.getStartPositionRect = function(
   // Vertical positioning.
   let top = 0;
   if (position.vertical ===
-      Blockly.uiPosition.verticalPosition.TOP) {
+      verticalPosition.TOP) {
     top = metrics.absoluteMetrics.top + verticalPadding;
   } else {  // position.vertical == verticalPosition.BOTTOM
     top = metrics.absoluteMetrics.top + metrics.viewMetrics.height -
@@ -112,6 +117,8 @@ Blockly.uiPosition.getStartPositionRect = function(
   return new Blockly.utils.Rect(
       top, top + size.height, left, left + size.width);
 };
+/** @package */
+exports.getStartPositionRect = getStartPositionRect;
 
 /**
  * Returns a corner position that is on the opposite side of the workspace from
@@ -120,26 +127,26 @@ Blockly.uiPosition.getStartPositionRect = function(
  * orientation, defaults to the right corner.
  * @param {!Blockly.WorkspaceSvg} workspace The workspace.
  * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
- * @return {!Blockly.uiPosition.Position} The suggested corner position.
+ * @return {!Position} The suggested corner position.
  * @package
  */
-Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
+const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =
       metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
   const topCorner =
       metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM;
-  const horizontalPosition = leftCorner ?
-      Blockly.uiPosition.horizontalPosition.LEFT :
-      Blockly.uiPosition.horizontalPosition.RIGHT;
-  const verticalPosition = topCorner ?
-      Blockly.uiPosition.verticalPosition.TOP :
-      Blockly.uiPosition.verticalPosition.BOTTOM;
+  const hPosition = leftCorner ?
+      horizontalPosition.LEFT : horizontalPosition.RIGHT;
+  const vPosition = topCorner ?
+      verticalPosition.TOP : verticalPosition.BOTTOM;
   return {
-    horizontal: horizontalPosition,
-    vertical: verticalPosition
+    horizontal: hPosition,
+    vertical: vPosition
   };
 };
+/** @package */
+exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
 
 /**
  * Returns a position Rect based on a starting position that is bumped
@@ -147,15 +154,14 @@ Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) {
  * method does not check that the bumped position is still within bounds.
  * @param {!Blockly.utils.Rect} startRect The starting position to use.
  * @param {number} margin The margin to use between elements when bumping.
- * @param {!Blockly.uiPosition.bumpDirection} bumpDirection The direction
- *    to bump if there is a collision with an existing UI element.
+ * @param {!bumpDirection} bumpDir The direction to bump if there is a collision
+ *    with an existing UI element.
  * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
  *    represent the positions of UI elements already placed.
  * @return {!Blockly.utils.Rect} The suggested position rectangle.
- * @package
  */
-Blockly.uiPosition.bumpPositionRect = function(
-    startRect, margin, bumpDirection, savedPositions) {
+const bumpPositionRect = function(
+    startRect, margin, bumpDir, savedPositions) {
   let top = startRect.top;
   const left = startRect.left;
   const width = startRect.right - startRect.left;
@@ -166,9 +172,9 @@ Blockly.uiPosition.bumpPositionRect = function(
   for (let i = 0; i < savedPositions.length; i++) {
     const otherEl = savedPositions[i];
     if (boundingRect.intersects(otherEl)) {
-      if (bumpDirection === Blockly.uiPosition.bumpDirection.UP) {
+      if (bumpDir === bumpDirection.UP) {
         top = otherEl.top - height - margin;
-      } else {  // bumpDirection == bumpDirection.DOWN
+      } else {  // bumpDir == bumpDirection.DOWN
         top = otherEl.bottom + margin;
       }
       // Recheck other savedPositions
@@ -179,3 +185,5 @@ Blockly.uiPosition.bumpPositionRect = function(
   }
   return boundingRect;
 };
+/** @package */
+exports.bumpPositionRect = bumpPositionRect;
diff --git a/tests/deps.js b/tests/deps.js
index 556839dd2..e250dc441 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -117,7 +117,7 @@ goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global'
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']);
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From c59f083485ca474d01dd2af75926073fe8864459 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:21:57 -0700
Subject: [PATCH 149/291] Migrate core/positionable_helpers.js named requires

---
 core/positionable_helpers.js | 45 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 9ca1d0759..6579a5a4e 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -13,13 +13,12 @@
 goog.module('Blockly.uiPosition');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Scrollbar');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.MetricsManager');
-goog.requireType('Blockly.utils.Size');
-goog.requireType('Blockly.WorkspaceSvg');
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
+const Rect = goog.require('Blockly.utils.Rect');
+const Scrollbar = goog.require('Blockly.Scrollbar');
+const Size = goog.requireType('Blockly.utils.Size');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const toolbox = goog.require('Blockly.utils.toolbox');
 
 
 /**
@@ -73,13 +72,13 @@ exports.bumpDirection = bumpDirection;
  * elements.
  * @param {!Position} position The starting
  *    horizontal and vertical position.
- * @param {!Blockly.utils.Size} size the size of the UI element to get a start
+ * @param {!Size} size the size of the UI element to get a start
  *    position for.
  * @param {number} horizontalPadding The horizontal padding to use.
  * @param {number} verticalPadding The vertical padding to use.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace UI metrics.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace.
- * @return {!Blockly.utils.Rect} The suggested start position.
+ * @param {!MetricsManager.UiMetrics} metrics The workspace UI metrics.
+ * @param {!WorkspaceSvg} workspace The workspace.
+ * @return {!Rect} The suggested start position.
  */
 const getStartPositionRect = function(
     position, size, horizontalPadding,
@@ -92,13 +91,13 @@ const getStartPositionRect = function(
       horizontalPosition.LEFT) {
     left = metrics.absoluteMetrics.left + horizontalPadding;
     if (hasVerticalScrollbar && workspace.RTL) {
-      left += Blockly.Scrollbar.scrollbarThickness;
+      left += Scrollbar.scrollbarThickness;
     }
   } else {  // position.horizontal == horizontalPosition.RIGHT
     left = metrics.absoluteMetrics.left + metrics.viewMetrics.width -
         size.width - horizontalPadding;
     if (hasVerticalScrollbar && !workspace.RTL) {
-      left -= Blockly.Scrollbar.scrollbarThickness;
+      left -= Scrollbar.scrollbarThickness;
     }
   }
   // Vertical positioning.
@@ -111,10 +110,10 @@ const getStartPositionRect = function(
         size.height - verticalPadding;
     if (workspace.scrollbar && workspace.scrollbar.canScrollHorizontally()) {
       // The scrollbars are always positioned on the bottom if they exist.
-      top -= Blockly.Scrollbar.scrollbarThickness;
+      top -= Scrollbar.scrollbarThickness;
     }
   }
-  return new Blockly.utils.Rect(
+  return new Rect(
       top, top + size.height, left, left + size.width);
 };
 /** @package */
@@ -125,17 +124,17 @@ exports.getStartPositionRect = getStartPositionRect;
  * the toolbox.
  * If in horizontal orientation, defaults to the bottom corner. If in vertical
  * orientation, defaults to the right corner.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace.
- * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics.
+ * @param {!WorkspaceSvg} workspace The workspace.
+ * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
  * @return {!Position} The suggested corner position.
  * @package
  */
 const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =
-      metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT &&
+      metrics.toolboxMetrics.position !== toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
   const topCorner =
-      metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM;
+      metrics.toolboxMetrics.position === toolbox.Position.BOTTOM;
   const hPosition = leftCorner ?
       horizontalPosition.LEFT : horizontalPosition.RIGHT;
   const vPosition = topCorner ?
@@ -152,13 +151,13 @@ exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
  * Returns a position Rect based on a starting position that is bumped
  * so that it doesn't intersect with any of the provided savedPositions. This
  * method does not check that the bumped position is still within bounds.
- * @param {!Blockly.utils.Rect} startRect The starting position to use.
+ * @param {!Rect} startRect The starting position to use.
  * @param {number} margin The margin to use between elements when bumping.
  * @param {!bumpDirection} bumpDir The direction to bump if there is a collision
  *    with an existing UI element.
- * @param {!Array<!Blockly.utils.Rect>} savedPositions List of rectangles that
+ * @param {!Array<!Rect>} savedPositions List of rectangles that
  *    represent the positions of UI elements already placed.
- * @return {!Blockly.utils.Rect} The suggested position rectangle.
+ * @return {!Rect} The suggested position rectangle.
  */
 const bumpPositionRect = function(
     startRect, margin, bumpDir, savedPositions) {
@@ -178,7 +177,7 @@ const bumpPositionRect = function(
         top = otherEl.bottom + margin;
       }
       // Recheck other savedPositions
-      boundingRect = new Blockly.utils.Rect(
+      boundingRect = new Rect(
           top, top + height, left, left + width);
       i = -1;
     }

From b3cd8b7c861d5e69efa0d7c2d0827ad0bbc917f3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:22:11 -0700
Subject: [PATCH 150/291] clang-format core/positionable_helpers.js

---
 core/positionable_helpers.js | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 6579a5a4e..9e45d5a68 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -81,14 +81,12 @@ exports.bumpDirection = bumpDirection;
  * @return {!Rect} The suggested start position.
  */
 const getStartPositionRect = function(
-    position, size, horizontalPadding,
-    verticalPadding, metrics, workspace) {
+    position, size, horizontalPadding, verticalPadding, metrics, workspace) {
   // Horizontal positioning.
   let left = 0;
   const hasVerticalScrollbar =
       workspace.scrollbar && workspace.scrollbar.canScrollVertically();
-  if (position.horizontal ===
-      horizontalPosition.LEFT) {
+  if (position.horizontal === horizontalPosition.LEFT) {
     left = metrics.absoluteMetrics.left + horizontalPadding;
     if (hasVerticalScrollbar && workspace.RTL) {
       left += Scrollbar.scrollbarThickness;
@@ -102,8 +100,7 @@ const getStartPositionRect = function(
   }
   // Vertical positioning.
   let top = 0;
-  if (position.vertical ===
-      verticalPosition.TOP) {
+  if (position.vertical === verticalPosition.TOP) {
     top = metrics.absoluteMetrics.top + verticalPadding;
   } else {  // position.vertical == verticalPosition.BOTTOM
     top = metrics.absoluteMetrics.top + metrics.viewMetrics.height -
@@ -113,8 +110,7 @@ const getStartPositionRect = function(
       top -= Scrollbar.scrollbarThickness;
     }
   }
-  return new Rect(
-      top, top + size.height, left, left + size.width);
+  return new Rect(top, top + size.height, left, left + size.width);
 };
 /** @package */
 exports.getStartPositionRect = getStartPositionRect;
@@ -133,16 +129,11 @@ const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =
       metrics.toolboxMetrics.position !== toolbox.Position.LEFT &&
       (!workspace.horizontalLayout || workspace.RTL);
-  const topCorner =
-      metrics.toolboxMetrics.position === toolbox.Position.BOTTOM;
-  const hPosition = leftCorner ?
-      horizontalPosition.LEFT : horizontalPosition.RIGHT;
-  const vPosition = topCorner ?
-      verticalPosition.TOP : verticalPosition.BOTTOM;
-  return {
-    horizontal: hPosition,
-    vertical: vPosition
-  };
+  const topCorner = metrics.toolboxMetrics.position === toolbox.Position.BOTTOM;
+  const hPosition =
+      leftCorner ? horizontalPosition.LEFT : horizontalPosition.RIGHT;
+  const vPosition = topCorner ? verticalPosition.TOP : verticalPosition.BOTTOM;
+  return {horizontal: hPosition, vertical: vPosition};
 };
 /** @package */
 exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
@@ -159,8 +150,7 @@ exports.getCornerOppositeToolbox = getCornerOppositeToolbox;
  *    represent the positions of UI elements already placed.
  * @return {!Rect} The suggested position rectangle.
  */
-const bumpPositionRect = function(
-    startRect, margin, bumpDir, savedPositions) {
+const bumpPositionRect = function(startRect, margin, bumpDir, savedPositions) {
   let top = startRect.top;
   const left = startRect.left;
   const width = startRect.right - startRect.left;
@@ -177,8 +167,7 @@ const bumpPositionRect = function(
         top = otherEl.bottom + margin;
       }
       // Recheck other savedPositions
-      boundingRect = new Rect(
-          top, top + height, left, left + width);
+      boundingRect = new Rect(top, top + height, left, left + width);
       i = -1;
     }
   }

From 97d95c87b6eea00b2ac2fe3e6bd9bf4542c8b290 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 14:26:42 -0700
Subject: [PATCH 151/291] Add eslint disable in core/positionable_helpers.js

---
 core/positionable_helpers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index 9e45d5a68..c38ca3263 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -13,10 +13,13 @@
 goog.module('Blockly.uiPosition');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
 const Rect = goog.require('Blockly.utils.Rect');
 const Scrollbar = goog.require('Blockly.Scrollbar');
+/* eslint-disable-next-line no-unused-vars */
 const Size = goog.requireType('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const toolbox = goog.require('Blockly.utils.toolbox');
 

From 5b5b15ccbc898933f1991597ffebbdd77595c01c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 30 Jul 2021 15:53:17 -0700
Subject: [PATCH 152/291] Add extra @package annotation

---
 core/positionable_helpers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js
index c38ca3263..812c5f7be 100644
--- a/core/positionable_helpers.js
+++ b/core/positionable_helpers.js
@@ -126,7 +126,6 @@ exports.getStartPositionRect = getStartPositionRect;
  * @param {!WorkspaceSvg} workspace The workspace.
  * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
  * @return {!Position} The suggested corner position.
- * @package
  */
 const getCornerOppositeToolbox = function(workspace, metrics) {
   const leftCorner =

From 315e1b856ffa83def33d42eb8a8b87f731d86e14 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:03:37 -0700
Subject: [PATCH 153/291] Migrate core/shortcut_items.js to ES6 const/let

---
 core/shortcut_items.js | 90 +++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 494b64bfe..6f80f5648 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -42,12 +42,12 @@ Blockly.ShortcutItems.names = {
 /** Keyboard shortcut to hide chaff on escape. */
 Blockly.ShortcutItems.registerEscape = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var escapeAction = {
+  const escapeAction = {
     name: Blockly.ShortcutItems.names.ESCAPE,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly;
     },
-    callback: function() {
+    callback: function () {
       Blockly.hideChaff();
       return true;
     }
@@ -60,14 +60,14 @@ Blockly.ShortcutItems.registerEscape = function() {
 /** Keyboard shortcut to delete a block on delete or backspace */
 Blockly.ShortcutItems.registerDelete = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var deleteShortcut = {
+  const deleteShortcut = {
     name: Blockly.ShortcutItems.names.DELETE,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           Blockly.selected &&
           Blockly.selected.isDeletable();
     },
-    callback: function(workspace, e) {
+    callback: function (workspace, e) {
       // Delete or backspace.
       // Stop the browser from going back to the previous page.
       // Do this first to prevent an error in the delete code from resulting in
@@ -91,16 +91,16 @@ Blockly.ShortcutItems.registerDelete = function() {
 /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */
 Blockly.ShortcutItems.registerCopy = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var copyShortcut = {
+  const copyShortcut = {
     name: Blockly.ShortcutItems.names.COPY,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-        !Blockly.Gesture.inProgress() &&
-        Blockly.selected &&
-        Blockly.selected.isDeletable() &&
-        Blockly.selected.isMovable();
+          !Blockly.Gesture.inProgress() &&
+          Blockly.selected &&
+          Blockly.selected.isDeletable() &&
+          Blockly.selected.isMovable();
     },
-    callback: function(workspace, e) {
+    callback: function (workspace, e) {
       // Prevent the default copy behavior, which may beep or otherwise indicate
       // an error due to the lack of a selection.
       e.preventDefault();
@@ -111,15 +111,15 @@ Blockly.ShortcutItems.registerCopy = function() {
   };
   Blockly.ShortcutRegistry.registry.register(copyShortcut);
 
-  var ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
 
-  var altC = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altC = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
 
-  var metaC = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaC = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
 };
@@ -127,15 +127,15 @@ Blockly.ShortcutItems.registerCopy = function() {
 /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */
 Blockly.ShortcutItems.registerCut = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var cutShortcut = {
+  const cutShortcut = {
     name: Blockly.ShortcutItems.names.CUT,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-        !Blockly.Gesture.inProgress() &&
-        Blockly.selected &&
-        Blockly.selected.isDeletable() &&
-        Blockly.selected.isMovable() &&
-        !Blockly.selected.workspace.isFlyout;
+          !Blockly.Gesture.inProgress() &&
+          Blockly.selected &&
+          Blockly.selected.isDeletable() &&
+          Blockly.selected.isMovable() &&
+          !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
       Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
@@ -146,15 +146,15 @@ Blockly.ShortcutItems.registerCut = function() {
 
   Blockly.ShortcutRegistry.registry.register(cutShortcut);
 
-  var ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
 
-  var altX = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altX = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
 
-  var metaX = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaX = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
 };
@@ -162,9 +162,9 @@ Blockly.ShortcutItems.registerCut = function() {
 /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */
 Blockly.ShortcutItems.registerPaste = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var pasteShortcut = {
+  const pasteShortcut = {
     name: Blockly.ShortcutItems.names.PASTE,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
     },
     callback: function() {
@@ -174,15 +174,15 @@ Blockly.ShortcutItems.registerPaste = function() {
 
   Blockly.ShortcutRegistry.registry.register(pasteShortcut);
 
-  var ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
 
-  var altV = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altV = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
 
-  var metaV = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaV = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
 };
@@ -190,13 +190,13 @@ Blockly.ShortcutItems.registerPaste = function() {
 /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */
 Blockly.ShortcutItems.registerUndo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var undoShortcut = {
+  const undoShortcut = {
     name: Blockly.ShortcutItems.names.UNDO,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-        !Blockly.Gesture.inProgress();
+          !Blockly.Gesture.inProgress();
     },
-    callback: function(workspace) {
+    callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(false);
@@ -205,15 +205,15 @@ Blockly.ShortcutItems.registerUndo = function() {
   };
   Blockly.ShortcutRegistry.registry.register(undoShortcut);
 
-  var ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
 
-  var altZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
 
-  var metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
 };
@@ -221,12 +221,12 @@ Blockly.ShortcutItems.registerUndo = function() {
 /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
 Blockly.ShortcutItems.registerRedo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
-  var redoShortcut = {
+  const redoShortcut = {
     name: Blockly.ShortcutItems.names.REDO,
-    preconditionFn: function(workspace) {
+    preconditionFn: function (workspace) {
       return !Blockly.Gesture.inProgress() && !workspace.options.readOnly;
     },
-    callback: function(workspace) {
+    callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(true);
@@ -235,25 +235,25 @@ Blockly.ShortcutItems.registerRedo = function() {
   };
   Blockly.ShortcutRegistry.registry.register(redoShortcut);
 
-  var ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z,
       [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       ctrlShiftZ, redoShortcut.name);
 
-  var altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z,
       [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.ALT]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
 
-  var metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Z,
       [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       metaShiftZ, redoShortcut.name);
 
   // Ctrl-y is redo in Windows.  Command-y is never valid on Macs.
-  var ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey(
+  const ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey(
       Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
 };

From 318fa4c014f1131a74e256aff0fa0b4e4fc37f3c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:05:12 -0700
Subject: [PATCH 154/291] Migrate core/shortcut_items.js to goog.module

---
 core/shortcut_items.js | 67 +++++++++++++++++++++++-------------------
 tests/deps.js          |  2 +-
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 6f80f5648..0a99e1259 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -10,12 +10,10 @@
  */
 'use strict';
 
-/**
- * @name Blockly.ShortcutItems
- * @namespace
- */
-goog.provide('Blockly.ShortcutItems');
+goog.module('Blockly.ShortcutItems');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly');
 goog.require('Blockly.clipboard');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.ShortcutRegistry');
@@ -29,7 +27,7 @@ goog.requireType('Blockly.ICopyable');
  * Object holding the names of the default shortcut items.
  * @enum {string}
  */
-Blockly.ShortcutItems.names = {
+const names = {
   ESCAPE: 'escape',
   DELETE: 'delete',
   COPY: 'copy',
@@ -38,12 +36,13 @@ Blockly.ShortcutItems.names = {
   UNDO: 'undo',
   REDO: 'redo'
 };
+exports.names = names;
 
 /** Keyboard shortcut to hide chaff on escape. */
-Blockly.ShortcutItems.registerEscape = function() {
+const registerEscape = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const escapeAction = {
-    name: Blockly.ShortcutItems.names.ESCAPE,
+    name: names.ESCAPE,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly;
     },
@@ -56,12 +55,13 @@ Blockly.ShortcutItems.registerEscape = function() {
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       Blockly.utils.KeyCodes.ESC, escapeAction.name);
 };
+exports.registerEscape = registerEscape;
 
 /** Keyboard shortcut to delete a block on delete or backspace */
-Blockly.ShortcutItems.registerDelete = function() {
+const registerDelete = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const deleteShortcut = {
-    name: Blockly.ShortcutItems.names.DELETE,
+    name: names.DELETE,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           Blockly.selected &&
@@ -87,12 +87,13 @@ Blockly.ShortcutItems.registerDelete = function() {
   Blockly.ShortcutRegistry.registry.addKeyMapping(
       Blockly.utils.KeyCodes.BACKSPACE, deleteShortcut.name);
 };
+exports.registerDelete = registerDelete;
 
 /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */
-Blockly.ShortcutItems.registerCopy = function() {
+const registerCopy = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const copyShortcut = {
-    name: Blockly.ShortcutItems.names.COPY,
+    name: names.COPY,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           !Blockly.Gesture.inProgress() &&
@@ -123,12 +124,13 @@ Blockly.ShortcutItems.registerCopy = function() {
       Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
 };
+exports.registerCopy = registerCopy;
 
 /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */
-Blockly.ShortcutItems.registerCut = function() {
+const registerCut = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const cutShortcut = {
-    name: Blockly.ShortcutItems.names.CUT,
+    name: names.CUT,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           !Blockly.Gesture.inProgress() &&
@@ -158,12 +160,13 @@ Blockly.ShortcutItems.registerCut = function() {
       Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
 };
+exports.registerCut = registerCut;
 
 /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */
-Blockly.ShortcutItems.registerPaste = function() {
+const registerPaste = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const pasteShortcut = {
-    name: Blockly.ShortcutItems.names.PASTE,
+    name: names.PASTE,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
     },
@@ -186,12 +189,13 @@ Blockly.ShortcutItems.registerPaste = function() {
       Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
 };
+exports.registerPaste = registerPaste;
 
 /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */
-Blockly.ShortcutItems.registerUndo = function() {
+const registerUndo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const undoShortcut = {
-    name: Blockly.ShortcutItems.names.UNDO,
+    name: names.UNDO,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
           !Blockly.Gesture.inProgress();
@@ -217,12 +221,13 @@ Blockly.ShortcutItems.registerUndo = function() {
       Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
 };
+exports.registerUndo = registerUndo;
 
 /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
-Blockly.ShortcutItems.registerRedo = function() {
+const registerRedo = function() {
   /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
   const redoShortcut = {
-    name: Blockly.ShortcutItems.names.REDO,
+    name: names.REDO,
     preconditionFn: function (workspace) {
       return !Blockly.Gesture.inProgress() && !workspace.options.readOnly;
     },
@@ -257,20 +262,22 @@ Blockly.ShortcutItems.registerRedo = function() {
       Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]);
   Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
 };
+exports.registerRedo = registerRedo;
 
 /**
  * Registers all default keyboard shortcut item. This should be called once per instance of
  * KeyboardShortcutRegistry.
- * @package
  */
-Blockly.ShortcutItems.registerDefaultShortcuts = function() {
-  Blockly.ShortcutItems.registerEscape();
-  Blockly.ShortcutItems.registerDelete();
-  Blockly.ShortcutItems.registerCopy();
-  Blockly.ShortcutItems.registerCut();
-  Blockly.ShortcutItems.registerPaste();
-  Blockly.ShortcutItems.registerUndo();
-  Blockly.ShortcutItems.registerRedo();
+const registerDefaultShortcuts = function() {
+  registerEscape();
+  registerDelete();
+  registerCopy();
+  registerCut();
+  registerPaste();
+  registerUndo();
+  registerRedo();
 };
+/** @package */
+exports.registerDefaultShortcuts = registerDefaultShortcuts;
 
-Blockly.ShortcutItems.registerDefaultShortcuts();
+registerDefaultShortcuts();
diff --git a/tests/deps.js b/tests/deps.js
index e250dc441..0b2e55f2c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -162,7 +162,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren
 goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
 goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']);
+goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);

From 47ac5548642b3afef730e8a466b0767f563006a0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 11:17:13 -0700
Subject: [PATCH 155/291] Migrate core/shortcut_items.js named requires

---
 core/shortcut_items.js | 181 +++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 90 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 0a99e1259..9d622914b 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -13,14 +13,15 @@
 goog.module('Blockly.ShortcutItems');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.clipboard');
-goog.require('Blockly.Gesture');
-goog.require('Blockly.ShortcutRegistry');
-goog.require('Blockly.utils.KeyCodes');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.ICopyable');
+const Blockly = goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Gesture = goog.require('Blockly.Gesture');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.requireType('Blockly.ICopyable');
+const KeyCodes = goog.require('Blockly.utils.KeyCodes');
+const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry');
+const clipboard = goog.require('Blockly.clipboard');
 
 
 /**
@@ -40,7 +41,7 @@ exports.names = names;
 
 /** Keyboard shortcut to hide chaff on escape. */
 const registerEscape = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const escapeAction = {
     name: names.ESCAPE,
     preconditionFn: function (workspace) {
@@ -51,15 +52,15 @@ const registerEscape = function() {
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(escapeAction);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
-      Blockly.utils.KeyCodes.ESC, escapeAction.name);
+  ShortcutRegistry.registry.register(escapeAction);
+  ShortcutRegistry.registry.addKeyMapping(
+      KeyCodes.ESC, escapeAction.name);
 };
 exports.registerEscape = registerEscape;
 
 /** Keyboard shortcut to delete a block on delete or backspace */
 const registerDelete = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const deleteShortcut = {
     name: names.DELETE,
     preconditionFn: function (workspace) {
@@ -74,29 +75,29 @@ const registerDelete = function() {
       // data loss.
       e.preventDefault();
       // Don't delete while dragging.  Jeez.
-      if (Blockly.Gesture.inProgress()) {
+      if (Gesture.inProgress()) {
         return false;
       }
-      Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected));
+      Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected));
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(deleteShortcut);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
-      Blockly.utils.KeyCodes.DELETE, deleteShortcut.name);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
-      Blockly.utils.KeyCodes.BACKSPACE, deleteShortcut.name);
+  ShortcutRegistry.registry.register(deleteShortcut);
+  ShortcutRegistry.registry.addKeyMapping(
+      KeyCodes.DELETE, deleteShortcut.name);
+  ShortcutRegistry.registry.addKeyMapping(
+      KeyCodes.BACKSPACE, deleteShortcut.name);
 };
 exports.registerDelete = registerDelete;
 
 /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */
 const registerCopy = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const copyShortcut = {
     name: names.COPY,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-          !Blockly.Gesture.inProgress() &&
+          !Gesture.inProgress() &&
           Blockly.selected &&
           Blockly.selected.isDeletable() &&
           Blockly.selected.isMovable();
@@ -106,99 +107,99 @@ const registerCopy = function() {
       // an error due to the lack of a selection.
       e.preventDefault();
       Blockly.hideChaff();
-      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
+      clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(copyShortcut);
+  ShortcutRegistry.registry.register(copyShortcut);
 
-  const ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
+  const ctrlC = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.C, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
 
-  const altC = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
+  const altC = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.C, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
 
-  const metaC = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
+  const metaC = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.C, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name);
 };
 exports.registerCopy = registerCopy;
 
 /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */
 const registerCut = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const cutShortcut = {
     name: names.CUT,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-          !Blockly.Gesture.inProgress() &&
+          !Gesture.inProgress() &&
           Blockly.selected &&
           Blockly.selected.isDeletable() &&
           Blockly.selected.isMovable() &&
           !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
-      Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected));
-      Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected));
+      clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
+      Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected));
       return true;
     }
   };
 
-  Blockly.ShortcutRegistry.registry.register(cutShortcut);
+  ShortcutRegistry.registry.register(cutShortcut);
 
-  const ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
+  const ctrlX = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.X, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
 
-  const altX = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
+  const altX = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.X, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
 
-  const metaX = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
+  const metaX = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.X, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name);
 };
 exports.registerCut = registerCut;
 
 /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */
 const registerPaste = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const pasteShortcut = {
     name: names.PASTE,
     preconditionFn: function (workspace) {
-      return !workspace.options.readOnly && !Blockly.Gesture.inProgress();
+      return !workspace.options.readOnly && !Gesture.inProgress();
     },
     callback: function() {
-      return Blockly.clipboard.paste();
+      return clipboard.paste();
     }
   };
 
-  Blockly.ShortcutRegistry.registry.register(pasteShortcut);
+  ShortcutRegistry.registry.register(pasteShortcut);
 
-  const ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
+  const ctrlV = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.V, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
 
-  const altV = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
+  const altV = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.V, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
 
-  const metaV = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
+  const metaV = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.V, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name);
 };
 exports.registerPaste = registerPaste;
 
 /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */
 const registerUndo = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const undoShortcut = {
     name: names.UNDO,
     preconditionFn: function (workspace) {
       return !workspace.options.readOnly &&
-          !Blockly.Gesture.inProgress();
+          !Gesture.inProgress();
     },
     callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
@@ -207,29 +208,29 @@ const registerUndo = function() {
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(undoShortcut);
+  ShortcutRegistry.registry.register(undoShortcut);
 
-  const ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
+  const ctrlZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
 
-  const altZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
+  const altZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z, [KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
 
-  const metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
+  const metaZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z, [KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name);
 };
 exports.registerUndo = registerUndo;
 
 /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
 const registerRedo = function() {
-  /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */
+  /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const redoShortcut = {
     name: names.REDO,
     preconditionFn: function (workspace) {
-      return !Blockly.Gesture.inProgress() && !workspace.options.readOnly;
+      return !Gesture.inProgress() && !workspace.options.readOnly;
     },
     callback: function (workspace) {
       // 'z' for undo 'Z' is for redo.
@@ -238,29 +239,29 @@ const registerRedo = function() {
       return true;
     }
   };
-  Blockly.ShortcutRegistry.registry.register(redoShortcut);
+  ShortcutRegistry.registry.register(redoShortcut);
 
-  const ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z,
-      [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
+  const ctrlShiftZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z,
+      [KeyCodes.SHIFT, KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(
       ctrlShiftZ, redoShortcut.name);
 
-  const altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z,
-      [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.ALT]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
+  const altShiftZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z,
+      [KeyCodes.SHIFT, KeyCodes.ALT]);
+  ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
 
-  const metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Z,
-      [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.META]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(
+  const metaShiftZ = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Z,
+      [KeyCodes.SHIFT, KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(
       metaShiftZ, redoShortcut.name);
 
   // Ctrl-y is redo in Windows.  Command-y is never valid on Macs.
-  const ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey(
-      Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]);
-  Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
+  const ctrlY = ShortcutRegistry.registry.createSerializedKey(
+      KeyCodes.Y, [KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name);
 };
 exports.registerRedo = registerRedo;
 

From d11071999ef317a289e0188ae3daa01746cbd458 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 11:17:20 -0700
Subject: [PATCH 156/291] clang-format core/shortcut_items.js

---
 core/shortcut_items.js | 91 +++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 51 deletions(-)

diff --git a/core/shortcut_items.js b/core/shortcut_items.js
index 9d622914b..259a8c4bc 100644
--- a/core/shortcut_items.js
+++ b/core/shortcut_items.js
@@ -44,17 +44,16 @@ const registerEscape = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const escapeAction = {
     name: names.ESCAPE,
-    preconditionFn: function (workspace) {
+    preconditionFn: function(workspace) {
       return !workspace.options.readOnly;
     },
-    callback: function () {
+    callback: function() {
       Blockly.hideChaff();
       return true;
     }
   };
   ShortcutRegistry.registry.register(escapeAction);
-  ShortcutRegistry.registry.addKeyMapping(
-      KeyCodes.ESC, escapeAction.name);
+  ShortcutRegistry.registry.addKeyMapping(KeyCodes.ESC, escapeAction.name);
 };
 exports.registerEscape = registerEscape;
 
@@ -63,12 +62,11 @@ const registerDelete = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const deleteShortcut = {
     name: names.DELETE,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          Blockly.selected &&
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && Blockly.selected &&
           Blockly.selected.isDeletable();
     },
-    callback: function (workspace, e) {
+    callback: function(workspace, e) {
       // Delete or backspace.
       // Stop the browser from going back to the previous page.
       // Do this first to prevent an error in the delete code from resulting in
@@ -83,8 +81,7 @@ const registerDelete = function() {
     }
   };
   ShortcutRegistry.registry.register(deleteShortcut);
-  ShortcutRegistry.registry.addKeyMapping(
-      KeyCodes.DELETE, deleteShortcut.name);
+  ShortcutRegistry.registry.addKeyMapping(KeyCodes.DELETE, deleteShortcut.name);
   ShortcutRegistry.registry.addKeyMapping(
       KeyCodes.BACKSPACE, deleteShortcut.name);
 };
@@ -95,14 +92,12 @@ const registerCopy = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const copyShortcut = {
     name: names.COPY,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          !Gesture.inProgress() &&
-          Blockly.selected &&
-          Blockly.selected.isDeletable() &&
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && !Gesture.inProgress() &&
+          Blockly.selected && Blockly.selected.isDeletable() &&
           Blockly.selected.isMovable();
     },
-    callback: function (workspace, e) {
+    callback: function(workspace, e) {
       // Prevent the default copy behavior, which may beep or otherwise indicate
       // an error due to the lack of a selection.
       e.preventDefault();
@@ -117,8 +112,8 @@ const registerCopy = function() {
       KeyCodes.C, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name);
 
-  const altC = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.C, [KeyCodes.ALT]);
+  const altC =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.C, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name);
 
   const metaC = ShortcutRegistry.registry.createSerializedKey(
@@ -132,13 +127,10 @@ const registerCut = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const cutShortcut = {
     name: names.CUT,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          !Gesture.inProgress() &&
-          Blockly.selected &&
-          Blockly.selected.isDeletable() &&
-          Blockly.selected.isMovable() &&
-          !Blockly.selected.workspace.isFlyout;
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && !Gesture.inProgress() &&
+          Blockly.selected && Blockly.selected.isDeletable() &&
+          Blockly.selected.isMovable() && !Blockly.selected.workspace.isFlyout;
     },
     callback: function() {
       clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected));
@@ -153,8 +145,8 @@ const registerCut = function() {
       KeyCodes.X, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name);
 
-  const altX = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.X, [KeyCodes.ALT]);
+  const altX =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.X, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name);
 
   const metaX = ShortcutRegistry.registry.createSerializedKey(
@@ -168,7 +160,7 @@ const registerPaste = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const pasteShortcut = {
     name: names.PASTE,
-    preconditionFn: function (workspace) {
+    preconditionFn: function(workspace) {
       return !workspace.options.readOnly && !Gesture.inProgress();
     },
     callback: function() {
@@ -182,8 +174,8 @@ const registerPaste = function() {
       KeyCodes.V, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name);
 
-  const altV = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.V, [KeyCodes.ALT]);
+  const altV =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.V, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name);
 
   const metaV = ShortcutRegistry.registry.createSerializedKey(
@@ -197,11 +189,10 @@ const registerUndo = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const undoShortcut = {
     name: names.UNDO,
-    preconditionFn: function (workspace) {
-      return !workspace.options.readOnly &&
-          !Gesture.inProgress();
+    preconditionFn: function(workspace) {
+      return !workspace.options.readOnly && !Gesture.inProgress();
     },
-    callback: function (workspace) {
+    callback: function(workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(false);
@@ -214,8 +205,8 @@ const registerUndo = function() {
       KeyCodes.Z, [KeyCodes.CTRL]);
   ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name);
 
-  const altZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z, [KeyCodes.ALT]);
+  const altZ =
+      ShortcutRegistry.registry.createSerializedKey(KeyCodes.Z, [KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name);
 
   const metaZ = ShortcutRegistry.registry.createSerializedKey(
@@ -224,15 +215,18 @@ const registerUndo = function() {
 };
 exports.registerUndo = registerUndo;
 
-/** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */
+/**
+ * Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z,
+ * or alt+shift+z.
+ */
 const registerRedo = function() {
   /** @type {!ShortcutRegistry.KeyboardShortcut} */
   const redoShortcut = {
     name: names.REDO,
-    preconditionFn: function (workspace) {
+    preconditionFn: function(workspace) {
       return !Gesture.inProgress() && !workspace.options.readOnly;
     },
-    callback: function (workspace) {
+    callback: function(workspace) {
       // 'z' for undo 'Z' is for redo.
       Blockly.hideChaff();
       workspace.undo(true);
@@ -242,21 +236,16 @@ const registerRedo = function() {
   ShortcutRegistry.registry.register(redoShortcut);
 
   const ctrlShiftZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z,
-      [KeyCodes.SHIFT, KeyCodes.CTRL]);
-  ShortcutRegistry.registry.addKeyMapping(
-      ctrlShiftZ, redoShortcut.name);
+      KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.CTRL]);
+  ShortcutRegistry.registry.addKeyMapping(ctrlShiftZ, redoShortcut.name);
 
   const altShiftZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z,
-      [KeyCodes.SHIFT, KeyCodes.ALT]);
+      KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.ALT]);
   ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name);
 
   const metaShiftZ = ShortcutRegistry.registry.createSerializedKey(
-      KeyCodes.Z,
-      [KeyCodes.SHIFT, KeyCodes.META]);
-  ShortcutRegistry.registry.addKeyMapping(
-      metaShiftZ, redoShortcut.name);
+      KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.META]);
+  ShortcutRegistry.registry.addKeyMapping(metaShiftZ, redoShortcut.name);
 
   // Ctrl-y is redo in Windows.  Command-y is never valid on Macs.
   const ctrlY = ShortcutRegistry.registry.createSerializedKey(
@@ -266,8 +255,8 @@ const registerRedo = function() {
 exports.registerRedo = registerRedo;
 
 /**
- * Registers all default keyboard shortcut item. This should be called once per instance of
- * KeyboardShortcutRegistry.
+ * Registers all default keyboard shortcut item. This should be called once per
+ * instance of KeyboardShortcutRegistry.
  */
 const registerDefaultShortcuts = function() {
   registerEscape();

From 8e30d9ebd1d74d881b553eff959a77e3a27aaa13 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 10:37:17 -0700
Subject: [PATCH 157/291] Migrate core/renderers/geras/constants.js to
 goog.module

---
 core/renderers/geras/constants.js | 15 +++++++++------
 tests/deps.js                     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index 0272d921f..117172ade 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.ConstantProvider');
+goog.module('Blockly.geras.ConstantProvider');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.utils.object');
@@ -23,8 +24,8 @@ goog.require('Blockly.utils.object');
  * @package
  * @extends {Blockly.blockRendering.ConstantProvider}
  */
-Blockly.geras.ConstantProvider = function() {
-  Blockly.geras.ConstantProvider.superClass_.constructor.call(this);
+const ConstantProvider = function() {
+  ConstantProvider.superClass_.constructor.call(this);
 
   /**
    * @override
@@ -47,15 +48,15 @@ Blockly.geras.ConstantProvider = function() {
    */
   this.STATEMENT_BOTTOM_SPACER = -this.NOTCH_HEIGHT / 2;
 };
-Blockly.utils.object.inherits(Blockly.geras.ConstantProvider,
+Blockly.utils.object.inherits(ConstantProvider,
     Blockly.blockRendering.ConstantProvider);
 
 
 /**
  * @override
  */
-Blockly.geras.ConstantProvider.prototype.getCSS_ = function(selector) {
-  return Blockly.geras.ConstantProvider.superClass_.getCSS_.call(this, selector)
+ConstantProvider.prototype.getCSS_ = function(selector) {
+  return ConstantProvider.superClass_.getCSS_.call(this, selector)
       .concat([
         /* eslint-disable indent */
         // Insertion marker.
@@ -67,3 +68,5 @@ Blockly.geras.ConstantProvider.prototype.getCSS_ = function(selector) {
         /* eslint-enable indent */
       ]);
 };
+
+exports = ConstantProvider;
diff --git a/tests/deps.js b/tests/deps.js
index 03c4b65e5..fd025333f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -130,7 +130,7 @@ goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRenderi
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
-goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);

From 0203eec8c78c5e32f696f64625ed6439ab91b032 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 10:40:25 -0700
Subject: [PATCH 158/291] Migrate core/renderers/geras/constants.js to named
 requires

---
 core/renderers/geras/constants.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index 117172ade..68b24efe5 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -14,15 +14,15 @@
 goog.module('Blockly.geras.ConstantProvider');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.utils.object');
+const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that provides constants for rendering blocks in Geras mode.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.ConstantProvider}
+ * @extends {BaseConstantProvider}
  */
 const ConstantProvider = function() {
   ConstantProvider.superClass_.constructor.call(this);
@@ -48,8 +48,8 @@ const ConstantProvider = function() {
    */
   this.STATEMENT_BOTTOM_SPACER = -this.NOTCH_HEIGHT / 2;
 };
-Blockly.utils.object.inherits(ConstantProvider,
-    Blockly.blockRendering.ConstantProvider);
+object.inherits(ConstantProvider,
+  BaseConstantProvider);
 
 
 /**

From 87ccee78437c724075a16dfea77c9f1cdf936cbb Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 10:42:26 -0700
Subject: [PATCH 159/291] clang-format core/renderers/geras/constants.js

---
 core/renderers/geras/constants.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index 68b24efe5..9a923a34a 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -48,25 +48,23 @@ const ConstantProvider = function() {
    */
   this.STATEMENT_BOTTOM_SPACER = -this.NOTCH_HEIGHT / 2;
 };
-object.inherits(ConstantProvider,
-  BaseConstantProvider);
+object.inherits(ConstantProvider, BaseConstantProvider);
 
 
 /**
  * @override
  */
 ConstantProvider.prototype.getCSS_ = function(selector) {
-  return ConstantProvider.superClass_.getCSS_.call(this, selector)
-      .concat([
-        /* eslint-disable indent */
-        // Insertion marker.
-        selector + ' .blocklyInsertionMarker>.blocklyPathLight,',
-        selector + ' .blocklyInsertionMarker>.blocklyPathDark {',
-          'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
-          'stroke: none;',
-        '}',
-        /* eslint-enable indent */
-      ]);
+  return ConstantProvider.superClass_.getCSS_.call(this, selector).concat([
+    /* eslint-disable indent */
+    // Insertion marker.
+    selector + ' .blocklyInsertionMarker>.blocklyPathLight,',
+    selector + ' .blocklyInsertionMarker>.blocklyPathDark {',
+      'fill-opacity: ' + this.INSERTION_MARKER_OPACITY + ';',
+      'stroke: none;',
+    '}',
+    /* eslint-enable indent */
+  ]);
 };
 
 exports = ConstantProvider;

From e7709cbd1fb6c9f5eecc94181443a4b435a75517 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Tue, 27 Jul 2021 11:03:16 -0700
Subject: [PATCH 160/291] Remove extra output from generator and mocha tests
 (#5196)

* Remove extra output from generator tests

* Fix test

* Update loglevel for both tests
---
 tests/generators/run_generators_in_browser.js | 1 +
 tests/mocha/run_mocha_tests_in_browser.js     | 3 ++-
 tests/scripts/run_generators.sh               | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/generators/run_generators_in_browser.js b/tests/generators/run_generators_in_browser.js
index d0ed80009..2ab48ee2e 100644
--- a/tests/generators/run_generators_in_browser.js
+++ b/tests/generators/run_generators_in_browser.js
@@ -42,6 +42,7 @@ async function runGeneratorsInBrowser() {
     capabilities: {
       browserName: 'chrome',
     },
+    logLevel: 'warn',
     services: ['selenium-standalone']
   };
   // Run in headless mode on Github Actions.
diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js
index b562586bd..253b79f01 100644
--- a/tests/mocha/run_mocha_tests_in_browser.js
+++ b/tests/mocha/run_mocha_tests_in_browser.js
@@ -24,7 +24,8 @@ async function runMochaTestsInBrowser() {
     },
     services: [
       ['selenium-standalone']
-    ]
+    ],
+    logLevel: 'warn'
   };
   // Run in headless mode on Github Actions.
   if (process.env.CI) {
diff --git a/tests/scripts/run_generators.sh b/tests/scripts/run_generators.sh
index 9d556acad..8c461f8e0 100755
--- a/tests/scripts/run_generators.sh
+++ b/tests/scripts/run_generators.sh
@@ -18,7 +18,7 @@ check_result() {
   if [ -f $tmp_filename ]; then
     local golden_filename="${GOLDEN_DIR}generated.$suffix"
     if [ -f $golden_filename ]; then
-      if cmp --silent $tmp_filename $golden_filename; then
+      if cmp $tmp_filename $golden_filename; then
         echo -e "$SUCCESS_PREFIX $suffix: $tmp_filename matches $golden_filename"
       else
         echo -e "$FAILURE_PREFIX $suffix: $tmp_filename does not match $golden_filename"

From e685e0fb8fe42421f6e8b22d6f74bb62f9c26d5f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:04:51 -0700
Subject: [PATCH 161/291] Migrate core/menuitem.js to ES6 const/let

---
 core/menuitem.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 91e156742..5eaff00fc 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -103,7 +103,7 @@ Blockly.MenuItem = function(content, opt_value) {
  * @return {!Element} Completed DOM.
  */
 Blockly.MenuItem.prototype.createDom = function() {
-  var element = document.createElement('div');
+  const element = document.createElement('div');
   element.id = Blockly.utils.IdGenerator.getNextUniqueId();
   this.element_ = element;
 
@@ -116,16 +116,16 @@ Blockly.MenuItem.prototype.createDom = function() {
         'blocklyMenuItemHighlight goog-menuitem-highlight ' : '') +
       (this.rightToLeft_ ? 'blocklyMenuItemRtl goog-menuitem-rtl ' : '');
 
-  var content = document.createElement('div');
+  const content = document.createElement('div');
   content.className = 'blocklyMenuItemContent goog-menuitem-content';
   // Add a checkbox for checkable menu items.
   if (this.checkable_) {
-    var checkbox = document.createElement('div');
+    const checkbox = document.createElement('div');
     checkbox.className = 'blocklyMenuItemCheckbox goog-menuitem-checkbox';
     content.appendChild(checkbox);
   }
 
-  var contentDom = /** @type {!HTMLElement} */ (this.content_);
+  let contentDom = /** @type {!HTMLElement} */ (this.content_);
   if (typeof this.content_ == 'string') {
     contentDom = document.createTextNode(this.content_);
   }
@@ -223,12 +223,12 @@ Blockly.MenuItem.prototype.setChecked = function(checked) {
 Blockly.MenuItem.prototype.setHighlighted = function(highlight) {
   this.highlight_ = highlight;
 
-  var el = this.getElement();
+  const el = this.getElement();
   if (el && this.isEnabled()) {
     // goog-menuitem-highlight is deprecated, use blocklyMenuItemHighlight.
     // May 2020.
-    var name = 'blocklyMenuItemHighlight';
-    var nameDep = 'goog-menuitem-highlight';
+    const name = 'blocklyMenuItemHighlight';
+    const nameDep = 'goog-menuitem-highlight';
     if (highlight) {
       Blockly.utils.dom.addClass(el, name);
       Blockly.utils.dom.addClass(el, nameDep);

From cc606ba2d24a1ae7e88d21d94c40767fe5fcc511 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:09:16 -0700
Subject: [PATCH 162/291] Migrate core/menuitem.js to goog.module

---
 core/menuitem.js | 37 ++++++++++++++++++++-----------------
 tests/deps.js    |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 5eaff00fc..40a7a8c6f 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.MenuItem');
+goog.module('Blockly.MenuItem');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.utils.aria');
 goog.require('Blockly.utils.dom');
@@ -25,7 +26,7 @@ goog.require('Blockly.utils.IdGenerator');
  * @param {string=} opt_value Data/model associated with the menu item.
  * @constructor
  */
-Blockly.MenuItem = function(content, opt_value) {
+const MenuItem = function(content, opt_value) {
   /**
    * Human-readable text of this menu item, or the HTML element to display.
    * @type {string|!HTMLElement}
@@ -102,7 +103,7 @@ Blockly.MenuItem = function(content, opt_value) {
  * Creates the menuitem's DOM.
  * @return {!Element} Completed DOM.
  */
-Blockly.MenuItem.prototype.createDom = function() {
+MenuItem.prototype.createDom = function() {
   const element = document.createElement('div');
   element.id = Blockly.utils.IdGenerator.getNextUniqueId();
   this.element_ = element;
@@ -147,7 +148,7 @@ Blockly.MenuItem.prototype.createDom = function() {
 /**
  * Dispose of this menu item.
  */
-Blockly.MenuItem.prototype.dispose = function() {
+MenuItem.prototype.dispose = function() {
   this.element_ = null;
 };
 
@@ -156,7 +157,7 @@ Blockly.MenuItem.prototype.dispose = function() {
  * @return {?Element} The DOM element.
  * @package
  */
-Blockly.MenuItem.prototype.getElement = function() {
+MenuItem.prototype.getElement = function() {
   return this.element_;
 };
 
@@ -165,7 +166,7 @@ Blockly.MenuItem.prototype.getElement = function() {
  * @return {string} Unique component ID.
  * @package
  */
-Blockly.MenuItem.prototype.getId = function() {
+MenuItem.prototype.getId = function() {
   return this.element_.id;
 };
 
@@ -174,7 +175,7 @@ Blockly.MenuItem.prototype.getId = function() {
  * @return {*} value Value associated with the menu item.
  * @package
  */
-Blockly.MenuItem.prototype.getValue = function() {
+MenuItem.prototype.getValue = function() {
   return this.value_;
 };
 
@@ -183,7 +184,7 @@ Blockly.MenuItem.prototype.getValue = function() {
  * @param {boolean} rtl True if RTL, false if LTR.
  * @package
  */
-Blockly.MenuItem.prototype.setRightToLeft = function(rtl) {
+MenuItem.prototype.setRightToLeft = function(rtl) {
   this.rightToLeft_ = rtl;
 };
 
@@ -192,7 +193,7 @@ Blockly.MenuItem.prototype.setRightToLeft = function(rtl) {
  * @param {!Blockly.utils.aria.Role} roleName Role name.
  * @package
  */
-Blockly.MenuItem.prototype.setRole = function(roleName) {
+MenuItem.prototype.setRole = function(roleName) {
   this.roleName_ = roleName;
 };
 
@@ -202,7 +203,7 @@ Blockly.MenuItem.prototype.setRole = function(roleName) {
  * @param {boolean} checkable Whether the menu item is checkable.
  * @package
  */
-Blockly.MenuItem.prototype.setCheckable = function(checkable) {
+MenuItem.prototype.setCheckable = function(checkable) {
   this.checkable_ = checkable;
 };
 
@@ -211,7 +212,7 @@ Blockly.MenuItem.prototype.setCheckable = function(checkable) {
  * @param {boolean} checked Whether to check or uncheck the component.
  * @package
  */
-Blockly.MenuItem.prototype.setChecked = function(checked) {
+MenuItem.prototype.setChecked = function(checked) {
   this.checked_ = checked;
 };
 
@@ -220,7 +221,7 @@ Blockly.MenuItem.prototype.setChecked = function(checked) {
  * @param {boolean} highlight Whether to highlight or unhighlight the component.
  * @package
  */
-Blockly.MenuItem.prototype.setHighlighted = function(highlight) {
+MenuItem.prototype.setHighlighted = function(highlight) {
   this.highlight_ = highlight;
 
   const el = this.getElement();
@@ -244,7 +245,7 @@ Blockly.MenuItem.prototype.setHighlighted = function(highlight) {
  * @return {boolean} Whether the menu item is enabled.
  * @package
  */
-Blockly.MenuItem.prototype.isEnabled = function() {
+MenuItem.prototype.isEnabled = function() {
   return this.enabled_;
 };
 
@@ -253,7 +254,7 @@ Blockly.MenuItem.prototype.isEnabled = function() {
  * @param {boolean} enabled Whether to enable or disable the menu item.
  * @package
  */
-Blockly.MenuItem.prototype.setEnabled = function(enabled) {
+MenuItem.prototype.setEnabled = function(enabled) {
   this.enabled_ = enabled;
 };
 
@@ -262,7 +263,7 @@ Blockly.MenuItem.prototype.setEnabled = function(enabled) {
  * by the user.
  * @package
  */
-Blockly.MenuItem.prototype.performAction = function() {
+MenuItem.prototype.performAction = function() {
   if (this.isEnabled() && this.actionHandler_) {
     this.actionHandler_(this);
   }
@@ -271,10 +272,12 @@ Blockly.MenuItem.prototype.performAction = function() {
 /**
  * Set the handler that's called when the menu item is activated by the user.
  * `obj` will be used as the 'this' object in the function when called.
- * @param {function(!Blockly.MenuItem)} fn The handler.
+ * @param {function(!MenuItem)} fn The handler.
  * @param {!Object} obj Used as the 'this' object in fn when called.
  * @package
  */
-Blockly.MenuItem.prototype.onAction = function(fn, obj) {
+MenuItem.prototype.onAction = function(fn, obj) {
   this.actionHandler_ = fn.bind(obj);
 };
+
+exports = MenuItem;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..37bc564c1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -111,7 +111,7 @@ goog.addDependency('../../core/keyboard_nav/marker.js', ['Blockly.Marker'], [],
 goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.TabNavigateCursor'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom']);
+goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});

From dc682a7e0b217fb35383ba14e3fba8b89691eb53 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:54:35 -0700
Subject: [PATCH 163/291] Migrate core/menuitem.js named requires

---
 core/menuitem.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 40a7a8c6f..c7d93014e 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -13,9 +13,9 @@
 goog.module('Blockly.MenuItem');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.IdGenerator');
+const aria = goog.require('Blockly.utils.aria');
+const {addClass, removeClass} = goog.require('Blockly.utils.dom');
+const {getNextUniqueId} = goog.require('Blockly.utils.IdGenerator');
 
 
 /**
@@ -64,7 +64,7 @@ const MenuItem = function(content, opt_value) {
 
   /**
    * ARIA name for this menu.
-   * @type {?Blockly.utils.aria.Role}
+   * @type {?aria.Role}
    * @private
    */
   this.roleName_ = null;
@@ -105,7 +105,7 @@ const MenuItem = function(content, opt_value) {
  */
 MenuItem.prototype.createDom = function() {
   const element = document.createElement('div');
-  element.id = Blockly.utils.IdGenerator.getNextUniqueId();
+  element.id = getNextUniqueId();
   this.element_ = element;
 
   // Set class and style
@@ -135,11 +135,11 @@ MenuItem.prototype.createDom = function() {
 
   // Initialize ARIA role and state.
   if (this.roleName_) {
-    Blockly.utils.aria.setRole(element, this.roleName_);
+    aria.setRole(element, this.roleName_);
   }
-  Blockly.utils.aria.setState(element, Blockly.utils.aria.State.SELECTED,
+  aria.setState(element, aria.State.SELECTED,
       (this.checkable_ && this.checked_) || false);
-  Blockly.utils.aria.setState(element, Blockly.utils.aria.State.DISABLED,
+  aria.setState(element, aria.State.DISABLED,
       !this.enabled_);
 
   return element;
@@ -190,7 +190,7 @@ MenuItem.prototype.setRightToLeft = function(rtl) {
 
 /**
  * Set the menu item's accessibility role.
- * @param {!Blockly.utils.aria.Role} roleName Role name.
+ * @param {!aria.Role} roleName Role name.
  * @package
  */
 MenuItem.prototype.setRole = function(roleName) {
@@ -231,11 +231,11 @@ MenuItem.prototype.setHighlighted = function(highlight) {
     const name = 'blocklyMenuItemHighlight';
     const nameDep = 'goog-menuitem-highlight';
     if (highlight) {
-      Blockly.utils.dom.addClass(el, name);
-      Blockly.utils.dom.addClass(el, nameDep);
+      addClass(el, name);
+      addClass(el, nameDep);
     } else {
-      Blockly.utils.dom.removeClass(el, name);
-      Blockly.utils.dom.removeClass(el, nameDep);
+      removeClass(el, name);
+      removeClass(el, nameDep);
     }
   }
 };

From 1e3cdeb16ea7c512ff9609c808e5673ff2356788 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Thu, 22 Jul 2021 09:55:27 -0700
Subject: [PATCH 164/291] clang-format core/menuitem.js

---
 core/menuitem.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index c7d93014e..5237068d2 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -113,8 +113,8 @@ MenuItem.prototype.createDom = function() {
   element.className = 'blocklyMenuItem goog-menuitem ' +
       (this.enabled_ ? '' : 'blocklyMenuItemDisabled goog-menuitem-disabled ') +
       (this.checked_ ? 'blocklyMenuItemSelected goog-option-selected ' : '') +
-      (this.highlight_ ?
-        'blocklyMenuItemHighlight goog-menuitem-highlight ' : '') +
+      (this.highlight_ ? 'blocklyMenuItemHighlight goog-menuitem-highlight ' :
+                         '') +
       (this.rightToLeft_ ? 'blocklyMenuItemRtl goog-menuitem-rtl ' : '');
 
   const content = document.createElement('div');
@@ -137,10 +137,10 @@ MenuItem.prototype.createDom = function() {
   if (this.roleName_) {
     aria.setRole(element, this.roleName_);
   }
-  aria.setState(element, aria.State.SELECTED,
+  aria.setState(
+      element, aria.State.SELECTED,
       (this.checkable_ && this.checked_) || false);
-  aria.setState(element, aria.State.DISABLED,
-      !this.enabled_);
+  aria.setState(element, aria.State.DISABLED, !this.enabled_);
 
   return element;
 };

From 0fb4ed3ff4374ec7b4e29bd0667702e8ea3b932f Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Fri, 23 Jul 2021 13:12:38 -0700
Subject: [PATCH 165/291] Fix imports

---
 core/menuitem.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/menuitem.js b/core/menuitem.js
index 5237068d2..9a8ea2c67 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -14,8 +14,8 @@ goog.module('Blockly.MenuItem');
 goog.module.declareLegacyNamespace();
 
 const aria = goog.require('Blockly.utils.aria');
-const {addClass, removeClass} = goog.require('Blockly.utils.dom');
-const {getNextUniqueId} = goog.require('Blockly.utils.IdGenerator');
+const dom = goog.require('Blockly.utils.dom');
+const idGenerator = goog.require('Blockly.utils.IdGenerator');
 
 
 /**
@@ -105,7 +105,7 @@ const MenuItem = function(content, opt_value) {
  */
 MenuItem.prototype.createDom = function() {
   const element = document.createElement('div');
-  element.id = getNextUniqueId();
+  element.id = idGenerator.getNextUniqueId();
   this.element_ = element;
 
   // Set class and style
@@ -231,11 +231,11 @@ MenuItem.prototype.setHighlighted = function(highlight) {
     const name = 'blocklyMenuItemHighlight';
     const nameDep = 'goog-menuitem-highlight';
     if (highlight) {
-      addClass(el, name);
-      addClass(el, nameDep);
+      dom.addClass(el, name);
+      dom.addClass(el, nameDep);
     } else {
-      removeClass(el, name);
-      removeClass(el, nameDep);
+      dom.removeClass(el, name);
+      dom.removeClass(el, nameDep);
     }
   }
 };

From 724cdd3bd234c5bf08162d0b8898b61ee1e82332 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 3 Aug 2021 14:36:54 -0700
Subject: [PATCH 166/291] Migrate core/events/events_selected.js to goog.module
 syntax (#5281)

* Migrate core/events/events_selected.js to ES6 const/let

* Migrate core/events/events_selected.js to goog.module

* Migrate core/events/events_selected.js to named requires

* clang-format core/events/events_selected.js
---
 core/events/events_selected.js | 35 +++++++++++++++++-----------------
 tests/deps.js                  |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/core/events/events_selected.js b/core/events/events_selected.js
index cfb7c6573..47fcee5df 100644
--- a/core/events/events_selected.js
+++ b/core/events/events_selected.js
@@ -10,12 +10,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Selected');
+goog.module('Blockly.Events.Selected');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -26,12 +27,11 @@ goog.require('Blockly.utils.object');
  *    element currently selected (deselect). Undefined for a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Null if no element previously selected. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.Selected = function(opt_oldElementId, opt_newElementId,
-    opt_workspaceId) {
-  Blockly.Events.Selected.superClass_.constructor.call(this, opt_workspaceId);
+const Selected = function(opt_oldElementId, opt_newElementId, opt_workspaceId) {
+  Selected.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * The id of the last selected element.
@@ -45,20 +45,20 @@ Blockly.Events.Selected = function(opt_oldElementId, opt_newElementId,
    */
   this.newElementId = opt_newElementId;
 };
-Blockly.utils.object.inherits(Blockly.Events.Selected, Blockly.Events.UiBase);
+object.inherits(Selected, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.Selected.prototype.type = Blockly.Events.SELECTED;
+Selected.prototype.type = Events.SELECTED;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Selected.prototype.toJson = function() {
-  var json = Blockly.Events.Selected.superClass_.toJson.call(this);
+Selected.prototype.toJson = function() {
+  const json = Selected.superClass_.toJson.call(this);
   json['oldElementId'] = this.oldElementId;
   json['newElementId'] = this.newElementId;
   return json;
@@ -68,11 +68,12 @@ Blockly.Events.Selected.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Selected.prototype.fromJson = function(json) {
-  Blockly.Events.Selected.superClass_.fromJson.call(this, json);
+Selected.prototype.fromJson = function(json) {
+  Selected.superClass_.fromJson.call(this, json);
   this.oldElementId = json['oldElementId'];
   this.newElementId = json['newElementId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.SELECTED,
-    Blockly.Events.Selected);
+registry.register(registry.Type.EVENT, Events.SELECTED, Selected);
+
+exports = Selected;
diff --git a/tests/deps.js b/tests/deps.js
index 95167497f..b35d0324a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -40,7 +40,7 @@ goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.Bl
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);

From bec82da3584819f0060a33fa732794a3cf2edcad Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Tue, 3 Aug 2021 15:07:14 -0700
Subject: [PATCH 167/291] Remove require destructuring (#5294)

---
 core/block_drag_surface.js                   | 27 +++++----
 core/comment.js                              | 63 ++++++++++----------
 core/connection_checker.js                   |  4 +-
 core/delete_area.js                          |  4 +-
 core/extensions.js                           | 22 +++----
 core/field.js                                | 43 +++++++------
 core/field_checkbox.js                       |  4 +-
 core/field_colour.js                         | 51 ++++++++--------
 core/field_dropdown.js                       | 18 +++---
 core/field_image.js                          | 24 ++++----
 core/field_label.js                          |  8 +--
 core/field_label_serializable.js             |  8 +--
 core/field_multilineinput.js                 |  8 +--
 core/field_number.js                         |  8 +--
 core/field_textinput.js                      | 12 ++--
 core/field_variable.js                       |  8 +--
 core/flyout_base.js                          |  4 +-
 core/flyout_button.js                        |  8 ++-
 core/flyout_horizontal.js                    | 20 +++----
 core/flyout_vertical.js                      | 24 ++++----
 core/icon.js                                 |  6 +-
 core/interfaces/i_flyout.js                  |  4 +-
 core/interfaces/i_metrics_manager.js         | 20 +++----
 core/interfaces/i_positionable.js            |  6 +-
 core/interfaces/i_selectable_toolbox_item.js |  4 +-
 core/interfaces/i_toolbox.js                 |  4 +-
 core/keyboard_nav/basic_cursor.js            |  9 +--
 core/keyboard_nav/cursor.js                  |  8 +--
 core/keyboard_nav/tab_navigate_cursor.js     |  4 +-
 core/renderers/common/info.js                | 28 +++++----
 core/utils/toolbox.js                        | 18 +++---
 31 files changed, 242 insertions(+), 237 deletions(-)

diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 2b911ef09..717713915 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -8,8 +8,9 @@
  * @fileoverview A class that manages a surface for dragging blocks.  When a
  * block drag is started, we move the block (and children) to a separate DOM
  * element that we move around using translate3d. At the end of the drag, the
- * blocks are put back in into the SVG they came from. This helps performance by
- * avoiding repainting the entire SVG on every mouse move while dragging blocks.
+ * blocks are put back in into the SVG they came from. This helps
+ * performance by avoiding repainting the entire SVG on every mouse move
+ * while dragging blocks.
  * @author picklesrus
  */
 
@@ -19,9 +20,9 @@ goog.module('Blockly.BlockDragSurfaceSvg');
 goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
-const {G, SVG} = goog.require('Blockly.utils.Svg');
-const {createSvgElement, HTML_NS, setCssTransform, SVG_NS, XLINK_NS} = goog.require('Blockly.utils.dom');
-const {getRelativeXY} = goog.require('Blockly.utils');
+const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -94,16 +95,16 @@ BlockDragSurfaceSvg.prototype.createDom = function() {
   if (this.SVG_) {
     return;  // Already created.
   }
-  this.SVG_ = createSvgElement(
-      SVG, {
-        'xmlns': SVG_NS,
-        'xmlns:html': HTML_NS,
-        'xmlns:xlink': XLINK_NS,
+  this.SVG_ = dom.createSvgElement(
+      Svg.SVG, {
+        'xmlns': dom.SVG_NS,
+        'xmlns:html': dom.HTML_NS,
+        'xmlns:xlink': dom.XLINK_NS,
         'version': '1.1',
         'class': 'blocklyBlockDragSurface'
       },
       this.container_);
-  this.dragGroup_ = createSvgElement(G, {}, this.SVG_);
+  this.dragGroup_ = dom.createSvgElement(Svg.G, {}, this.SVG_);
 };
 
 /**
@@ -157,7 +158,7 @@ BlockDragSurfaceSvg.prototype.translateSurfaceInternal_ = function() {
   y = y.toFixed(0);
   this.SVG_.style.display = 'block';
 
-  setCssTransform(this.SVG_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
+  dom.setCssTransform(this.SVG_, 'translate3d(' + x + 'px, ' + y + 'px, 0)');
 };
 
 /**
@@ -191,7 +192,7 @@ BlockDragSurfaceSvg.prototype.translateSurface = function(x, y) {
  * @return {!Coordinate} Current translation of the surface.
  */
 BlockDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
-  const xy = getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
+  const xy = utils.getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
   return new Coordinate(xy.x / this.scale_, xy.y / this.scale_);
 };
 
diff --git a/core/comment.js b/core/comment.js
index 99d81e89c..b126aaf57 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -20,6 +20,7 @@ const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
 const Icon = goog.require('Blockly.Icon');
 /* eslint-disable-next-line no-unused-vars */
@@ -27,12 +28,10 @@ const Size = goog.requireType('Blockly.utils.Size');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-/* eslint-disable-next-line no-unused-vars */
-const {conditionalBind, Data, unbind} = goog.require('Blockly.browserEvents');
-const {createSvgElement, HTML_NS} = goog.require('Blockly.utils.dom');
-const {inherits} = goog.require('Blockly.utils.object');
-const {register} = goog.require('Blockly.Css');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -70,35 +69,35 @@ const Comment = function(block) {
 
   /**
    * Mouse up event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseUpWrapper_ = null;
 
   /**
    * Wheel event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onWheelWrapper_ = null;
 
   /**
    * Change event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onChangeWrapper_ = null;
 
   /**
    * Input event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onInputWrapper_ = null;
 
   this.createIcon();
 };
-inherits(Comment, Icon);
+object.inherits(Comment, Icon);
 
 /**
  * Draw the comment icon.
@@ -107,13 +106,13 @@ inherits(Comment, Icon);
  */
 Comment.prototype.drawIcon_ = function(group) {
   // Circle.
-  createSvgElement(
+  dom.createSvgElement(
       Svg.CIRCLE, {'class': 'blocklyIconShape', 'r': '8', 'cx': '8', 'cy': '8'},
       group);
   // Can't use a real '?' text character since different browsers and operating
   // systems render it differently.
   // Body of question mark.
-  createSvgElement(
+  dom.createSvgElement(
       Svg.PATH, {
         'class': 'blocklyIconSymbol',
         'd': 'm6.8,10h2c0.003,-0.617 0.271,-0.962 0.633,-1.266 2.875,-2.405' +
@@ -122,7 +121,7 @@ Comment.prototype.drawIcon_ = function(group) {
       },
       group);
   // Dot of question mark.
-  createSvgElement(
+  dom.createSvgElement(
       Svg.RECT, {
         'class': 'blocklyIconSymbol',
         'x': '6.8',
@@ -151,15 +150,15 @@ Comment.prototype.createEditor_ = function() {
    * For non-editable mode see Warning.textToDom_.
    */
 
-  this.foreignObject_ = createSvgElement(
+  this.foreignObject_ = dom.createSvgElement(
       Svg.FOREIGNOBJECT, {'x': Bubble.BORDER_WIDTH, 'y': Bubble.BORDER_WIDTH},
       null);
 
-  const body = document.createElementNS(HTML_NS, 'body');
-  body.setAttribute('xmlns', HTML_NS);
+  const body = document.createElementNS(dom.HTML_NS, 'body');
+  body.setAttribute('xmlns', dom.HTML_NS);
   body.className = 'blocklyMinimalBody';
 
-  this.textarea_ = document.createElementNS(HTML_NS, 'textarea');
+  this.textarea_ = document.createElementNS(dom.HTML_NS, 'textarea');
   const textarea = this.textarea_;
   textarea.className = 'blocklyCommentTextarea';
   textarea.setAttribute('dir', this.block_.RTL ? 'RTL' : 'LTR');
@@ -172,23 +171,25 @@ Comment.prototype.createEditor_ = function() {
   // Ideally this would be hooked to the focus event for the comment.
   // However doing so in Firefox swallows the cursor for unknown reasons.
   // So this is hooked to mouseup instead.  No big deal.
-  this.onMouseUpWrapper_ =
-      conditionalBind(textarea, 'mouseup', this, this.startEdit_, true, true);
+  this.onMouseUpWrapper_ = browserEvents.conditionalBind(
+      textarea, 'mouseup', this, this.startEdit_, true, true);
   // Don't zoom with mousewheel.
-  this.onWheelWrapper_ = conditionalBind(textarea, 'wheel', this, function(e) {
-    e.stopPropagation();
-  });
+  this.onWheelWrapper_ =
+      browserEvents.conditionalBind(textarea, 'wheel', this, function(e) {
+        e.stopPropagation();
+      });
   this.onChangeWrapper_ =
-      conditionalBind(textarea, 'change', this, function(_e) {
+      browserEvents.conditionalBind(textarea, 'change', this, function(_e) {
         if (this.cachedText_ != this.model_.text) {
           Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
               this.block_, 'comment', null, this.cachedText_,
               this.model_.text));
         }
       });
-  this.onInputWrapper_ = conditionalBind(textarea, 'input', this, function(_e) {
-    this.model_.text = textarea.value;
-  });
+  this.onInputWrapper_ =
+      browserEvents.conditionalBind(textarea, 'input', this, function(_e) {
+        this.model_.text = textarea.value;
+      });
 
   setTimeout(textarea.focus.bind(textarea), 0);
 
@@ -307,19 +308,19 @@ Comment.prototype.createNonEditableBubble_ = function() {
  */
 Comment.prototype.disposeBubble_ = function() {
   if (this.onMouseUpWrapper_) {
-    unbind(this.onMouseUpWrapper_);
+    browserEvents.unbind(this.onMouseUpWrapper_);
     this.onMouseUpWrapper_ = null;
   }
   if (this.onWheelWrapper_) {
-    unbind(this.onWheelWrapper_);
+    browserEvents.unbind(this.onWheelWrapper_);
     this.onWheelWrapper_ = null;
   }
   if (this.onChangeWrapper_) {
-    unbind(this.onChangeWrapper_);
+    browserEvents.unbind(this.onChangeWrapper_);
     this.onChangeWrapper_ = null;
   }
   if (this.onInputWrapper_) {
-    unbind(this.onInputWrapper_);
+    browserEvents.unbind(this.onInputWrapper_);
     this.onInputWrapper_ = null;
   }
   this.bubble_.dispose();
@@ -397,7 +398,7 @@ Comment.prototype.dispose = function() {
 /**
  * CSS for block comment.  See css.js for use.
  */
-register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyCommentTextarea {', 'background-color: #fef49c;', 'border: 0;',
   'outline: 0;', 'margin: 0;', 'padding: 3px;', 'resize: none;',
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 2ea27aa19..20a582aac 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -20,8 +20,8 @@ const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const connectionTypes = goog.require('Blockly.connectionTypes');
+const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
-const {OPPOSITE_TYPE} = goog.require('Blockly.internalConstants');
 
 
 /**
@@ -145,7 +145,7 @@ ConnectionChecker.prototype.doSafetyChecks = function(a, b) {
   }
   if (blockA == blockB) {
     return Connection.REASON_SELF_CONNECTION;
-  } else if (b.type != OPPOSITE_TYPE[a.type]) {
+  } else if (b.type != internalConstants.OPPOSITE_TYPE[a.type]) {
     return Connection.REASON_WRONG_TYPE;
   } else if (blockA.workspace !== blockB.workspace) {
     return Connection.REASON_DIFFERENT_WORKSPACES;
diff --git a/core/delete_area.js b/core/delete_area.js
index 55eb61a34..248ef2fd2 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -21,7 +21,7 @@ const DragTarget = goog.require('Blockly.DragTarget');
 const IDeleteArea = goog.require('Blockly.IDeleteArea');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 
 /**
  * Abstract class for a component that can delete a block or bubble that is
@@ -42,7 +42,7 @@ const DeleteArea = function() {
    */
   this.wouldDelete_ = false;
 };
-inherits(DeleteArea, DragTarget);
+object.inherits(DeleteArea, DragTarget);
 
 /**
  * Returns whether the provided block or bubble would be deleted if dropped on
diff --git a/core/extensions.js b/core/extensions.js
index 3f20777aa..bb9ef6731 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -22,7 +22,7 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
-const {checkMessageReferences, replaceMessageReferences, runAfterPageLoad} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -331,13 +331,13 @@ const buildTooltipForDropdown = function(dropdownName, lookupTable) {
 
   // Check the tooltip string messages for invalid references.
   // Wait for load, in case Blockly.Msg is not yet populated.
-  // runAfterPageLoad() does not run in a Node.js environment due to lack of
-  // document object, in which case skip the validation.
+  // utils.runAfterPageLoad() does not run in a Node.js environment due to lack
+  // of document object, in which case skip the validation.
   if (typeof document == 'object') {  // Relies on document.readyState
-    runAfterPageLoad(function() {
+    utils.runAfterPageLoad(function() {
       for (let key in lookupTable) {
         // Will print warnings if reference is missing.
-        checkMessageReferences(lookupTable[key]);
+        utils.checkMessageReferences(lookupTable[key]);
       }
     });
   }
@@ -366,7 +366,7 @@ const buildTooltipForDropdown = function(dropdownName, lookupTable) {
           console.warn(warning + '.');
         }
       } else {
-        tooltip = replaceMessageReferences(tooltip);
+        tooltip = utils.replaceMessageReferences(tooltip);
       }
       return tooltip;
     }.bind(this));
@@ -411,12 +411,12 @@ const checkDropdownOptionsInTable = function(block, dropdownName, lookupTable) {
 const buildTooltipWithFieldText = function(msgTemplate, fieldName) {
   // Check the tooltip string messages for invalid references.
   // Wait for load, in case Blockly.Msg is not yet populated.
-  // runAfterPageLoad() does not run in a Node.js environment due to lack of
-  // document object, in which case skip the validation.
+  // utils.runAfterPageLoad() does not run in a Node.js environment due to lack
+  // of document object, in which case skip the validation.
   if (typeof document == 'object') {  // Relies on document.readyState
-    runAfterPageLoad(function() {
+    utils.runAfterPageLoad(function() {
       // Will print warnings if reference is missing.
-      checkMessageReferences(msgTemplate);
+      utils.checkMessageReferences(msgTemplate);
     });
   }
 
@@ -427,7 +427,7 @@ const buildTooltipWithFieldText = function(msgTemplate, fieldName) {
   const extensionFn = function() {
     this.setTooltip(function() {
       const field = this.getField(fieldName);
-      return replaceMessageReferences(msgTemplate)
+      return utils.replaceMessageReferences(msgTemplate)
           .replace('%1', field ? field.getText() : '');
     }.bind(this));
   };
diff --git a/core/field.js b/core/field.js
index 926e62008..77e0ab88c 100644
--- a/core/field.js
+++ b/core/field.js
@@ -32,9 +32,9 @@ const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBloc
 /* eslint-disable-next-line no-unused-vars */
 const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
 /* eslint-disable-next-line no-unused-vars */
-const IRegistrable = goog.require('Blockly.IRegistrable');
-/* eslint-disable-next-line no-unused-vars */
 const Input = goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const IRegistrable = goog.require('Blockly.IRegistrable');
 const MarkerManager = goog.require('Blockly.MarkerManager');
 const Rect = goog.require('Blockly.utils.Rect');
 /* eslint-disable-next-line no-unused-vars */
@@ -45,12 +45,11 @@ const Tooltip = goog.require('Blockly.Tooltip');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const dom = goog.require('Blockly.utils.dom');
+const browserEvents = goog.require('Blockly.browserEvents');
+const style = goog.require('Blockly.utils.style');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {addClass, createSvgElement, getFastTextWidth, removeClass, removeNode} = goog.require('Blockly.utils.dom');
-/* eslint-disable-next-line no-unused-vars */
-const {conditionalBind, unbind, Data} = goog.require('Blockly.browserEvents');
-const {getPageOffset} = goog.require('Blockly.utils.style');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -150,7 +149,7 @@ const Field = function(value, opt_validator, opt_config) {
 
   /**
    * Mouse down event listener data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.mouseDownWrapper_ = null;
@@ -281,7 +280,7 @@ Field.prototype.SERIALIZABLE = false;
 Field.prototype.configure_ = function(config) {
   let tooltip = config['tooltip'];
   if (typeof tooltip == 'string') {
-    tooltip = replaceMessageReferences(config['tooltip']);
+    tooltip = utils.replaceMessageReferences(config['tooltip']);
   }
   tooltip && this.setTooltip(tooltip);
 
@@ -331,7 +330,7 @@ Field.prototype.init = function() {
     // Field has already been initialized once.
     return;
   }
-  this.fieldGroup_ = createSvgElement(Svg.G, {}, null);
+  this.fieldGroup_ = dom.createSvgElement(Svg.G, {}, null);
   if (!this.isVisible()) {
     this.fieldGroup_.style.display = 'none';
   }
@@ -367,7 +366,7 @@ Field.prototype.initModel = function() {};
  * @protected
  */
 Field.prototype.createBorderRect_ = function() {
-  this.borderRect_ = createSvgElement(
+  this.borderRect_ = dom.createSvgElement(
       Svg.RECT, {
         'rx': this.getConstants().FIELD_BORDER_RECT_RADIUS,
         'ry': this.getConstants().FIELD_BORDER_RECT_RADIUS,
@@ -387,7 +386,7 @@ Field.prototype.createBorderRect_ = function() {
  * @protected
  */
 Field.prototype.createTextElement_ = function() {
-  this.textElement_ = createSvgElement(
+  this.textElement_ = dom.createSvgElement(
       Svg.TEXT, {
         'class': 'blocklyText',
       },
@@ -406,7 +405,7 @@ Field.prototype.createTextElement_ = function() {
  */
 Field.prototype.bindEvents_ = function() {
   Tooltip.bindMouseEvents(this.getClickTarget_());
-  this.mouseDownWrapper_ = conditionalBind(
+  this.mouseDownWrapper_ = browserEvents.conditionalBind(
       this.getClickTarget_(), 'mousedown', this, this.onMouseDown_);
 };
 
@@ -443,10 +442,10 @@ Field.prototype.dispose = function() {
   Tooltip.unbindMouseEvents(this.getClickTarget_());
 
   if (this.mouseDownWrapper_) {
-    unbind(this.mouseDownWrapper_);
+    browserEvents.unbind(this.mouseDownWrapper_);
   }
 
-  removeNode(this.fieldGroup_);
+  dom.removeNode(this.fieldGroup_);
 
   this.disposed = true;
 };
@@ -460,12 +459,12 @@ Field.prototype.updateEditable = function() {
     return;
   }
   if (this.enabled_ && this.sourceBlock_.isEditable()) {
-    addClass(group, 'blocklyEditableText');
-    removeClass(group, 'blocklyNonEditableText');
+    dom.addClass(group, 'blocklyEditableText');
+    dom.removeClass(group, 'blocklyNonEditableText');
     group.style.cursor = this.CURSOR;
   } else {
-    addClass(group, 'blocklyNonEditableText');
-    removeClass(group, 'blocklyEditableText');
+    dom.addClass(group, 'blocklyNonEditableText');
+    dom.removeClass(group, 'blocklyEditableText');
     group.style.cursor = '';
   }
 };
@@ -643,7 +642,7 @@ Field.prototype.updateSize_ = function(opt_margin) {
 
   let contentWidth = 0;
   if (this.textElement_) {
-    contentWidth = getFastTextWidth(
+    contentWidth = dom.getFastTextWidth(
         this.textElement_, constants.FIELD_TEXT_FONTSIZE,
         constants.FIELD_TEXT_FONTWEIGHT, constants.FIELD_TEXT_FONTFAMILY);
     totalWidth += contentWidth;
@@ -760,7 +759,7 @@ Field.prototype.getScaledBBox = function() {
     }
   } else {
     const bBox = this.borderRect_.getBoundingClientRect();
-    xy = getPageOffset(this.borderRect_);
+    xy = style.getPageOffset(this.borderRect_);
     scaledWidth = bBox.width;
     scaledHeight = bBox.height;
   }
@@ -1020,7 +1019,7 @@ Field.prototype.getClickTarget_ = function() {
  * @protected
  */
 Field.prototype.getAbsoluteXY_ = function() {
-  return getPageOffset(
+  return style.getPageOffset(
       /** @type {!SVGRectElement} */ (this.getClickTarget_()));
 };
 
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index d2ce60eaa..67362fd63 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -48,7 +48,7 @@ const FieldCheckbox = function(opt_value, opt_validator, opt_config) {
   FieldCheckbox.superClass_.constructor.call(
       this, opt_value, opt_validator, opt_config);
 };
-inherits(FieldCheckbox, Field);
+object.inherits(FieldCheckbox, Field);
 
 /**
  * The default value for this field.
diff --git a/core/field_colour.js b/core/field_colour.js
index a3dc0bf72..b4f53967d 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -20,12 +20,11 @@ const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 const KeyCodes = goog.require('Blockly.utils.KeyCodes');
 const Size = goog.require('Blockly.utils.Size');
 const aria = goog.require('Blockly.utils.aria');
+const browserEvents = goog.require('Blockly.browserEvents');
 const colour = goog.require('Blockly.utils.colour');
+const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {addClass, removeClass} = goog.require('Blockly.utils.dom');
-/* eslint-disable-next-line no-unused-vars */
-const {conditionalBind, unbind, Data} = goog.require('Blockly.browserEvents');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -65,40 +64,40 @@ const FieldColour = function(opt_value, opt_validator, opt_config) {
 
   /**
    * Mouse click event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onClickWrapper_ = null;
 
   /**
    * Mouse move event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseMoveWrapper_ = null;
 
   /**
    * Mouse enter event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseEnterWrapper_ = null;
 
   /**
    * Mouse leave event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onMouseLeaveWrapper_ = null;
 
   /**
    * Key down event data.
-   * @type {?Data}
+   * @type {?browserEvents.Data}
    * @private
    */
   this.onKeyDownWrapper_ = null;
 };
-inherits(FieldColour, Field);
+object.inherits(FieldColour, Field);
 
 /**
  * Construct a FieldColour from a JSON arg object.
@@ -472,7 +471,7 @@ FieldColour.prototype.onMouseLeave_ = function() {
   this.picker_.blur();
   const highlighted = this.getHighlighted_();
   if (highlighted) {
-    removeClass(highlighted, 'blocklyColourHighlighted');
+    dom.removeClass(highlighted, 'blocklyColourHighlighted');
   }
 };
 
@@ -503,10 +502,10 @@ FieldColour.prototype.setHighlightedCell_ = function(cell, index) {
   // Unhighlight the current item.
   const highlighted = this.getHighlighted_();
   if (highlighted) {
-    removeClass(highlighted, 'blocklyColourHighlighted');
+    dom.removeClass(highlighted, 'blocklyColourHighlighted');
   }
   // Highlight new item.
-  addClass(cell, 'blocklyColourHighlighted');
+  dom.addClass(cell, 'blocklyColourHighlighted');
   // Set new highlighted index.
   this.highlightedIndex_ = index;
 
@@ -560,15 +559,15 @@ FieldColour.prototype.dropdownCreate_ = function() {
 
   // Configure event handler on the table to listen for any event in a cell.
   this.onClickWrapper_ =
-      conditionalBind(table, 'click', this, this.onClick_, true);
-  this.onMouseMoveWrapper_ =
-      conditionalBind(table, 'mousemove', this, this.onMouseMove_, true);
-  this.onMouseEnterWrapper_ =
-      conditionalBind(table, 'mouseenter', this, this.onMouseEnter_, true);
-  this.onMouseLeaveWrapper_ =
-      conditionalBind(table, 'mouseleave', this, this.onMouseLeave_, true);
+      browserEvents.conditionalBind(table, 'click', this, this.onClick_, true);
+  this.onMouseMoveWrapper_ = browserEvents.conditionalBind(
+      table, 'mousemove', this, this.onMouseMove_, true);
+  this.onMouseEnterWrapper_ = browserEvents.conditionalBind(
+      table, 'mouseenter', this, this.onMouseEnter_, true);
+  this.onMouseLeaveWrapper_ = browserEvents.conditionalBind(
+      table, 'mouseleave', this, this.onMouseLeave_, true);
   this.onKeyDownWrapper_ =
-      conditionalBind(table, 'keydown', this, this.onKeyDown_);
+      browserEvents.conditionalBind(table, 'keydown', this, this.onKeyDown_);
 
   this.picker_ = table;
 };
@@ -579,23 +578,23 @@ FieldColour.prototype.dropdownCreate_ = function() {
  */
 FieldColour.prototype.dropdownDispose_ = function() {
   if (this.onClickWrapper_) {
-    unbind(this.onClickWrapper_);
+    browserEvents.unbind(this.onClickWrapper_);
     this.onClickWrapper_ = null;
   }
   if (this.onMouseMoveWrapper_) {
-    unbind(this.onMouseMoveWrapper_);
+    browserEvents.unbind(this.onMouseMoveWrapper_);
     this.onMouseMoveWrapper_ = null;
   }
   if (this.onMouseEnterWrapper_) {
-    unbind(this.onMouseEnterWrapper_);
+    browserEvents.unbind(this.onMouseEnterWrapper_);
     this.onMouseEnterWrapper_ = null;
   }
   if (this.onMouseLeaveWrapper_) {
-    unbind(this.onMouseLeaveWrapper_);
+    browserEvents.unbind(this.onMouseLeaveWrapper_);
     this.onMouseLeaveWrapper_ = null;
   }
   if (this.onKeyDownWrapper_) {
-    unbind(this.onKeyDownWrapper_);
+    browserEvents.unbind(this.onKeyDownWrapper_);
     this.onKeyDownWrapper_ = null;
   }
   this.picker_ = null;
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index ddb5a4e18..effd6a31d 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -24,10 +24,10 @@ const Svg = goog.require('Blockly.utils.Svg');
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {commonWordPrefix, commonWordSuffix, shortestStringLength} = goog.require('Blockly.utils.string');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
+const utilsString = goog.require('Blockly.utils.string');
 
 
 /**
@@ -130,7 +130,7 @@ const FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
    */
   this.svgArrow_ = null;
 };
-inherits(FieldDropdown, Field);
+object.inherits(FieldDropdown, Field);
 
 /**
  * Dropdown image properties.
@@ -405,10 +405,10 @@ FieldDropdown.prototype.trimOptions_ = function() {
   for (let i = 0; i < options.length; i++) {
     const label = options[i][0];
     if (typeof label == 'string') {
-      options[i][0] = replaceMessageReferences(label);
+      options[i][0] = utils.replaceMessageReferences(label);
     } else {
       if (label.alt != null) {
-        options[i][0].alt = replaceMessageReferences(label.alt);
+        options[i][0].alt = utils.replaceMessageReferences(label.alt);
       }
       hasImages = true;
     }
@@ -420,9 +420,9 @@ FieldDropdown.prototype.trimOptions_ = function() {
   for (let i = 0; i < options.length; i++) {
     strings.push(options[i][0]);
   }
-  const shortest = shortestStringLength(strings);
-  const prefixLength = commonWordPrefix(strings, shortest);
-  const suffixLength = commonWordSuffix(strings, shortest);
+  const shortest = utilsString.shortestStringLength(strings);
+  const prefixLength = utilsString.commonWordPrefix(strings, shortest);
+  const suffixLength = utilsString.commonWordSuffix(strings, shortest);
   if (!prefixLength && !suffixLength) {
     return;
   }
diff --git a/core/field_image.js b/core/field_image.js
index 9edc92c56..ff4460867 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -16,10 +16,10 @@ goog.module.declareLegacyNamespace();
 const Field = goog.require('Blockly.Field');
 const Size = goog.require('Blockly.utils.Size');
 const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {createSvgElement, XLINK_NS} = goog.require('Blockly.utils.dom');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -45,9 +45,9 @@ const FieldImage = function(
   if (!src) {
     throw Error('Src value of an image field is required');
   }
-  src = replaceMessageReferences(src);
-  const imageHeight = Number(replaceMessageReferences(height));
-  const imageWidth = Number(replaceMessageReferences(width));
+  src = utils.replaceMessageReferences(src);
+  const imageHeight = Number(utils.replaceMessageReferences(height));
+  const imageWidth = Number(utils.replaceMessageReferences(width));
   if (isNaN(imageHeight) || isNaN(imageWidth)) {
     throw Error(
         'Height and width values of an image field must cast to' +
@@ -78,7 +78,7 @@ const FieldImage = function(
 
   if (!opt_config) {  // If the config wasn't passed, do old configuration.
     this.flipRtl_ = !!opt_flipRtl;
-    this.altText_ = replaceMessageReferences(opt_alt) || '';
+    this.altText_ = utils.replaceMessageReferences(opt_alt) || '';
   }
 
   // Initialize other properties.
@@ -115,7 +115,7 @@ const FieldImage = function(
    */
   this.imageElement_ = null;
 };
-inherits(FieldImage, Field);
+object.inherits(FieldImage, Field);
 
 /**
  * The default value for this field.
@@ -174,7 +174,7 @@ FieldImage.prototype.isDirty_ = false;
 FieldImage.prototype.configure_ = function(config) {
   FieldImage.superClass_.configure_.call(this, config);
   this.flipRtl_ = !!config['flipRtl'];
-  this.altText_ = replaceMessageReferences(config['alt']) || '';
+  this.altText_ = utils.replaceMessageReferences(config['alt']) || '';
 };
 
 /**
@@ -182,7 +182,7 @@ FieldImage.prototype.configure_ = function(config) {
  * @package
  */
 FieldImage.prototype.initView = function() {
-  this.imageElement_ = createSvgElement(
+  this.imageElement_ = dom.createSvgElement(
       Svg.IMAGE, {
         'height': this.imageHeight_ + 'px',
         'width': this.size_.width + 'px',
@@ -190,7 +190,7 @@ FieldImage.prototype.initView = function() {
       },
       this.fieldGroup_);
   this.imageElement_.setAttributeNS(
-      XLINK_NS, 'xlink:href', /** @type {string} */ (this.value_));
+      dom.XLINK_NS, 'xlink:href', /** @type {string} */ (this.value_));
 
   if (this.clickHandler_) {
     this.imageElement_.style.cursor = 'pointer';
@@ -227,7 +227,7 @@ FieldImage.prototype.doValueUpdate_ = function(newValue) {
   this.value_ = newValue;
   if (this.imageElement_) {
     this.imageElement_.setAttributeNS(
-        XLINK_NS, 'xlink:href', String(this.value_));
+        dom.XLINK_NS, 'xlink:href', String(this.value_));
   }
 };
 
diff --git a/core/field_label.js b/core/field_label.js
index 822d476ab..1a7480543 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -17,8 +17,8 @@ goog.module.declareLegacyNamespace();
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -47,7 +47,7 @@ const FieldLabel = function(opt_value, opt_class, opt_config) {
     this.class_ = opt_class || null;
   }
 };
-inherits(FieldLabel, Field);
+object.inherits(FieldLabel, Field);
 
 /**
  * The default value for this field.
@@ -65,7 +65,7 @@ FieldLabel.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 FieldLabel.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabel if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);
diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index daabaa59f..dee9da1ef 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -16,8 +16,8 @@ goog.module.declareLegacyNamespace();
 
 const FieldLabel = goog.require('Blockly.FieldLabel');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -37,7 +37,7 @@ const FieldLabelSerializable = function(opt_value, opt_class, opt_config) {
   FieldLabelSerializable.superClass_.constructor.call(
       this, opt_value, opt_class, opt_config);
 };
-inherits(FieldLabelSerializable, FieldLabel);
+object.inherits(FieldLabelSerializable, FieldLabel);
 
 /**
  * Construct a FieldLabelSerializable from a JSON arg object,
@@ -48,7 +48,7 @@ inherits(FieldLabelSerializable, FieldLabel);
  * @nocollapse
  */
 FieldLabelSerializable.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldLabelSerializable if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);
diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index 4842429a5..eee4f58c4 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -24,9 +24,9 @@ const WidgetDiv = goog.require('Blockly.WidgetDiv');
 const aria = goog.require('Blockly.utils.aria');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -70,7 +70,7 @@ const FieldMultilineInput = function(opt_value, opt_validator, opt_config) {
    */
   this.isOverflowedY_ = false;
 };
-inherits(FieldMultilineInput, FieldTextInput);
+object.inherits(FieldMultilineInput, FieldTextInput);
 
 /**
  * @override
@@ -89,7 +89,7 @@ FieldMultilineInput.prototype.configure_ = function(config) {
  * @nocollapse
  */
 FieldMultilineInput.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldMultilineInput if that class doesn't
   // override the static fromJson method.
   return new this(text, undefined, options);
diff --git a/core/field_number.js b/core/field_number.js
index 8389f477f..4ed5ac5aa 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -15,8 +15,8 @@ goog.module.declareLegacyNamespace();
 
 const FieldTextInput = goog.require('Blockly.FieldTextInput');
 const aria = goog.require('Blockly.utils.aria');
-const {inherits} = goog.require('Blockly.utils.object');
-const {register} = goog.require('Blockly.fieldRegistry');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -74,7 +74,7 @@ const FieldNumber = function(
     this.setConstraints(opt_min, opt_max, opt_precision);
   }
 };
-inherits(FieldNumber, FieldTextInput);
+object.inherits(FieldNumber, FieldTextInput);
 
 /**
  * The default value for this field.
@@ -313,6 +313,6 @@ FieldNumber.prototype.widgetCreate_ = function() {
   return htmlInput;
 };
 
-register('field_number', FieldNumber);
+fieldRegistry.register('field_number', FieldNumber);
 
 exports = FieldNumber;
diff --git a/core/field_textinput.js b/core/field_textinput.js
index cfa891e34..4b80e411b 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.FieldTextInput');
 goog.module.declareLegacyNamespace();
 
+const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
@@ -28,10 +29,9 @@ const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const object = goog.require('Blockly.utils.object');
 const userAgent = goog.require('Blockly.utils.userAgent');
-const {inherits} = goog.require('Blockly.utils.object');
-const {prompt: blocklyPrompt} = goog.require('Blockly');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -95,7 +95,7 @@ const FieldTextInput = function(opt_value, opt_validator, opt_config) {
    */
   this.workspace_ = null;
 };
-inherits(FieldTextInput, Field);
+object.inherits(FieldTextInput, Field);
 
 /**
  * The default value for this field.
@@ -113,7 +113,7 @@ FieldTextInput.prototype.DEFAULT_VALUE = '';
  * @nocollapse
  */
 FieldTextInput.fromJson = function(options) {
-  const text = replaceMessageReferences(options['text']);
+  const text = utils.replaceMessageReferences(options['text']);
   // `this` might be a subclass of FieldTextInput if that class doesn't override
   // the static fromJson method.
   return new this(text, undefined, options);
@@ -312,7 +312,7 @@ FieldTextInput.prototype.showEditor_ = function(_opt_e, opt_quietInput) {
  * @private
  */
 FieldTextInput.prototype.showPromptEditor_ = function() {
-  blocklyPrompt(Msg['CHANGE_VALUE_TITLE'], this.getText(), function(text) {
+  Blockly.prompt(Msg['CHANGE_VALUE_TITLE'], this.getText(), function(text) {
     this.setValue(this.getValueFromEditorText_(text));
   }.bind(this));
 };
diff --git a/core/field_variable.js b/core/field_variable.js
index f4ae38a51..e98db6f86 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -27,8 +27,8 @@ const Variables = goog.require('Blockly.Variables');
 const Xml = goog.require('Blockly.Xml');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const internalConstants = goog.require('Blockly.internalConstants');
-const {inherits} = goog.require('Blockly.utils.object');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 
@@ -89,7 +89,7 @@ const FieldVariable = function(
     this.setTypes_(opt_variableTypes, opt_defaultType);
   }
 };
-inherits(FieldVariable, FieldDropdown);
+object.inherits(FieldVariable, FieldDropdown);
 
 /**
  * Construct a FieldVariable from a JSON arg object,
@@ -101,7 +101,7 @@ inherits(FieldVariable, FieldDropdown);
  * @nocollapse
  */
 FieldVariable.fromJson = function(options) {
-  const varName = replaceMessageReferences(options['variable']);
+  const varName = utils.replaceMessageReferences(options['variable']);
   // `this` might be a subclass of FieldVariable if that class doesn't override
   // the static fromJson method.
   return new this(varName, undefined, undefined, undefined, options);
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 594d83a9f..2e6908174 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -15,6 +15,7 @@ goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.require('Blockly.Block');
+const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const ComponentManager = goog.require('Blockly.ComponentManager');
@@ -38,7 +39,6 @@ const dom = goog.require('Blockly.utils.dom');
 const toolbox = goog.require('Blockly.utils.toolbox');
 const utils = goog.require('Blockly.utils');
 const utilsXml = goog.require('Blockly.utils.xml');
-const {hideChaff} = goog.require('Blockly');
 /** @suppress {extraRequire} */
 goog.require('Blockly.blockRendering');
 /** @suppress {extraRequire} */
@@ -854,7 +854,7 @@ Flyout.prototype.createBlock = function(originalBlock) {
   }
 
   // Close the flyout.
-  hideChaff();
+  Blockly.hideChaff();
 
   const newVariables = Variables.getAddedVariables(
       this.targetWorkspace, variablesBeforeCreation);
diff --git a/core/flyout_button.js b/core/flyout_button.js
index db05ca4f4..7bb5a3e88 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -23,7 +23,7 @@ const dom = goog.require('Blockly.utils.dom');
 const style = goog.require('Blockly.utils.style');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
-const {replaceMessageReferences} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -167,7 +167,7 @@ FlyoutButton.prototype.createDom = function() {
         'text-anchor': 'middle'
       },
       this.svgGroup_);
-  let text = replaceMessageReferences(this.text_);
+  let text = utils.replaceMessageReferences(this.text_);
   if (this.workspace_.RTL) {
     // Force text to be RTL by adding an RLM.
     text += '\u200F';
@@ -329,7 +329,9 @@ Css.register([
     'cursor: default;',
   '}',
 
-  '.blocklyFlyoutLabelBackground {', 'opacity: 0;', '}',
+  '.blocklyFlyoutLabelBackground {',
+    'opacity: 0;',
+  '}',
   /* eslint-enable indent */
 ]);
 
diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 7f1ad72fd..b1c611215 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -22,10 +22,10 @@ const Options = goog.requireType('Blockly.Options');
 const Rect = goog.require('Blockly.utils.Rect');
 const Scrollbar = goog.require('Blockly.Scrollbar');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
+const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-const {Position} = goog.require('Blockly.utils.toolbox');
-const {getScrollDeltaPixels} = goog.require('Blockly.utils');
-const {inherits} = goog.require('Blockly.utils.object');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -39,7 +39,7 @@ const HorizontalFlyout = function(workspaceOptions) {
   HorizontalFlyout.superClass_.constructor.call(this, workspaceOptions);
   this.horizontalLayout = true;
 };
-inherits(HorizontalFlyout, Flyout);
+object.inherits(HorizontalFlyout, Flyout);
 
 /**
  * Sets the translation of the flyout to match the scrollbars.
@@ -92,7 +92,7 @@ HorizontalFlyout.prototype.getY = function() {
   const toolboxMetrics = metricsManager.getToolboxMetrics();
 
   let y = 0;
-  const atTop = this.toolboxPosition_ == Position.TOP;
+  const atTop = this.toolboxPosition_ == toolbox.Position.TOP;
   // If this flyout is not the trashcan flyout (e.g. toolbox or mutator).
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
     // If there is a category toolbox.
@@ -159,7 +159,7 @@ HorizontalFlyout.prototype.position = function() {
  * @private
  */
 HorizontalFlyout.prototype.setBackgroundPath_ = function(width, height) {
-  const atTop = this.toolboxPosition_ == Position.TOP;
+  const atTop = this.toolboxPosition_ == toolbox.Position.TOP;
   // Start at top left.
   const path = ['M 0,' + (atTop ? 0 : this.CORNER_RADIUS)];
 
@@ -210,7 +210,7 @@ HorizontalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 HorizontalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = getScrollDeltaPixels(e);
+  const scrollDelta = utils.getScrollDeltaPixels(e);
   const delta = scrollDelta.x || scrollDelta.y;
 
   if (delta) {
@@ -326,7 +326,7 @@ HorizontalFlyout.prototype.getClientRect = function() {
   const BIG_NUM = 1000000000;
   const top = flyoutRect.top;
 
-  if (this.toolboxPosition_ == Position.TOP) {
+  if (this.toolboxPosition_ == toolbox.Position.TOP) {
     const height = flyoutRect.height;
     return new Rect(-BIG_NUM, top + height, -BIG_NUM, BIG_NUM);
   } else {  // Bottom.
@@ -335,7 +335,7 @@ HorizontalFlyout.prototype.getClientRect = function() {
 };
 
 /**
- * Compute height of flyout.  Position mat under each block.
+ * Compute height of flyout.  toolbox.Position mat under each block.
  * For RTL: Lay out the blocks right-aligned.
  * @protected
  */
@@ -362,7 +362,7 @@ HorizontalFlyout.prototype.reflowInternal_ = function() {
     }
 
     if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_ &&
-        this.toolboxPosition_ == Position.TOP &&
+        this.toolboxPosition_ == toolbox.Position.TOP &&
         !this.targetWorkspace.getToolbox()) {
       // This flyout is a simple toolbox. Reposition the workspace so that (0,0)
       // is in the correct position relative to the new absolute edge (ie
diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index 2091d1321..5b396c061 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -22,10 +22,10 @@ const Options = goog.requireType('Blockly.Options');
 const Rect = goog.require('Blockly.utils.Rect');
 const Scrollbar = goog.require('Blockly.Scrollbar');
 const WidgetDiv = goog.require('Blockly.WidgetDiv');
+const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
-const {Position} = goog.require('Blockly.utils.toolbox');
-const {getScrollDeltaPixels} = goog.require('Blockly.utils');
-const {inherits} = goog.require('Blockly.utils.object');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Block');
 /** @suppress {extraRequire} */
@@ -42,7 +42,7 @@ goog.require('Blockly.constants');
 const VerticalFlyout = function(workspaceOptions) {
   VerticalFlyout.superClass_.constructor.call(this, workspaceOptions);
 };
-inherits(VerticalFlyout, Flyout);
+object.inherits(VerticalFlyout, Flyout);
 
 /**
  * The name of the vertical flyout in the registry.
@@ -94,14 +94,14 @@ VerticalFlyout.prototype.getX = function() {
   if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_) {
     // If there is a category toolbox.
     if (this.targetWorkspace.getToolbox()) {
-      if (this.toolboxPosition_ == Position.LEFT) {
+      if (this.toolboxPosition_ == toolbox.Position.LEFT) {
         x = toolboxMetrics.width;
       } else {
         x = viewMetrics.width - this.width_;
       }
       // Simple (flyout-only) toolbox.
     } else {
-      if (this.toolboxPosition_ == Position.LEFT) {
+      if (this.toolboxPosition_ == toolbox.Position.LEFT) {
         x = 0;
       } else {
         // The simple flyout does not cover the workspace.
@@ -110,7 +110,7 @@ VerticalFlyout.prototype.getX = function() {
     }
     // Trashcan flyout is opposite the main flyout.
   } else {
-    if (this.toolboxPosition_ == Position.LEFT) {
+    if (this.toolboxPosition_ == toolbox.Position.LEFT) {
       x = 0;
     } else {
       // Because the anchor point of the flyout is on the left, but we want
@@ -165,7 +165,7 @@ VerticalFlyout.prototype.position = function() {
  * @private
  */
 VerticalFlyout.prototype.setBackgroundPath_ = function(width, height) {
-  const atRight = this.toolboxPosition_ == Position.RIGHT;
+  const atRight = this.toolboxPosition_ == toolbox.Position.RIGHT;
   const totalWidth = width + this.CORNER_RADIUS;
 
   // Decide whether to start on the left or right.
@@ -201,7 +201,7 @@ VerticalFlyout.prototype.scrollToStart = function() {
  * @protected
  */
 VerticalFlyout.prototype.wheel_ = function(e) {
-  const scrollDelta = getScrollDeltaPixels(e);
+  const scrollDelta = utils.getScrollDeltaPixels(e);
 
   if (scrollDelta.y) {
     const metricsManager = this.workspace_.getMetricsManager();
@@ -306,7 +306,7 @@ VerticalFlyout.prototype.getClientRect = function() {
   const BIG_NUM = 1000000000;
   const left = flyoutRect.left;
 
-  if (this.toolboxPosition_ == Position.LEFT) {
+  if (this.toolboxPosition_ == toolbox.Position.LEFT) {
     const width = flyoutRect.width;
     return new Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, left + width);
   } else {  // Right
@@ -315,7 +315,7 @@ VerticalFlyout.prototype.getClientRect = function() {
 };
 
 /**
- * Compute width of flyout.  Position mat under each block.
+ * Compute width of flyout.  toolbox.Position mat under each block.
  * For RTL: Lay out the blocks and buttons to be right-aligned.
  * @protected
  */
@@ -363,7 +363,7 @@ VerticalFlyout.prototype.reflowInternal_ = function() {
     }
 
     if (this.targetWorkspace.toolboxPosition == this.toolboxPosition_ &&
-        this.toolboxPosition_ == Position.LEFT &&
+        this.toolboxPosition_ == toolbox.Position.LEFT &&
         !this.targetWorkspace.getToolbox()) {
       // This flyout is a simple toolbox. Reposition the workspace so that (0,0)
       // is in the correct position relative to the new absolute edge (ie
diff --git a/core/icon.js b/core/icon.js
index 69ff3ef37..cae1d8b6c 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -22,7 +22,7 @@ const Size = goog.require('Blockly.utils.Size');
 const Svg = goog.require('Blockly.utils.Svg');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
-const {getRelativeXY, isRightButton} = goog.require('Blockly.utils');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -135,7 +135,7 @@ Icon.prototype.iconClick_ = function(e) {
     // Drag operation is concluding.  Don't open the editor.
     return;
   }
-  if (!this.block_.isInFlyout && !isRightButton(e)) {
+  if (!this.block_.isInFlyout && !utils.isRightButton(e)) {
     this.setVisible(!this.isVisible());
   }
 };
@@ -167,7 +167,7 @@ Icon.prototype.setIconLocation = function(xy) {
 Icon.prototype.computeIconLocation = function() {
   // Find coordinates for the centre of the icon and update the arrow.
   const blockXY = this.block_.getRelativeToSurfaceXY();
-  const iconXY = getRelativeXY(
+  const iconXY = utils.getRelativeXY(
       /** @type {!SVGElement} */ (this.iconGroup_));
   const newXY = new Coordinate(
       blockXY.x + iconXY.x + this.SIZE / 2,
diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index 23c76dd0b..7c0c47421 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -25,7 +25,7 @@ const Svg = goog.requireType('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
-const {FlyoutDefinition} = goog.requireType('Blockly.utils.toolbox');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
@@ -142,7 +142,7 @@ IFlyout.prototype.hide;
 
 /**
  * Show and populate the flyout.
- * @param {!FlyoutDefinition|string} flyoutDef Contents to
+ * @param {!toolbox.FlyoutDefinition|string} flyoutDef Contents to
  *     display in the flyout. This is either an array of Nodes, a NodeList, a
  *     toolbox definition, or a string with the name of the dynamic category.
  */
diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js
index db1f575c1..7dd8ef663 100644
--- a/core/interfaces/i_metrics_manager.js
+++ b/core/interfaces/i_metrics_manager.js
@@ -17,9 +17,9 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Metrics = goog.requireType('Blockly.utils.Metrics');
 /* eslint-disable-next-line no-unused-vars */
-const Size = goog.requireType('Blockly.utils.Size');
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
 /* eslint-disable-next-line no-unused-vars */
-const {AbsoluteMetrics, ContainerRegion, ToolboxMetrics} = goog.requireType('Blockly.MetricsManager');
+const Size = goog.requireType('Blockly.utils.Size');
 
 
 /**
@@ -39,13 +39,13 @@ IMetricsManager.prototype.hasFixedEdges;
  * Returns the metrics for the scroll area of the workspace.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the scroll metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @param {!ContainerRegion=} opt_viewMetrics The view
+ * @param {!MetricsManager.ContainerRegion=} opt_viewMetrics The view
  *     metrics if they have been previously computed. Passing in null may cause
  *     the view metrics to be computed again, if it is needed.
- * @param {!ContainerRegion=} opt_contentMetrics The
+ * @param {!MetricsManager.ContainerRegion=} opt_contentMetrics The
  *     content metrics if they have been previously computed. Passing in null
  *     may cause the content metrics to be computed again, if it is needed.
- * @return {!ContainerRegion} The metrics for the scroll
+ * @return {!MetricsManager.ContainerRegion} The metrics for the scroll
  *    container
  */
 IMetricsManager.prototype.getScrollMetrics;
@@ -55,7 +55,7 @@ IMetricsManager.prototype.getScrollMetrics;
  * coordinates. Returns 0 for the width and height if the workspace has a
  * category toolbox instead of a simple toolbox.
  * @param {boolean=} opt_own Whether to only return the workspace's own flyout.
- * @return {!ToolboxMetrics} The width and height of the
+ * @return {!MetricsManager.ToolboxMetrics} The width and height of the
  *     flyout.
  * @public
  */
@@ -66,7 +66,7 @@ IMetricsManager.prototype.getFlyoutMetrics;
  * coordinates. Returns 0 for the width and height if the workspace has a simple
  * toolbox instead of a category toolbox. To get the width and height of a
  * simple toolbox @see {@link getFlyoutMetrics}.
- * @return {!ToolboxMetrics} The object with the width,
+ * @return {!MetricsManager.ToolboxMetrics} The object with the width,
  *     height and position of the toolbox.
  * @public
  */
@@ -84,7 +84,7 @@ IMetricsManager.prototype.getSvgMetrics;
 /**
  * Gets the absolute left and absolute top in pixel coordinates.
  * This is where the visible workspace starts in relation to the SVG container.
- * @return {!AbsoluteMetrics} The absolute metrics for
+ * @return {!MetricsManager.AbsoluteMetrics} The absolute metrics for
  *     the workspace.
  * @public
  */
@@ -95,7 +95,7 @@ IMetricsManager.prototype.getAbsoluteMetrics;
  * coordinates. The visible workspace does not include the toolbox or flyout.
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the view metrics in
  *     workspace coordinates, false to get them in pixel coordinates.
- * @return {!ContainerRegion} The width, height, top and
+ * @return {!MetricsManager.ContainerRegion} The width, height, top and
  *     left of the viewport in either workspace coordinates or pixel
  *     coordinates.
  * @public
@@ -108,7 +108,7 @@ IMetricsManager.prototype.getViewMetrics;
  * workspace (workspace comments and blocks).
  * @param {boolean=} opt_getWorkspaceCoordinates True to get the content metrics
  *     in workspace coordinates, false to get them in pixel coordinates.
- * @return {!ContainerRegion} The
+ * @return {!MetricsManager.ContainerRegion} The
  *     metrics for the content container.
  * @public
  */
diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index 1fe773add..56b9515c3 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -17,9 +17,9 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IComponent = goog.require('Blockly.IComponent');
 /* eslint-disable-next-line no-unused-vars */
-const Rect = goog.requireType('Blockly.utils.Rect');
+const MetricsManager = goog.requireType('Blockly.MetricsManager');
 /* eslint-disable-next-line no-unused-vars */
-const {UiMetrics} = goog.requireType('Blockly.MetricsManager');
+const Rect = goog.requireType('Blockly.utils.Rect');
 
 
 /**
@@ -31,7 +31,7 @@ const IPositionable = function() {};
 
 /**
  * Positions the element. Called when the window is resized.
- * @param {!UiMetrics} metrics The workspace metrics.
+ * @param {!MetricsManager.UiMetrics} metrics The workspace metrics.
  * @param {!Array<!Rect>} savedPositions List of rectangles that
  *     are already on the workspace.
  */
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index cefe35740..837aad148 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.require('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
-const {FlyoutItemInfoArray} = goog.requireType('Blockly.utils.toolbox');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
@@ -37,7 +37,7 @@ ISelectableToolboxItem.prototype.getName;
 /**
  * Gets the contents of the toolbox item. These are items that are meant to be
  * displayed in the flyout.
- * @return {!FlyoutItemInfoArray|string} The definition
+ * @return {!toolbox.FlyoutItemInfoArray|string} The definition
  *     of items to be displayed in the flyout.
  * @public
  */
diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index 0c7e7deb3..d6d6ec626 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -23,7 +23,7 @@ const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
-const {ToolboxInfo} = goog.requireType('Blockly.utils.toolbox');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
@@ -41,7 +41,7 @@ IToolbox.prototype.init;
 
 /**
  * Fills the toolbox with new toolbox items and removes any old contents.
- * @param {!ToolboxInfo} toolboxDef Object holding information
+ * @param {!toolbox.ToolboxInfo} toolboxDef Object holding information
  *     for creating a toolbox.
  */
 IToolbox.prototype.render;
diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index e9780e119..78ee3fe1b 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -16,8 +16,8 @@ goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const Cursor = goog.require('Blockly.Cursor');
-const {register, Type} = goog.require('Blockly.registry');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -30,7 +30,7 @@ const {inherits} = goog.require('Blockly.utils.object');
 const BasicCursor = function() {
   BasicCursor.superClass_.constructor.call(this);
 };
-inherits(BasicCursor, Cursor);
+object.inherits(BasicCursor, Cursor);
 
 /**
  * Name used for registering a basic cursor.
@@ -214,6 +214,7 @@ BasicCursor.prototype.getRightMostChild_ = function(node) {
   return this.getRightMostChild_(newNode);
 };
 
-register(Type.CURSOR, BasicCursor.registrationName, BasicCursor);
+registry.register(
+    registry.Type.CURSOR, BasicCursor.registrationName, BasicCursor);
 
 exports = BasicCursor;
diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index de3d97498..9bc9526e2 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -16,8 +16,8 @@ goog.module.declareLegacyNamespace();
 
 const ASTNode = goog.require('Blockly.ASTNode');
 const Marker = goog.require('Blockly.Marker');
-const {DEFAULT, register, Type} = goog.require('Blockly.registry');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -34,7 +34,7 @@ const Cursor = function() {
    */
   this.type = 'cursor';
 };
-inherits(Cursor, Marker);
+object.inherits(Cursor, Marker);
 
 /**
  * Find the next connection, field, or block.
@@ -134,6 +134,6 @@ Cursor.prototype.out = function() {
   return newNode;
 };
 
-register(Type.CURSOR, DEFAULT, Cursor);
+registry.register(registry.Type.CURSOR, registry.DEFAULT, Cursor);
 
 exports = Cursor;
diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 77fc5a2a2..3847b03a9 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -18,7 +18,7 @@ const ASTNode = goog.require('Blockly.ASTNode');
 const BasicCursor = goog.require('Blockly.BasicCursor');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
-const {inherits} = goog.require('Blockly.utils.object');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -29,7 +29,7 @@ const {inherits} = goog.require('Blockly.utils.object');
 const TabNavigateCursor = function() {
   TabNavigateCursor.superClass_.constructor.call(this);
 };
-inherits(TabNavigateCursor, BasicCursor);
+object.inherits(TabNavigateCursor, BasicCursor);
 
 /**
  * Skip all nodes except for tab navigable fields.
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 0f8548192..06f9d7009 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -46,8 +46,8 @@ const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');
 const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
 const TopRow = goog.require('Blockly.blockRendering.TopRow');
 const Types = goog.require('Blockly.blockRendering.Types');
-const {ALIGN} = goog.require('Blockly.constants');
-const {DUMMY, STATEMENT, VALUE} = goog.require('Blockly.inputTypes');
+const constants = goog.require('Blockly.constants');
+const inputTypes = goog.require('Blockly.inputTypes');
 
 
 
@@ -290,7 +290,7 @@ RenderInfo.prototype.populateTopRow_ = function() {
   }
 
   const precedesStatement = this.block_.inputList.length &&
-      this.block_.inputList[0].type == STATEMENT;
+      this.block_.inputList[0].type == inputTypes.STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -314,7 +314,8 @@ RenderInfo.prototype.populateBottomRow_ = function() {
   this.bottomRow.hasNextConnection = !!this.block_.nextConnection;
 
   const followsStatement = this.block_.inputList.length &&
-      this.block_.inputList[this.block_.inputList.length - 1].type == STATEMENT;
+      this.block_.inputList[this.block_.inputList.length - 1].type ==
+          inputTypes.STATEMENT;
 
   // This is the minimum height for the row. If one of its elements has a
   // greater height it will be overwritten in the compute pass.
@@ -359,16 +360,16 @@ RenderInfo.prototype.populateBottomRow_ = function() {
  */
 RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // Non-dummy inputs have visual representations onscreen.
-  if (this.isInline && input.type == VALUE) {
+  if (this.isInline && input.type == inputTypes.VALUE) {
     activeRow.elements.push(new InlineInput(this.constants_, input));
     activeRow.hasInlineInput = true;
-  } else if (input.type == STATEMENT) {
+  } else if (input.type == inputTypes.STATEMENT) {
     activeRow.elements.push(new StatementInput(this.constants_, input));
     activeRow.hasStatement = true;
-  } else if (input.type == VALUE) {
+  } else if (input.type == inputTypes.VALUE) {
     activeRow.elements.push(new ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
-  } else if (input.type == DUMMY) {
+  } else if (input.type == inputTypes.DUMMY) {
     // Dummy inputs have no visual representation, but the information is still
     // important.
     activeRow.minHeight = Math.max(
@@ -397,11 +398,12 @@ RenderInfo.prototype.shouldStartNewRow_ = function(input, lastInput) {
     return false;
   }
   // A statement input or an input following one always gets a new row.
-  if (input.type == STATEMENT || lastInput.type == STATEMENT) {
+  if (input.type == inputTypes.STATEMENT ||
+      lastInput.type == inputTypes.STATEMENT) {
     return true;
   }
   // Value and dummy inputs get new row if inputs are not inlined.
-  if (input.type == VALUE || input.type == DUMMY) {
+  if (input.type == inputTypes.VALUE || input.type == inputTypes.DUMMY) {
     return !this.isInline;
   }
   return false;
@@ -575,14 +577,14 @@ RenderInfo.prototype.addAlignmentPadding_ = function(row, missingSpace) {
   }
 
   // Decide where the extra padding goes.
-  if (row.align == ALIGN.LEFT) {
+  if (row.align == constants.ALIGN.LEFT) {
     // Add padding to the end of the row.
     lastSpacer.width += missingSpace;
-  } else if (row.align == ALIGN.CENTRE) {
+  } else if (row.align == constants.ALIGN.CENTRE) {
     // Split the padding between the beginning and end of the row.
     firstSpacer.width += missingSpace / 2;
     lastSpacer.width += missingSpace / 2;
-  } else if (row.align == ALIGN.RIGHT) {
+  } else if (row.align == constants.ALIGN.RIGHT) {
     // Add padding at the beginning of the row.
     firstSpacer.width += missingSpace;
   } else {
diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js
index 6dabc1fd5..73b57cbd7 100644
--- a/core/utils/toolbox.js
+++ b/core/utils/toolbox.js
@@ -17,12 +17,12 @@
 goog.module('Blockly.utils.toolbox');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
+const ToolboxCategory = goog.requireType('Blockly.ToolboxCategory');
+/* eslint-disable-next-line no-unused-vars */
+const ToolboxSeparator = goog.requireType('Blockly.ToolboxSeparator');
+const Xml = goog.require('Blockly.Xml');
 const userAgent = goog.require('Blockly.utils.userAgent');
-/* eslint-disable-next-line no-unused-vars */
-const {CssConfig: CategoryCssConfig} = goog.requireType('Blockly.ToolboxCategory');
-/* eslint-disable-next-line no-unused-vars */
-const {CssConfig: SeparatorCssConfig} = goog.requireType('Blockly.ToolboxSeparator');
-const {textToDom} = goog.require('Blockly.Xml');
 
 /**
  * The information needed to create a block in the toolbox.
@@ -43,7 +43,7 @@ exports.BlockInfo = BlockInfo;
  *            kind:string,
  *            id:(string|undefined),
  *            gap:(number|undefined),
- *            cssconfig:(!SeparatorCssConfig|undefined)
+ *            cssconfig:(!ToolboxSeparator.CssConfig|undefined)
  *          }}
  */
 let SeparatorInfo;
@@ -88,7 +88,7 @@ exports.ButtonOrLabelInfo = ButtonOrLabelInfo;
  *            id:(string|undefined),
  *            categorystyle:(string|undefined),
  *            colour:(string|undefined),
- *            cssconfig:(!CategoryCssConfig|undefined),
+ *            cssconfig:(!ToolboxCategory.CssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
  */
@@ -103,7 +103,7 @@ exports.StaticCategoryInfo = StaticCategoryInfo;
  *            id:(string|undefined),
  *            categorystyle:(string|undefined),
  *            colour:(string|undefined),
- *            cssconfig:(!CategoryCssConfig|undefined),
+ *            cssconfig:(!ToolboxCategory.CssConfig|undefined),
  *            hidden:(string|undefined)
  *          }}
  */
@@ -413,7 +413,7 @@ const parseToolboxTree = function(toolboxDef) {
       }
     }
     if (typeof toolboxDef == 'string') {
-      toolboxDef = textToDom(toolboxDef);
+      toolboxDef = Xml.textToDom(toolboxDef);
       if (toolboxDef.nodeName.toLowerCase() != 'xml') {
         throw TypeError('Toolbox should be an <xml> document.');
       }

From 582b67ae7b392d98a5006405de2d2ea94bd3713e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:03:58 -0700
Subject: [PATCH 168/291] Migrate core/toolbox/separator.js to ES6 const/let

---
 core/toolbox/separator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 63ded4a6b..27f475ba4 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -45,7 +45,7 @@ Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
     'container': 'blocklyTreeSeparator'
   };
 
-  var cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
+  const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
   Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
 };
 Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
@@ -77,7 +77,7 @@ Blockly.ToolboxSeparator.prototype.init = function() {
  * @protected
  */
 Blockly.ToolboxSeparator.prototype.createDom_ = function() {
-  var container = document.createElement('div');
+  const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   this.htmlDiv_ = container;
   return container;

From bce1136500c5e2db32638bd1290a70a66ff0eff3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:04:21 -0700
Subject: [PATCH 169/291] Migrate core/toolbox/separator.js to goog.module

---
 core/toolbox/separator.js | 29 +++++++++++++++++------------
 tests/deps.js             |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 27f475ba4..90a6ab276 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -11,12 +11,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.ToolboxSeparator');
+goog.module('Blockly.ToolboxSeparator');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly.Css');
 goog.require('Blockly.IToolboxItem');
 goog.require('Blockly.registry');
 goog.require('Blockly.ToolboxItem');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.IToolbox');
 goog.requireType('Blockly.utils.toolbox');
@@ -32,13 +35,13 @@ goog.requireType('Blockly.utils.toolbox');
  * @extends {Blockly.ToolboxItem}
  * @implements {Blockly.IToolboxItem}
  */
-Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
+const ToolboxSeparator = function(separatorDef, toolbox) {
 
-  Blockly.ToolboxSeparator.superClass_.constructor.call(
+  ToolboxSeparator.superClass_.constructor.call(
       this, separatorDef, toolbox);
   /**
    * All the CSS class names that are used to create a separator.
-   * @type {!Blockly.ToolboxSeparator.CssConfig}
+   * @type {!ToolboxSeparator.CssConfig}
    * @protected
    */
   this.cssConfig_ = {
@@ -48,7 +51,7 @@ Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
   const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
   Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
 };
-Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
+Blockly.utils.object.inherits(ToolboxSeparator, Blockly.ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a separator.
@@ -56,18 +59,18 @@ Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
  *            container:(string|undefined)
  *          }}
  */
-Blockly.ToolboxSeparator.CssConfig;
+ToolboxSeparator.CssConfig;
 
 /**
  * Name used for registering a toolbox separator.
  * @const {string}
  */
-Blockly.ToolboxSeparator.registrationName = 'sep';
+ToolboxSeparator.registrationName = 'sep';
 
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.init = function() {
+ToolboxSeparator.prototype.init = function() {
   this.createDom_();
 };
 
@@ -76,7 +79,7 @@ Blockly.ToolboxSeparator.prototype.init = function() {
  * @return {!Element} The parent element for the separator.
  * @protected
  */
-Blockly.ToolboxSeparator.prototype.createDom_ = function() {
+ToolboxSeparator.prototype.createDom_ = function() {
   const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   this.htmlDiv_ = container;
@@ -86,14 +89,14 @@ Blockly.ToolboxSeparator.prototype.createDom_ = function() {
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.getDiv = function() {
+ToolboxSeparator.prototype.getDiv = function() {
   return this.htmlDiv_;
 };
 
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.dispose = function() {
+ToolboxSeparator.prototype.dispose = function() {
   Blockly.utils.dom.removeNode(this.htmlDiv_);
 };
 
@@ -120,4 +123,6 @@ Blockly.Css.register([
 ]);
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
-    Blockly.ToolboxSeparator.registrationName, Blockly.ToolboxSeparator);
+    ToolboxSeparator.registrationName, ToolboxSeparator);
+
+exports = ToolboxSeparator;
diff --git a/tests/deps.js b/tests/deps.js
index b35d0324a..1e3476539 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -170,7 +170,7 @@ goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Bloc
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);

From 6bf443bdd684180d96057014493dda02d8d7a954 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:07:40 -0700
Subject: [PATCH 170/291] Migrate core/toolbox/separator.js named requires

---
 core/toolbox/separator.js | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 90a6ab276..d0de25646 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -14,26 +14,25 @@
 goog.module('Blockly.ToolboxSeparator');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Css');
-goog.require('Blockly.IToolboxItem');
-goog.require('Blockly.registry');
-goog.require('Blockly.ToolboxItem');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.utils.toolbox');
+const Css = goog.require('Blockly.Css');
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 
 /**
  * Class for a toolbox separator. This is the thin visual line that appears on
  * the toolbox. This item is not interactable.
- * @param {!Blockly.utils.toolbox.SeparatorInfo} separatorDef The information
+ * @param {!toolbox.SeparatorInfo} separatorDef The information
  *     needed to create a separator.
- * @param {!Blockly.IToolbox} toolbox The parent toolbox for the separator.
+ * @param {!IToolbox} toolbox The parent toolbox for the separator.
  * @constructor
- * @extends {Blockly.ToolboxItem}
- * @implements {Blockly.IToolboxItem}
+ * @extends {ToolboxItem}
+ * @implements {IToolboxItem}
  */
 const ToolboxSeparator = function(separatorDef, toolbox) {
 
@@ -49,9 +48,9 @@ const ToolboxSeparator = function(separatorDef, toolbox) {
   };
 
   const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
-  Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
+  object.mixin(this.cssConfig_, cssConfig);
 };
-Blockly.utils.object.inherits(ToolboxSeparator, Blockly.ToolboxItem);
+object.inherits(ToolboxSeparator, ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a separator.
@@ -81,7 +80,7 @@ ToolboxSeparator.prototype.init = function() {
  */
 ToolboxSeparator.prototype.createDom_ = function() {
   const container = document.createElement('div');
-  Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
+  dom.addClass(container, this.cssConfig_['container']);
   this.htmlDiv_ = container;
   return container;
 };
@@ -97,13 +96,13 @@ ToolboxSeparator.prototype.getDiv = function() {
  * @override
  */
 ToolboxSeparator.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.htmlDiv_);
+  dom.removeNode(this.htmlDiv_);
 };
 
 /**
  * CSS for Toolbox.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyTreeSeparator {',
     'border-bottom: solid #e5e5e5 1px;',
@@ -122,7 +121,7 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
+registry.register(registry.Type.TOOLBOX_ITEM,
     ToolboxSeparator.registrationName, ToolboxSeparator);
 
 exports = ToolboxSeparator;

From d004607b3b09aaa0f51f0df7c3ec3c741883c846 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:09:11 -0700
Subject: [PATCH 171/291] clang-format core/toolbox/separator.js

---
 core/toolbox/separator.js | 42 +++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index d0de25646..f4222cd0b 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -35,17 +35,13 @@ const toolbox = goog.requireType('Blockly.utils.toolbox');
  * @implements {IToolboxItem}
  */
 const ToolboxSeparator = function(separatorDef, toolbox) {
-
-  ToolboxSeparator.superClass_.constructor.call(
-      this, separatorDef, toolbox);
+  ToolboxSeparator.superClass_.constructor.call(this, separatorDef, toolbox);
   /**
    * All the CSS class names that are used to create a separator.
    * @type {!ToolboxSeparator.CssConfig}
    * @protected
    */
-  this.cssConfig_ = {
-    'container': 'blocklyTreeSeparator'
-  };
+  this.cssConfig_ = {'container': 'blocklyTreeSeparator'};
 
   const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
   object.mixin(this.cssConfig_, cssConfig);
@@ -103,25 +99,23 @@ ToolboxSeparator.prototype.dispose = function() {
  * CSS for Toolbox.  See css.js for use.
  */
 Css.register([
-  /* eslint-disable indent */
-  '.blocklyTreeSeparator {',
-    'border-bottom: solid #e5e5e5 1px;',
-    'height: 0;',
-    'margin: 5px 0;',
-  '}',
-
-  '.blocklyToolboxDiv[layout="h"] .blocklyTreeSeparator {',
-    'border-right: solid #e5e5e5 1px;',
-    'border-bottom: none;',
-    'height: auto;',
-    'margin: 0 5px 0 5px;',
-    'padding: 5px 0;',
-    'width: 0;',
-  '}',
-  /* eslint-enable indent */
+  `.blocklyTreeSeparator {
+  border-bottom: solid #e5e5e5 1px;
+  height: 0;
+  margin: 5px 0;
+}`,
+  `.blocklyToolboxDiv[layout="h"] .blocklyTreeSeparator {
+  border-right: solid #e5e5e5 1px;
+  border-bottom: none;
+  height: auto;
+  margin: 0 5px 0 5px;
+  padding: 5px 0;
+  width: 0;
+}`,
 ]);
 
-registry.register(registry.Type.TOOLBOX_ITEM,
-    ToolboxSeparator.registrationName, ToolboxSeparator);
+registry.register(
+    registry.Type.TOOLBOX_ITEM, ToolboxSeparator.registrationName,
+    ToolboxSeparator);
 
 exports = ToolboxSeparator;

From d5d155641e6e6934b0e05eadb0c652f97e549705 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:14:14 -0700
Subject: [PATCH 172/291] Add eslint disable to core/toolbox/separator.js

---
 core/toolbox/separator.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index f4222cd0b..664fa4584 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -15,12 +15,14 @@ goog.module('Blockly.ToolboxSeparator');
 goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
+/* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 const IToolboxItem = goog.require('Blockly.IToolboxItem');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 
 

From 38b44f5dab80a273b91fee9ea7650197245045c1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 15:26:29 -0700
Subject: [PATCH 173/291] Remove unecessary implements

---
 core/toolbox/separator.js | 2 --
 tests/deps.js             | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 664fa4584..dbf30f4f0 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -17,7 +17,6 @@ goog.module.declareLegacyNamespace();
 const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
-const IToolboxItem = goog.require('Blockly.IToolboxItem');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');
 const dom = goog.require('Blockly.utils.dom');
 const object = goog.require('Blockly.utils.object');
@@ -34,7 +33,6 @@ const toolbox = goog.requireType('Blockly.utils.toolbox');
  * @param {!IToolbox} toolbox The parent toolbox for the separator.
  * @constructor
  * @extends {ToolboxItem}
- * @implements {IToolboxItem}
  */
 const ToolboxSeparator = function(separatorDef, toolbox) {
   ToolboxSeparator.superClass_.constructor.call(this, separatorDef, toolbox);
diff --git a/tests/deps.js b/tests/deps.js
index 1e3476539..69bb647ad 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -170,7 +170,7 @@ goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Bloc
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);

From 136fc7e668577bacaad1d6203b19b069269eb806 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 08:19:15 -0700
Subject: [PATCH 174/291] Migrate core/workspace_drag_surface_svg.js to
 goog.module syntax (#5263)

* Migrate core/workspace_drag_surface_svg.js to ES6 const/let

* Migrate core/workspace_drag_surface_svg.js to goog.module

* Migrate core/workspace_drag_surface_svg.js to named requires

* clang-format core/workspace_drag_surface_svg.js

* Re-wrap strings onto one line
---
 core/workspace_drag_surface_svg.js | 93 +++++++++++++++---------------
 tests/deps.js                      |  4 +-
 2 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js
index cef1f7921..8cffb37d6 100644
--- a/core/workspace_drag_surface_svg.js
+++ b/core/workspace_drag_surface_svg.js
@@ -14,13 +14,14 @@
 
 'use strict';
 
-goog.provide('Blockly.WorkspaceDragSurfaceSvg');
+goog.module('Blockly.WorkspaceDragSurfaceSvg');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-
-goog.requireType('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Svg = goog.require('Blockly.utils.Svg');
+const dom = goog.require('Blockly.utils.dom');
+const utils = goog.require('Blockly.utils');
 
 
 /**
@@ -30,50 +31,50 @@ goog.requireType('Blockly.utils.Coordinate');
  * @param {!Element} container Containing element.
  * @constructor
  */
-Blockly.WorkspaceDragSurfaceSvg = function(container) {
+const WorkspaceDragSurfaceSvg = function(container) {
   this.container_ = container;
   this.createDom();
 };
 
 /**
- * The SVG drag surface. Set once by Blockly.WorkspaceDragSurfaceSvg.createDom.
+ * The SVG drag surface. Set once by WorkspaceDragSurfaceSvg.createDom.
  * @type {SVGElement}
  * @private
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.SVG_ = null;
+WorkspaceDragSurfaceSvg.prototype.SVG_ = null;
 
 /**
  * Containing HTML element; parent of the workspace and the drag surface.
  * @type {Element}
  * @private
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.container_ = null;
+WorkspaceDragSurfaceSvg.prototype.container_ = null;
 
 /**
  * Create the drag surface and inject it into the container.
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.createDom = function() {
+WorkspaceDragSurfaceSvg.prototype.createDom = function() {
   if (this.SVG_) {
     return;  // Already created.
   }
 
   /**
-  * Dom structure when the workspace is being dragged. If there is no drag in
-  * progress, the SVG is empty and display: none.
-  * <svg class="blocklyWsDragSurface" style=transform:translate3d(...)>
-  *   <g class="blocklyBlockCanvas"></g>
-  *   <g class="blocklyBubbleCanvas">/g>
-  * </svg>
-  */
-  this.SVG_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.SVG,
-      {
-        'xmlns': Blockly.utils.dom.SVG_NS,
-        'xmlns:html': Blockly.utils.dom.HTML_NS,
-        'xmlns:xlink': Blockly.utils.dom.XLINK_NS,
+   * Dom structure when the workspace is being dragged. If there is no drag in
+   * progress, the SVG is empty and display: none.
+   * <svg class="blocklyWsDragSurface" style=transform:translate3d(...)>
+   *   <g class="blocklyBlockCanvas"></g>
+   *   <g class="blocklyBubbleCanvas">/g>
+   * </svg>
+   */
+  this.SVG_ = dom.createSvgElement(
+      Svg.SVG, {
+        'xmlns': dom.SVG_NS,
+        'xmlns:html': dom.HTML_NS,
+        'xmlns:xlink': dom.XLINK_NS,
         'version': '1.1',
         'class': 'blocklyWsDragSurface blocklyOverflowVisible'
-      }, null);
+      },
+      null);
   this.container_.appendChild(this.SVG_);
 };
 
@@ -86,25 +87,25 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.createDom = function() {
  * @param {number} y Y translation for the entire surface
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.translateSurface = function(x, y) {
+WorkspaceDragSurfaceSvg.prototype.translateSurface = function(x, y) {
   // This is a work-around to prevent a the blocks from rendering
   // fuzzy while they are being moved on the drag surface.
-  var fixedX = x.toFixed(0);
-  var fixedY = y.toFixed(0);
+  const fixedX = x.toFixed(0);
+  const fixedY = y.toFixed(0);
 
   this.SVG_.style.display = 'block';
-  Blockly.utils.dom.setCssTransform(
+  dom.setCssTransform(
       this.SVG_, 'translate3d(' + fixedX + 'px, ' + fixedY + 'px, 0)');
 };
 
 /**
  * Reports the surface translation in scaled workspace coordinates.
  * Use this when finishing a drag to return blocks to the correct position.
- * @return {!Blockly.utils.Coordinate} Current translation of the surface
+ * @return {!Coordinate} Current translation of the surface
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
-  return Blockly.utils.getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
+WorkspaceDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
+  return utils.getRelativeXY(/** @type {!SVGElement} */ (this.SVG_));
 };
 
 /**
@@ -114,36 +115,36 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.getSurfaceTranslation = function() {
  *     into.
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.clearAndHide = function(newSurface) {
+WorkspaceDragSurfaceSvg.prototype.clearAndHide = function(newSurface) {
   if (!newSurface) {
-    throw Error('Couldn\'t clear and hide the drag surface: missing ' +
-        'new surface.');
+    throw Error(
+        'Couldn\'t clear and hide the drag surface: missing new surface.');
   }
-  var blockCanvas = /** @type {!Element} */ (this.SVG_.childNodes[0]);
-  var bubbleCanvas = /** @type {!Element} */ (this.SVG_.childNodes[1]);
+  const blockCanvas = /** @type {!Element} */ (this.SVG_.childNodes[0]);
+  const bubbleCanvas = /** @type {!Element} */ (this.SVG_.childNodes[1]);
   if (!blockCanvas || !bubbleCanvas ||
-      !Blockly.utils.dom.hasClass(blockCanvas, 'blocklyBlockCanvas') ||
-      !Blockly.utils.dom.hasClass(bubbleCanvas, 'blocklyBubbleCanvas')) {
-    throw Error('Couldn\'t clear and hide the drag surface. ' +
-        'A node was missing.');
+      !dom.hasClass(blockCanvas, 'blocklyBlockCanvas') ||
+      !dom.hasClass(bubbleCanvas, 'blocklyBubbleCanvas')) {
+    throw Error(
+        'Couldn\'t clear and hide the drag surface. A node was missing.');
   }
 
   // If there is a previous sibling, put the blockCanvas back right afterwards,
   // otherwise insert it as the first child node in newSurface.
   if (this.previousSibling_ != null) {
-    Blockly.utils.dom.insertAfter(blockCanvas, this.previousSibling_);
+    dom.insertAfter(blockCanvas, this.previousSibling_);
   } else {
     newSurface.insertBefore(blockCanvas, newSurface.firstChild);
   }
 
   // Reattach the bubble canvas after the blockCanvas.
-  Blockly.utils.dom.insertAfter(bubbleCanvas, blockCanvas);
+  dom.insertAfter(bubbleCanvas, blockCanvas);
   // Hide the drag surface.
   this.SVG_.style.display = 'none';
   if (this.SVG_.childNodes.length) {
     throw Error('Drag surface was not cleared.');
   }
-  Blockly.utils.dom.setCssTransform(this.SVG_, '');
+  dom.setCssTransform(this.SVG_, '');
   this.previousSibling_ = null;
 };
 
@@ -160,7 +161,7 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.clearAndHide = function(newSurface) {
  * @param {number} scale The scale of the workspace being dragged.
  * @package
  */
-Blockly.WorkspaceDragSurfaceSvg.prototype.setContentsAndShow = function(
+WorkspaceDragSurfaceSvg.prototype.setContentsAndShow = function(
     blockCanvas, bubbleCanvas, previousSibling, width, height, scale) {
   if (this.SVG_.childNodes.length) {
     throw Error('Already dragging a block.');
@@ -176,3 +177,5 @@ Blockly.WorkspaceDragSurfaceSvg.prototype.setContentsAndShow = function(
   this.SVG_.appendChild(bubbleCanvas);
   this.SVG_.style.display = 'block';
 };
+
+exports = WorkspaceDragSurfaceSvg;
diff --git a/tests/deps.js b/tests/deps.js
index 69bb647ad..8cccc9ea1 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -208,9 +208,9 @@ goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.C
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From 623e901b1c35039d82e277c3629b1c22a6d2f152 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 08:23:38 -0700
Subject: [PATCH 175/291] Migrate core/events/events_trashcan_open.js to
 goog.module syntax (#5277)

* Migrate core/events/events_trashcan_open.js to ES6 const/let

* Migrate core/events/events_trashcan_open.js to goog.module

* Migrate core/events/events_trashcan_open.js to named requires

* clang-format core/events/events_trashcan_open.js
---
 core/events/events_trashcan_open.js | 34 +++++++++++++++--------------
 tests/deps.js                       |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/events/events_trashcan_open.js b/core/events/events_trashcan_open.js
index ab388d909..6f5318213 100644
--- a/core/events/events_trashcan_open.js
+++ b/core/events/events_trashcan_open.js
@@ -10,12 +10,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.TrashcanOpen');
+goog.module('Blockly.Events.TrashcanOpen');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -24,11 +25,11 @@ goog.require('Blockly.utils.object');
  *    opening). Undefined for a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
-  Blockly.Events.TrashcanOpen.superClass_.constructor.call(this, opt_workspaceId);
+const TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
+  TrashcanOpen.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * Whether the trashcan flyout is opening (false if closing).
@@ -36,20 +37,20 @@ Blockly.Events.TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
    */
   this.isOpen = opt_isOpen;
 };
-Blockly.utils.object.inherits(Blockly.Events.TrashcanOpen, Blockly.Events.UiBase);
+object.inherits(TrashcanOpen, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.TrashcanOpen.prototype.type = Blockly.Events.TRASHCAN_OPEN;
+TrashcanOpen.prototype.type = Events.TRASHCAN_OPEN;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.TrashcanOpen.prototype.toJson = function() {
-  var json = Blockly.Events.TrashcanOpen.superClass_.toJson.call(this);
+TrashcanOpen.prototype.toJson = function() {
+  const json = TrashcanOpen.superClass_.toJson.call(this);
   json['isOpen'] = this.isOpen;
   return json;
 };
@@ -58,10 +59,11 @@ Blockly.Events.TrashcanOpen.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.TrashcanOpen.prototype.fromJson = function(json) {
-  Blockly.Events.TrashcanOpen.superClass_.fromJson.call(this, json);
+TrashcanOpen.prototype.fromJson = function(json) {
+  TrashcanOpen.superClass_.fromJson.call(this, json);
   this.isOpen = json['isOpen'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.TRASHCAN_OPEN, Blockly.Events.TrashcanOpen);
+registry.register(registry.Type.EVENT, Events.TRASHCAN_OPEN, TrashcanOpen);
+
+exports = TrashcanOpen;
diff --git a/tests/deps.js b/tests/deps.js
index 8cccc9ea1..e379b9add 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -43,7 +43,7 @@ goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.M
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);

From 18efccc2f6e101e87b78fb12547e9fc8b6cec3fa Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 08:25:07 -0700
Subject: [PATCH 176/291] Migrate core/events/events_bubble_open.js to
 goog.module syntax (#5285)

* Migrate core/events/events_bubble_open.js to ES6 const/let

* Migrate core/events/events_bubble_open.js to goog.module

* Migrate core/events/events_bubble_open.js to named requires
---
 core/events/events_bubble_open.js | 45 ++++++++++++++++---------------
 tests/deps.js                     |  2 +-
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js
index 7d3fbff2d..1e177f33e 100644
--- a/core/events/events_bubble_open.js
+++ b/core/events/events_bubble_open.js
@@ -10,30 +10,32 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BubbleOpen');
+goog.module('Blockly.Events.BubbleOpen');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a bubble open event.
- * @param {Blockly.BlockSvg} opt_block The associated block. Undefined for a
+ * @param {BlockSvg} opt_block The associated block. Undefined for a
  *    blank event.
  * @param {boolean=} opt_isOpen Whether the bubble is opening (false if
  *    closing). Undefined for a blank event.
- * @param {string=} opt_bubbleType The type of bubble. One of 'mutator', 'comment'
+ * @param {string=} opt_bubbleType The type of bubble. One of 'mutator',
+ *     'comment'
  *    or 'warning'. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.BubbleOpen = function(opt_block, opt_isOpen, opt_bubbleType) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  Blockly.Events.BubbleOpen.superClass_.constructor.call(this, workspaceId);
+const BubbleOpen = function(opt_block, opt_isOpen, opt_bubbleType) {
+  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  BubbleOpen.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
   /**
@@ -48,20 +50,20 @@ Blockly.Events.BubbleOpen = function(opt_block, opt_isOpen, opt_bubbleType) {
    */
   this.bubbleType = opt_bubbleType;
 };
-Blockly.utils.object.inherits(Blockly.Events.BubbleOpen, Blockly.Events.UiBase);
+object.inherits(BubbleOpen, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BubbleOpen.prototype.type = Blockly.Events.BUBBLE_OPEN;
+BubbleOpen.prototype.type = Events.BUBBLE_OPEN;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BubbleOpen.prototype.toJson = function() {
-  var json = Blockly.Events.BubbleOpen.superClass_.toJson.call(this);
+BubbleOpen.prototype.toJson = function() {
+  const json = BubbleOpen.superClass_.toJson.call(this);
   json['isOpen'] = this.isOpen;
   json['bubbleType'] = this.bubbleType;
   json['blockId'] = this.blockId;
@@ -72,12 +74,13 @@ Blockly.Events.BubbleOpen.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BubbleOpen.prototype.fromJson = function(json) {
-  Blockly.Events.BubbleOpen.superClass_.fromJson.call(this, json);
+BubbleOpen.prototype.fromJson = function(json) {
+  BubbleOpen.superClass_.fromJson.call(this, json);
   this.isOpen = json['isOpen'];
   this.bubbleType = json['bubbleType'];
   this.blockId = json['blockId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.BUBBLE_OPEN, Blockly.Events.BubbleOpen);
+registry.register(registry.Type.EVENT, Events.BUBBLE_OPEN, BubbleOpen);
+
+exports = BubbleOpen;
diff --git a/tests/deps.js b/tests/deps.js
index e379b9add..e77cd3f94 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -37,7 +37,7 @@ goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBa
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 8eda99ea34856ef64225ad23162b3d473e9e1f9a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:26:21 -0700
Subject: [PATCH 177/291] Migrate core/renderers/common/marker_svg.js to ES6
 const/let

---
 core/renderers/common/marker_svg.js | 99 +++++++++++++++--------------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 36d12b119..c8232d235 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -75,7 +75,7 @@ Blockly.blockRendering.MarkerSvg = function(workspace, constants, marker) {
    */
   this.currentMarkerSvg = null;
 
-  var defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
+  const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
       this.constants_.MARKER_COLOUR;
 
   /**
@@ -135,7 +135,7 @@ Blockly.blockRendering.MarkerSvg.prototype.isCursor = function() {
  * @package
  */
 Blockly.blockRendering.MarkerSvg.prototype.createDom = function() {
-  var className = this.isCursor() ?
+  const className = this.isCursor() ?
       Blockly.blockRendering.MarkerSvg.CURSOR_CLASS :
       Blockly.blockRendering.MarkerSvg.MARKER_CLASS;
 
@@ -182,8 +182,8 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
 
   this.constants_ = this.workspace_.getRenderer().getConstants();
 
-  var defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
-    this.constants_.MARKER_COLOUR;
+  const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
+      this.constants_.MARKER_COLOUR;
   this.colour_ = this.marker_.colour || defaultColour;
   this.applyColour_(curNode);
 
@@ -192,7 +192,7 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
   this.fireMarkerEvent_(oldNode, curNode);
 
   // Ensures the marker will be visible immediately after the move.
-  var animate = this.currentMarkerSvg.childNodes[0];
+  const animate = this.currentMarkerSvg.childNodes[0];
   if (animate !== undefined) {
     animate.beginElement && animate.beginElement();
   }
@@ -205,9 +205,9 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
-  var curNodeAsConnection =
-    /** @type {!Blockly.Connection} */ (curNode.getLocation());
-  var connectionType = curNodeAsConnection.type;
+  const curNodeAsConnection =
+      /** @type {!Blockly.Connection} */ (curNode.getLocation());
+  const connectionType = curNodeAsConnection.type;
   if (curNode.getType() == Blockly.ASTNode.types.BLOCK) {
     this.showWithBlock_(curNode);
   } else if (curNode.getType() == Blockly.ASTNode.types.OUTPUT) {
@@ -239,17 +239,18 @@ Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
     curNode) {
-  var block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
-  var width = block.width;
-  var height = block.height;
-  var markerHeight = height * Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER;
-  var markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
+  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
+  const width = block.width;
+  const height = block.height;
+  const markerHeight = height
+      * Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER;
+  const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {
-    var connectionShape = this.constants_.shapeFor(block.previousConnection);
+    let connectionShape = this.constants_.shapeFor(block.previousConnection);
     this.positionPrevious_(width, markerOffset, markerHeight, connectionShape);
   } else if (block.outputConnection) {
-    var connectionShape = this.constants_.shapeFor(block.outputConnection);
+    let connectionShape = this.constants_.shapeFor(block.outputConnection);
     this.positionOutput_(width, height, connectionShape);
   } else {
     this.positionBlock_(width, markerOffset, markerHeight);
@@ -294,9 +295,9 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
     curNode) {
-  var wsCoordinate = curNode.getWsCoordinate();
-  var x = wsCoordinate.x;
-  var y = wsCoordinate.y;
+  const wsCoordinate = curNode.getWsCoordinate();
+  let x = wsCoordinate.x;
+  const y = wsCoordinate.y;
 
   if (this.workspace_.RTL) {
     x -= this.constants_.CURSOR_WS_WIDTH;
@@ -314,9 +315,9 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
-  var field = /** @type {Blockly.Field} */ (curNode.getLocation());
-  var width = field.getSize().width;
-  var height = field.getSize().height;
+  const field = /** @type {Blockly.Field} */ (curNode.getLocation());
+  const width = field.getSize().width;
+  const height = field.getSize().height;
 
   this.positionRect_(0, 0, width, height);
   this.setParent_(field);
@@ -330,9 +331,9 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
-  var connection = /** @type {Blockly.RenderedConnection} */
+  const connection = /** @type {Blockly.RenderedConnection} */
       (curNode.getLocation());
-  var sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
+  const sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
 
   this.positionInput_(connection);
   this.setParent_(sourceBlock);
@@ -347,13 +348,13 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
-  var connection =
-    /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
-  var targetBlock =
-    /** @type {Blockly.BlockSvg} */ (connection.getSourceBlock());
-  var x = 0;
-  var y = connection.getOffsetInBlock().y;
-  var width = targetBlock.getHeightWidth().width;
+  const connection =
+      /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
+  const targetBlock =
+      /** @type {Blockly.BlockSvg} */ (connection.getSourceBlock());
+  let x = 0;
+  const y = connection.getOffsetInBlock().y;
+  const width = targetBlock.getHeightWidth().width;
   if (this.workspace_.RTL) {
     x = -width;
   }
@@ -369,21 +370,21 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
  * @protected
  */
 Blockly.blockRendering.MarkerSvg.prototype.showWithStack_ = function(curNode) {
-  var block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
+  const block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
-  var heightWidth = block.getHeightWidth();
+  const heightWidth = block.getHeightWidth();
 
   // Add padding so that being on a stack looks different than being on a block.
-  var width = heightWidth.width + this.constants_.CURSOR_STACK_PADDING;
-  var height = heightWidth.height + this.constants_.CURSOR_STACK_PADDING;
+  const width = heightWidth.width + this.constants_.CURSOR_STACK_PADDING;
+  const height = heightWidth.height + this.constants_.CURSOR_STACK_PADDING;
 
   // Shift the rectangle slightly to upper left so padding is equal on all sides.
-  var xPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
-  var yPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
+  const xPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
+  const yPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
 
-  var x = xPadding;
-  var y = yPadding;
+  let x = xPadding;
+  const y = yPadding;
 
   if (this.workspace_.RTL) {
     x = -(width + xPadding);
@@ -416,7 +417,8 @@ Blockly.blockRendering.MarkerSvg.prototype.showCurrent_ = function() {
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
-  var markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight) +
+  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+      +
       Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
       Blockly.utils.svgPaths.lineOnAxis('H', width + markerOffset * 2) +
       Blockly.utils.svgPaths.lineOnAxis('V', markerHeight);
@@ -436,10 +438,10 @@ Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionInput_ = function(
     connection) {
-  var x = connection.getOffsetInBlock().x;
-  var y = connection.getOffsetInBlock().y;
+  const x = connection.getOffsetInBlock().x;
+  const y = connection.getOffsetInBlock().y;
 
-  var path = Blockly.utils.svgPaths.moveTo(0, 0) +
+  const path = Blockly.utils.svgPaths.moveTo(0, 0) +
       this.constants_.shapeFor(connection).pathDown;
 
   this.markerInput_.setAttribute('d', path);
@@ -475,7 +477,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionLine_ = function(
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
     width, height, connectionShape) {
-  var markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
+  const markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
       Blockly.utils.svgPaths.lineOnAxis(
           'h', -(width - connectionShape.width)) +
       Blockly.utils.svgPaths.lineOnAxis(
@@ -502,7 +504,8 @@ Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
  */
 Blockly.blockRendering.MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
-  var markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight) +
+  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+      +
       Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
       Blockly.utils.svgPaths.lineOnAxis(
           'H', this.constants_.NOTCH_OFFSET_LEFT) +
@@ -563,8 +566,8 @@ Blockly.blockRendering.MarkerSvg.prototype.hide = function() {
  */
 Blockly.blockRendering.MarkerSvg.prototype.fireMarkerEvent_ = function(
     oldNode, curNode) {
-  var curBlock = curNode.getSourceBlock();
-  var event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
+  const curBlock = curNode.getSourceBlock();
+  const event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
       curBlock, this.isCursor(), oldNode, curNode);
   Blockly.Events.fire(event);
 };
@@ -651,7 +654,7 @@ Blockly.blockRendering.MarkerSvg.prototype.createDomInternal_ = function() {
 
   // Markers and stack markers don't blink.
   if (this.isCursor()) {
-    var blinkProperties = this.getBlinkProperties_();
+    const blinkProperties = this.getBlinkProperties_();
     Blockly.utils.dom.createSvgElement(
         Blockly.utils.Svg.ANIMATE, blinkProperties,
         this.markerSvgLine_);
@@ -680,7 +683,7 @@ Blockly.blockRendering.MarkerSvg.prototype.applyColour_ = function(_curNode) {
   this.markerBlock_.setAttribute('stroke', this.colour_);
 
   if (this.isCursor()) {
-    var values = this.colour_ + ';transparent;transparent;';
+    const values = this.colour_ + ';transparent;transparent;';
     this.markerSvgLine_.firstChild.setAttribute('values', values);
     this.markerInput_.firstChild.setAttribute('values', values);
     this.markerBlock_.firstChild.setAttribute('values', values);

From 7aa382154c18e7a5c5c8533568e857b10a265028 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:26:30 -0700
Subject: [PATCH 178/291] Migrate core/renderers/common/marker_svg.js to
 goog.module

---
 core/renderers/common/marker_svg.js | 80 +++++++++++++++--------------
 tests/deps.js                       |  2 +-
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index c8232d235..12982168d 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -11,7 +11,8 @@
 'use strict';
 
 
-goog.provide('Blockly.blockRendering.MarkerSvg');
+goog.module('Blockly.blockRendering.MarkerSvg');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.ASTNode');
 goog.require('Blockly.connectionTypes');
@@ -20,6 +21,7 @@ goog.require('Blockly.Events');
 goog.require('Blockly.Events.MarkerMove');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Svg');
+goog.require('Blockly.utils.svgPaths');
 
 goog.requireType('Blockly.blockRendering.ConstantProvider');
 goog.requireType('Blockly.BlockSvg');
@@ -39,7 +41,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {!Blockly.Marker} marker The marker to draw.
  * @constructor
  */
-Blockly.blockRendering.MarkerSvg = function(workspace, constants, marker) {
+const MarkerSvg = function(workspace, constants, marker) {
   /**
    * The workspace the marker belongs to.
    * @type {!Blockly.WorkspaceSvg}
@@ -89,26 +91,26 @@ Blockly.blockRendering.MarkerSvg = function(workspace, constants, marker) {
  * The name of the CSS class for a cursor.
  * @const {string}
  */
-Blockly.blockRendering.MarkerSvg.CURSOR_CLASS = 'blocklyCursor';
+MarkerSvg.CURSOR_CLASS = 'blocklyCursor';
 
 /**
  * The name of the CSS class for a marker.
  * @const {string}
  */
-Blockly.blockRendering.MarkerSvg.MARKER_CLASS = 'blocklyMarker';
+MarkerSvg.MARKER_CLASS = 'blocklyMarker';
 
 /**
  * What we multiply the height by to get the height of the marker.
  * Only used for the block and block connections.
  * @const {number}
  */
-Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER = 3 / 4;
+MarkerSvg.HEIGHT_MULTIPLIER = 3 / 4;
 
 /**
  * Return the root node of the SVG or null if none exists.
  * @return {SVGElement} The root SVG node.
  */
-Blockly.blockRendering.MarkerSvg.prototype.getSvgRoot = function() {
+MarkerSvg.prototype.getSvgRoot = function() {
   return this.svgGroup_;
 };
 
@@ -116,7 +118,7 @@ Blockly.blockRendering.MarkerSvg.prototype.getSvgRoot = function() {
  * Get the marker.
  * @return {!Blockly.Marker} The marker to draw for.
  */
-Blockly.blockRendering.MarkerSvg.prototype.getMarker = function() {
+MarkerSvg.prototype.getMarker = function() {
   return this.marker_;
 };
 
@@ -125,7 +127,7 @@ Blockly.blockRendering.MarkerSvg.prototype.getMarker = function() {
  * A cursor is drawn as a flashing line. A marker is drawn as a solid line.
  * @return {boolean} True if the marker is a cursor, false otherwise.
  */
-Blockly.blockRendering.MarkerSvg.prototype.isCursor = function() {
+MarkerSvg.prototype.isCursor = function() {
   return this.marker_.type == 'cursor';
 };
 
@@ -134,10 +136,10 @@ Blockly.blockRendering.MarkerSvg.prototype.isCursor = function() {
  * @return {!SVGElement} The marker controls SVG group.
  * @package
  */
-Blockly.blockRendering.MarkerSvg.prototype.createDom = function() {
+MarkerSvg.prototype.createDom = function() {
   const className = this.isCursor() ?
-      Blockly.blockRendering.MarkerSvg.CURSOR_CLASS :
-      Blockly.blockRendering.MarkerSvg.MARKER_CLASS;
+      MarkerSvg.CURSOR_CLASS :
+      MarkerSvg.MARKER_CLASS;
 
   this.svgGroup_ = Blockly.utils.dom.createSvgElement(
       Blockly.utils.Svg.G, {
@@ -154,7 +156,7 @@ Blockly.blockRendering.MarkerSvg.prototype.createDom = function() {
  *     block that the marker SVG element should be attached to.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.setParent_ = function(newParent) {
+MarkerSvg.prototype.setParent_ = function(newParent) {
   if (!this.isCursor()) {
     if (this.parent_) {
       this.parent_.setMarkerSvg(null);
@@ -174,7 +176,7 @@ Blockly.blockRendering.MarkerSvg.prototype.setParent_ = function(newParent) {
  * @param {Blockly.ASTNode} oldNode The previous node the marker was on or null.
  * @param {Blockly.ASTNode} curNode The node that we want to draw the marker for.
  */
-Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
+MarkerSvg.prototype.draw = function(oldNode, curNode) {
   if (!curNode) {
     this.hide();
     return;
@@ -204,7 +206,7 @@ Blockly.blockRendering.MarkerSvg.prototype.draw = function(oldNode, curNode) {
  * @param {!Blockly.ASTNode} curNode The node that we want to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
+MarkerSvg.prototype.showAtLocation_ = function(curNode) {
   const curNodeAsConnection =
       /** @type {!Blockly.Connection} */ (curNode.getLocation());
   const connectionType = curNodeAsConnection.type;
@@ -237,13 +239,13 @@ Blockly.blockRendering.MarkerSvg.prototype.showAtLocation_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @private
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
+MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
     curNode) {
   const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
   const markerHeight = height
-      * Blockly.blockRendering.MarkerSvg.HEIGHT_MULTIPLIER;
+      * MarkerSvg.HEIGHT_MULTIPLIER;
   const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {
@@ -264,7 +266,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
+MarkerSvg.prototype.showWithBlock_ = function(curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
 
@@ -273,7 +275,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithBlock_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithPrevious_ = function(
+MarkerSvg.prototype.showWithPrevious_ = function(
     curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
@@ -283,7 +285,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithPrevious_ = function(
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
+MarkerSvg.prototype.showWithOutput_ = function(curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
 
@@ -293,7 +295,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithOutput_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
+MarkerSvg.prototype.showWithCoordinates_ = function(
     curNode) {
   const wsCoordinate = curNode.getWsCoordinate();
   let x = wsCoordinate.x;
@@ -314,7 +316,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithCoordinates_ = function(
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
+MarkerSvg.prototype.showWithField_ = function(curNode) {
   const field = /** @type {Blockly.Field} */ (curNode.getLocation());
   const width = field.getSize().width;
   const height = field.getSize().height;
@@ -330,7 +332,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithField_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
+MarkerSvg.prototype.showWithInput_ = function(curNode) {
   const connection = /** @type {Blockly.RenderedConnection} */
       (curNode.getLocation());
   const sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
@@ -347,7 +349,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithInput_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
+MarkerSvg.prototype.showWithNext_ = function(curNode) {
   const connection =
       /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
   const targetBlock =
@@ -369,7 +371,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithNext_ = function(curNode) {
  * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showWithStack_ = function(curNode) {
+MarkerSvg.prototype.showWithStack_ = function(curNode) {
   const block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
@@ -398,7 +400,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showWithStack_ = function(curNode) {
  * Show the current marker.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.showCurrent_ = function() {
+MarkerSvg.prototype.showCurrent_ = function() {
   this.hide();
   this.currentMarkerSvg.style.display = '';
 };
@@ -415,7 +417,7 @@ Blockly.blockRendering.MarkerSvg.prototype.showCurrent_ = function() {
  * @param {number} markerHeight The height of the marker.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
+MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
   const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
       +
@@ -436,7 +438,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionBlock_ = function(
  *     marker around.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionInput_ = function(
+MarkerSvg.prototype.positionInput_ = function(
     connection) {
   const x = connection.getOffsetInBlock().x;
   const y = connection.getOffsetInBlock().y;
@@ -459,7 +461,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionInput_ = function(
  * @param {number} width The new width, in workspace units.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionLine_ = function(
+MarkerSvg.prototype.positionLine_ = function(
     x, y, width) {
   this.markerSvgLine_.setAttribute('x', x);
   this.markerSvgLine_.setAttribute('y', y);
@@ -475,7 +477,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionLine_ = function(
  * @param {!Object} connectionShape The shape object for the connection.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
+MarkerSvg.prototype.positionOutput_ = function(
     width, height, connectionShape) {
   const markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
       Blockly.utils.svgPaths.lineOnAxis(
@@ -502,7 +504,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionOutput_ = function(
  * @param {!Object} connectionShape The shape object for the connection.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionPrevious_ = function(
+MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
   const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
       +
@@ -529,7 +531,7 @@ Blockly.blockRendering.MarkerSvg.prototype.positionPrevious_ = function(
  * @param {number} height The new height, in workspace units.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.positionRect_ = function(
+MarkerSvg.prototype.positionRect_ = function(
     x, y, width, height) {
   this.markerSvgRect_.setAttribute('x', x);
   this.markerSvgRect_.setAttribute('y', y);
@@ -543,14 +545,14 @@ Blockly.blockRendering.MarkerSvg.prototype.positionRect_ = function(
  * @param {!SVGElement} markerSvg The marker that we want to flip.
  * @private
  */
-Blockly.blockRendering.MarkerSvg.prototype.flipRtl_ = function(markerSvg) {
+MarkerSvg.prototype.flipRtl_ = function(markerSvg) {
   markerSvg.setAttribute('transform', 'scale(-1 1)');
 };
 
 /**
  * Hide the marker.
  */
-Blockly.blockRendering.MarkerSvg.prototype.hide = function() {
+MarkerSvg.prototype.hide = function() {
   this.markerSvgLine_.style.display = 'none';
   this.markerSvgRect_.style.display = 'none';
   this.markerInput_.style.display = 'none';
@@ -564,7 +566,7 @@ Blockly.blockRendering.MarkerSvg.prototype.hide = function() {
  * @param {!Blockly.ASTNode} curNode The new node the marker is currently on.
  * @private
  */
-Blockly.blockRendering.MarkerSvg.prototype.fireMarkerEvent_ = function(
+MarkerSvg.prototype.fireMarkerEvent_ = function(
     oldNode, curNode) {
   const curBlock = curNode.getSourceBlock();
   const event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
@@ -577,7 +579,7 @@ Blockly.blockRendering.MarkerSvg.prototype.fireMarkerEvent_ = function(
  * @return {!Object} The object holding attributes to make the marker blink.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.getBlinkProperties_ = function() {
+MarkerSvg.prototype.getBlinkProperties_ = function() {
   return {
     'attributeType': 'XML',
     'attributeName': 'fill',
@@ -593,7 +595,7 @@ Blockly.blockRendering.MarkerSvg.prototype.getBlinkProperties_ = function() {
  * @return {Element} The SVG node created.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.createDomInternal_ = function() {
+MarkerSvg.prototype.createDomInternal_ = function() {
   /* This markup will be generated and added to the .svgGroup_:
   <g>
     <rect width="100" height="5">
@@ -676,7 +678,7 @@ Blockly.blockRendering.MarkerSvg.prototype.createDomInternal_ = function() {
  *    for.
  * @protected
  */
-Blockly.blockRendering.MarkerSvg.prototype.applyColour_ = function(_curNode) {
+MarkerSvg.prototype.applyColour_ = function(_curNode) {
   this.markerSvgLine_.setAttribute('fill', this.colour_);
   this.markerSvgRect_.setAttribute('stroke', this.colour_);
   this.markerInput_.setAttribute('fill', this.colour_);
@@ -693,8 +695,10 @@ Blockly.blockRendering.MarkerSvg.prototype.applyColour_ = function(_curNode) {
 /**
  * Dispose of this marker.
  */
-Blockly.blockRendering.MarkerSvg.prototype.dispose = function() {
+MarkerSvg.prototype.dispose = function() {
   if (this.svgGroup_) {
     Blockly.utils.dom.removeNode(this.svgGroup_);
   }
 };
+
+exports = MarkerSvg;
diff --git a/tests/deps.js b/tests/deps.js
index e77cd3f94..a596ec5f0 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -127,7 +127,7 @@ goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRen
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
+goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 3b43a19705e4a0dc799f3af0b2cf230e5502d64a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:29:58 -0700
Subject: [PATCH 179/291] Migrate core/renderers/common/marker_svg.js named
 requires

---
 core/renderers/common/marker_svg.js | 191 ++++++++++++++--------------
 1 file changed, 99 insertions(+), 92 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 12982168d..514785bd2 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -14,44 +14,51 @@
 goog.module('Blockly.blockRendering.MarkerSvg');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
+const ASTNode = goog.require('Blockly.ASTNode');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Marker = goog.requireType('Blockly.Marker');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const dom = goog.require('Blockly.utils.dom');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.MarkerMove');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.svgPaths');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.IASTNodeLocationSvg');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.RenderedConnection');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a marker.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace the marker belongs to.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The constants for
+ * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
+ * @param {!ConstantProvider} constants The constants for
  *     the renderer.
- * @param {!Blockly.Marker} marker The marker to draw.
+ * @param {!Marker} marker The marker to draw.
  * @constructor
  */
 const MarkerSvg = function(workspace, constants, marker) {
   /**
    * The workspace the marker belongs to.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = workspace;
 
   /**
    * The marker to draw.
-   * @type {!Blockly.Marker}
+   * @type {!Marker}
    * @private
    */
   this.marker_ = marker;
@@ -59,14 +66,14 @@ const MarkerSvg = function(workspace, constants, marker) {
   /**
    * The workspace, field, or block that the marker SVG element should be
    * attached to.
-   * @type {Blockly.IASTNodeLocationSvg}
+   * @type {IASTNodeLocationSvg}
    * @private
    */
   this.parent_ = null;
 
   /**
    * The constants necessary to draw the marker.
-   * @type {Blockly.blockRendering.ConstantProvider}
+   * @type {ConstantProvider}
    * @protected
    */
   this.constants_ = constants;
@@ -116,7 +123,7 @@ MarkerSvg.prototype.getSvgRoot = function() {
 
 /**
  * Get the marker.
- * @return {!Blockly.Marker} The marker to draw for.
+ * @return {!Marker} The marker to draw for.
  */
 MarkerSvg.prototype.getMarker = function() {
   return this.marker_;
@@ -141,8 +148,8 @@ MarkerSvg.prototype.createDom = function() {
       MarkerSvg.CURSOR_CLASS :
       MarkerSvg.MARKER_CLASS;
 
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {
+  this.svgGroup_ = dom.createSvgElement(
+      Svg.G, {
         'class': className
       }, null);
 
@@ -152,7 +159,7 @@ MarkerSvg.prototype.createDom = function() {
 
 /**
  * Attaches the SVG root of the marker to the SVG group of the parent.
- * @param {!Blockly.IASTNodeLocationSvg} newParent The workspace, field, or
+ * @param {!IASTNodeLocationSvg} newParent The workspace, field, or
  *     block that the marker SVG element should be attached to.
  * @protected
  */
@@ -173,8 +180,8 @@ MarkerSvg.prototype.setParent_ = function(newParent) {
 
 /**
  * Update the marker.
- * @param {Blockly.ASTNode} oldNode The previous node the marker was on or null.
- * @param {Blockly.ASTNode} curNode The node that we want to draw the marker for.
+ * @param {ASTNode} oldNode The previous node the marker was on or null.
+ * @param {ASTNode} curNode The node that we want to draw the marker for.
  */
 MarkerSvg.prototype.draw = function(oldNode, curNode) {
   if (!curNode) {
@@ -203,28 +210,28 @@ MarkerSvg.prototype.draw = function(oldNode, curNode) {
 
 /**
  * Update the marker's visible state based on the type of curNode..
- * @param {!Blockly.ASTNode} curNode The node that we want to draw the marker for.
+ * @param {!ASTNode} curNode The node that we want to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showAtLocation_ = function(curNode) {
   const curNodeAsConnection =
-      /** @type {!Blockly.Connection} */ (curNode.getLocation());
+      /** @type {!Connection} */ (curNode.getLocation());
   const connectionType = curNodeAsConnection.type;
-  if (curNode.getType() == Blockly.ASTNode.types.BLOCK) {
+  if (curNode.getType() == ASTNode.types.BLOCK) {
     this.showWithBlock_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.OUTPUT) {
+  } else if (curNode.getType() == ASTNode.types.OUTPUT) {
     this.showWithOutput_(curNode);
-  } else if (connectionType == Blockly.connectionTypes.INPUT_VALUE) {
+  } else if (connectionType == connectionTypes.INPUT_VALUE) {
     this.showWithInput_(curNode);
-  } else if (connectionType == Blockly.connectionTypes.NEXT_STATEMENT) {
+  } else if (connectionType == connectionTypes.NEXT_STATEMENT) {
     this.showWithNext_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.PREVIOUS) {
+  } else if (curNode.getType() == ASTNode.types.PREVIOUS) {
     this.showWithPrevious_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.FIELD) {
+  } else if (curNode.getType() == ASTNode.types.FIELD) {
     this.showWithField_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.WORKSPACE) {
+  } else if (curNode.getType() == ASTNode.types.WORKSPACE) {
     this.showWithCoordinates_(curNode);
-  } else if (curNode.getType() == Blockly.ASTNode.types.STACK) {
+  } else if (curNode.getType() == ASTNode.types.STACK) {
     this.showWithStack_(curNode);
   }
 };
@@ -236,12 +243,12 @@ MarkerSvg.prototype.showAtLocation_ = function(curNode) {
 /**
  * Show the marker as a combination of the previous connection and block,
  * the output connection and block, or just the block.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @private
  */
 MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
     curNode) {
-  const block = /** @type {!Blockly.BlockSvg} */ (curNode.getSourceBlock());
+  const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
   const markerHeight = height
@@ -263,7 +270,7 @@ MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
 
 /**
  * Position and display the marker for a block.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithBlock_ = function(curNode) {
@@ -272,7 +279,7 @@ MarkerSvg.prototype.showWithBlock_ = function(curNode) {
 
 /**
  * Position and display the marker for a previous connection.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithPrevious_ = function(
@@ -282,7 +289,7 @@ MarkerSvg.prototype.showWithPrevious_ = function(
 
 /**
  * Position and display the marker for an output connection.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithOutput_ = function(curNode) {
@@ -292,7 +299,7 @@ MarkerSvg.prototype.showWithOutput_ = function(curNode) {
 /**
  * Position and display the marker for a workspace coordinate.
  * This is a horizontal line.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithCoordinates_ = function(
@@ -313,11 +320,11 @@ MarkerSvg.prototype.showWithCoordinates_ = function(
 /**
  * Position and display the marker for a field.
  * This is a box around the field.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithField_ = function(curNode) {
-  const field = /** @type {Blockly.Field} */ (curNode.getLocation());
+  const field = /** @type {Field} */ (curNode.getLocation());
   const width = field.getSize().width;
   const height = field.getSize().height;
 
@@ -329,13 +336,13 @@ MarkerSvg.prototype.showWithField_ = function(curNode) {
 /**
  * Position and display the marker for an input.
  * This is a puzzle piece.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithInput_ = function(curNode) {
-  const connection = /** @type {Blockly.RenderedConnection} */
+  const connection = /** @type {RenderedConnection} */
       (curNode.getLocation());
-  const sourceBlock = /** @type {!Blockly.BlockSvg} */ (connection.getSourceBlock());
+  const sourceBlock = /** @type {!BlockSvg} */ (connection.getSourceBlock());
 
   this.positionInput_(connection);
   this.setParent_(sourceBlock);
@@ -346,14 +353,14 @@ MarkerSvg.prototype.showWithInput_ = function(curNode) {
 /**
  * Position and display the marker for a next connection.
  * This is a horizontal line.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithNext_ = function(curNode) {
   const connection =
-      /** @type {!Blockly.RenderedConnection} */ (curNode.getLocation());
+      /** @type {!RenderedConnection} */ (curNode.getLocation());
   const targetBlock =
-      /** @type {Blockly.BlockSvg} */ (connection.getSourceBlock());
+      /** @type {BlockSvg} */ (connection.getSourceBlock());
   let x = 0;
   const y = connection.getOffsetInBlock().y;
   const width = targetBlock.getHeightWidth().width;
@@ -368,11 +375,11 @@ MarkerSvg.prototype.showWithNext_ = function(curNode) {
 /**
  * Position and display the marker for a stack.
  * This is a box with extra padding around the entire stack of blocks.
- * @param {!Blockly.ASTNode} curNode The node to draw the marker for.
+ * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
 MarkerSvg.prototype.showWithStack_ = function(curNode) {
-  const block = /** @type {Blockly.BlockSvg} */ (curNode.getLocation());
+  const block = /** @type {BlockSvg} */ (curNode.getLocation());
 
   // Gets the height and width of entire stack.
   const heightWidth = block.getHeightWidth();
@@ -419,11 +426,11 @@ MarkerSvg.prototype.showCurrent_ = function() {
  */
 MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
-  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
       +
-      Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
-      Blockly.utils.svgPaths.lineOnAxis('H', width + markerOffset * 2) +
-      Blockly.utils.svgPaths.lineOnAxis('V', markerHeight);
+      svgPaths.lineOnAxis('V', -markerOffset) +
+      svgPaths.lineOnAxis('H', width + markerOffset * 2) +
+      svgPaths.lineOnAxis('V', markerHeight);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
     this.flipRtl_(this.markerBlock_);
@@ -434,7 +441,7 @@ MarkerSvg.prototype.positionBlock_ = function(
 /**
  * Position the marker for an input connection.
  * Displays a filled in puzzle piece.
- * @param {!Blockly.RenderedConnection} connection The connection to position
+ * @param {!RenderedConnection} connection The connection to position
  *     marker around.
  * @protected
  */
@@ -443,7 +450,7 @@ MarkerSvg.prototype.positionInput_ = function(
   const x = connection.getOffsetInBlock().x;
   const y = connection.getOffsetInBlock().y;
 
-  const path = Blockly.utils.svgPaths.moveTo(0, 0) +
+  const path = svgPaths.moveTo(0, 0) +
       this.constants_.shapeFor(connection).pathDown;
 
   this.markerInput_.setAttribute('d', path);
@@ -479,14 +486,14 @@ MarkerSvg.prototype.positionLine_ = function(
  */
 MarkerSvg.prototype.positionOutput_ = function(
     width, height, connectionShape) {
-  const markerPath = Blockly.utils.svgPaths.moveBy(width, 0) +
-      Blockly.utils.svgPaths.lineOnAxis(
+  const markerPath = svgPaths.moveBy(width, 0) +
+      svgPaths.lineOnAxis(
           'h', -(width - connectionShape.width)) +
-      Blockly.utils.svgPaths.lineOnAxis(
+      svgPaths.lineOnAxis(
           'v', this.constants_.TAB_OFFSET_FROM_TOP) +
       connectionShape.pathDown +
-      Blockly.utils.svgPaths.lineOnAxis('V', height) +
-      Blockly.utils.svgPaths.lineOnAxis('H', width);
+      svgPaths.lineOnAxis('V', height) +
+      svgPaths.lineOnAxis('H', width);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
     this.flipRtl_(this.markerBlock_);
@@ -506,15 +513,15 @@ MarkerSvg.prototype.positionOutput_ = function(
  */
 MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
-  const markerPath = Blockly.utils.svgPaths.moveBy(-markerOffset, markerHeight)
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
       +
-      Blockly.utils.svgPaths.lineOnAxis('V', -markerOffset) +
-      Blockly.utils.svgPaths.lineOnAxis(
+      svgPaths.lineOnAxis('V', -markerOffset) +
+      svgPaths.lineOnAxis(
           'H', this.constants_.NOTCH_OFFSET_LEFT) +
       connectionShape.pathLeft +
-      Blockly.utils.svgPaths.lineOnAxis(
+      svgPaths.lineOnAxis(
           'H', width + markerOffset * 2) +
-      Blockly.utils.svgPaths.lineOnAxis('V', markerHeight);
+      svgPaths.lineOnAxis('V', markerHeight);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
     this.flipRtl_(this.markerBlock_);
@@ -562,16 +569,16 @@ MarkerSvg.prototype.hide = function() {
 
 /**
  * Fire event for the marker or marker.
- * @param {Blockly.ASTNode} oldNode The old node the marker used to be on.
- * @param {!Blockly.ASTNode} curNode The new node the marker is currently on.
+ * @param {ASTNode} oldNode The old node the marker used to be on.
+ * @param {!ASTNode} curNode The new node the marker is currently on.
  * @private
  */
 MarkerSvg.prototype.fireMarkerEvent_ = function(
     oldNode, curNode) {
   const curBlock = curNode.getSourceBlock();
-  const event = new (Blockly.Events.get(Blockly.Events.MARKER_MOVE))(
+  const event = new (Events.get(Events.MARKER_MOVE))(
       curBlock, this.isCursor(), oldNode, curNode);
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -605,8 +612,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   </g>
   */
 
-  this.markerSvg_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
+  this.markerSvg_ = dom.createSvgElement(
+      Svg.G,
       {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT
@@ -614,8 +621,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
   // A horizontal line used to represent a workspace coordinate or next
   // connection.
-  this.markerSvgLine_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.markerSvgLine_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT,
@@ -624,8 +631,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
       this.markerSvg_);
 
   // A filled in rectangle used to represent a stack.
-  this.markerSvgRect_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.RECT,
+  this.markerSvgRect_ = dom.createSvgElement(
+      Svg.RECT,
       {
         'class': 'blocklyVerticalMarker',
         'rx': 10, 'ry': 10,
@@ -634,8 +641,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
       this.markerSvg_);
 
   // A filled in puzzle piece used to represent an input value.
-  this.markerInput_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  this.markerInput_ = dom.createSvgElement(
+      Svg.PATH,
       {
         'transform': '',
         'style': 'display: none'
@@ -644,8 +651,8 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
   // A path used to represent a previous connection and a block, an output
   // connection and a block, or a block.
-  this.markerBlock_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
+  this.markerBlock_ = dom.createSvgElement(
+      Svg.PATH,
       {
         'transform': '',
         'style': 'display: none',
@@ -657,15 +664,15 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   // Markers and stack markers don't blink.
   if (this.isCursor()) {
     const blinkProperties = this.getBlinkProperties_();
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.ANIMATE, blinkProperties,
+    dom.createSvgElement(
+        Svg.ANIMATE, blinkProperties,
         this.markerSvgLine_);
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.ANIMATE, blinkProperties,
+    dom.createSvgElement(
+        Svg.ANIMATE, blinkProperties,
         this.markerInput_);
     blinkProperties['attributeName'] = 'stroke';
-    Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.ANIMATE, blinkProperties,
+    dom.createSvgElement(
+        Svg.ANIMATE, blinkProperties,
         this.markerBlock_);
   }
 
@@ -674,7 +681,7 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
 /**
  * Apply the marker's colour.
- * @param {!Blockly.ASTNode} _curNode The node that we want to draw the marker
+ * @param {!ASTNode} _curNode The node that we want to draw the marker
  *    for.
  * @protected
  */
@@ -697,7 +704,7 @@ MarkerSvg.prototype.applyColour_ = function(_curNode) {
  */
 MarkerSvg.prototype.dispose = function() {
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
   }
 };
 

From 99b30b92cefb78554431a498085dcfdc5a5a18df Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 16:31:27 -0700
Subject: [PATCH 180/291] clang-format core/renderers/common/marker_svg.js

---
 core/renderers/common/marker_svg.js | 114 ++++++++++------------------
 1 file changed, 42 insertions(+), 72 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index 514785bd2..bfc4baf35 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -85,7 +85,7 @@ const MarkerSvg = function(workspace, constants, marker) {
   this.currentMarkerSvg = null;
 
   const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
-      this.constants_.MARKER_COLOUR;
+                                          this.constants_.MARKER_COLOUR;
 
   /**
    * The colour of the marker.
@@ -144,14 +144,10 @@ MarkerSvg.prototype.isCursor = function() {
  * @package
  */
 MarkerSvg.prototype.createDom = function() {
-  const className = this.isCursor() ?
-      MarkerSvg.CURSOR_CLASS :
-      MarkerSvg.MARKER_CLASS;
+  const className =
+      this.isCursor() ? MarkerSvg.CURSOR_CLASS : MarkerSvg.MARKER_CLASS;
 
-  this.svgGroup_ = dom.createSvgElement(
-      Svg.G, {
-        'class': className
-      }, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {'class': className}, null);
 
   this.createDomInternal_();
   return this.svgGroup_;
@@ -192,7 +188,7 @@ MarkerSvg.prototype.draw = function(oldNode, curNode) {
   this.constants_ = this.workspace_.getRenderer().getConstants();
 
   const defaultColour = this.isCursor() ? this.constants_.CURSOR_COLOUR :
-      this.constants_.MARKER_COLOUR;
+                                          this.constants_.MARKER_COLOUR;
   this.colour_ = this.marker_.colour || defaultColour;
   this.applyColour_(curNode);
 
@@ -246,13 +242,11 @@ MarkerSvg.prototype.showAtLocation_ = function(curNode) {
  * @param {!ASTNode} curNode The node to draw the marker for.
  * @private
  */
-MarkerSvg.prototype.showWithBlockPrevOutput_ = function(
-    curNode) {
+MarkerSvg.prototype.showWithBlockPrevOutput_ = function(curNode) {
   const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
-  const markerHeight = height
-      * MarkerSvg.HEIGHT_MULTIPLIER;
+  const markerHeight = height * MarkerSvg.HEIGHT_MULTIPLIER;
   const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {
@@ -282,8 +276,7 @@ MarkerSvg.prototype.showWithBlock_ = function(curNode) {
  * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-MarkerSvg.prototype.showWithPrevious_ = function(
-    curNode) {
+MarkerSvg.prototype.showWithPrevious_ = function(curNode) {
   this.showWithBlockPrevOutput_(curNode);
 };
 
@@ -302,8 +295,7 @@ MarkerSvg.prototype.showWithOutput_ = function(curNode) {
  * @param {!ASTNode} curNode The node to draw the marker for.
  * @protected
  */
-MarkerSvg.prototype.showWithCoordinates_ = function(
-    curNode) {
+MarkerSvg.prototype.showWithCoordinates_ = function(curNode) {
   const wsCoordinate = curNode.getWsCoordinate();
   let x = wsCoordinate.x;
   const y = wsCoordinate.y;
@@ -388,7 +380,8 @@ MarkerSvg.prototype.showWithStack_ = function(curNode) {
   const width = heightWidth.width + this.constants_.CURSOR_STACK_PADDING;
   const height = heightWidth.height + this.constants_.CURSOR_STACK_PADDING;
 
-  // Shift the rectangle slightly to upper left so padding is equal on all sides.
+  // Shift the rectangle slightly to upper left so padding is equal on all
+  // sides.
   const xPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
   const yPadding = -this.constants_.CURSOR_STACK_PADDING / 2;
 
@@ -426,8 +419,7 @@ MarkerSvg.prototype.showCurrent_ = function() {
  */
 MarkerSvg.prototype.positionBlock_ = function(
     width, markerOffset, markerHeight) {
-  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
-      +
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight) +
       svgPaths.lineOnAxis('V', -markerOffset) +
       svgPaths.lineOnAxis('H', width + markerOffset * 2) +
       svgPaths.lineOnAxis('V', markerHeight);
@@ -445,18 +437,18 @@ MarkerSvg.prototype.positionBlock_ = function(
  *     marker around.
  * @protected
  */
-MarkerSvg.prototype.positionInput_ = function(
-    connection) {
+MarkerSvg.prototype.positionInput_ = function(connection) {
   const x = connection.getOffsetInBlock().x;
   const y = connection.getOffsetInBlock().y;
 
-  const path = svgPaths.moveTo(0, 0) +
-      this.constants_.shapeFor(connection).pathDown;
+  const path =
+      svgPaths.moveTo(0, 0) + this.constants_.shapeFor(connection).pathDown;
 
   this.markerInput_.setAttribute('d', path);
-  this.markerInput_.setAttribute('transform',
+  this.markerInput_.setAttribute(
+      'transform',
       'translate(' + x + ',' + y + ')' +
-      (this.workspace_.RTL ? ' scale(-1 1)' : ''));
+          (this.workspace_.RTL ? ' scale(-1 1)' : ''));
   this.currentMarkerSvg = this.markerInput_;
 };
 
@@ -468,8 +460,7 @@ MarkerSvg.prototype.positionInput_ = function(
  * @param {number} width The new width, in workspace units.
  * @protected
  */
-MarkerSvg.prototype.positionLine_ = function(
-    x, y, width) {
+MarkerSvg.prototype.positionLine_ = function(x, y, width) {
   this.markerSvgLine_.setAttribute('x', x);
   this.markerSvgLine_.setAttribute('y', y);
   this.markerSvgLine_.setAttribute('width', width);
@@ -484,15 +475,11 @@ MarkerSvg.prototype.positionLine_ = function(
  * @param {!Object} connectionShape The shape object for the connection.
  * @protected
  */
-MarkerSvg.prototype.positionOutput_ = function(
-    width, height, connectionShape) {
+MarkerSvg.prototype.positionOutput_ = function(width, height, connectionShape) {
   const markerPath = svgPaths.moveBy(width, 0) +
-      svgPaths.lineOnAxis(
-          'h', -(width - connectionShape.width)) +
-      svgPaths.lineOnAxis(
-          'v', this.constants_.TAB_OFFSET_FROM_TOP) +
-      connectionShape.pathDown +
-      svgPaths.lineOnAxis('V', height) +
+      svgPaths.lineOnAxis('h', -(width - connectionShape.width)) +
+      svgPaths.lineOnAxis('v', this.constants_.TAB_OFFSET_FROM_TOP) +
+      connectionShape.pathDown + svgPaths.lineOnAxis('V', height) +
       svgPaths.lineOnAxis('H', width);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
@@ -513,14 +500,11 @@ MarkerSvg.prototype.positionOutput_ = function(
  */
 MarkerSvg.prototype.positionPrevious_ = function(
     width, markerOffset, markerHeight, connectionShape) {
-  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight)
-      +
+  const markerPath = svgPaths.moveBy(-markerOffset, markerHeight) +
       svgPaths.lineOnAxis('V', -markerOffset) +
-      svgPaths.lineOnAxis(
-          'H', this.constants_.NOTCH_OFFSET_LEFT) +
+      svgPaths.lineOnAxis('H', this.constants_.NOTCH_OFFSET_LEFT) +
       connectionShape.pathLeft +
-      svgPaths.lineOnAxis(
-          'H', width + markerOffset * 2) +
+      svgPaths.lineOnAxis('H', width + markerOffset * 2) +
       svgPaths.lineOnAxis('V', markerHeight);
   this.markerBlock_.setAttribute('d', markerPath);
   if (this.workspace_.RTL) {
@@ -538,8 +522,7 @@ MarkerSvg.prototype.positionPrevious_ = function(
  * @param {number} height The new height, in workspace units.
  * @protected
  */
-MarkerSvg.prototype.positionRect_ = function(
-    x, y, width, height) {
+MarkerSvg.prototype.positionRect_ = function(x, y, width, height) {
   this.markerSvgRect_.setAttribute('x', x);
   this.markerSvgRect_.setAttribute('y', y);
   this.markerSvgRect_.setAttribute('width', width);
@@ -573,8 +556,7 @@ MarkerSvg.prototype.hide = function() {
  * @param {!ASTNode} curNode The new node the marker is currently on.
  * @private
  */
-MarkerSvg.prototype.fireMarkerEvent_ = function(
-    oldNode, curNode) {
+MarkerSvg.prototype.fireMarkerEvent_ = function(oldNode, curNode) {
   const curBlock = curNode.getSourceBlock();
   const event = new (Events.get(Events.MARKER_MOVE))(
       curBlock, this.isCursor(), oldNode, curNode);
@@ -607,23 +589,23 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   <g>
     <rect width="100" height="5">
       <animate attributeType="XML" attributeName="fill" dur="1s"
-        values="transparent;transparent;#fff;transparent" repeatCount="indefinite" />
+        values="transparent;transparent;#fff;transparent"
+  repeatCount="indefinite" />
     </rect>
   </g>
   */
 
   this.markerSvg_ = dom.createSvgElement(
-      Svg.G,
-      {
+      Svg.G, {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT
-      }, this.svgGroup_);
+      },
+      this.svgGroup_);
 
   // A horizontal line used to represent a workspace coordinate or next
   // connection.
   this.markerSvgLine_ = dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'width': this.constants_.CURSOR_WS_WIDTH,
         'height': this.constants_.WS_CURSOR_HEIGHT,
         'style': 'display: none'
@@ -632,28 +614,22 @@ MarkerSvg.prototype.createDomInternal_ = function() {
 
   // A filled in rectangle used to represent a stack.
   this.markerSvgRect_ = dom.createSvgElement(
-      Svg.RECT,
-      {
+      Svg.RECT, {
         'class': 'blocklyVerticalMarker',
-        'rx': 10, 'ry': 10,
+        'rx': 10,
+        'ry': 10,
         'style': 'display: none'
       },
       this.markerSvg_);
 
   // A filled in puzzle piece used to represent an input value.
   this.markerInput_ = dom.createSvgElement(
-      Svg.PATH,
-      {
-        'transform': '',
-        'style': 'display: none'
-      },
-      this.markerSvg_);
+      Svg.PATH, {'transform': '', 'style': 'display: none'}, this.markerSvg_);
 
   // A path used to represent a previous connection and a block, an output
   // connection and a block, or a block.
   this.markerBlock_ = dom.createSvgElement(
-      Svg.PATH,
-      {
+      Svg.PATH, {
         'transform': '',
         'style': 'display: none',
         'fill': 'none',
@@ -664,16 +640,10 @@ MarkerSvg.prototype.createDomInternal_ = function() {
   // Markers and stack markers don't blink.
   if (this.isCursor()) {
     const blinkProperties = this.getBlinkProperties_();
-    dom.createSvgElement(
-        Svg.ANIMATE, blinkProperties,
-        this.markerSvgLine_);
-    dom.createSvgElement(
-        Svg.ANIMATE, blinkProperties,
-        this.markerInput_);
+    dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerSvgLine_);
+    dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerInput_);
     blinkProperties['attributeName'] = 'stroke';
-    dom.createSvgElement(
-        Svg.ANIMATE, blinkProperties,
-        this.markerBlock_);
+    dom.createSvgElement(Svg.ANIMATE, blinkProperties, this.markerBlock_);
   }
 
   return this.markerSvg_;

From b233c5f10ad1e34529de815fbed81fc535c4bcab Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:50:31 -0700
Subject: [PATCH 181/291] Update visibility of constants

---
 core/renderers/common/marker_svg.js | 42 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index bfc4baf35..171fa36a6 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -40,6 +40,25 @@ const svgPaths = goog.require('Blockly.utils.svgPaths');
 goog.require('Blockly.Events.MarkerMove');
 
 
+/**
+ * The name of the CSS class for a cursor.
+ * @const {string}
+ */
+const CURSOR_CLASS = 'blocklyCursor';
+
+/**
+ * The name of the CSS class for a marker.
+ * @const {string}
+ */
+const MARKER_CLASS = 'blocklyMarker';
+
+/**
+ * What we multiply the height by to get the height of the marker.
+ * Only used for the block and block connections.
+ * @const {number}
+ */
+const HEIGHT_MULTIPLIER = 3 / 4;
+
 /**
  * Class for a marker.
  * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
@@ -94,25 +113,6 @@ const MarkerSvg = function(workspace, constants, marker) {
   this.colour_ = marker.colour || defaultColour;
 };
 
-/**
- * The name of the CSS class for a cursor.
- * @const {string}
- */
-MarkerSvg.CURSOR_CLASS = 'blocklyCursor';
-
-/**
- * The name of the CSS class for a marker.
- * @const {string}
- */
-MarkerSvg.MARKER_CLASS = 'blocklyMarker';
-
-/**
- * What we multiply the height by to get the height of the marker.
- * Only used for the block and block connections.
- * @const {number}
- */
-MarkerSvg.HEIGHT_MULTIPLIER = 3 / 4;
-
 /**
  * Return the root node of the SVG or null if none exists.
  * @return {SVGElement} The root SVG node.
@@ -145,7 +145,7 @@ MarkerSvg.prototype.isCursor = function() {
  */
 MarkerSvg.prototype.createDom = function() {
   const className =
-      this.isCursor() ? MarkerSvg.CURSOR_CLASS : MarkerSvg.MARKER_CLASS;
+      this.isCursor() ? CURSOR_CLASS : MARKER_CLASS;
 
   this.svgGroup_ = dom.createSvgElement(Svg.G, {'class': className}, null);
 
@@ -246,7 +246,7 @@ MarkerSvg.prototype.showWithBlockPrevOutput_ = function(curNode) {
   const block = /** @type {!BlockSvg} */ (curNode.getSourceBlock());
   const width = block.width;
   const height = block.height;
-  const markerHeight = height * MarkerSvg.HEIGHT_MULTIPLIER;
+  const markerHeight = height * HEIGHT_MULTIPLIER;
   const markerOffset = this.constants_.CURSOR_BLOCK_PADDING;
 
   if (block.previousConnection) {

From fae0c2ac6d910228fd93e81364e30ef3dfd517c0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 13:03:16 -0700
Subject: [PATCH 182/291] Migrate core/contextmenu.js to ES6 const/let

---
 core/contextmenu.js | 56 +++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index 3bfcda167..9af86b0c9 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -62,7 +62,7 @@ Blockly.ContextMenu.show = function(e, options, rtl) {
     Blockly.ContextMenu.hide();
     return;
   }
-  var menu = Blockly.ContextMenu.populate_(options, rtl);
+  const menu = Blockly.ContextMenu.populate_(options, rtl);
   Blockly.ContextMenu.menu_ = menu;
 
   Blockly.ContextMenu.position_(menu, e, rtl);
@@ -85,17 +85,18 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
      enabled: true,
      callback: Blockly.MakeItSo}
   */
-  var menu = new Blockly.Menu();
+  const menu = new Blockly.Menu();
   menu.setRole(Blockly.utils.aria.Role.MENU);
-  for (var i = 0, option; (option = options[i]); i++) {
-    var menuItem = new Blockly.MenuItem(option.text);
+  for (let i = 0; i < options.length; i++) {
+    const option = options[i];
+    const menuItem = new Blockly.MenuItem(option.text);
     menuItem.setRightToLeft(rtl);
     menuItem.setRole(Blockly.utils.aria.Role.MENUITEM);
     menu.addChild(menuItem);
     menuItem.setEnabled(option.enabled);
     if (option.enabled) {
-      var actionHandler = function(_menuItem) {
-        var option = this;
+      const actionHandler = function (_menuItem) {
+        const option = this;
         Blockly.ContextMenu.hide();
         option.callback(option.scope);
       };
@@ -115,10 +116,10 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
  */
 Blockly.ContextMenu.position_ = function(menu, e, rtl) {
   // Record windowSize and scrollOffset before adding menu.
-  var viewportBBox = Blockly.utils.getViewportBBox();
+  const viewportBBox = Blockly.utils.getViewportBBox();
   // This one is just a point, but we'll pretend that it's a rect so we can use
   // some helper functions.
-  var anchorBBox = new Blockly.utils.Rect(
+  const anchorBBox = new Blockly.utils.Rect(
       e.clientY + viewportBBox.top,
       e.clientY + viewportBBox.top,
       e.clientX + viewportBBox.left,
@@ -126,7 +127,7 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
   );
 
   Blockly.ContextMenu.createWidget_(menu);
-  var menuSize = menu.getSize();
+  const menuSize = menu.getSize();
 
   if (rtl) {
     anchorBBox.left += menuSize.width;
@@ -148,9 +149,9 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
  * @private
  */
 Blockly.ContextMenu.createWidget_ = function(menu) {
-  var div = Blockly.WidgetDiv.DIV;
+  const div = Blockly.WidgetDiv.DIV;
   menu.render(div);
-  var menuDom = menu.getElement();
+  const menuDom = menu.getElement();
   Blockly.utils.dom.addClass(
       /** @type {!Element} */ (menuDom), 'blocklyContextMenu');
   // Prevent system context menu when right-clicking a Blockly context menu.
@@ -189,10 +190,11 @@ Blockly.ContextMenu.dispose = function() {
 Blockly.ContextMenu.callbackFactory = function(block, xml) {
   return function() {
     Blockly.Events.disable();
+    let newBlock;
     try {
-      var newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
+      newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
       // Move the new block next to the old block.
-      var xy = block.getRelativeToSurfaceXY();
+      const xy = block.getRelativeToSurfaceXY();
       if (block.RTL) {
         xy.x -= Blockly.internalConstants.SNAP_RADIUS;
       } else {
@@ -221,10 +223,10 @@ Blockly.ContextMenu.callbackFactory = function(block, xml) {
  * @package
  */
 Blockly.ContextMenu.commentDeleteOption = function(comment) {
-  var deleteOption = {
+  const deleteOption = {
     text: Blockly.Msg['REMOVE_COMMENT'],
     enabled: true,
-    callback: function() {
+    callback: function () {
       Blockly.Events.setGroup(true);
       comment.dispose(true, true);
       Blockly.Events.setGroup(false);
@@ -241,10 +243,10 @@ Blockly.ContextMenu.commentDeleteOption = function(comment) {
  * @package
  */
 Blockly.ContextMenu.commentDuplicateOption = function(comment) {
-  var duplicateOption = {
+  const duplicateOption = {
     text: Blockly.Msg['DUPLICATE_COMMENT'],
     enabled: true,
-    callback: function() {
+    callback: function () {
       Blockly.duplicate(comment);
     }
   };
@@ -267,35 +269,35 @@ Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
   }
   // Helper function to create and position a comment correctly based on the
   // location of the mouse event.
-  var addWsComment = function() {
-    var comment = new Blockly.WorkspaceCommentSvg(
+  const addWsComment = function () {
+    const comment = new Blockly.WorkspaceCommentSvg(
         ws, Blockly.Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE);
 
-    var injectionDiv = ws.getInjectionDiv();
+    const injectionDiv = ws.getInjectionDiv();
     // Bounding rect coordinates are in client coordinates, meaning that they
     // are in pixels relative to the upper left corner of the visible browser
     // window.  These coordinates change when you scroll the browser window.
-    var boundingRect = injectionDiv.getBoundingClientRect();
+    const boundingRect = injectionDiv.getBoundingClientRect();
 
     // The client coordinates offset by the injection div's upper left corner.
-    var clientOffsetPixels = new Blockly.utils.Coordinate(
+    const clientOffsetPixels = new Blockly.utils.Coordinate(
         e.clientX - boundingRect.left, e.clientY - boundingRect.top);
 
     // The offset in pixels between the main workspace's origin and the upper
     // left corner of the injection div.
-    var mainOffsetPixels = ws.getOriginOffsetInPixels();
+    const mainOffsetPixels = ws.getOriginOffsetInPixels();
 
     // The position of the new comment in pixels relative to the origin of the
     // main workspace.
-    var finalOffset = Blockly.utils.Coordinate.difference(clientOffsetPixels,
+    const finalOffset = Blockly.utils.Coordinate.difference(clientOffsetPixels,
         mainOffsetPixels);
     // The position of the new comment in main workspace coordinates.
     finalOffset.scale(1 / ws.scale);
 
-    var commentX = finalOffset.x;
-    var commentY = finalOffset.y;
+    const commentX = finalOffset.x;
+    const commentY = finalOffset.y;
     comment.moveBy(commentX, commentY);
     if (ws.rendered) {
       comment.initSvg();
@@ -304,7 +306,7 @@ Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
     }
   };
 
-  var wsCommentOption = {
+  const wsCommentOption = {
     // Foreign objects don't work in IE.  Don't let the user create comments
     // that they won't be able to edit.
     enabled: !Blockly.utils.userAgent.IE

From 19722e508fcbc9600af3a87dc19457a413c34a0f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:47:11 -0700
Subject: [PATCH 183/291] Migrate core/contextmenu.js to goog.module

---
 core/block_svg.js   |  4 +-
 core/contextmenu.js | 94 ++++++++++++++++++++++++++++++---------------
 tests/deps.js       |  2 +-
 3 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index fd5be3212..57d20c1ba 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -780,7 +780,7 @@ Blockly.BlockSvg.prototype.showContextMenu = function(e) {
 
   if (menuOptions && menuOptions.length) {
     Blockly.ContextMenu.show(e, menuOptions, this.RTL);
-    Blockly.ContextMenu.currentBlock = this;
+    Blockly.ContextMenu.setCurrentBlock(this);
   }
 };
 
@@ -921,7 +921,7 @@ Blockly.BlockSvg.prototype.dispose = function(healStack, animate) {
     this.workspace.cancelCurrentGesture();
   }
   // If this block has a context menu open, close it.
-  if (Blockly.ContextMenu.currentBlock == this) {
+  if (Blockly.ContextMenu.getCurrentBlock() == this) {
     Blockly.ContextMenu.hide();
   }
 
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 9af86b0c9..9bb76033a 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -14,8 +14,11 @@
  * @name Blockly.ContextMenu
  * @namespace
  */
-goog.provide('Blockly.ContextMenu');
+goog.module('Blockly.ContextMenu');
+goog.module.declareLegacyNamespace();
 
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.Events');
 /** @suppress {extraRequire} */
@@ -39,16 +42,39 @@ goog.requireType('Blockly.WorkspaceSvg');
 
 /**
  * Which block is the context menu attached to?
- * @type {Blockly.Block}
+ * @type {?Blockly.Block}
  */
-Blockly.ContextMenu.currentBlock = null;
+let currentBlock = null;
+
+/**
+ * Gets the block the context menu is currently attached to.
+ * @return {?Blockly.Block} The block the context menu is attached to.
+ */
+const getCurrentBlock = function() {
+  return currentBlock;
+};
+exports.getCurrentBlock = getCurrentBlock;
+
+/**
+ * Sets the block the context menu is currently attached to.
+ * @param {?Blockly.Block} block The block the context menu is attached to.
+ */
+const setCurrentBlock = function(block) {
+  currentBlock = block;
+};
+exports.setCurrentBlock = setCurrentBlock;
+
+// Ad JS accessors for backwards compatibility.
+Object.defineProperty(exports, 'currentBlock', {
+  get: getCurrentBlock,
+  set: setCurrentBlock,
+});
 
 /**
  * Menu object.
  * @type {Blockly.Menu}
- * @private
  */
-Blockly.ContextMenu.menu_ = null;
+let menu_ = null;
 
 /**
  * Construct the menu based on the list of options and show the menu.
@@ -56,21 +82,22 @@ Blockly.ContextMenu.menu_ = null;
  * @param {!Array<!Object>} options Array of menu options.
  * @param {boolean} rtl True if RTL, false if LTR.
  */
-Blockly.ContextMenu.show = function(e, options, rtl) {
-  Blockly.WidgetDiv.show(Blockly.ContextMenu, rtl, Blockly.ContextMenu.dispose);
+const show = function(e, options, rtl) {
+  Blockly.WidgetDiv.show(exports, rtl, dispose);
   if (!options.length) {
-    Blockly.ContextMenu.hide();
+    hide();
     return;
   }
-  const menu = Blockly.ContextMenu.populate_(options, rtl);
-  Blockly.ContextMenu.menu_ = menu;
+  const menu = populate_(options, rtl);
+  menu_ = menu;
 
-  Blockly.ContextMenu.position_(menu, e, rtl);
+  position_(menu, e, rtl);
   // 1ms delay is required for focusing on context menus because some other
   // mouse event is still waiting in the queue and clears focus.
   setTimeout(function() {menu.focus();}, 1);
-  Blockly.ContextMenu.currentBlock = null;  // May be set by Blockly.Block.
+  currentBlock = null;  // May be set by Blockly.Block.
 };
+exports.show = show;
 
 /**
  * Create the context menu object and populate it with the given options.
@@ -79,7 +106,7 @@ Blockly.ContextMenu.show = function(e, options, rtl) {
  * @return {!Blockly.Menu} The menu that will be shown on right click.
  * @private
  */
-Blockly.ContextMenu.populate_ = function(options, rtl) {
+const populate_ = function(options, rtl) {
   /* Here's what one option object looks like:
     {text: 'Make It So',
      enabled: true,
@@ -97,7 +124,7 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
     if (option.enabled) {
       const actionHandler = function (_menuItem) {
         const option = this;
-        Blockly.ContextMenu.hide();
+        hide();
         option.callback(option.scope);
       };
       menuItem.onAction(actionHandler, option);
@@ -114,7 +141,7 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
  * @param {boolean} rtl True if RTL, false if LTR.
  * @private
  */
-Blockly.ContextMenu.position_ = function(menu, e, rtl) {
+const position_ = function(menu, e, rtl) {
   // Record windowSize and scrollOffset before adding menu.
   const viewportBBox = Blockly.utils.getViewportBBox();
   // This one is just a point, but we'll pretend that it's a rect so we can use
@@ -126,7 +153,7 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
       e.clientX + viewportBBox.left
   );
 
-  Blockly.ContextMenu.createWidget_(menu);
+  createWidget_(menu);
   const menuSize = menu.getSize();
 
   if (rtl) {
@@ -148,7 +175,7 @@ Blockly.ContextMenu.position_ = function(menu, e, rtl) {
  * @param {!Blockly.Menu} menu The menu to add to the widget div.
  * @private
  */
-Blockly.ContextMenu.createWidget_ = function(menu) {
+const createWidget_ = function(menu) {
   const div = Blockly.WidgetDiv.DIV;
   menu.render(div);
   const menuDom = menu.getElement();
@@ -165,20 +192,22 @@ Blockly.ContextMenu.createWidget_ = function(menu) {
 /**
  * Hide the context menu.
  */
-Blockly.ContextMenu.hide = function() {
-  Blockly.WidgetDiv.hideIfOwner(Blockly.ContextMenu);
-  Blockly.ContextMenu.currentBlock = null;
+const hide = function() {
+  Blockly.WidgetDiv.hideIfOwner(exports);
+  currentBlock = null;
 };
+exports.hide = hide;
 
 /**
  * Dispose of the menu.
  */
-Blockly.ContextMenu.dispose = function() {
-  if (Blockly.ContextMenu.menu_) {
-    Blockly.ContextMenu.menu_.dispose();
-    Blockly.ContextMenu.menu_ = null;
+const dispose = function() {
+  if (menu_) {
+    menu_.dispose();
+    menu_ = null;
   }
 };
+exports.dispose = dispose;
 
 /**
  * Create a callback function that creates and configures a block,
@@ -187,7 +216,7 @@ Blockly.ContextMenu.dispose = function() {
  * @param {!Element} xml XML representation of new block.
  * @return {!Function} Function that creates a block.
  */
-Blockly.ContextMenu.callbackFactory = function(block, xml) {
+const callbackFactory = function(block, xml) {
   return function() {
     Blockly.Events.disable();
     let newBlock;
@@ -212,6 +241,7 @@ Blockly.ContextMenu.callbackFactory = function(block, xml) {
     newBlock.select();
   };
 };
+exports.callbackFactory = callbackFactory;
 
 // Helper functions for creating context menu options.
 
@@ -220,9 +250,8 @@ Blockly.ContextMenu.callbackFactory = function(block, xml) {
  * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
- * @package
  */
-Blockly.ContextMenu.commentDeleteOption = function(comment) {
+const commentDeleteOption = function(comment) {
   const deleteOption = {
     text: Blockly.Msg['REMOVE_COMMENT'],
     enabled: true,
@@ -234,15 +263,16 @@ Blockly.ContextMenu.commentDeleteOption = function(comment) {
   };
   return deleteOption;
 };
+/** @package */
+exports.commentDeleteOption = commentDeleteOption;
 
 /**
  * Make a context menu option for duplicating the current workspace comment.
  * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
- * @package
  */
-Blockly.ContextMenu.commentDuplicateOption = function(comment) {
+const commentDuplicateOption = function(comment) {
   const duplicateOption = {
     text: Blockly.Msg['DUPLICATE_COMMENT'],
     enabled: true,
@@ -252,6 +282,8 @@ Blockly.ContextMenu.commentDuplicateOption = function(comment) {
   };
   return duplicateOption;
 };
+/** @package */
+exports.commentDuplicateOption = commentDuplicateOption;
 
 /**
  * Make a context menu option for adding a comment on the workspace.
@@ -263,7 +295,7 @@ Blockly.ContextMenu.commentDuplicateOption = function(comment) {
  * @suppress {strictModuleDepCheck,checkTypes} Suppress checks while workspace
  *     comments are not bundled in.
  */
-Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
+const workspaceCommentOption = function(ws, e) {
   if (!Blockly.WorkspaceCommentSvg) {
     throw Error('Missing require for Blockly.WorkspaceCommentSvg');
   }
@@ -317,3 +349,5 @@ Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
   };
   return wsCommentOption;
 };
+/** @package */
+exports.workspaceCommentOption = workspaceCommentOption;
diff --git a/tests/deps.js b/tests/deps.js
index a596ec5f0..bbf289725 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -26,7 +26,7 @@ goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionCheck
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});

From fe29e1cb9dbf09f629c685467d42064348963a09 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 09:30:31 -0700
Subject: [PATCH 184/291] Migrate core/contextmenu.js named requires

---
 core/contextmenu.js | 119 +++++++++++++++++++++-----------------------
 1 file changed, 58 insertions(+), 61 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index 9bb76033a..bd8fddf88 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -10,45 +10,42 @@
  */
 'use strict';
 
-/**
- * @name Blockly.ContextMenu
- * @namespace
- */
 goog.module('Blockly.ContextMenu');
 goog.module.declareLegacyNamespace();
 
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Menu = goog.require('Blockly.Menu');
+const MenuItem = goog.require('Blockly.MenuItem');
+const Msg = goog.require('Blockly.Msg');
+const Rect = goog.require('Blockly.utils.Rect');
+const WidgetDiv = goog.require('Blockly.WidgetDiv');
+const Xml = goog.require('Blockly.Xml');
+const aria = goog.require('Blockly.utils.aria');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Menu');
-goog.require('Blockly.MenuItem');
-goog.require('Blockly.Msg');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.WidgetDiv');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Which block is the context menu attached to?
- * @type {?Blockly.Block}
+ * @type {?Block}
  */
 let currentBlock = null;
 
 /**
  * Gets the block the context menu is currently attached to.
- * @return {?Blockly.Block} The block the context menu is attached to.
+ * @return {?Block} The block the context menu is attached to.
  */
 const getCurrentBlock = function() {
   return currentBlock;
@@ -57,7 +54,7 @@ exports.getCurrentBlock = getCurrentBlock;
 
 /**
  * Sets the block the context menu is currently attached to.
- * @param {?Blockly.Block} block The block the context menu is attached to.
+ * @param {?Block} block The block the context menu is attached to.
  */
 const setCurrentBlock = function(block) {
   currentBlock = block;
@@ -72,7 +69,7 @@ Object.defineProperty(exports, 'currentBlock', {
 
 /**
  * Menu object.
- * @type {Blockly.Menu}
+ * @type {Menu}
  */
 let menu_ = null;
 
@@ -83,7 +80,7 @@ let menu_ = null;
  * @param {boolean} rtl True if RTL, false if LTR.
  */
 const show = function(e, options, rtl) {
-  Blockly.WidgetDiv.show(exports, rtl, dispose);
+  WidgetDiv.show(exports, rtl, dispose);
   if (!options.length) {
     hide();
     return;
@@ -103,7 +100,7 @@ exports.show = show;
  * Create the context menu object and populate it with the given options.
  * @param {!Array<!Object>} options Array of menu options.
  * @param {boolean} rtl True if RTL, false if LTR.
- * @return {!Blockly.Menu} The menu that will be shown on right click.
+ * @return {!Menu} The menu that will be shown on right click.
  * @private
  */
 const populate_ = function(options, rtl) {
@@ -112,13 +109,13 @@ const populate_ = function(options, rtl) {
      enabled: true,
      callback: Blockly.MakeItSo}
   */
-  const menu = new Blockly.Menu();
-  menu.setRole(Blockly.utils.aria.Role.MENU);
+  const menu = new Menu();
+  menu.setRole(aria.Role.MENU);
   for (let i = 0; i < options.length; i++) {
     const option = options[i];
-    const menuItem = new Blockly.MenuItem(option.text);
+    const menuItem = new MenuItem(option.text);
     menuItem.setRightToLeft(rtl);
-    menuItem.setRole(Blockly.utils.aria.Role.MENUITEM);
+    menuItem.setRole(aria.Role.MENUITEM);
     menu.addChild(menuItem);
     menuItem.setEnabled(option.enabled);
     if (option.enabled) {
@@ -135,7 +132,7 @@ const populate_ = function(options, rtl) {
 
 /**
  * Add the menu to the page and position it correctly.
- * @param {!Blockly.Menu} menu The menu to add and position.
+ * @param {!Menu} menu The menu to add and position.
  * @param {!Event} e Mouse event for the right click that is making the context
  *     menu appear.
  * @param {boolean} rtl True if RTL, false if LTR.
@@ -143,10 +140,10 @@ const populate_ = function(options, rtl) {
  */
 const position_ = function(menu, e, rtl) {
   // Record windowSize and scrollOffset before adding menu.
-  const viewportBBox = Blockly.utils.getViewportBBox();
+  const viewportBBox = utils.getViewportBBox();
   // This one is just a point, but we'll pretend that it's a rect so we can use
   // some helper functions.
-  const anchorBBox = new Blockly.utils.Rect(
+  const anchorBBox = new Rect(
       e.clientY + viewportBBox.top,
       e.clientY + viewportBBox.top,
       e.clientX + viewportBBox.left,
@@ -163,7 +160,7 @@ const position_ = function(menu, e, rtl) {
     viewportBBox.right += menuSize.width;
   }
 
-  Blockly.WidgetDiv.positionWithAnchor(viewportBBox, anchorBBox, menuSize, rtl);
+  WidgetDiv.positionWithAnchor(viewportBBox, anchorBBox, menuSize, rtl);
   // Calling menuDom.focus() has to wait until after the menu has been placed
   // correctly.  Otherwise it will cause a page scroll to get the misplaced menu
   // in view.  See issue #1329.
@@ -172,19 +169,19 @@ const position_ = function(menu, e, rtl) {
 
 /**
  * Create and render the menu widget inside Blockly's widget div.
- * @param {!Blockly.Menu} menu The menu to add to the widget div.
+ * @param {!Menu} menu The menu to add to the widget div.
  * @private
  */
 const createWidget_ = function(menu) {
-  const div = Blockly.WidgetDiv.DIV;
+  const div = WidgetDiv.DIV;
   menu.render(div);
   const menuDom = menu.getElement();
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!Element} */ (menuDom), 'blocklyContextMenu');
   // Prevent system context menu when right-clicking a Blockly context menu.
-  Blockly.browserEvents.conditionalBind(
+  browserEvents.conditionalBind(
       /** @type {!EventTarget} */ (menuDom), 'contextmenu', null,
-      Blockly.utils.noEvent);
+      utils.noEvent);
   // Focus only after the initial render to avoid issue #1329.
   menu.focus();
 };
@@ -193,7 +190,7 @@ const createWidget_ = function(menu) {
  * Hide the context menu.
  */
 const hide = function() {
-  Blockly.WidgetDiv.hideIfOwner(exports);
+  WidgetDiv.hideIfOwner(exports);
   currentBlock = null;
 };
 exports.hide = hide;
@@ -212,31 +209,31 @@ exports.dispose = dispose;
 /**
  * Create a callback function that creates and configures a block,
  *   then places the new block next to the original.
- * @param {!Blockly.Block} block Original block.
+ * @param {!Block} block Original block.
  * @param {!Element} xml XML representation of new block.
  * @return {!Function} Function that creates a block.
  */
 const callbackFactory = function(block, xml) {
   return function() {
-    Blockly.Events.disable();
+    Events.disable();
     let newBlock;
     try {
-      newBlock = Blockly.Xml.domToBlock(xml, block.workspace);
+      newBlock = Xml.domToBlock(xml, block.workspace);
       // Move the new block next to the old block.
       const xy = block.getRelativeToSurfaceXY();
       if (block.RTL) {
-        xy.x -= Blockly.internalConstants.SNAP_RADIUS;
+        xy.x -= internalConstants.SNAP_RADIUS;
       } else {
-        xy.x += Blockly.internalConstants.SNAP_RADIUS;
+        xy.x += internalConstants.SNAP_RADIUS;
       }
-      xy.y += Blockly.internalConstants.SNAP_RADIUS * 2;
+      xy.y += internalConstants.SNAP_RADIUS * 2;
       newBlock.moveBy(xy.x, xy.y);
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
-    if (Blockly.Events.isEnabled() && !newBlock.isShadow()) {
-      Blockly.Events.fire(
-          new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(newBlock));
+    if (Events.isEnabled() && !newBlock.isShadow()) {
+      Events.fire(
+          new (Events.get(Events.BLOCK_CREATE))(newBlock));
     }
     newBlock.select();
   };
@@ -253,12 +250,12 @@ exports.callbackFactory = callbackFactory;
  */
 const commentDeleteOption = function(comment) {
   const deleteOption = {
-    text: Blockly.Msg['REMOVE_COMMENT'],
+    text: Msg['REMOVE_COMMENT'],
     enabled: true,
     callback: function () {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
       comment.dispose(true, true);
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
   };
   return deleteOption;
@@ -274,7 +271,7 @@ exports.commentDeleteOption = commentDeleteOption;
  */
 const commentDuplicateOption = function(comment) {
   const duplicateOption = {
-    text: Blockly.Msg['DUPLICATE_COMMENT'],
+    text: Msg['DUPLICATE_COMMENT'],
     enabled: true,
     callback: function () {
       Blockly.duplicate(comment);
@@ -287,7 +284,7 @@ exports.commentDuplicateOption = commentDuplicateOption;
 
 /**
  * Make a context menu option for adding a comment on the workspace.
- * @param {!Blockly.WorkspaceSvg} ws The workspace where the right-click
+ * @param {!WorkspaceSvg} ws The workspace where the right-click
  *     originated.
  * @param {!Event} e The right-click mouse event.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
@@ -303,7 +300,7 @@ const workspaceCommentOption = function(ws, e) {
   // location of the mouse event.
   const addWsComment = function () {
     const comment = new Blockly.WorkspaceCommentSvg(
-        ws, Blockly.Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
+        ws, Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE);
 
@@ -314,7 +311,7 @@ const workspaceCommentOption = function(ws, e) {
     const boundingRect = injectionDiv.getBoundingClientRect();
 
     // The client coordinates offset by the injection div's upper left corner.
-    const clientOffsetPixels = new Blockly.utils.Coordinate(
+    const clientOffsetPixels = new Coordinate(
         e.clientX - boundingRect.left, e.clientY - boundingRect.top);
 
     // The offset in pixels between the main workspace's origin and the upper
@@ -323,7 +320,7 @@ const workspaceCommentOption = function(ws, e) {
 
     // The position of the new comment in pixels relative to the origin of the
     // main workspace.
-    const finalOffset = Blockly.utils.Coordinate.difference(clientOffsetPixels,
+    const finalOffset = Coordinate.difference(clientOffsetPixels,
         mainOffsetPixels);
     // The position of the new comment in main workspace coordinates.
     finalOffset.scale(1 / ws.scale);
@@ -341,9 +338,9 @@ const workspaceCommentOption = function(ws, e) {
   const wsCommentOption = {
     // Foreign objects don't work in IE.  Don't let the user create comments
     // that they won't be able to edit.
-    enabled: !Blockly.utils.userAgent.IE
+    enabled: !userAgent.IE
   };
-  wsCommentOption.text = Blockly.Msg['ADD_COMMENT'];
+  wsCommentOption.text = Msg['ADD_COMMENT'];
   wsCommentOption.callback = function() {
     addWsComment();
   };

From eea23e24f667d208025ce960cb6480041d348b48 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 09:31:15 -0700
Subject: [PATCH 185/291] clang-format core/contextmenu.js

---
 core/contextmenu.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/core/contextmenu.js b/core/contextmenu.js
index bd8fddf88..39d4a8319 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -91,7 +91,9 @@ const show = function(e, options, rtl) {
   position_(menu, e, rtl);
   // 1ms delay is required for focusing on context menus because some other
   // mouse event is still waiting in the queue and clears focus.
-  setTimeout(function() {menu.focus();}, 1);
+  setTimeout(function() {
+    menu.focus();
+  }, 1);
   currentBlock = null;  // May be set by Blockly.Block.
 };
 exports.show = show;
@@ -119,7 +121,7 @@ const populate_ = function(options, rtl) {
     menu.addChild(menuItem);
     menuItem.setEnabled(option.enabled);
     if (option.enabled) {
-      const actionHandler = function (_menuItem) {
+      const actionHandler = function(_menuItem) {
         const option = this;
         hide();
         option.callback(option.scope);
@@ -144,11 +146,8 @@ const position_ = function(menu, e, rtl) {
   // This one is just a point, but we'll pretend that it's a rect so we can use
   // some helper functions.
   const anchorBBox = new Rect(
-      e.clientY + viewportBBox.top,
-      e.clientY + viewportBBox.top,
-      e.clientX + viewportBBox.left,
-      e.clientX + viewportBBox.left
-  );
+      e.clientY + viewportBBox.top, e.clientY + viewportBBox.top,
+      e.clientX + viewportBBox.left, e.clientX + viewportBBox.left);
 
   createWidget_(menu);
   const menuSize = menu.getSize();
@@ -232,8 +231,7 @@ const callbackFactory = function(block, xml) {
       Events.enable();
     }
     if (Events.isEnabled() && !newBlock.isShadow()) {
-      Events.fire(
-          new (Events.get(Events.BLOCK_CREATE))(newBlock));
+      Events.fire(new (Events.get(Events.BLOCK_CREATE))(newBlock));
     }
     newBlock.select();
   };
@@ -252,7 +250,7 @@ const commentDeleteOption = function(comment) {
   const deleteOption = {
     text: Msg['REMOVE_COMMENT'],
     enabled: true,
-    callback: function () {
+    callback: function() {
       Events.setGroup(true);
       comment.dispose(true, true);
       Events.setGroup(false);
@@ -273,7 +271,7 @@ const commentDuplicateOption = function(comment) {
   const duplicateOption = {
     text: Msg['DUPLICATE_COMMENT'],
     enabled: true,
-    callback: function () {
+    callback: function() {
       Blockly.duplicate(comment);
     }
   };
@@ -298,7 +296,7 @@ const workspaceCommentOption = function(ws, e) {
   }
   // Helper function to create and position a comment correctly based on the
   // location of the mouse event.
-  const addWsComment = function () {
+  const addWsComment = function() {
     const comment = new Blockly.WorkspaceCommentSvg(
         ws, Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
         Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
@@ -320,8 +318,8 @@ const workspaceCommentOption = function(ws, e) {
 
     // The position of the new comment in pixels relative to the origin of the
     // main workspace.
-    const finalOffset = Coordinate.difference(clientOffsetPixels,
-        mainOffsetPixels);
+    const finalOffset =
+        Coordinate.difference(clientOffsetPixels, mainOffsetPixels);
     // The position of the new comment in main workspace coordinates.
     finalOffset.scale(1 / ws.scale);
 

From fba87c93c4f680f37fee8d902c82340a4905a363 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 4 Aug 2021 12:12:53 -0700
Subject: [PATCH 186/291] Migrate core/renderers/geras/highlighter.js to
 goog.module syntax (#5304)

* Migrate core/renderers/geras/highlighter.js to ES6 const/let

* Migrate core/renderers/geras/highlighter.js to goog.module

* Migrate core/renderers/geras/highlighter.js to named requires

* clang-format core/renderers/geras/highlighter.js
---
 core/renderers/geras/highlighter.js | 185 ++++++++++++++--------------
 tests/deps.js                       |   4 +-
 2 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js
index 74a6bb43d..f04339d29 100644
--- a/core/renderers/geras/highlighter.js
+++ b/core/renderers/geras/highlighter.js
@@ -11,15 +11,19 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.Highlighter');
+goog.module('Blockly.geras.Highlighter');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.svgPaths');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.geras.HighlightConstantProvider');
-goog.requireType('Blockly.geras.Renderer');
-goog.requireType('Blockly.geras.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const HighlightConstantProvider = goog.requireType('Blockly.geras.HighlightConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.geras.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.geras.RenderInfo');
+const Types = goog.require('Blockly.blockRendering.Types');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
@@ -33,28 +37,28 @@ goog.requireType('Blockly.geras.RenderInfo');
  * or closed paths.  The highlights for tabs and notches are loosely based on
  * tab and notch shapes, but are not exactly the same.
  *
- * @param {!Blockly.geras.RenderInfo} info An object containing all
+ * @param {!RenderInfo} info An object containing all
  *     information needed to render this block.
  * @package
  * @constructor
  */
-Blockly.geras.Highlighter = function(info) {
+const Highlighter = function(info) {
   this.info_ = info;
   this.steps_ = '';
   this.inlineSteps_ = '';
 
   this.RTL_ = this.info_.RTL;
 
-  var renderer = /** @type {!Blockly.geras.Renderer} */ (info.getRenderer());
+  const renderer = /** @type {!Renderer} */ (info.getRenderer());
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    */
   this.constants_ = renderer.getConstants();
 
   /**
-   * @type {!Blockly.geras.HighlightConstantProvider}
+   * @type {!HighlightConstantProvider}
    */
   this.highlightConstants_ = renderer.getHighlightConstants();
   /**
@@ -69,8 +73,7 @@ Blockly.geras.Highlighter = function(info) {
   this.puzzleTabPaths_ = this.highlightConstants_.PUZZLE_TAB;
   this.notchPaths_ = this.highlightConstants_.NOTCH;
   this.startPaths_ = this.highlightConstants_.START_HAT;
-  this.jaggedTeethPaths_ =
-      this.highlightConstants_.JAGGED_TEETH;
+  this.jaggedTeethPaths_ = this.highlightConstants_.JAGGED_TEETH;
 };
 
 /**
@@ -78,177 +81,175 @@ Blockly.geras.Highlighter = function(info) {
  * @return {string} The steps for the highlight path.
  * @package
  */
-Blockly.geras.Highlighter.prototype.getPath = function() {
+Highlighter.prototype.getPath = function() {
   return this.steps_ + '\n' + this.inlineSteps_;
 };
 
-Blockly.geras.Highlighter.prototype.drawTopCorner = function(row) {
-  this.steps_ += Blockly.utils.svgPaths.moveBy(row.xPos, this.info_.startY);
-  for (var i = 0, elem; (elem = row.elements[i]); i++) {
-    if (Blockly.blockRendering.Types.isLeftSquareCorner(elem)) {
+Highlighter.prototype.drawTopCorner = function(row) {
+  this.steps_ += svgPaths.moveBy(row.xPos, this.info_.startY);
+  for (let i = 0, elem; (elem = row.elements[i]); i++) {
+    if (Types.isLeftSquareCorner(elem)) {
       this.steps_ += this.highlightConstants_.START_POINT;
-    } else if (Blockly.blockRendering.Types.isLeftRoundedCorner(elem)) {
+    } else if (Types.isLeftRoundedCorner(elem)) {
       this.steps_ += this.outsideCornerPaths_.topLeft(this.RTL_);
-    } else if (Blockly.blockRendering.Types.isPreviousConnection(elem)) {
+    } else if (Types.isPreviousConnection(elem)) {
       this.steps_ += this.notchPaths_.pathLeft;
-    } else if (Blockly.blockRendering.Types.isHat(elem)) {
+    } else if (Types.isHat(elem)) {
       this.steps_ += this.startPaths_.path(this.RTL_);
-    } else if (Blockly.blockRendering.Types.isSpacer(elem) && elem.width != 0) {
+    } else if (Types.isSpacer(elem) && elem.width != 0) {
       // The end point of the spacer needs to be offset by the highlight amount.
       // So instead of using the spacer's width for a relative horizontal, use
       // its width and position for an absolute horizontal move.
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H',
-          elem.xPos + elem.width - this.highlightOffset_);
+      this.steps_ += svgPaths.lineOnAxis(
+          'H', elem.xPos + elem.width - this.highlightOffset_);
     }
   }
 
-  var right = row.xPos + row.width - this.highlightOffset_;
-  this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H', right);
+  const right = row.xPos + row.width - this.highlightOffset_;
+  this.steps_ += svgPaths.lineOnAxis('H', right);
 };
 
-Blockly.geras.Highlighter.prototype.drawJaggedEdge_ = function(row) {
+Highlighter.prototype.drawJaggedEdge_ = function(row) {
   if (this.info_.RTL) {
-    var remainder =
+    const remainder =
         row.height - this.jaggedTeethPaths_.height - this.highlightOffset_;
-    this.steps_ += this.jaggedTeethPaths_.pathLeft +
-        Blockly.utils.svgPaths.lineOnAxis('v', remainder);
+    this.steps_ +=
+        this.jaggedTeethPaths_.pathLeft + svgPaths.lineOnAxis('v', remainder);
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawValueInput = function(row) {
-  var input = row.getLastInput();
+Highlighter.prototype.drawValueInput = function(row) {
+  const input = row.getLastInput();
   if (this.RTL_) {
-    var belowTabHeight = row.height - input.connectionHeight;
+    const belowTabHeight = row.height - input.connectionHeight;
 
     this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(
+        svgPaths.moveTo(
             input.xPos + input.width - this.highlightOffset_, row.yPos) +
         this.puzzleTabPaths_.pathDown(this.RTL_) +
-        Blockly.utils.svgPaths.lineOnAxis('v', belowTabHeight);
+        svgPaths.lineOnAxis('v', belowTabHeight);
   } else {
-    this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(input.xPos + input.width, row.yPos) +
+    this.steps_ += svgPaths.moveTo(input.xPos + input.width, row.yPos) +
         this.puzzleTabPaths_.pathDown(this.RTL_);
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawStatementInput = function(row) {
-  var input = row.getLastInput();
+Highlighter.prototype.drawStatementInput = function(row) {
+  const input = row.getLastInput();
   if (this.RTL_) {
-    var innerHeight = row.height - (2 * this.insideCornerPaths_.height);
-    this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(input.xPos, row.yPos) +
+    const innerHeight = row.height - (2 * this.insideCornerPaths_.height);
+    this.steps_ += svgPaths.moveTo(input.xPos, row.yPos) +
         this.insideCornerPaths_.pathTop(this.RTL_) +
-        Blockly.utils.svgPaths.lineOnAxis('v', innerHeight) +
+        svgPaths.lineOnAxis('v', innerHeight) +
         this.insideCornerPaths_.pathBottom(this.RTL_) +
-        Blockly.utils.svgPaths.lineTo(
+        svgPaths.lineTo(
             row.width - input.xPos - this.insideCornerPaths_.width, 0);
   } else {
-    this.steps_ +=
-        Blockly.utils.svgPaths.moveTo(input.xPos, row.yPos + row.height) +
+    this.steps_ += svgPaths.moveTo(input.xPos, row.yPos + row.height) +
         this.insideCornerPaths_.pathBottom(this.RTL_) +
-        Blockly.utils.svgPaths.lineTo(
+        svgPaths.lineTo(
             row.width - input.xPos - this.insideCornerPaths_.width, 0);
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawRightSideRow = function(row) {
-  var rightEdge = row.xPos + row.width - this.highlightOffset_;
+Highlighter.prototype.drawRightSideRow = function(row) {
+  const rightEdge = row.xPos + row.width - this.highlightOffset_;
   if (row.followsStatement) {
-    this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H', rightEdge);
+    this.steps_ += svgPaths.lineOnAxis('H', rightEdge);
   }
   if (this.RTL_) {
-    this.steps_ += Blockly.utils.svgPaths.lineOnAxis('H', rightEdge);
+    this.steps_ += svgPaths.lineOnAxis('H', rightEdge);
     if (row.height > this.highlightOffset_) {
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('V',
-          row.yPos + row.height - this.highlightOffset_);
+      this.steps_ += svgPaths.lineOnAxis(
+          'V', row.yPos + row.height - this.highlightOffset_);
     }
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawBottomRow = function(row) {
+Highlighter.prototype.drawBottomRow = function(row) {
   // Highlight the vertical edge of the bottom row on the input side.
   // Highlighting is always from the top left, both in LTR and RTL.
   if (this.RTL_) {
     this.steps_ +=
-        Blockly.utils.svgPaths.lineOnAxis('V', row.baseline - this.highlightOffset_);
+        svgPaths.lineOnAxis('V', row.baseline - this.highlightOffset_);
   } else {
-    var cornerElem = this.info_.bottomRow.elements[0];
-    if (Blockly.blockRendering.Types.isLeftSquareCorner(cornerElem)) {
-      this.steps_ += Blockly.utils.svgPaths.moveTo(
+    const cornerElem = this.info_.bottomRow.elements[0];
+    if (Types.isLeftSquareCorner(cornerElem)) {
+      this.steps_ += svgPaths.moveTo(
           row.xPos + this.highlightOffset_,
           row.baseline - this.highlightOffset_);
-    } else if (Blockly.blockRendering.Types.isLeftRoundedCorner(cornerElem)) {
-      this.steps_ += Blockly.utils.svgPaths.moveTo(row.xPos, row.baseline);
+    } else if (Types.isLeftRoundedCorner(cornerElem)) {
+      this.steps_ += svgPaths.moveTo(row.xPos, row.baseline);
       this.steps_ += this.outsideCornerPaths_.bottomLeft();
     }
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawLeft = function() {
-  var outputConnection = this.info_.outputConnection;
+Highlighter.prototype.drawLeft = function() {
+  const outputConnection = this.info_.outputConnection;
   if (outputConnection) {
-    var tabBottom =
+    const tabBottom =
         outputConnection.connectionOffsetY + outputConnection.height;
     // Draw a line up to the bottom of the tab.
     if (this.RTL_) {
-      this.steps_ += Blockly.utils.svgPaths.moveTo(this.info_.startX, tabBottom);
+      this.steps_ += svgPaths.moveTo(this.info_.startX, tabBottom);
     } else {
-      var left = this.info_.startX + this.highlightOffset_;
-      var bottom = this.info_.bottomRow.baseline - this.highlightOffset_;
-      this.steps_ += Blockly.utils.svgPaths.moveTo(left, bottom);
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('V', tabBottom);
+      const left = this.info_.startX + this.highlightOffset_;
+      const bottom = this.info_.bottomRow.baseline - this.highlightOffset_;
+      this.steps_ += svgPaths.moveTo(left, bottom);
+      this.steps_ += svgPaths.lineOnAxis('V', tabBottom);
     }
     this.steps_ += this.puzzleTabPaths_.pathUp(this.RTL_);
   }
 
   if (!this.RTL_) {
-    var topRow = this.info_.topRow;
-    if (Blockly.blockRendering.Types.isLeftRoundedCorner(topRow.elements[0])) {
-      this.steps_ += Blockly.utils.svgPaths.lineOnAxis('V', this.outsideCornerPaths_.height);
+    const topRow = this.info_.topRow;
+    if (Types.isLeftRoundedCorner(topRow.elements[0])) {
+      this.steps_ += svgPaths.lineOnAxis('V', this.outsideCornerPaths_.height);
     } else {
       this.steps_ +=
-          Blockly.utils.svgPaths.lineOnAxis('V', topRow.capline + this.highlightOffset_);
+          svgPaths.lineOnAxis('V', topRow.capline + this.highlightOffset_);
     }
   }
 };
 
-Blockly.geras.Highlighter.prototype.drawInlineInput = function(input) {
-  var offset = this.highlightOffset_;
+Highlighter.prototype.drawInlineInput = function(input) {
+  const offset = this.highlightOffset_;
 
   // Relative to the block's left.
-  var connectionRight = input.xPos + input.connectionWidth;
-  var yPos = input.centerline - input.height / 2;
-  var bottomHighlightWidth = input.width - input.connectionWidth;
-  var startY = yPos + offset;
+  const connectionRight = input.xPos + input.connectionWidth;
+  const yPos = input.centerline - input.height / 2;
+  const bottomHighlightWidth = input.width - input.connectionWidth;
+  const startY = yPos + offset;
 
   if (this.RTL_) {
-    var aboveTabHeight = input.connectionOffsetY - offset;
-    var belowTabHeight = input.height -
+    const aboveTabHeight = input.connectionOffsetY - offset;
+    const belowTabHeight = input.height -
         (input.connectionOffsetY + input.connectionHeight) + offset;
 
-    var startX = connectionRight - offset;
+    const startX = connectionRight - offset;
 
-    this.inlineSteps_ += Blockly.utils.svgPaths.moveTo(startX, startY) +
+    this.inlineSteps_ += svgPaths.moveTo(startX, startY) +
         // Right edge above tab.
-        Blockly.utils.svgPaths.lineOnAxis('v', aboveTabHeight) +
+        svgPaths.lineOnAxis('v', aboveTabHeight) +
         // Back of tab.
         this.puzzleTabPaths_.pathDown(this.RTL_) +
         // Right edge below tab.
-        Blockly.utils.svgPaths.lineOnAxis('v', belowTabHeight) +
+        svgPaths.lineOnAxis('v', belowTabHeight) +
         // Bottom.
-        Blockly.utils.svgPaths.lineOnAxis('h', bottomHighlightWidth);
+        svgPaths.lineOnAxis('h', bottomHighlightWidth);
   } else {
-
     this.inlineSteps_ +=
         // Go to top right corner.
-        Blockly.utils.svgPaths.moveTo(input.xPos + input.width + offset, startY) +
+        svgPaths.moveTo(input.xPos + input.width + offset, startY) +
         // Highlight right edge, bottom.
-        Blockly.utils.svgPaths.lineOnAxis('v', input.height) +
-        Blockly.utils.svgPaths.lineOnAxis('h', -bottomHighlightWidth) +
+        svgPaths.lineOnAxis('v', input.height) +
+        svgPaths.lineOnAxis('h', -bottomHighlightWidth) +
         // Go to top of tab.
-        Blockly.utils.svgPaths.moveTo(connectionRight, yPos + input.connectionOffsetY) +
+        svgPaths.moveTo(connectionRight, yPos + input.connectionOffsetY) +
         // Short highlight glint at bottom of tab.
         this.puzzleTabPaths_.pathDown(this.RTL_);
   }
 };
+
+exports = Highlighter;
diff --git a/tests/deps.js b/tests/deps.js
index bbf289725..14ae08221 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -133,7 +133,7 @@ goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRen
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
@@ -210,7 +210,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From 084c421597977501df1f6b7e178391715dd17a7d Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 13:44:21 -0700
Subject: [PATCH 187/291] Remove some unused functions and add deprecation
 warnings

---
 core/blockly.js | 84 +++----------------------------------------------
 core/inject.js  |  2 --
 2 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 7ad87be94..4d14aac1e 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -76,9 +76,14 @@ Blockly.VERSION = 'uncompiled';
 // Add a getter and setter pair for Blockly.mainWorkspace, for legacy reasons.
 Object.defineProperty(Blockly, 'mainWorkspace', {
   set: function(x) {
+    Blockly.utils.deprecation.warn(
+        'Blockly.mainWorkspace', 'September 2021', 'September 2022');
     Blockly.common.setMainWorkspace(x);
   },
   get: function() {
+    Blockly.utils.deprecation.warn(
+        'Blockly.mainWorkspace', 'September 2021', 'September 2022',
+        'Blockly.getMainWorkspace()');
     return Blockly.common.getMainWorkspace();
   }
 });
@@ -96,13 +101,6 @@ Blockly.selected = null;
  */
 Blockly.draggingConnections = [];
 
-/**
- * Cached value for whether 3D is supported.
- * @type {?boolean}
- * @private
- */
-Blockly.cache3dSupported_ = null;
-
 /**
  * Container element to render the WidgetDiv, DropDownDiv and Tooltip.
  * @type {?Element}
@@ -372,78 +370,6 @@ Blockly.hueToHex = function(hue) {
       Blockly.internalConstants.HSV_VALUE * 255);
 };
 
-/**
- * Checks old colour constants are not overwritten by the host application.
- * If a constant is overwritten, it prints a console warning directing the
- * developer to use the equivalent Msg constant.
- * @package
- */
-Blockly.checkBlockColourConstants = function() {
-  Blockly.checkBlockColourConstant_(
-      'LOGIC_HUE', ['Blocks', 'logic', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'LOGIC_HUE', ['Constants', 'Logic', 'HUE'], 210);
-  Blockly.checkBlockColourConstant_(
-      'LOOPS_HUE', ['Blocks', 'loops', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'LOOPS_HUE', ['Constants', 'Loops', 'HUE'], 120);
-  Blockly.checkBlockColourConstant_(
-      'MATH_HUE', ['Blocks', 'math', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'MATH_HUE', ['Constants', 'Math', 'HUE'], 230);
-  Blockly.checkBlockColourConstant_(
-      'TEXTS_HUE', ['Blocks', 'texts', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'TEXTS_HUE', ['Constants', 'Text', 'HUE'], 160);
-  Blockly.checkBlockColourConstant_(
-      'LISTS_HUE', ['Blocks', 'lists', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'LISTS_HUE', ['Constants', 'Lists', 'HUE'], 260);
-  Blockly.checkBlockColourConstant_(
-      'COLOUR_HUE', ['Blocks', 'colour', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'COLOUR_HUE', ['Constants', 'Colour', 'HUE'], 20);
-  Blockly.checkBlockColourConstant_(
-      'VARIABLES_HUE', ['Blocks', 'variables', 'HUE'], undefined);
-  Blockly.checkBlockColourConstant_(
-      'VARIABLES_HUE', ['Constants', 'Variables', 'HUE'], 330);
-  // Blockly.Blocks.variables_dynamic.HUE never existed.
-  Blockly.checkBlockColourConstant_(
-      'VARIABLES_DYNAMIC_HUE', ['Constants', 'VariablesDynamic', 'HUE'], 310);
-  Blockly.checkBlockColourConstant_(
-      'PROCEDURES_HUE', ['Blocks', 'procedures', 'HUE'], undefined);
-  // Blockly.Constants.Procedures.HUE never existed.
-};
-
-/**
- * Checks for a constant in the Blockly namespace, verifying it is undefined or
- * has the old/original value. Prints a warning if this is not true.
- * @param {string} msgName The Msg constant identifier.
- * @param {!Array<string>} blocklyNamePath The name parts of the tested
- *     constant.
- * @param {number|undefined} expectedValue The expected value of the constant.
- * @private
- */
-Blockly.checkBlockColourConstant_ = function(
-    msgName, blocklyNamePath, expectedValue) {
-  var namePath = 'Blockly';
-  var value = Blockly;
-  for (var i = 0; i < blocklyNamePath.length; ++i) {
-    namePath += '.' + blocklyNamePath[i];
-    if (value) {
-      value = value[blocklyNamePath[i]];
-    }
-  }
-
-  if (value && value !== expectedValue) {
-    var warningPattern = (expectedValue === undefined) ?
-        '%1 has been removed. Use Blockly.Msg["%2"].' :
-        '%1 is deprecated and unused. Override Blockly.Msg["%2"].';
-    var warning = warningPattern.replace('%1', namePath).replace('%2', msgName);
-    console.warn(warning);
-  }
-};
-
 /**
  * Set the parent container.  This is the container element that the WidgetDiv,
  * DropDownDiv, and Tooltip are rendered into the first time `Blockly.inject`
diff --git a/core/inject.js b/core/inject.js
index 6bb3e6077..3b3715b0f 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -45,8 +45,6 @@ goog.requireType('Blockly.BlockSvg');
  * @return {!Blockly.WorkspaceSvg} Newly created main workspace.
  */
 Blockly.inject = function(container, opt_options) {
-  Blockly.checkBlockColourConstants();
-
   if (typeof container == 'string') {
     container = document.getElementById(container) ||
         document.querySelector(container);

From 1eabe91fa68f4e69fc470580b5873b5f5ba867cf Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 13:55:17 -0700
Subject: [PATCH 188/291] Move set/getParentContainer into common

---
 core/blockly.js     | 11 +----------
 core/common.js      | 28 ++++++++++++++++++++++++++++
 core/dropdowndiv.js |  2 +-
 core/tooltip.js     |  3 ++-
 core/widgetdiv.js   |  2 +-
 tests/deps.js       |  5 +++++
 6 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 4d14aac1e..f8dc17d3d 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -101,13 +101,6 @@ Blockly.selected = null;
  */
 Blockly.draggingConnections = [];
 
-/**
- * Container element to render the WidgetDiv, DropDownDiv and Tooltip.
- * @type {?Element}
- * @package
- */
-Blockly.parentContainer = null;
-
 /**
  * Returns the dimensions of the specified SVG image.
  * @param {!SVGElement} svg SVG image.
@@ -377,9 +370,7 @@ Blockly.hueToHex = function(hue) {
  * This method is a NOP if called after the first ``Blockly.inject``.
  * @param {!Element} container The container element.
  */
-Blockly.setParentContainer = function(container) {
-  Blockly.parentContainer = container;
-};
+Blockly.setParentContainer = Blockly.common.setParentContainer;
 
 /** Aliases. */
 
diff --git a/core/common.js b/core/common.js
index d9a6b9638..711cf3571 100644
--- a/core/common.js
+++ b/core/common.js
@@ -44,3 +44,31 @@ const setMainWorkspace = function(workspace) {
   mainWorkspace = workspace;
 };
 exports.setMainWorkspace = setMainWorkspace;
+
+/**
+ * Container element in which to render the WidgetDiv, DropDownDiv and Tooltip.
+ * @type {?Element}
+ */
+let parentContainer;
+
+/**
+ * Get the container element in which to render the WidgetDiv, DropDownDiv and\
+ * Tooltip.
+ * @return {?Element}
+ */
+const getParentContainer = function() {
+  return parentContainer;
+};
+exports.getParentContainer = getParentContainer;
+
+/**
+ * Set the parent container.  This is the container element that the WidgetDiv,
+ * DropDownDiv, and Tooltip are rendered into the first time `Blockly.inject`
+ * is called.
+ * This method is a NOP if called after the first ``Blockly.inject``.
+ * @param {!Element} newParent The container element.
+ */
+const setParentContainer = function(newParent) {
+  parentContainer = newParent;
+};
+exports.setParentContainer = setParentContainer;
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index bf5eddb69..5ebb22a5e 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -163,7 +163,7 @@ Blockly.DropDownDiv.createDom = function() {
   }
   var div = document.createElement('div');
   div.className = 'blocklyDropDownDiv';
-  var container = Blockly.parentContainer || document.body;
+  var container = Blockly.common.getParentContainer() || document.body;
   container.appendChild(div);
   /**
    * The div element.
diff --git a/core/tooltip.js b/core/tooltip.js
index 12819e13f..d93825815 100644
--- a/core/tooltip.js
+++ b/core/tooltip.js
@@ -22,6 +22,7 @@
 goog.provide('Blockly.Tooltip');
 
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.utils.string');
 
 
@@ -170,7 +171,7 @@ Blockly.Tooltip.createDom = function() {
   // Create an HTML container for popup overlays (e.g. editor widgets).
   Blockly.Tooltip.DIV = document.createElement('div');
   Blockly.Tooltip.DIV.className = 'blocklyTooltipDiv';
-  var container = Blockly.parentContainer || document.body;
+  var container = Blockly.common.getParentContainer() || document.body;
   container.appendChild(Blockly.Tooltip.DIV);
 };
 
diff --git a/core/widgetdiv.js b/core/widgetdiv.js
index 8b7de7dac..106dce645 100644
--- a/core/widgetdiv.js
+++ b/core/widgetdiv.js
@@ -67,7 +67,7 @@ Blockly.WidgetDiv.createDom = function() {
    */
   Blockly.WidgetDiv.DIV = document.createElement('div');
   Blockly.WidgetDiv.DIV.className = 'blocklyWidgetDiv';
-  var container = Blockly.parentContainer || document.body;
+  var container = Blockly.common.getParentContainer() || document.body;
   container.appendChild(Blockly.WidgetDiv.DIV);
 };
 
diff --git a/tests/deps.js b/tests/deps.js
index 14ae08221..784fc398a 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -172,8 +172,13 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+<<<<<<< HEAD
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
+=======
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
+goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
+>>>>>>> c62fba04 (Move set/getParentContainer into common)
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From d5a6d7d3db2d929ad174fb59e3bddfc52eea3c3c Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Jul 2021 14:13:39 -0700
Subject: [PATCH 189/291] Move draggingConnections to common

---
 core/block_dragger.js      |  3 ++-
 core/block_svg.js          |  8 +++++---
 core/blockly.js            |  8 --------
 core/common.js             | 31 ++++++++++++++++++++++++++++++-
 core/connection_checker.js |  5 +++--
 tests/deps.js              |  6 +++---
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index b7c11e8a3..7345c0327 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -24,6 +24,7 @@ const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const blockAnimation = goog.require('Blockly.blockAnimations');
+const common = goog.require('Blockly.common');
 const dom = goog.require('Blockly.utils.dom');
 const events = goog.require('Blockly.Events');
 const registry = goog.require('Blockly.registry');
@@ -332,7 +333,7 @@ BlockDragger.prototype.maybeDeleteBlock_ = function() {
     // Fire a move event, so we know where to go back to for an undo.
     this.fireMoveEvent_();
     this.draggingBlock_.dispose(false, true);
-    Blockly.draggingConnections = [];
+    common.setDraggingConnections([]);
     return true;
   }
   return false;
diff --git a/core/block_svg.js b/core/block_svg.js
index 57d20c1ba..cbb69063e 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -17,6 +17,7 @@ goog.require('Blockly.Block');
 goog.require('Blockly.blockAnimations');
 goog.require('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.browserEvents');
+goog.require('Blockly.common');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.constants');
 goog.require('Blockly.ContextMenu');
@@ -824,12 +825,13 @@ Blockly.BlockSvg.prototype.setDragging = function(adding) {
     var group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    Blockly.draggingConnections =
-        Blockly.draggingConnections.concat(this.getConnections_(true));
+    var newList =
+        Blockly.common.getDraggingConnections().concat(this.getConnections_(true));
+    Blockly.common.setDraggingConnections(newList);
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.draggingConnections = [];
+    Blockly.common.setDraggingConnections([]);
     Blockly.utils.dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
diff --git a/core/blockly.js b/core/blockly.js
index f8dc17d3d..1f8cfa55a 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -57,7 +57,6 @@ goog.require('Blockly.WorkspaceSvg');
 goog.require('Blockly.Xml');
 
 goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.ICopyable');
 goog.requireType('Blockly.Workspace');
 
@@ -94,13 +93,6 @@ Object.defineProperty(Blockly, 'mainWorkspace', {
  */
 Blockly.selected = null;
 
-/**
- * All of the connections on blocks that are currently being dragged.
- * @type {!Array<!Blockly.Connection>}
- * @package
- */
-Blockly.draggingConnections = [];
-
 /**
  * Returns the dimensions of the specified SVG image.
  * @param {!SVGElement} svg SVG image.
diff --git a/core/common.js b/core/common.js
index 711cf3571..762ac8f3f 100644
--- a/core/common.js
+++ b/core/common.js
@@ -14,6 +14,8 @@
 goog.module('Blockly.common');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.requireType('Blockly.Workspace');
 
@@ -54,7 +56,7 @@ let parentContainer;
 /**
  * Get the container element in which to render the WidgetDiv, DropDownDiv and\
  * Tooltip.
- * @return {?Element}
+ * @return {?Element} The parent container.
  */
 const getParentContainer = function() {
   return parentContainer;
@@ -72,3 +74,30 @@ const setParentContainer = function(newParent) {
   parentContainer = newParent;
 };
 exports.setParentContainer = setParentContainer;
+
+/**
+ * All of the connections on blocks that are currently being dragged.
+ * @type {!Array.<!Connection>}
+ */
+let draggingConnections = [];
+
+/**
+ * Get the list of dragging connections.
+ * @returns {!Array.<!Connection>} The list of connections on blocks that are
+ *     currently being dragged.
+ */
+const getDraggingConnections = function() {
+  return draggingConnections;
+};
+/** @package **/
+exports.getDraggingConnections = getDraggingConnections;
+
+/**
+ * Set the list of dragging connections.
+ * @param {!Array.<!Connection>} connectionList The new list of connections on
+ *     blocks that are currently being dragged.
+ */
+const setDraggingConnections = function(connectionList) {
+  draggingConnections = connectionList;
+};
+exports.setDraggingConnections = setDraggingConnections;
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 20a582aac..c6fb1fd9b 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -19,6 +19,7 @@ const Connection = goog.require('Blockly.Connection');
 const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const common = goog.require('Blockly.common');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 const internalConstants = goog.require('Blockly.internalConstants');
 const registry = goog.require('Blockly.registry');
@@ -239,7 +240,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (Blockly.draggingConnections.indexOf(b) != -1) {
+  if (common.getDraggingConnections().indexOf(b) != -1) {
     return false;
   }
 
@@ -263,7 +264,7 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (Blockly.draggingConnections.indexOf(b) != -1) {
+  if (common.getDraggingConnections().indexOf(b) != -1) {
     return false;
   }
 
diff --git a/tests/deps.js b/tests/deps.js
index 784fc398a..2438a641b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -10,8 +10,8 @@ goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.Vari
 goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
@@ -22,7 +22,7 @@ goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubbl
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});

From 36c02120e9bdff8ae60a588016a42dd86be7ef62 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Mon, 2 Aug 2021 20:10:10 -0700
Subject: [PATCH 190/291] Rebuild

---
 tests/deps.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/deps.js b/tests/deps.js
index 2438a641b..e1834d0a3 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -172,13 +172,8 @@ goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory']
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-<<<<<<< HEAD
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);
-=======
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem']);
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
->>>>>>> c62fba04 (Move set/getParentContainer into common)
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From 7bc461ea833878fef147f6f683fbb9c6f2fd0eca Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 4 Aug 2021 17:17:24 -0700
Subject: [PATCH 191/291] polish: export draggingConnections directly

---
 core/block_dragger.js      |  2 +-
 core/block_svg.js          |  6 ++----
 core/common.js             | 25 ++-----------------------
 core/connection_checker.js |  4 ++--
 tests/deps.js              |  2 +-
 5 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/core/block_dragger.js b/core/block_dragger.js
index 7345c0327..6e5ac10c1 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -333,7 +333,7 @@ BlockDragger.prototype.maybeDeleteBlock_ = function() {
     // Fire a move event, so we know where to go back to for an undo.
     this.fireMoveEvent_();
     this.draggingBlock_.dispose(false, true);
-    common.setDraggingConnections([]);
+    common.draggingConnections.length = 0;
     return true;
   }
   return false;
diff --git a/core/block_svg.js b/core/block_svg.js
index cbb69063e..fbd3dd5dc 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -825,13 +825,11 @@ Blockly.BlockSvg.prototype.setDragging = function(adding) {
     var group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    var newList =
-        Blockly.common.getDraggingConnections().concat(this.getConnections_(true));
-    Blockly.common.setDraggingConnections(newList);
+    Blockly.common.draggingConnections.push(...this.getConnections_(true));
     Blockly.utils.dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.common.setDraggingConnections([]);
+    Blockly.common.draggingConnections.length = 0;
     Blockly.utils.dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
diff --git a/core/common.js b/core/common.js
index 762ac8f3f..b6d7ad369 100644
--- a/core/common.js
+++ b/core/common.js
@@ -77,27 +77,6 @@ exports.setParentContainer = setParentContainer;
 
 /**
  * All of the connections on blocks that are currently being dragged.
- * @type {!Array.<!Connection>}
+ * @type {!Array<!Connection>}
  */
-let draggingConnections = [];
-
-/**
- * Get the list of dragging connections.
- * @returns {!Array.<!Connection>} The list of connections on blocks that are
- *     currently being dragged.
- */
-const getDraggingConnections = function() {
-  return draggingConnections;
-};
-/** @package **/
-exports.getDraggingConnections = getDraggingConnections;
-
-/**
- * Set the list of dragging connections.
- * @param {!Array.<!Connection>} connectionList The new list of connections on
- *     blocks that are currently being dragged.
- */
-const setDraggingConnections = function(connectionList) {
-  draggingConnections = connectionList;
-};
-exports.setDraggingConnections = setDraggingConnections;
+exports.draggingConnections = [];
diff --git a/core/connection_checker.js b/core/connection_checker.js
index c6fb1fd9b..76162b017 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -240,7 +240,7 @@ ConnectionChecker.prototype.doDragChecks = function(a, b, distance) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (common.getDraggingConnections().indexOf(b) != -1) {
+  if (common.draggingConnections.indexOf(b) != -1) {
     return false;
   }
 
@@ -264,7 +264,7 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   }
 
   // Don't let blocks try to connect to themselves or ones they nest.
-  if (common.getDraggingConnections().indexOf(b) != -1) {
+  if (common.draggingConnections.indexOf(b) != -1) {
     return false;
   }
 
diff --git a/tests/deps.js b/tests/deps.js
index e1834d0a3..0cb50f476 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});

From 08cdbcf8c73671f53eb89a07eec55206040a9c58 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Wed, 4 Aug 2021 17:35:34 -0700
Subject: [PATCH 192/291] fix: update tag module workflow to add labels instead
 of setting one label

---
 .github/workflows/tag_module_cleanup.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 94e7ec692..9cec19500 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -5,14 +5,14 @@ name: Tag module cleanup
 
 # Trigger on pull requests against goog_module branch only
 # Uses pull_request_target to get write permissions so that it can write labels.
-on: 
+on:
   pull_request_target:
     branches:
       - goog_module
 
 jobs:
   tag-module-cleanup:
-  
+
     # Add the type: cleanup label
     runs-on: ubuntu-latest
     steps:
@@ -23,13 +23,22 @@ jobs:
             // https://github.com/google/blockly/milestone/18
             const milestoneNumber = 18;
             // Note that pull requests are accessed through the issues API.
-            const issuesUpdateParams = { 
-              owner: context.repo.owner, 
-              repo: context.repo.repo, 
+
+            const issueGetParams = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            }
+
+            const issueInfo = await github.issues.get(issueGetParams)
+
+            const issuesUpdateParams = {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
               // Adds the milestone
-              milestone: milestoneNumber, 
+              milestone: milestoneNumber,
               issue_number: context.issue.number,
               // Sets the labels
-              labels: ['type: cleanup']
+              labels: [...issueInfo.labels, 'type: cleanup']
             }
             await github.issues.update(issuesUpdateParams)

From 80b521e8d7a0d376793f399170a9643afc404738 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 5 Aug 2021 08:09:10 -0700
Subject: [PATCH 193/291] Migrate core/renderers/geras/info.js to goog.module
 syntax (#5305)

* Migrate core/renderers/geras/info.js to ES6 const/let

* Migrate core/renderers/geras/info.js to goog.module

* Migrate core/renderers/geras/info.js to named requires

* clang-format core/renderers/geras/info.js
---
 core/renderers/geras/info.js | 280 +++++++++++++++++------------------
 tests/deps.js                |   2 +-
 2 files changed, 133 insertions(+), 149 deletions(-)

diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 121e3b353..582aab2da 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -11,22 +11,25 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras');
-goog.provide('Blockly.geras.RenderInfo');
+goog.module('Blockly.geras.RenderInfo');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ExternalValueInput');
-goog.require('Blockly.blockRendering.InputRow');
-goog.require('Blockly.blockRendering.InRowSpacer');
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.geras.InlineInput');
-goog.require('Blockly.geras.StatementInput');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.Field');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.geras.Renderer');
+const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.blockRendering.Field');
+const InlineInput = goog.require('Blockly.geras.InlineInput');
+/* eslint-disable-next-line no-unused-vars */
+const InputRow = goog.requireType('Blockly.blockRendering.InputRow');
+const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.geras.Renderer');
+const StatementInput = goog.require('Blockly.geras.StatementInput');
+const Types = goog.require('Blockly.blockRendering.Types');
+const inputTypes = goog.require('Blockly.inputTypes');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -36,36 +39,35 @@ goog.requireType('Blockly.geras.Renderer');
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
  *
- * @param {!Blockly.geras.Renderer} renderer The renderer in use.
- * @param {!Blockly.BlockSvg} block The block to measure.
+ * @param {!Renderer} renderer The renderer in use.
+ * @param {!BlockSvg} block The block to measure.
  * @constructor
  * @package
- * @extends {Blockly.blockRendering.RenderInfo}
+ * @extends {BaseRenderInfo}
  */
-Blockly.geras.RenderInfo = function(renderer, block) {
-  Blockly.geras.RenderInfo.superClass_.constructor.call(this, renderer, block);
+const RenderInfo = function(renderer, block) {
+  RenderInfo.superClass_.constructor.call(this, renderer, block);
 };
-Blockly.utils.object.inherits(Blockly.geras.RenderInfo,
-    Blockly.blockRendering.RenderInfo);
+object.inherits(RenderInfo, BaseRenderInfo);
 
 /**
  * Get the block renderer in use.
- * @return {!Blockly.geras.Renderer} The block renderer in use.
+ * @return {!Renderer} The block renderer in use.
  * @package
  */
-Blockly.geras.RenderInfo.prototype.getRenderer = function() {
-  return /** @type {!Blockly.geras.Renderer} */ (this.renderer_);
+RenderInfo.prototype.getRenderer = function() {
+  return /** @type {!Renderer} */ (this.renderer_);
 };
 
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.populateBottomRow_ = function() {
-  Blockly.geras.RenderInfo.superClass_.populateBottomRow_.call(this);
+RenderInfo.prototype.populateBottomRow_ = function() {
+  RenderInfo.superClass_.populateBottomRow_.call(this);
 
-  var followsStatement = this.block_.inputList.length &&
+  const followsStatement = this.block_.inputList.length &&
       this.block_.inputList[this.block_.inputList.length - 1].type ==
-          Blockly.inputTypes.STATEMENT;
+          inputTypes.STATEMENT;
 
   // The minimum height of the bottom row is smaller in Geras than in other
   // renderers, because the dark path adds a pixel.
@@ -75,31 +77,27 @@ Blockly.geras.RenderInfo.prototype.populateBottomRow_ = function() {
     this.bottomRow.minHeight =
         this.constants_.MEDIUM_PADDING - this.constants_.DARK_PATH_OFFSET;
   }
-
 };
 
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.addInput_ = function(input, activeRow) {
+RenderInfo.prototype.addInput_ = function(input, activeRow) {
   // Non-dummy inputs have visual representations onscreen.
-  if (this.isInline && input.type == Blockly.inputTypes.VALUE) {
-    activeRow.elements.push(
-        new Blockly.geras.InlineInput(this.constants_, input));
+  if (this.isInline && input.type == inputTypes.VALUE) {
+    activeRow.elements.push(new InlineInput(this.constants_, input));
     activeRow.hasInlineInput = true;
-  } else if (input.type == Blockly.inputTypes.STATEMENT) {
-    activeRow.elements.push(
-        new Blockly.geras.StatementInput(this.constants_, input));
+  } else if (input.type == inputTypes.STATEMENT) {
+    activeRow.elements.push(new StatementInput(this.constants_, input));
     activeRow.hasStatement = true;
-  } else if (input.type == Blockly.inputTypes.VALUE) {
-    activeRow.elements.push(
-        new Blockly.blockRendering.ExternalValueInput(this.constants_, input));
+  } else if (input.type == inputTypes.VALUE) {
+    activeRow.elements.push(new ExternalValueInput(this.constants_, input));
     activeRow.hasExternalInput = true;
-  } else if (input.type == Blockly.inputTypes.DUMMY) {
+  } else if (input.type == inputTypes.DUMMY) {
     // Dummy inputs have no visual representation, but the information is still
     // important.
-    activeRow.minHeight = Math.max(activeRow.minHeight,
-        this.constants_.DUMMY_INPUT_MIN_HEIGHT);
+    activeRow.minHeight =
+        Math.max(activeRow.minHeight, this.constants_.DUMMY_INPUT_MIN_HEIGHT);
     activeRow.hasDummyInput = true;
   }
   // Ignore row alignment if inline.
@@ -111,40 +109,38 @@ Blockly.geras.RenderInfo.prototype.addInput_ = function(input, activeRow) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.addElemSpacing_ = function() {
-  var hasExternalInputs = false;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+RenderInfo.prototype.addElemSpacing_ = function() {
+  let hasExternalInputs = false;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasExternalInput) {
       hasExternalInputs = true;
     }
   }
-  for (var i = 0, row; (row = this.rows[i]); i++) {
-    var oldElems = row.elements;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
+    const oldElems = row.elements;
     row.elements = [];
     // No spacing needed before the corner on the top row or the bottom row.
     if (row.startsWithElemSpacer()) {
       // There's a spacer before the first element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
+      row.elements.push(new InRowSpacer(
           this.constants_, this.getInRowSpacing_(null, oldElems[0])));
     }
     if (!oldElems.length) {
       continue;
     }
-    for (var e = 0; e < oldElems.length - 1; e++) {
+    for (let e = 0; e < oldElems.length - 1; e++) {
       row.elements.push(oldElems[e]);
-      var spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
-      row.elements.push(
-          new Blockly.blockRendering.InRowSpacer(this.constants_, spacing));
+      const spacing = this.getInRowSpacing_(oldElems[e], oldElems[e + 1]);
+      row.elements.push(new InRowSpacer(this.constants_, spacing));
     }
     row.elements.push(oldElems[oldElems.length - 1]);
     if (row.endsWithElemSpacer()) {
-      var spacing = this.getInRowSpacing_(oldElems[oldElems.length - 1], null);
+      let spacing = this.getInRowSpacing_(oldElems[oldElems.length - 1], null);
       if (hasExternalInputs && row.hasDummyInput) {
         spacing += this.constants_.TAB_WIDTH;
       }
       // There's a spacer after the last element in the row.
-      row.elements.push(new Blockly.blockRendering.InRowSpacer(
-          this.constants_, spacing));
+      row.elements.push(new InRowSpacer(this.constants_, spacing));
     }
   }
 };
@@ -152,18 +148,18 @@ Blockly.geras.RenderInfo.prototype.addElemSpacing_ = function() {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
+RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   if (!prev) {
     // Between an editable field and the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isField(next) &&
-        (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
+    if (next && Types.isField(next) &&
+        (/** @type {Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Inline input at the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isInlineInput(next)) {
+    if (next && Types.isInlineInput(next)) {
       return this.constants_.MEDIUM_LARGE_PADDING;
     }
-    if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
+    if (next && Types.isStatementInput(next)) {
       return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
     }
     // Anything else at the beginning of the row.
@@ -171,30 +167,28 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between a non-input and the end of the row or a statement input.
-  if (!Blockly.blockRendering.Types.isInput(prev) && (!next ||
-      Blockly.blockRendering.Types.isStatementInput(next))) {
+  if (!Types.isInput(prev) && (!next || Types.isStatementInput(next))) {
     // Between an editable field and the end of the row.
-    if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
+    if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     }
     // Padding at the end of an icon-only row to make the block shape clearer.
-    if (Blockly.blockRendering.Types.isIcon(prev)) {
+    if (Types.isIcon(prev)) {
       return (this.constants_.LARGE_PADDING * 2) + 1;
     }
-    if (Blockly.blockRendering.Types.isHat(prev)) {
+    if (Types.isHat(prev)) {
       return this.constants_.NO_PADDING;
     }
     // Establish a minimum width for a block with a previous or next connection.
-    if (Blockly.blockRendering.Types.isPreviousOrNextConnection(prev)) {
+    if (Types.isPreviousOrNextConnection(prev)) {
       return this.constants_.LARGE_PADDING;
     }
     // Between rounded corner and the end of the row.
-    if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev)) {
+    if (Types.isLeftRoundedCorner(prev)) {
       return this.constants_.MIN_BLOCK_WIDTH;
     }
     // Between a jagged edge and the end of the row.
-    if (Blockly.blockRendering.Types.isJaggedEdge(prev)) {
+    if (Types.isJaggedEdge(prev)) {
       return this.constants_.NO_PADDING;
     }
     // Between noneditable fields and icons and the end of the row.
@@ -202,33 +196,31 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Between inputs and the end of the row.
-  if (Blockly.blockRendering.Types.isInput(prev) && !next) {
-    if (Blockly.blockRendering.Types.isExternalInput(prev)) {
+  if (Types.isInput(prev) && !next) {
+    if (Types.isExternalInput(prev)) {
       return this.constants_.NO_PADDING;
-    } else if (Blockly.blockRendering.Types.isInlineInput(prev)) {
+    } else if (Types.isInlineInput(prev)) {
       return this.constants_.LARGE_PADDING;
-    } else if (Blockly.blockRendering.Types.isStatementInput(prev)) {
+    } else if (Types.isStatementInput(prev)) {
       return this.constants_.NO_PADDING;
     }
   }
 
   // Spacing between a non-input and an input.
-  if (!Blockly.blockRendering.Types.isInput(prev) &&
-      next && Blockly.blockRendering.Types.isInput(next)) {
+  if (!Types.isInput(prev) && next && Types.isInput(next)) {
     // Between an editable field and an input.
-    if (Blockly.blockRendering.Types.isField(prev) &&
-        (/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable) {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
+    if (Types.isField(prev) && (/** @type {Field} */ (prev)).isEditable) {
+      if (Types.isInlineInput(next)) {
         return this.constants_.SMALL_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
+      } else if (Types.isExternalInput(next)) {
         return this.constants_.SMALL_PADDING;
       }
     } else {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
+      if (Types.isInlineInput(next)) {
         return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
+      } else if (Types.isExternalInput(next)) {
         return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isStatementInput(next)) {
+      } else if (Types.isStatementInput(next)) {
         return this.constants_.LARGE_PADDING;
       }
     }
@@ -236,16 +228,14 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
   }
 
   // Spacing between an icon and an icon or field.
-  if (Blockly.blockRendering.Types.isIcon(prev) &&
-      next && !Blockly.blockRendering.Types.isInput(next)) {
+  if (Types.isIcon(prev) && next && !Types.isInput(next)) {
     return this.constants_.LARGE_PADDING;
   }
 
   // Spacing between an inline input and a field.
-  if (Blockly.blockRendering.Types.isInlineInput(prev) &&
-      next && Blockly.blockRendering.Types.isField(next)) {
+  if (Types.isInlineInput(prev) && next && Types.isField(next)) {
     // Editable field after inline input.
-    if ((/** @type {Blockly.blockRendering.Field} */ (next)).isEditable) {
+    if ((/** @type {Field} */ (next)).isEditable) {
       return this.constants_.MEDIUM_PADDING;
     } else {
       // Noneditable field after inline input.
@@ -253,46 +243,43 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
     }
   }
 
-  if (Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next) {
+  if (Types.isLeftSquareCorner(prev) && next) {
     // Spacing between a hat and a corner
-    if (Blockly.blockRendering.Types.isHat(next)) {
+    if (Types.isHat(next)) {
       return this.constants_.NO_PADDING;
     }
     // Spacing between a square corner and a previous or next connection
-    if (Blockly.blockRendering.Types.isPreviousConnection(next)) {
+    if (Types.isPreviousConnection(next)) {
       return next.notchOffset;
-    } else if (Blockly.blockRendering.Types.isNextConnection(next)) {
+    } else if (Types.isNextConnection(next)) {
       // Next connections are shifted slightly to the left (in both LTR and RTL)
       // to make the dark path under the previous connection show through.
-      var offset = (this.RTL ? 1 : -1) *
-          this.constants_.DARK_PATH_OFFSET / 2;
+      const offset = (this.RTL ? 1 : -1) * this.constants_.DARK_PATH_OFFSET / 2;
       return next.notchOffset + offset;
     }
   }
 
   // Spacing between a rounded corner and a previous or next connection.
-  if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) {
-    if (Blockly.blockRendering.Types.isPreviousConnection(next)) {
+  if (Types.isLeftRoundedCorner(prev) && next) {
+    if (Types.isPreviousConnection(next)) {
       return next.notchOffset - this.constants_.CORNER_RADIUS;
-    } else if (Blockly.blockRendering.Types.isNextConnection(next)) {
+    } else if (Types.isNextConnection(next)) {
       // Next connections are shifted slightly to the left (in both LTR and RTL)
       // to make the dark path under the previous connection show through.
-      var offset = (this.RTL ? 1 : -1) *
-          this.constants_.DARK_PATH_OFFSET / 2;
+      const offset = (this.RTL ? 1 : -1) * this.constants_.DARK_PATH_OFFSET / 2;
       return next.notchOffset - this.constants_.CORNER_RADIUS + offset;
     }
   }
 
   // Spacing between two fields of the same editability.
-  if (Blockly.blockRendering.Types.isField(prev) &&
-      next && Blockly.blockRendering.Types.isField(next) &&
-      ((/** @type {Blockly.blockRendering.Field} */ (prev)).isEditable ==
-          (/** @type {Blockly.blockRendering.Field} */ (next)).isEditable)) {
+  if (Types.isField(prev) && next && Types.isField(next) &&
+      ((/** @type {Field} */ (prev)).isEditable ==
+       (/** @type {Field} */ (next)).isEditable)) {
     return this.constants_.LARGE_PADDING;
   }
 
   // Spacing between anything and a jagged edge.
-  if (next && Blockly.blockRendering.Types.isJaggedEdge(next)) {
+  if (next && Types.isJaggedEdge(next)) {
     return this.constants_.LARGE_PADDING;
   }
 
@@ -302,15 +289,13 @@ Blockly.geras.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
+RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
   // If we have an empty block add a spacer to increase the height.
-  if (Blockly.blockRendering.Types.isTopRow(prev) &&
-      Blockly.blockRendering.Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) && Types.isBottomRow(next)) {
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
-  if (Blockly.blockRendering.Types.isTopRow(prev) ||
-      Blockly.blockRendering.Types.isBottomRow(next)) {
+  if (Types.isTopRow(prev) || Types.isBottomRow(next)) {
     return this.constants_.NO_PADDING;
   }
   if (prev.hasExternalInput && next.hasExternalInput) {
@@ -334,33 +319,32 @@ Blockly.geras.RenderInfo.prototype.getSpacerRowHeight_ = function(prev, next) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
-  if (Blockly.blockRendering.Types.isSpacer(elem)) {
+RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
+  if (Types.isSpacer(elem)) {
     return row.yPos + elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isBottomRow(row)) {
-    var baseline = row.yPos + row.height - row.descenderHeight;
-    if (Blockly.blockRendering.Types.isNextConnection(elem)) {
+  if (Types.isBottomRow(row)) {
+    const baseline = row.yPos + row.height - row.descenderHeight;
+    if (Types.isNextConnection(elem)) {
       return baseline + elem.height / 2;
     }
     return baseline - elem.height / 2;
   }
-  if (Blockly.blockRendering.Types.isTopRow(row)) {
-    if (Blockly.blockRendering.Types.isHat(elem)) {
+  if (Types.isTopRow(row)) {
+    if (Types.isHat(elem)) {
       return row.capline - elem.height / 2;
     }
     return row.capline + elem.height / 2;
   }
 
-  var result = row.yPos;
-  if (Blockly.blockRendering.Types.isField(elem) ||
-      Blockly.blockRendering.Types.isIcon(elem)) {
+  let result = row.yPos;
+  if (Types.isField(elem) || Types.isIcon(elem)) {
     result += (elem.height / 2);
     if ((row.hasInlineInput || row.hasStatement) &&
         elem.height + this.constants_.TALL_INPUT_FIELD_OFFSET_Y <= row.height) {
       result += this.constants_.TALL_INPUT_FIELD_OFFSET_Y;
     }
-  } else if (Blockly.blockRendering.Types.isInlineInput(elem)) {
+  } else if (Types.isInlineInput(elem)) {
     result += elem.height / 2;
   } else {
     result += (row.height / 2);
@@ -371,22 +355,22 @@ Blockly.geras.RenderInfo.prototype.getElemCenterline_ = function(row, elem) {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.alignRowElements_ = function() {
+RenderInfo.prototype.alignRowElements_ = function() {
   if (!this.isInline) {
-    Blockly.geras.RenderInfo.superClass_.alignRowElements_.call(this);
+    RenderInfo.superClass_.alignRowElements_.call(this);
     return;
   }
 
   // Walk backgrounds through rows on the block, keeping track of the right
   // input edge.
-  var nextRightEdge = 0;
-  var prevInput = null;
-  for (var i = this.rows.length - 1, row; (row = this.rows[i]); i--) {
+  let nextRightEdge = 0;
+  let prevInput = null;
+  for (let i = this.rows.length - 1, row; (row = this.rows[i]); i--) {
     row.nextRightEdge = nextRightEdge;
-    if (Blockly.blockRendering.Types.isInputRow(row)) {
+    if (Types.isInputRow(row)) {
       if (row.hasStatement) {
         this.alignStatementRow_(
-            /** @type {!Blockly.blockRendering.InputRow} */ (row));
+            /** @type {!InputRow} */ (row));
       }
       if (prevInput && prevInput.hasStatement && row.width < prevInput.width) {
         row.nextRightEdge = prevInput.width;
@@ -398,17 +382,17 @@ Blockly.geras.RenderInfo.prototype.alignRowElements_ = function() {
   }
   // Walk down each row from the top, comparing the prev and next right input
   // edges and setting the desired width to the max of the two.
-  var prevRightEdge = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let prevRightEdge = 0;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     if (row.hasStatement) {
       prevRightEdge = this.getDesiredRowWidth_(row);
-    } else if (Blockly.blockRendering.Types.isSpacer(row)) {
+    } else if (Types.isSpacer(row)) {
       // Set the spacer row to the max of the prev or next input width.
       row.width = Math.max(prevRightEdge, row.nextRightEdge);
     } else {
-      var currentWidth = row.width;
-      var desiredWidth = Math.max(prevRightEdge, row.nextRightEdge);
-      var missingSpace = desiredWidth - currentWidth;
+      const currentWidth = row.width;
+      const desiredWidth = Math.max(prevRightEdge, row.nextRightEdge);
+      const missingSpace = desiredWidth - currentWidth;
       if (missingSpace > 0) {
         this.addAlignmentPadding_(row, missingSpace);
       }
@@ -420,26 +404,24 @@ Blockly.geras.RenderInfo.prototype.alignRowElements_ = function() {
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.getDesiredRowWidth_ = function(
-    row) {
+RenderInfo.prototype.getDesiredRowWidth_ = function(row) {
   // Limit the width of a statement row when a block is inline.
   if (this.isInline && row.hasStatement) {
     return this.statementEdge + this.constants_.MAX_BOTTOM_WIDTH + this.startX;
   }
-  return Blockly.geras.RenderInfo.superClass_.getDesiredRowWidth_.call(this,
-      row);
+  return RenderInfo.superClass_.getDesiredRowWidth_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.RenderInfo.prototype.finalize_ = function() {
+RenderInfo.prototype.finalize_ = function() {
   // Performance note: this could be combined with the draw pass, if the time
   // that this takes is excessive.  But it shouldn't be, because it only
   // accesses and sets properties that already exist on the objects.
-  var widestRowWithConnectedBlocks = 0;
-  var yCursor = 0;
-  for (var i = 0, row; (row = this.rows[i]); i++) {
+  let widestRowWithConnectedBlocks = 0;
+  let yCursor = 0;
+  for (let i = 0, row; (row = this.rows[i]); i++) {
     row.yPos = yCursor;
     row.xPos = this.startX;
     yCursor += row.height;
@@ -447,11 +429,11 @@ Blockly.geras.RenderInfo.prototype.finalize_ = function() {
     widestRowWithConnectedBlocks =
         Math.max(widestRowWithConnectedBlocks, row.widthWithConnectedBlocks);
     // Add padding to the bottom row if block height is less than minimum
-    var heightWithoutHat = yCursor - this.topRow.ascenderHeight;
+    const heightWithoutHat = yCursor - this.topRow.ascenderHeight;
     if (row == this.bottomRow &&
         heightWithoutHat < this.constants_.MIN_BLOCK_HEIGHT) {
       // But the hat height shouldn't be part of this.
-      var diff = this.constants_.MIN_BLOCK_HEIGHT - heightWithoutHat;
+      const diff = this.constants_.MIN_BLOCK_HEIGHT - heightWithoutHat;
       this.bottomRow.height += diff;
       yCursor += diff;
     }
@@ -460,18 +442,20 @@ Blockly.geras.RenderInfo.prototype.finalize_ = function() {
   if (this.outputConnection && this.block_.nextConnection &&
       this.block_.nextConnection.isConnected()) {
     // Include width of connected block in value to stack width measurement.
-    widestRowWithConnectedBlocks =
-        Math.max(widestRowWithConnectedBlocks,
-            this.block_.nextConnection.targetBlock().getHeightWidth().width -
+    widestRowWithConnectedBlocks = Math.max(
+        widestRowWithConnectedBlocks,
+        this.block_.nextConnection.targetBlock().getHeightWidth().width -
             this.constants_.DARK_PATH_OFFSET);
   }
 
   this.bottomRow.baseline = yCursor - this.bottomRow.descenderHeight;
 
   // The dark (lowlight) adds to the size of the block in both x and y.
-  this.widthWithChildren = widestRowWithConnectedBlocks +
-      this.startX + this.constants_.DARK_PATH_OFFSET;
+  this.widthWithChildren = widestRowWithConnectedBlocks + this.startX +
+      this.constants_.DARK_PATH_OFFSET;
   this.width += this.constants_.DARK_PATH_OFFSET;
   this.height = yCursor + this.constants_.DARK_PATH_OFFSET;
   this.startY = this.topRow.capline;
 };
+
+exports = RenderInfo;
diff --git a/tests/deps.js b/tests/deps.js
index 14ae08221..c3e682394 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -134,7 +134,7 @@ goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.Co
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras', 'Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);

From de732f181d4233bdc2a88ecf5f7ae8c605ff254f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:18:10 -0700
Subject: [PATCH 194/291] Migrate core/input_types.js to goog.module

---
 core/input_types.js | 7 +++++--
 tests/deps.js       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/input_types.js b/core/input_types.js
index a58706358..eb9a08a71 100644
--- a/core/input_types.js
+++ b/core/input_types.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-goog.provide('Blockly.inputTypes');
+goog.module('Blockly.inputTypes');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 
@@ -19,7 +20,7 @@ goog.require('Blockly.connectionTypes');
  * Enum for the type of a connection or input.
  * @enum {number}
  */
-Blockly.inputTypes = {
+const inputTypes = {
   // A right-facing value input.  E.g. 'set item to' or 'return'.
   VALUE: Blockly.connectionTypes.INPUT_VALUE,
   // A down-facing block stack.  E.g. 'if-do' or 'else'.
@@ -27,3 +28,5 @@ Blockly.inputTypes = {
   // A dummy input.  Used to add field(s) with no input.
   DUMMY: 5
 };
+
+exports = inputTypes;
diff --git a/tests/deps.js b/tests/deps.js
index c3e682394..9b5264dc5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -73,7 +73,7 @@ goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg',
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes']);
+goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});

From 5d09b80cb63506ae92b1302125f576fa8015433b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:18:19 -0700
Subject: [PATCH 195/291] Migrate core/input_types.js named requires

---
 core/input_types.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/input_types.js b/core/input_types.js
index eb9a08a71..8bdc9e504 100644
--- a/core/input_types.js
+++ b/core/input_types.js
@@ -14,7 +14,7 @@
 goog.module('Blockly.inputTypes');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
+const connectionTypes = goog.require('Blockly.connectionTypes');
 
 /**
  * Enum for the type of a connection or input.
@@ -22,9 +22,9 @@ goog.require('Blockly.connectionTypes');
  */
 const inputTypes = {
   // A right-facing value input.  E.g. 'set item to' or 'return'.
-  VALUE: Blockly.connectionTypes.INPUT_VALUE,
+  VALUE: connectionTypes.INPUT_VALUE,
   // A down-facing block stack.  E.g. 'if-do' or 'else'.
-  STATEMENT: Blockly.connectionTypes.NEXT_STATEMENT,
+  STATEMENT: connectionTypes.NEXT_STATEMENT,
   // A dummy input.  Used to add field(s) with no input.
   DUMMY: 5
 };

From d0b5f6db8bbb297f022bd54fc8ef9a9c62211852 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 5 Aug 2021 10:13:03 -0700
Subject: [PATCH 196/291] Migrate core/renderers/geras/highlight_constants.js
 to goog.module syntax (#5303)

* Migrate core/renderers/geras/highlight_constants.js to ES6 const/let

* Migrate core/renderers/geras/highlight_constants.js to goog.module

* Migrate core/renderers/geras/highlight_constants.js to named requires

* clang-format core/renderers/geras/highlight_constants.js
---
 core/renderers/geras/highlight_constants.js | 200 +++++++++-----------
 tests/deps.js                               |   2 +-
 2 files changed, 89 insertions(+), 113 deletions(-)

diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js
index a986c9e35..5689029b5 100644
--- a/core/renderers/geras/highlight_constants.js
+++ b/core/renderers/geras/highlight_constants.js
@@ -10,10 +10,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.HighlightConstantProvider');
+goog.module('Blockly.geras.HighlightConstantProvider');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.utils.svgPaths');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
@@ -21,15 +23,15 @@ goog.require('Blockly.utils.svgPaths');
  * Some highlights are simple offsets of the parent paths and can be generated
  * programmatically.  Others, especially on curves, are just made out of piles
  * of constants and are hard to tweak.
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @constructor
  * @package
  */
-Blockly.geras.HighlightConstantProvider = function(constants) {
+const HighlightConstantProvider = function(constants) {
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    */
   this.constantProvider = constants;
 
@@ -44,16 +46,14 @@ Blockly.geras.HighlightConstantProvider = function(constants) {
    * The start point, which is offset in both X and Y, as an SVG path chunk.
    * @type {string}
    */
-  this.START_POINT = Blockly.utils.svgPaths.moveBy(this.OFFSET, this.OFFSET);
-
+  this.START_POINT = svgPaths.moveBy(this.OFFSET, this.OFFSET);
 };
 
 /**
  * Initialize shape objects based on the constants set in the constructor.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.init = function() {
-
+HighlightConstantProvider.prototype.init = function() {
   /**
    * An object containing sizing and path information about inside corner
    * highlights.
@@ -101,34 +101,32 @@ Blockly.geras.HighlightConstantProvider.prototype.init = function() {
  *     inside corner highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeInsideCorner = function() {
-  var radius = this.constantProvider.CORNER_RADIUS;
-  var offset = this.OFFSET;
+HighlightConstantProvider.prototype.makeInsideCorner = function() {
+  const radius = this.constantProvider.CORNER_RADIUS;
+  const offset = this.OFFSET;
 
   /**
    * Distance from shape edge to intersect with a curved corner at 45 degrees.
    * Applies to highlighting on around the outside of a curve.
    * @const
    */
-  var distance45outside = (1 - Math.SQRT1_2) * (radius + offset) - offset;
+  const distance45outside = (1 - Math.SQRT1_2) * (radius + offset) - offset;
 
-  var pathTopRtl =
-      Blockly.utils.svgPaths.moveBy(distance45outside, distance45outside) +
-      Blockly.utils.svgPaths.arc('a', '0 0,0', radius,
-          Blockly.utils.svgPaths.point(
-              -distance45outside - offset,
-              radius - distance45outside));
+  const pathTopRtl = svgPaths.moveBy(distance45outside, distance45outside) +
+      svgPaths.arc(
+          'a', '0 0,0', radius,
+          svgPaths.point(
+              -distance45outside - offset, radius - distance45outside));
 
-  var pathBottomRtl =
-      Blockly.utils.svgPaths.arc('a', '0 0,0', radius + offset,
-          Blockly.utils.svgPaths.point(radius + offset, radius + offset));
+  const pathBottomRtl = svgPaths.arc(
+      'a', '0 0,0', radius + offset,
+      svgPaths.point(radius + offset, radius + offset));
 
-  var pathBottomLtr =
-      Blockly.utils.svgPaths.moveBy(distance45outside, - distance45outside) +
-      Blockly.utils.svgPaths.arc('a', '0 0,0', radius + offset,
-          Blockly.utils.svgPaths.point(
-              radius - distance45outside,
-              distance45outside + offset));
+  const pathBottomLtr = svgPaths.moveBy(distance45outside, -distance45outside) +
+      svgPaths.arc(
+          'a', '0 0,0', radius + offset,
+          svgPaths.point(
+              radius - distance45outside, distance45outside + offset));
 
   return {
     width: radius + offset,
@@ -147,39 +145,40 @@ Blockly.geras.HighlightConstantProvider.prototype.makeInsideCorner = function()
  *     outside corner highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeOutsideCorner = function() {
-  var radius = this.constantProvider.CORNER_RADIUS;
-  var offset = this.OFFSET;
+HighlightConstantProvider.prototype.makeOutsideCorner = function() {
+  const radius = this.constantProvider.CORNER_RADIUS;
+  const offset = this.OFFSET;
 
   /**
    * Distance from shape edge to intersect with a curved corner at 45 degrees.
    * Applies to highlighting on around the inside of a curve.
    * @const
    */
-  var distance45inside = (1 - Math.SQRT1_2) * (radius - offset) + offset;
+  const distance45inside = (1 - Math.SQRT1_2) * (radius - offset) + offset;
 
-  var topLeftStartX = distance45inside;
-  var topLeftStartY = distance45inside;
-  var topLeftCornerHighlightRtl =
-      Blockly.utils.svgPaths.moveBy(topLeftStartX, topLeftStartY) +
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius - offset,
-          Blockly.utils.svgPaths.point(radius - topLeftStartX, -topLeftStartY + offset));
+  const topLeftStartX = distance45inside;
+  const topLeftStartY = distance45inside;
+  const topLeftCornerHighlightRtl =
+      svgPaths.moveBy(topLeftStartX, topLeftStartY) +
+      svgPaths.arc(
+          'a', '0 0,1', radius - offset,
+          svgPaths.point(radius - topLeftStartX, -topLeftStartY + offset));
   /**
    * SVG path for drawing the highlight on the rounded top-left corner.
    * @const
    */
-  var topLeftCornerHighlightLtr =
-      Blockly.utils.svgPaths.moveBy(offset, radius) +
-      Blockly.utils.svgPaths.arc('a', '0 0,1', radius - offset,
-          Blockly.utils.svgPaths.point(radius, -radius + offset));
+  const topLeftCornerHighlightLtr = svgPaths.moveBy(offset, radius) +
+      svgPaths.arc(
+          'a', '0 0,1', radius - offset,
+          svgPaths.point(radius, -radius + offset));
 
-  var bottomLeftStartX = distance45inside;
-  var bottomLeftStartY = -distance45inside;
-  var bottomLeftPath = Blockly.utils.svgPaths.moveBy(
-      bottomLeftStartX, bottomLeftStartY) +
-          Blockly.utils.svgPaths.arc('a', '0 0,1', radius - offset,
-              Blockly.utils.svgPaths.point(-bottomLeftStartX + offset,
-                  -bottomLeftStartY - radius));
+  const bottomLeftStartX = distance45inside;
+  const bottomLeftStartY = -distance45inside;
+  const bottomLeftPath = svgPaths.moveBy(bottomLeftStartX, bottomLeftStartY) +
+      svgPaths.arc(
+          'a', '0 0,1', radius - offset,
+          svgPaths.point(
+              -bottomLeftStartX + offset, -bottomLeftStartY - radius));
 
   return {
     height: radius,
@@ -197,42 +196,35 @@ Blockly.geras.HighlightConstantProvider.prototype.makeOutsideCorner = function()
  *     puzzle tab highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makePuzzleTab = function() {
-  var width = this.constantProvider.TAB_WIDTH;
-  var height = this.constantProvider.TAB_HEIGHT;
+HighlightConstantProvider.prototype.makePuzzleTab = function() {
+  const width = this.constantProvider.TAB_WIDTH;
+  const height = this.constantProvider.TAB_HEIGHT;
 
   // This is how much of the vertical block edge is actually drawn by the puzzle
   // tab.
-  var verticalOverlap = 2.5;
+  const verticalOverlap = 2.5;
 
-  var highlightRtlUp =
-      Blockly.utils.svgPaths.moveBy(-2, -height + verticalOverlap + 0.9) +
-      Blockly.utils.svgPaths.lineTo(width * -0.45, -2.1);
+  const highlightRtlUp = svgPaths.moveBy(-2, -height + verticalOverlap + 0.9) +
+      svgPaths.lineTo(width * -0.45, -2.1);
 
-  var highlightRtlDown =
-      Blockly.utils.svgPaths.lineOnAxis('v', verticalOverlap) +
-      Blockly.utils.svgPaths.moveBy(-width * 0.97, 2.5) +
-      Blockly.utils.svgPaths.curve('q',
+  const highlightRtlDown = svgPaths.lineOnAxis('v', verticalOverlap) +
+      svgPaths.moveBy(-width * 0.97, 2.5) +
+      svgPaths.curve(
+          'q',
           [
-            Blockly.utils.svgPaths.point(-width * 0.05, 10),
-            Blockly.utils.svgPaths.point(width * 0.3, 9.5)
+            svgPaths.point(-width * 0.05, 10), svgPaths.point(width * 0.3, 9.5)
           ]) +
-      Blockly.utils.svgPaths.moveBy(width * 0.67, -1.9) +
-      Blockly.utils.svgPaths.lineOnAxis('v', verticalOverlap);
+      svgPaths.moveBy(width * 0.67, -1.9) +
+      svgPaths.lineOnAxis('v', verticalOverlap);
 
-  var highlightLtrUp =
-      Blockly.utils.svgPaths.lineOnAxis('v', -1.5) +
-      Blockly.utils.svgPaths.moveBy(width * -0.92, -0.5) +
-      Blockly.utils.svgPaths.curve('q',
-          [
-            Blockly.utils.svgPaths.point(width * -0.19, -5.5),
-            Blockly.utils.svgPaths.point(0,-11)
-          ]) +
-      Blockly.utils.svgPaths.moveBy(width * 0.92, 1);
+  const highlightLtrUp = svgPaths.lineOnAxis('v', -1.5) +
+      svgPaths.moveBy(width * -0.92, -0.5) +
+      svgPaths.curve(
+          'q', [svgPaths.point(width * -0.19, -5.5), svgPaths.point(0, -11)]) +
+      svgPaths.moveBy(width * 0.92, 1);
 
-  var highlightLtrDown =
-      Blockly.utils.svgPaths.moveBy(-5, height - 0.7) +
-      Blockly.utils.svgPaths.lineTo(width * 0.46, -2.1);
+  const highlightLtrDown =
+      svgPaths.moveBy(-5, height - 0.7) + svgPaths.lineTo(width * 0.46, -2.1);
 
   return {
     width: width,
@@ -251,15 +243,11 @@ Blockly.geras.HighlightConstantProvider.prototype.makePuzzleTab = function() {
  *     notch highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeNotch = function() {
+HighlightConstantProvider.prototype.makeNotch = function() {
   // This is only for the previous connection.
-  var pathLeft =
-      Blockly.utils.svgPaths.lineOnAxis(
-          'h', this.OFFSET) +
+  const pathLeft = svgPaths.lineOnAxis('h', this.OFFSET) +
       this.constantProvider.NOTCH.pathLeft;
-  return {
-    pathLeft: pathLeft
-  };
+  return {pathLeft: pathLeft};
 };
 
 /**
@@ -267,16 +255,10 @@ Blockly.geras.HighlightConstantProvider.prototype.makeNotch = function() {
  *     collapsed block edge highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
-  var pathLeft =
-      Blockly.utils.svgPaths.lineTo(5.1, 2.6) +
-      Blockly.utils.svgPaths.moveBy(-10.2, 6.8) +
-      Blockly.utils.svgPaths.lineTo(5.1, 2.6);
-  return {
-    pathLeft: pathLeft,
-    height: 12,
-    width: 10.2
-  };
+HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
+  const pathLeft = svgPaths.lineTo(5.1, 2.6) + svgPaths.moveBy(-10.2, 6.8) +
+      svgPaths.lineTo(5.1, 2.6);
+  return {pathLeft: pathLeft, height: 12, width: 10.2};
 };
 
 /**
@@ -284,28 +266,22 @@ Blockly.geras.HighlightConstantProvider.prototype.makeJaggedTeeth = function() {
  *     start highlights.
  * @package
  */
-Blockly.geras.HighlightConstantProvider.prototype.makeStartHat = function() {
-  var hatHeight = this.constantProvider.START_HAT.height;
-  var pathRtl =
-      Blockly.utils.svgPaths.moveBy(25, -8.7) +
-      Blockly.utils.svgPaths.curve('c',
-          [
-            Blockly.utils.svgPaths.point(29.7, -6.2),
-            Blockly.utils.svgPaths.point(57.2, -0.5),
-            Blockly.utils.svgPaths.point(75, 8.7)
-          ]);
+HighlightConstantProvider.prototype.makeStartHat = function() {
+  const hatHeight = this.constantProvider.START_HAT.height;
+  const pathRtl = svgPaths.moveBy(25, -8.7) + svgPaths.curve('c', [
+    svgPaths.point(29.7, -6.2), svgPaths.point(57.2, -0.5),
+    svgPaths.point(75, 8.7)
+  ]);
 
-  var pathLtr =
-      Blockly.utils.svgPaths.curve('c',
-          [
-            Blockly.utils.svgPaths.point(17.8, -9.2),
-            Blockly.utils.svgPaths.point(45.3, -14.9),
-            Blockly.utils.svgPaths.point(75, -8.7)
-          ]) +
-      Blockly.utils.svgPaths.moveTo(100.5, hatHeight + 0.5);
+  const pathLtr = svgPaths.curve('c', [
+    svgPaths.point(17.8, -9.2), svgPaths.point(45.3, -14.9),
+    svgPaths.point(75, -8.7)
+  ]) + svgPaths.moveTo(100.5, hatHeight + 0.5);
   return {
     path: function(rtl) {
       return rtl ? pathRtl : pathLtr;
     }
   };
 };
+
+exports = HighlightConstantProvider;
diff --git a/tests/deps.js b/tests/deps.js
index abed86ec5..fb30bbb2b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -132,7 +132,7 @@ goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.block
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
-goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.svgPaths'], {'lang': 'es5'});
+goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);

From ef0fcdbcdd7c3b9389a34c76e1bf0508f51b2757 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:38:01 -0700
Subject: [PATCH 197/291] Split Blockly.BlocklyOptions into a separate file

---
 core/blockly_options.js | 21 +++++++++++++++++++++
 core/inject.js          |  1 +
 core/mutator.js         |  6 +++---
 core/options.js         |  9 +--------
 core/toolbox/toolbox.js |  1 +
 core/trashcan.js        |  4 ++--
 core/workspace.js       |  1 +
 core/workspace_svg.js   |  1 +
 tests/deps.js           |  1 +
 9 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 core/blockly_options.js

diff --git a/core/blockly_options.js b/core/blockly_options.js
new file mode 100644
index 000000000..d2964385f
--- /dev/null
+++ b/core/blockly_options.js
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Object that defines user-specified options for the workspace.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.BlocklyOptions');
+
+/**
+ * Blockly options.
+ * This interface is further described in
+ * `typings/parts/blockly-interfaces.d.ts`.
+ * @interface
+ */
+Blockly.BlocklyOptions = function() {};
diff --git a/core/inject.js b/core/inject.js
index 3b3715b0f..a1bdffbe1 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -34,6 +34,7 @@ goog.require('Blockly.WorkspaceDragSurfaceSvg');
 goog.require('Blockly.WorkspaceSvg');
 goog.require('Blockly.WidgetDiv');
 
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.BlockSvg');
 
 
diff --git a/core/mutator.js b/core/mutator.js
index 8f9bab118..5f7189fcd 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -19,9 +19,9 @@ const Abstract = goog.requireType('Blockly.Events.Abstract');
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
-const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 /* eslint-disable-next-line no-unused-vars */
-const Blockly = goog.requireType('Blockly');
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Bubble = goog.require('Blockly.Bubble');
 /* eslint-disable-next-line no-unused-vars */
 const Connection = goog.requireType('Blockly.Connection');
@@ -170,7 +170,7 @@ Mutator.prototype.createEditor_ = function() {
     quarkXml = null;
   }
   const workspaceOptions = new Options(
-      /** @type {!Blockly.BlocklyOptions} */
+      /** @type {!BlocklyOptions} */
       ({
         // If you want to enable disabling, also remove the
         // event filter from workspaceChanged_ .
diff --git a/core/options.js b/core/options.js
index 58c4e378a..fbb4cfd1e 100644
--- a/core/options.js
+++ b/core/options.js
@@ -19,6 +19,7 @@ goog.require('Blockly.utils.IdGenerator');
 goog.require('Blockly.utils.Metrics');
 goog.require('Blockly.utils.toolbox');
 
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
@@ -180,14 +181,6 @@ Blockly.Options = function(options) {
   this.plugins = plugins;
 };
 
-/**
- * Blockly options.
- * This interface is further described in
- * `typings/parts/blockly-interfaces.d.ts`.
- * @interface
- */
-Blockly.BlocklyOptions = function() {};
-
 /**
  * Grid Options.
  * @typedef {{
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index a2e76ef70..826482eaf 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -36,6 +36,7 @@ goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Rect');
 goog.require('Blockly.utils.toolbox');
 
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.ICollapsibleToolboxItem');
 goog.requireType('Blockly.IDraggable');
 goog.requireType('Blockly.IFlyout');
diff --git a/core/trashcan.js b/core/trashcan.js
index fb60ca3a1..7e60d841d 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Abstract = goog.requireType('Blockly.Events.Abstract');
 /* eslint-disable-next-line no-unused-vars */
-const Blockly = goog.requireType('Blockly');
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const ComponentManager = goog.require('Blockly.ComponentManager');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
@@ -90,7 +90,7 @@ const Trashcan = function(workspace) {
   }
   // Create flyout options.
   const flyoutWorkspaceOptions = new Options(
-      /** @type {!Blockly.BlocklyOptions} */
+      /** @type {!BlocklyOptions} */
       ({
         'scrollbars': true,
         'parentWorkspace': this.workspace_,
diff --git a/core/workspace.js b/core/workspace.js
index 9a1dd8cbb..4c35f5b83 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -23,6 +23,7 @@ goog.require('Blockly.utils.math');
 goog.require('Blockly.VariableMap');
 
 goog.requireType('Blockly.Block');
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.ConnectionDB');
 goog.requireType('Blockly.Events.Abstract');
 goog.requireType('Blockly.IConnectionChecker');
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 81536d5e6..e4aa50229 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -57,6 +57,7 @@ goog.require('Blockly.Xml');
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.BlockDragSurfaceSvg');
+goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.blockRendering.Renderer');
 goog.requireType('Blockly.Cursor');
 goog.requireType('Blockly.FlyoutButton');
diff --git a/tests/deps.js b/tests/deps.js
index fb30bbb2b..40c6a7e40 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -13,6 +13,7 @@ goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfac
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], []);
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);

From de92fe9cb8bcfe2d9f5fa629e4b57e72204e7fd1 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:50:09 -0700
Subject: [PATCH 198/291] Migrate core/options.js to ES6 const/let

---
 core/options.js | 85 +++++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/core/options.js b/core/options.js
index fbb4cfd1e..5dd8c24e6 100644
--- a/core/options.js
+++ b/core/options.js
@@ -31,57 +31,57 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  */
 Blockly.Options = function(options) {
-  var readOnly = !!options['readOnly'];
-  if (readOnly) {
-    var toolboxJsonDef = null;
-    var hasCategories = false;
-    var hasTrashcan = false;
-    var hasCollapse = false;
-    var hasComments = false;
-    var hasDisable = false;
-    var hasSounds = false;
-  } else {
-    var toolboxJsonDef = Blockly.utils.toolbox.convertToolboxDefToJson(options['toolbox']);
-    var hasCategories = Blockly.utils.toolbox.hasCategories(toolboxJsonDef);
-    var hasTrashcan = options['trashcan'];
+  let toolboxJsonDef = null;
+  let hasCategories = false;
+  let hasTrashcan = false;
+  let hasCollapse = false;
+  let hasComments = false;
+  let hasDisable = false;
+  let hasSounds = false;
+  const readOnly = !!options['readOnly'];
+  if (!readOnly) {
+    toolboxJsonDef = Blockly.utils.toolbox.convertToolboxDefToJson(options['toolbox']);
+    hasCategories = Blockly.utils.toolbox.hasCategories(toolboxJsonDef);
+    hasTrashcan = options['trashcan'];
     if (hasTrashcan === undefined) {
       hasTrashcan = hasCategories;
     }
-    var maxTrashcanContents = options['maxTrashcanContents'];
-    if (hasTrashcan) {
-      if (maxTrashcanContents === undefined) {
-        maxTrashcanContents = 32;
-      }
-    } else {
-      maxTrashcanContents = 0;
-    }
-    var hasCollapse = options['collapse'];
+    hasCollapse = options['collapse'];
     if (hasCollapse === undefined) {
       hasCollapse = hasCategories;
     }
-    var hasComments = options['comments'];
+    hasComments = options['comments'];
     if (hasComments === undefined) {
       hasComments = hasCategories;
     }
-    var hasDisable = options['disable'];
+    hasDisable = options['disable'];
     if (hasDisable === undefined) {
       hasDisable = hasCategories;
     }
-    var hasSounds = options['sounds'];
+    hasSounds = options['sounds'];
     if (hasSounds === undefined) {
       hasSounds = true;
     }
   }
-  var rtl = !!options['rtl'];
-  var horizontalLayout = options['horizontalLayout'];
+
+  let maxTrashcanContents = options['maxTrashcanContents'];
+  if (hasTrashcan) {
+    if (maxTrashcanContents === undefined) {
+      maxTrashcanContents = 32;
+    }
+  } else {
+    maxTrashcanContents = 0;
+  }
+  const rtl = !!options['rtl'];
+  let horizontalLayout = options['horizontalLayout'];
   if (horizontalLayout === undefined) {
     horizontalLayout = false;
   }
-  var toolboxAtStart = options['toolboxPosition'];
+  let toolboxAtStart = options['toolboxPosition'];
   toolboxAtStart = toolboxAtStart !== 'end';
 
   /** @type {!Blockly.utils.toolbox.Position} */
-  var toolboxPosition;
+  let toolboxPosition;
   if (horizontalLayout) {
     toolboxPosition = toolboxAtStart ?
         Blockly.utils.toolbox.Position.TOP : Blockly.utils.toolbox.Position.BOTTOM;
@@ -90,25 +90,26 @@ Blockly.Options = function(options) {
         Blockly.utils.toolbox.Position.RIGHT : Blockly.utils.toolbox.Position.LEFT;
   }
 
-  var hasCss = options['css'];
+  let hasCss = options['css'];
   if (hasCss === undefined) {
     hasCss = true;
   }
-  var pathToMedia = 'https://blockly-demo.appspot.com/static/media/';
+  let pathToMedia = 'https://blockly-demo.appspot.com/static/media/';
   if (options['media']) {
     pathToMedia = options['media'];
   } else if (options['path']) {
     // 'path' is a deprecated option which has been replaced by 'media'.
     pathToMedia = options['path'] + 'media/';
   }
+  let oneBasedIndex;
   if (options['oneBasedIndex'] === undefined) {
-    var oneBasedIndex = true;
+    oneBasedIndex = true;
   } else {
-    var oneBasedIndex = !!options['oneBasedIndex'];
+    oneBasedIndex = !!options['oneBasedIndex'];
   }
-  var renderer = options['renderer'] || 'geras';
+  const renderer = options['renderer'] || 'geras';
 
-  var plugins = options['plugins'] || {};
+  const plugins = options['plugins'] || {};
 
   /** @type {boolean} */
   this.RTL = rtl;
@@ -248,8 +249,8 @@ Blockly.Options.prototype.getMetrics;
  * @private
  */
 Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
-  var move = options['move'] || {};
-  var moveOptions = {};
+  const move = options['move'] || {};
+  const moveOptions = {};
   if (move['scrollbars'] === undefined && options['scrollbars'] === undefined) {
     moveOptions.scrollbars = hasCategories;
   } else if (typeof move['scrollbars'] == 'object') {
@@ -295,8 +296,8 @@ Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
  * @private
  */
 Blockly.Options.parseZoomOptions_ = function(options) {
-  var zoom = options['zoom'] || {};
-  var zoomOptions = {};
+  const zoom = options['zoom'] || {};
+  const zoomOptions = {};
   if (zoom['controls'] === undefined) {
     zoomOptions.controls = false;
   } else {
@@ -344,8 +345,8 @@ Blockly.Options.parseZoomOptions_ = function(options) {
  * @private
  */
 Blockly.Options.parseGridOptions_ = function(options) {
-  var grid = options['grid'] || {};
-  var gridOptions = {};
+  const grid = options['grid'] || {};
+  const gridOptions = {};
   gridOptions.spacing = Number(grid['spacing']) || 0;
   gridOptions.colour = grid['colour'] || '#888';
   gridOptions.length =
@@ -362,7 +363,7 @@ Blockly.Options.parseGridOptions_ = function(options) {
  * @private
  */
 Blockly.Options.parseThemeOptions_ = function(options) {
-  var theme = options['theme'] || Blockly.Themes.Classic;
+  const theme = options['theme'] || Blockly.Themes.Classic;
   if (typeof theme == 'string') {
     return /** @type {!Blockly.Theme} */ (
       Blockly.registry.getObject(Blockly.registry.Type.THEME, theme));

From 468360873f9694711816b3b4049d09bd78b54e9c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:51:28 -0700
Subject: [PATCH 199/291] Migrate core/options.js and core/blockly_options.js
 to goog.module

---
 core/blockly_options.js |  7 ++++--
 core/options.js         | 56 ++++++++++++++++++++++-------------------
 tests/deps.js           |  4 +--
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/core/blockly_options.js b/core/blockly_options.js
index d2964385f..3c93f8784 100644
--- a/core/blockly_options.js
+++ b/core/blockly_options.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.BlocklyOptions');
+goog.module('Blockly.BlocklyOptions');
+goog.module.declareLegacyNamespace();
 
 /**
  * Blockly options.
@@ -18,4 +19,6 @@ goog.provide('Blockly.BlocklyOptions');
  * `typings/parts/blockly-interfaces.d.ts`.
  * @interface
  */
-Blockly.BlocklyOptions = function() {};
+const BlocklyOptions = function() {};
+
+exports = BlocklyOptions;
diff --git a/core/options.js b/core/options.js
index 5dd8c24e6..2f2836f07 100644
--- a/core/options.js
+++ b/core/options.js
@@ -10,16 +10,18 @@
  */
 'use strict';
 
-goog.provide('Blockly.Options');
+goog.module('Blockly.Options');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 goog.require('Blockly.Theme');
 goog.require('Blockly.Themes.Classic');
+goog.require('Blockly.utils.deprecation');
 goog.require('Blockly.utils.IdGenerator');
-goog.require('Blockly.utils.Metrics');
 goog.require('Blockly.utils.toolbox');
 
 goog.requireType('Blockly.BlocklyOptions');
+goog.requireType('Blockly.utils.Metrics');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
@@ -30,7 +32,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  *     Specification: https://developers.google.com/blockly/guides/get-started/web#configuration
  * @constructor
  */
-Blockly.Options = function(options) {
+const Options = function(options) {
   let toolboxJsonDef = null;
   let hasCategories = false;
   let hasTrashcan = false;
@@ -131,8 +133,8 @@ Blockly.Options = function(options) {
   this.pathToMedia = pathToMedia;
   /** @type {boolean} */
   this.hasCategories = hasCategories;
-  /** @type {!Blockly.Options.MoveOptions} */
-  this.moveOptions = Blockly.Options.parseMoveOptions_(options, hasCategories);
+  /** @type {!Options.MoveOptions} */
+  this.moveOptions = Options.parseMoveOptions_(options, hasCategories);
   /** @deprecated  January 2019 */
   this.hasScrollbars = !!this.moveOptions.scrollbars;
   /** @type {boolean} */
@@ -147,14 +149,14 @@ Blockly.Options = function(options) {
   this.horizontalLayout = horizontalLayout;
   /** @type {?Blockly.utils.toolbox.ToolboxInfo} */
   this.languageTree = toolboxJsonDef;
-  /** @type {!Blockly.Options.GridOptions} */
-  this.gridOptions = Blockly.Options.parseGridOptions_(options);
-  /** @type {!Blockly.Options.ZoomOptions} */
-  this.zoomOptions = Blockly.Options.parseZoomOptions_(options);
+  /** @type {!Options.GridOptions} */
+  this.gridOptions = Options.parseGridOptions_(options);
+  /** @type {!Options.ZoomOptions} */
+  this.zoomOptions = Options.parseZoomOptions_(options);
   /** @type {!Blockly.utils.toolbox.Position} */
   this.toolboxPosition = toolboxPosition;
   /** @type {!Blockly.Theme} */
-  this.theme = Blockly.Options.parseThemeOptions_(options);
+  this.theme = Options.parseThemeOptions_(options);
   /** @type {string} */
   this.renderer = renderer;
   /** @type {?Object} */
@@ -191,17 +193,17 @@ Blockly.Options = function(options) {
  *     spacing: number
  * }}
  */
-Blockly.Options.GridOptions;
+Options.GridOptions;
 
 /**
  * Move Options.
  * @typedef {{
  *     drag: boolean,
- *     scrollbars: (boolean | !Blockly.Options.ScrollbarOptions),
+ *     scrollbars: (boolean | !Options.ScrollbarOptions),
  *     wheel: boolean
  * }}
  */
-Blockly.Options.MoveOptions;
+Options.MoveOptions;
 
 /**
  * Scrollbar Options.
@@ -210,7 +212,7 @@ Blockly.Options.MoveOptions;
  *     vertical: boolean
  * }}
  */
-Blockly.Options.ScrollbarOptions;
+Options.ScrollbarOptions;
 
 /**
  * Zoom Options.
@@ -224,7 +226,7 @@ Blockly.Options.ScrollbarOptions;
  *     wheel: boolean
  * }}
  */
-Blockly.Options.ZoomOptions;
+Options.ZoomOptions;
 
 /**
  * If set, sets the translation of the workspace to match the scrollbars.
@@ -232,23 +234,23 @@ Blockly.Options.ZoomOptions;
  *     is a float between 0 and 1 specifying the degree of scrolling.
  * @return {void}
  */
-Blockly.Options.prototype.setMetrics;
+Options.prototype.setMetrics;
 
 /**
  * Return an object with the metrics required to size the workspace.
  * @return {!Blockly.utils.Metrics} Contains size and position metrics.
  */
-Blockly.Options.prototype.getMetrics;
+Options.prototype.getMetrics;
 
 /**
  * Parse the user-specified move options, using reasonable defaults where
  *    behaviour is unspecified.
  * @param {!Object} options Dictionary of options.
  * @param {boolean} hasCategories Whether the workspace has categories or not.
- * @return {!Blockly.Options.MoveOptions} Normalized move options.
+ * @return {!Options.MoveOptions} Normalized move options.
  * @private
  */
-Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
+Options.parseMoveOptions_ = function(options, hasCategories) {
   const move = options['move'] || {};
   const moveOptions = {};
   if (move['scrollbars'] === undefined && options['scrollbars'] === undefined) {
@@ -292,10 +294,10 @@ Blockly.Options.parseMoveOptions_ = function(options, hasCategories) {
  * behaviour is unspecified.  See zoom documentation:
  *   https://developers.google.com/blockly/guides/configure/web/zoom
  * @param {!Object} options Dictionary of options.
- * @return {!Blockly.Options.ZoomOptions} Normalized zoom options.
+ * @return {!Options.ZoomOptions} Normalized zoom options.
  * @private
  */
-Blockly.Options.parseZoomOptions_ = function(options) {
+Options.parseZoomOptions_ = function(options) {
   const zoom = options['zoom'] || {};
   const zoomOptions = {};
   if (zoom['controls'] === undefined) {
@@ -341,10 +343,10 @@ Blockly.Options.parseZoomOptions_ = function(options) {
  * behaviour is unspecified. See grid documentation:
  *   https://developers.google.com/blockly/guides/configure/web/grid
  * @param {!Object} options Dictionary of options.
- * @return {!Blockly.Options.GridOptions} Normalized grid options.
+ * @return {!Options.GridOptions} Normalized grid options.
  * @private
  */
-Blockly.Options.parseGridOptions_ = function(options) {
+Options.parseGridOptions_ = function(options) {
   const grid = options['grid'] || {};
   const gridOptions = {};
   gridOptions.spacing = Number(grid['spacing']) || 0;
@@ -362,7 +364,7 @@ Blockly.Options.parseGridOptions_ = function(options) {
  * @return {!Blockly.Theme} A Blockly Theme.
  * @private
  */
-Blockly.Options.parseThemeOptions_ = function(options) {
+Options.parseThemeOptions_ = function(options) {
   const theme = options['theme'] || Blockly.Themes.Classic;
   if (typeof theme == 'string') {
     return /** @type {!Blockly.Theme} */ (
@@ -381,11 +383,13 @@ Blockly.Options.parseThemeOptions_ = function(options) {
  * @return {?Node} DOM tree of blocks, or null.
  * @deprecated Use Blockly.utils.toolbox.parseToolboxTree. (2020 September 28)
  */
-Blockly.Options.parseToolboxTree = function(toolboxDef) {
+Options.parseToolboxTree = function(toolboxDef) {
   Blockly.utils.deprecation.warn(
-      'Blockly.Options.parseToolboxTree',
+      'Options.parseToolboxTree',
       'September 2020',
       'September 2021',
       'Blockly.utils.toolbox.parseToolboxTree');
   return Blockly.utils.toolbox.parseToolboxTree(toolboxDef);
 };
+
+exports = Options;
diff --git a/tests/deps.js b/tests/deps.js
index 40c6a7e40..c71382196 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -13,7 +13,7 @@ goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfac
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
-goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], []);
+goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
@@ -117,7 +117,7 @@ goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManag
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']);
-goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']);
+goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});

From d8bc82fa1ceafb13f19d1a948faebd863684f35e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 12:59:34 -0700
Subject: [PATCH 200/291] Migrate core/options.js named requires

---
 core/options.js | 68 +++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/core/options.js b/core/options.js
index 2f2836f07..5c6397a96 100644
--- a/core/options.js
+++ b/core/options.js
@@ -13,22 +13,24 @@
 goog.module('Blockly.Options');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-goog.require('Blockly.Theme');
-goog.require('Blockly.Themes.Classic');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.utils.IdGenerator');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.utils.Metrics');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+const Classic = goog.require('Blockly.Themes.Classic');
+const IdGenerator = goog.require('Blockly.utils.IdGenerator');
+/* eslint-disable-next-line no-unused-vars */
+const Metrics = goog.requireType('Blockly.utils.Metrics');
+const Theme = goog.require('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
 
 
 /**
  * Parse the user-specified options, using reasonable defaults where behaviour
  * is unspecified.
- * @param {!Blockly.BlocklyOptions} options Dictionary of options.
+ * @param {!BlocklyOptions} options Dictionary of options.
  *     Specification: https://developers.google.com/blockly/guides/get-started/web#configuration
  * @constructor
  */
@@ -42,8 +44,8 @@ const Options = function(options) {
   let hasSounds = false;
   const readOnly = !!options['readOnly'];
   if (!readOnly) {
-    toolboxJsonDef = Blockly.utils.toolbox.convertToolboxDefToJson(options['toolbox']);
-    hasCategories = Blockly.utils.toolbox.hasCategories(toolboxJsonDef);
+    toolboxJsonDef = toolbox.convertToolboxDefToJson(options['toolbox']);
+    hasCategories = toolbox.hasCategories(toolboxJsonDef);
     hasTrashcan = options['trashcan'];
     if (hasTrashcan === undefined) {
       hasTrashcan = hasCategories;
@@ -82,14 +84,14 @@ const Options = function(options) {
   let toolboxAtStart = options['toolboxPosition'];
   toolboxAtStart = toolboxAtStart !== 'end';
 
-  /** @type {!Blockly.utils.toolbox.Position} */
+  /** @type {!toolbox.Position} */
   let toolboxPosition;
   if (horizontalLayout) {
     toolboxPosition = toolboxAtStart ?
-        Blockly.utils.toolbox.Position.TOP : Blockly.utils.toolbox.Position.BOTTOM;
+        toolbox.Position.TOP : toolbox.Position.BOTTOM;
   } else {
     toolboxPosition = (toolboxAtStart == rtl) ?
-        Blockly.utils.toolbox.Position.RIGHT : Blockly.utils.toolbox.Position.LEFT;
+        toolbox.Position.RIGHT : toolbox.Position.LEFT;
   }
 
   let hasCss = options['css'];
@@ -147,15 +149,15 @@ const Options = function(options) {
   this.hasCss = hasCss;
   /** @type {boolean} */
   this.horizontalLayout = horizontalLayout;
-  /** @type {?Blockly.utils.toolbox.ToolboxInfo} */
+  /** @type {?toolbox.ToolboxInfo} */
   this.languageTree = toolboxJsonDef;
   /** @type {!Options.GridOptions} */
   this.gridOptions = Options.parseGridOptions_(options);
   /** @type {!Options.ZoomOptions} */
   this.zoomOptions = Options.parseZoomOptions_(options);
-  /** @type {!Blockly.utils.toolbox.Position} */
+  /** @type {!toolbox.Position} */
   this.toolboxPosition = toolboxPosition;
-  /** @type {!Blockly.Theme} */
+  /** @type {!Theme} */
   this.theme = Options.parseThemeOptions_(options);
   /** @type {string} */
   this.renderer = renderer;
@@ -173,7 +175,7 @@ const Options = function(options) {
    * The parent of the current workspace, or null if there is no parent
    * workspace.  We can assert that this is of type WorkspaceSvg as opposed to
    * Workspace as this is only used in a rendered workspace.
-   * @type {Blockly.WorkspaceSvg}
+   * @type {WorkspaceSvg}
    */
   this.parentWorkspace = options['parentWorkspace'];
 
@@ -238,7 +240,7 @@ Options.prototype.setMetrics;
 
 /**
  * Return an object with the metrics required to size the workspace.
- * @return {!Blockly.utils.Metrics} Contains size and position metrics.
+ * @return {!Metrics} Contains size and position metrics.
  */
 Options.prototype.getMetrics;
 
@@ -361,19 +363,19 @@ Options.parseGridOptions_ = function(options) {
  * Parse the user-specified theme options, using the classic theme as a default.
  *   https://developers.google.com/blockly/guides/configure/web/themes
  * @param {!Object} options Dictionary of options.
- * @return {!Blockly.Theme} A Blockly Theme.
+ * @return {!Theme} A Blockly Theme.
  * @private
  */
 Options.parseThemeOptions_ = function(options) {
-  const theme = options['theme'] || Blockly.Themes.Classic;
+  const theme = options['theme'] || Classic;
   if (typeof theme == 'string') {
-    return /** @type {!Blockly.Theme} */ (
-      Blockly.registry.getObject(Blockly.registry.Type.THEME, theme));
-  } else if (theme instanceof Blockly.Theme) {
-    return /** @type {!Blockly.Theme} */ (theme);
+    return /** @type {!Theme} */ (
+      registry.getObject(registry.Type.THEME, theme));
+  } else if (theme instanceof Theme) {
+    return /** @type {!Theme} */ (theme);
   }
-  return Blockly.Theme.defineTheme(theme.name ||
-      ('builtin' + Blockly.utils.IdGenerator.getNextUniqueId()), theme);
+  return Theme.defineTheme(theme.name ||
+      ('builtin' + IdGenerator.getNextUniqueId()), theme);
 };
 
 /**
@@ -381,15 +383,15 @@ Options.parseThemeOptions_ = function(options) {
  * @param {?Node|?string} toolboxDef DOM tree of blocks, or text representation
  *    of same.
  * @return {?Node} DOM tree of blocks, or null.
- * @deprecated Use Blockly.utils.toolbox.parseToolboxTree. (2020 September 28)
+ * @deprecated Use toolbox.parseToolboxTree. (2020 September 28)
  */
 Options.parseToolboxTree = function(toolboxDef) {
-  Blockly.utils.deprecation.warn(
+  deprecation.warn(
       'Options.parseToolboxTree',
       'September 2020',
       'September 2021',
-      'Blockly.utils.toolbox.parseToolboxTree');
-  return Blockly.utils.toolbox.parseToolboxTree(toolboxDef);
+      'toolbox.parseToolboxTree');
+  return toolbox.parseToolboxTree(toolboxDef);
 };
 
 exports = Options;

From 9354670828586df5417882e19bfda6d65b894737 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 13:00:34 -0700
Subject: [PATCH 201/291] clang-format core/options.js

---
 core/options.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/options.js b/core/options.js
index 5c6397a96..0ed544bae 100644
--- a/core/options.js
+++ b/core/options.js
@@ -31,7 +31,8 @@ const toolbox = goog.require('Blockly.utils.toolbox');
  * Parse the user-specified options, using reasonable defaults where behaviour
  * is unspecified.
  * @param {!BlocklyOptions} options Dictionary of options.
- *     Specification: https://developers.google.com/blockly/guides/get-started/web#configuration
+ *     Specification:
+ * https://developers.google.com/blockly/guides/get-started/web#configuration
  * @constructor
  */
 const Options = function(options) {
@@ -87,11 +88,11 @@ const Options = function(options) {
   /** @type {!toolbox.Position} */
   let toolboxPosition;
   if (horizontalLayout) {
-    toolboxPosition = toolboxAtStart ?
-        toolbox.Position.TOP : toolbox.Position.BOTTOM;
+    toolboxPosition =
+        toolboxAtStart ? toolbox.Position.TOP : toolbox.Position.BOTTOM;
   } else {
-    toolboxPosition = (toolboxAtStart == rtl) ?
-        toolbox.Position.RIGHT : toolbox.Position.LEFT;
+    toolboxPosition = (toolboxAtStart == rtl) ? toolbox.Position.RIGHT :
+                                                toolbox.Position.LEFT;
   }
 
   let hasCss = options['css'];
@@ -266,7 +267,8 @@ Options.parseMoveOptions_ = function(options, hasCategories) {
     // !!moveOptions.scrollbars.
     if (moveOptions.scrollbars.horizontal && moveOptions.scrollbars.vertical) {
       moveOptions.scrollbars = true;
-    } else if (!moveOptions.scrollbars.horizontal &&
+    } else if (
+        !moveOptions.scrollbars.horizontal &&
         !moveOptions.scrollbars.vertical) {
       moveOptions.scrollbars = false;
     }
@@ -370,12 +372,12 @@ Options.parseThemeOptions_ = function(options) {
   const theme = options['theme'] || Classic;
   if (typeof theme == 'string') {
     return /** @type {!Theme} */ (
-      registry.getObject(registry.Type.THEME, theme));
+        registry.getObject(registry.Type.THEME, theme));
   } else if (theme instanceof Theme) {
     return /** @type {!Theme} */ (theme);
   }
-  return Theme.defineTheme(theme.name ||
-      ('builtin' + IdGenerator.getNextUniqueId()), theme);
+  return Theme.defineTheme(
+      theme.name || ('builtin' + IdGenerator.getNextUniqueId()), theme);
 };
 
 /**
@@ -387,9 +389,7 @@ Options.parseThemeOptions_ = function(options) {
  */
 Options.parseToolboxTree = function(toolboxDef) {
   deprecation.warn(
-      'Options.parseToolboxTree',
-      'September 2020',
-      'September 2021',
+      'Options.parseToolboxTree', 'September 2020', 'September 2021',
       'toolbox.parseToolboxTree');
   return toolbox.parseToolboxTree(toolboxDef);
 };

From 569ddec1c901acbc9837accf35604e69b569ac7e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:08:39 -0700
Subject: [PATCH 202/291] Add newline

---
 core/blockly_options.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/blockly_options.js b/core/blockly_options.js
index 3c93f8784..c9c7b62f9 100644
--- a/core/blockly_options.js
+++ b/core/blockly_options.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.BlocklyOptions');
 goog.module.declareLegacyNamespace();
 
+
 /**
  * Blockly options.
  * This interface is further described in

From 3ae6a21c5566598731dd6602de03b924025274dd Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 27 Jul 2021 16:06:34 -0700
Subject: [PATCH 203/291] Migrate core/toolbox/category.js to ES6 const/let

---
 core/toolbox/category.js | 42 +++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index ae9755cad..d035c13d1 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -96,7 +96,7 @@ Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
    */
   this.cssConfig_ = this.makeDefaultCssConfig_();
 
-  var cssConfig = categoryDef['cssconfig'] || categoryDef['cssConfig'];
+  const cssConfig = categoryDef['cssconfig'] || categoryDef['cssConfig'];
   Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
 
   /**
@@ -193,13 +193,14 @@ Blockly.ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
-  var contents = categoryDef['contents'];
+  const contents = categoryDef['contents'];
 
   if (categoryDef['custom']) {
     this.flyoutItems_ = categoryDef['custom'];
   } else if (contents) {
-    for (var i = 0, itemDef; (itemDef = contents[i]); i++) {
-      var flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+    for (let i = 0; i < contents.length; i++) {
+      const itemDef = contents[i];
+      const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
       this.flyoutItems_.push(flyoutItem);
     }
   }
@@ -256,7 +257,7 @@ Blockly.ToolboxCategory.prototype.createDom_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createContainer_ = function() {
-  var container = document.createElement('div');
+  const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   return container;
 };
@@ -268,9 +269,9 @@ Blockly.ToolboxCategory.prototype.createContainer_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
-  var rowDiv = document.createElement('div');
+  const rowDiv = document.createElement('div');
   Blockly.utils.dom.addClass(rowDiv, this.cssConfig_['row']);
-  var nestedPadding = Blockly.ToolboxCategory.nestedPadding * this.getLevel();
+  let nestedPadding = Blockly.ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
       rowDiv.style.paddingLeft = nestedPadding;
@@ -284,7 +285,7 @@ Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
-  var contentsContainer = document.createElement('div');
+  const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
   return contentsContainer;
 };
@@ -295,7 +296,7 @@ Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
-  var toolboxIcon = document.createElement('span');
+  const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
   }
@@ -312,7 +313,7 @@ Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.createLabelDom_ = function(name) {
-  var toolboxLabel = document.createElement('span');
+  const toolboxLabel = document.createElement('span');
   toolboxLabel.setAttribute('id', this.getId() + '.label');
   toolboxLabel.textContent = name;
   Blockly.utils.dom.addClass(toolboxLabel, this.cssConfig_['label']);
@@ -336,7 +337,7 @@ Blockly.ToolboxCategory.prototype.refreshTheme = function() {
  */
 Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
   if (colour) {
-    var border = Blockly.ToolboxCategory.borderWidth + 'px solid ' +
+    const border = Blockly.ToolboxCategory.borderWidth + 'px solid ' +
         (colour || '#ddd');
     if (this.workspace_.RTL) {
       this.rowDiv_.style.borderRight = border;
@@ -354,8 +355,9 @@ Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
-  var styleName = categoryDef['categorystyle'] || categoryDef['categoryStyle'];
-  var colour = categoryDef['colour'];
+  const styleName = categoryDef['categorystyle']
+      || categoryDef['categoryStyle'];
+  const colour = categoryDef['colour'];
 
   if (colour && styleName) {
     console.warn('Toolbox category "' + this.name_ +
@@ -376,9 +378,9 @@ Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
  * @private
  */
 Blockly.ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
-  var theme = this.workspace_.getTheme();
+  const theme = this.workspace_.getTheme();
   if (styleName && theme) {
-    var style = theme.categoryStyles[styleName];
+    const style = theme.categoryStyles[styleName];
     if (style && style.colour) {
       return this.parseColour_(style.colour);
     } else {
@@ -410,16 +412,16 @@ Blockly.ToolboxCategory.prototype.getClickTarget = function() {
 Blockly.ToolboxCategory.prototype.parseColour_ = function(colourValue) {
   // Decode the colour for any potential message references
   // (eg. `%{BKY_MATH_HUE}`).
-  var colour = Blockly.utils.replaceMessageReferences(colourValue);
+  const colour = Blockly.utils.replaceMessageReferences(colourValue);
   if (colour == null || colour === '') {
     // No attribute. No colour.
     return '';
   } else {
-    var hue = Number(colour);
+    const hue = Number(colour);
     if (!isNaN(hue)) {
       return Blockly.hueToHex(hue);
     } else {
-      var hex = Blockly.utils.colour.parse(colour);
+      const hex = Blockly.utils.colour.parse(colour);
       if (hex) {
         return hex;
       } else {
@@ -503,7 +505,7 @@ Blockly.ToolboxCategory.prototype.isVisible = function() {
  * @protected
  */
 Blockly.ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
-  var category = this;
+  let category = this;
   while (category.getParent()) {
     category = category.getParent();
     if (!category.isExpanded()) {
@@ -537,7 +539,7 @@ Blockly.ToolboxCategory.prototype.onClick = function(_e) {
  */
 Blockly.ToolboxCategory.prototype.setSelected = function(isSelected) {
   if (isSelected) {
-    var defaultColour = this.parseColour_(
+    const defaultColour = this.parseColour_(
         Blockly.ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
     Blockly.utils.dom.addClass(this.rowDiv_, this.cssConfig_['selected']);

From 68654b34d15359b941ea2b0fd79f11d65aa97ef3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:42:52 -0700
Subject: [PATCH 204/291] Migrate core/toolbox/category.js to goog.module

---
 core/toolbox/category.js | 99 +++++++++++++++++++++-------------------
 tests/deps.js            |  2 +-
 2 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index d035c13d1..3613b5a75 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -10,8 +10,11 @@
  */
 'use strict';
 
-goog.provide('Blockly.ToolboxCategory');
+goog.module('Blockly.ToolboxCategory');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly');
+goog.require('Blockly.Css');
 goog.require('Blockly.ISelectableToolboxItem');
 goog.require('Blockly.registry');
 goog.require('Blockly.ToolboxItem');
@@ -36,8 +39,8 @@ goog.requireType('Blockly.IToolbox');
  * @extends {Blockly.ToolboxItem}
  * @implements {Blockly.ISelectableToolboxItem}
  */
-Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
-  Blockly.ToolboxCategory.superClass_.constructor.call(
+const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
+  ToolboxCategory.superClass_.constructor.call(
       this, categoryDef, toolbox, opt_parent);
 
   /**
@@ -91,7 +94,7 @@ Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * All the css class names that are used to create a category.
-   * @type {!Blockly.ToolboxCategory.CssConfig}
+   * @type {!ToolboxCategory.CssConfig}
    * @protected
    */
   this.cssConfig_ = this.makeDefaultCssConfig_();
@@ -123,7 +126,7 @@ Blockly.ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   this.parseContents_(categoryDef);
 };
 
-Blockly.utils.object.inherits(Blockly.ToolboxCategory, Blockly.ToolboxItem);
+Blockly.utils.object.inherits(ToolboxCategory, Blockly.ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a category.
@@ -138,40 +141,40 @@ Blockly.utils.object.inherits(Blockly.ToolboxCategory, Blockly.ToolboxItem);
  *            closedicon:(string|undefined)
  *          }}
  */
-Blockly.ToolboxCategory.CssConfig;
+ToolboxCategory.CssConfig;
 
 /**
  * Name used for registering a toolbox category.
  * @const {string}
  */
-Blockly.ToolboxCategory.registrationName = 'category';
+ToolboxCategory.registrationName = 'category';
 
 /**
  * The number of pixels to move the category over at each nested level.
  * @type {number}
  */
-Blockly.ToolboxCategory.nestedPadding = 19;
+ToolboxCategory.nestedPadding = 19;
 
 /**
  * The width in pixels of the strip of colour next to each category.
  * @type {number}
  */
-Blockly.ToolboxCategory.borderWidth = 8;
+ToolboxCategory.borderWidth = 8;
 
 /**
  * The default colour of the category. This is used as the background colour of
  * the category when it is selected.
  * @type {string}
  */
-Blockly.ToolboxCategory.defaultBackgroundColour = '#57e';
+ToolboxCategory.defaultBackgroundColour = '#57e';
 
 /**
  * Creates an object holding the default classes for a category.
- * @return {!Blockly.ToolboxCategory.CssConfig} The configuration object holding
+ * @return {!ToolboxCategory.CssConfig} The configuration object holding
  *    all the CSS classes for a category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
+ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
   return {
     'container': 'blocklyToolboxCategory',
     'row': 'blocklyTreeRow',
@@ -192,7 +195,7 @@ Blockly.ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
  *     to create a category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
+ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
   const contents = categoryDef['contents'];
 
   if (categoryDef['custom']) {
@@ -209,7 +212,7 @@ Blockly.ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.init = function() {
+ToolboxCategory.prototype.init = function() {
   this.createDom_();
   if (this.toolboxItemDef_['hidden'] == 'true') {
     this.hide();
@@ -221,7 +224,7 @@ Blockly.ToolboxCategory.prototype.init = function() {
  * @return {!Element} The parent element for the category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createDom_ = function() {
+ToolboxCategory.prototype.createDom_ = function() {
   this.htmlDiv_ = this.createContainer_();
   Blockly.utils.aria.setRole(this.htmlDiv_, Blockly.utils.aria.Role.TREEITEM);
   Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
@@ -256,7 +259,7 @@ Blockly.ToolboxCategory.prototype.createDom_ = function() {
  * @return {!Element} The div that holds the icon and the label.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createContainer_ = function() {
+ToolboxCategory.prototype.createContainer_ = function() {
   const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   return container;
@@ -268,10 +271,10 @@ Blockly.ToolboxCategory.prototype.createContainer_ = function() {
  * @return {!Element} The div that holds the contents container.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
+ToolboxCategory.prototype.createRowContainer_ = function() {
   const rowDiv = document.createElement('div');
   Blockly.utils.dom.addClass(rowDiv, this.cssConfig_['row']);
-  let nestedPadding = Blockly.ToolboxCategory.nestedPadding * this.getLevel();
+  let nestedPadding = ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
       rowDiv.style.paddingLeft = nestedPadding;
@@ -284,7 +287,7 @@ Blockly.ToolboxCategory.prototype.createRowContainer_ = function() {
  * @return {!Element} The div that holds the icon and the label.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
+ToolboxCategory.prototype.createRowContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
   return contentsContainer;
@@ -295,7 +298,7 @@ Blockly.ToolboxCategory.prototype.createRowContentsContainer_ = function() {
  * @return {!Element} The span that holds the category icon.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
+ToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
     Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
@@ -312,7 +315,7 @@ Blockly.ToolboxCategory.prototype.createIconDom_ = function() {
  * @return {!Element} The span that holds the category label.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.createLabelDom_ = function(name) {
+ToolboxCategory.prototype.createLabelDom_ = function(name) {
   const toolboxLabel = document.createElement('span');
   toolboxLabel.setAttribute('id', this.getId() + '.label');
   toolboxLabel.textContent = name;
@@ -324,7 +327,7 @@ Blockly.ToolboxCategory.prototype.createLabelDom_ = function(name) {
  * Updates the colour for this category.
  * @public
  */
-Blockly.ToolboxCategory.prototype.refreshTheme = function() {
+ToolboxCategory.prototype.refreshTheme = function() {
   this.colour_ = this.getColour_(/** @type {Blockly.utils.toolbox.CategoryInfo} **/
       (this.toolboxItemDef_));
   this.addColourBorder_(this.colour_);
@@ -335,9 +338,9 @@ Blockly.ToolboxCategory.prototype.refreshTheme = function() {
  * @param {string} colour The category colour.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
+ToolboxCategory.prototype.addColourBorder_ = function(colour) {
   if (colour) {
-    const border = Blockly.ToolboxCategory.borderWidth + 'px solid ' +
+    const border = ToolboxCategory.borderWidth + 'px solid ' +
         (colour || '#ddd');
     if (this.workspace_.RTL) {
       this.rowDiv_.style.borderRight = border;
@@ -354,7 +357,7 @@ Blockly.ToolboxCategory.prototype.addColourBorder_ = function(colour) {
  * @return {string} The hex colour for the category.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
+ToolboxCategory.prototype.getColour_ = function(categoryDef) {
   const styleName = categoryDef['categorystyle']
       || categoryDef['categoryStyle'];
   const colour = categoryDef['colour'];
@@ -377,7 +380,7 @@ Blockly.ToolboxCategory.prototype.getColour_ = function(categoryDef) {
  * @return {string} The hex colour for the category.
  * @private
  */
-Blockly.ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
+ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
   const theme = this.workspace_.getTheme();
   if (styleName && theme) {
     const style = theme.categoryStyles[styleName];
@@ -398,7 +401,7 @@ Blockly.ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
  * @return {!Element} The HTML element that receives clicks.
  * @public
  */
-Blockly.ToolboxCategory.prototype.getClickTarget = function() {
+ToolboxCategory.prototype.getClickTarget = function() {
   return /** @type {!Element} */(this.rowDiv_);
 };
 
@@ -409,7 +412,7 @@ Blockly.ToolboxCategory.prototype.getClickTarget = function() {
  * @return {string} The hex colour for the category.
  * @private
  */
-Blockly.ToolboxCategory.prototype.parseColour_ = function(colourValue) {
+ToolboxCategory.prototype.parseColour_ = function(colourValue) {
   // Decode the colour for any potential message references
   // (eg. `%{BKY_MATH_HUE}`).
   const colour = Blockly.utils.replaceMessageReferences(colourValue);
@@ -438,7 +441,7 @@ Blockly.ToolboxCategory.prototype.parseColour_ = function(colourValue) {
  * @param {?Element} iconDiv The div that holds the icon.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
+ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
@@ -451,7 +454,7 @@ Blockly.ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
  * @param {?Element} iconDiv The div that holds the icon.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
+ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
@@ -465,7 +468,7 @@ Blockly.ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
  * @param {boolean} isVisible True if category should be visible.
  * @protected
  */
-Blockly.ToolboxCategory.prototype.setVisible_ = function(isVisible) {
+ToolboxCategory.prototype.setVisible_ = function(isVisible) {
   this.htmlDiv_.style.display = isVisible ? 'block' : 'none';
   this.isHidden_ = !isVisible;
 
@@ -477,7 +480,7 @@ Blockly.ToolboxCategory.prototype.setVisible_ = function(isVisible) {
 /**
  * Hide the category.
  */
-Blockly.ToolboxCategory.prototype.hide = function() {
+ToolboxCategory.prototype.hide = function() {
   this.setVisible_(false);
 };
 
@@ -485,7 +488,7 @@ Blockly.ToolboxCategory.prototype.hide = function() {
  * Show the category. Category will only appear if its parent category is also
  * expanded.
  */
-Blockly.ToolboxCategory.prototype.show = function() {
+ToolboxCategory.prototype.show = function() {
   this.setVisible_(true);
 };
 
@@ -495,7 +498,7 @@ Blockly.ToolboxCategory.prototype.show = function() {
  * @return {boolean} True if the category is visible, false otherwise.
  * @public
  */
-Blockly.ToolboxCategory.prototype.isVisible = function() {
+ToolboxCategory.prototype.isVisible = function() {
   return !this.isHidden_ && this.allAncestorsExpanded_();
 };
 
@@ -504,7 +507,7 @@ Blockly.ToolboxCategory.prototype.isVisible = function() {
  * @return {boolean} True only if every ancestor is expanded
  * @protected
  */
-Blockly.ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
+ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
   let category = this;
   while (category.getParent()) {
     category = category.getParent();
@@ -518,7 +521,7 @@ Blockly.ToolboxCategory.prototype.allAncestorsExpanded_ = function() {
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.isSelectable = function() {
+ToolboxCategory.prototype.isSelectable = function() {
   return this.isVisible() && !this.isDisabled_;
 };
 
@@ -527,7 +530,7 @@ Blockly.ToolboxCategory.prototype.isSelectable = function() {
  * @param {!Event} _e Click event to handle.
  * @public
  */
-Blockly.ToolboxCategory.prototype.onClick = function(_e) {
+ToolboxCategory.prototype.onClick = function(_e) {
   // No-op
 };
 
@@ -537,10 +540,10 @@ Blockly.ToolboxCategory.prototype.onClick = function(_e) {
  *     otherwise.
  * @public
  */
-Blockly.ToolboxCategory.prototype.setSelected = function(isSelected) {
+ToolboxCategory.prototype.setSelected = function(isSelected) {
   if (isSelected) {
     const defaultColour = this.parseColour_(
-        Blockly.ToolboxCategory.defaultBackgroundColour);
+        ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
     Blockly.utils.dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
   } else {
@@ -555,7 +558,7 @@ Blockly.ToolboxCategory.prototype.setSelected = function(isSelected) {
  * Sets whether the category is disabled.
  * @param {boolean} isDisabled True to disable the category, false otherwise.
  */
-Blockly.ToolboxCategory.prototype.setDisabled = function(isDisabled) {
+ToolboxCategory.prototype.setDisabled = function(isDisabled) {
   this.isDisabled_ = isDisabled;
   this.getDiv().setAttribute('disabled', isDisabled);
   isDisabled ? this.getDiv().setAttribute('disabled', 'true') :
@@ -567,21 +570,21 @@ Blockly.ToolboxCategory.prototype.setDisabled = function(isDisabled) {
  * @return {string} The name of the toolbox item.
  * @public
  */
-Blockly.ToolboxCategory.prototype.getName = function() {
+ToolboxCategory.prototype.getName = function() {
   return this.name_;
 };
 
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.getParent = function() {
+ToolboxCategory.prototype.getParent = function() {
   return this.parent_;
 };
 
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.getDiv = function() {
+ToolboxCategory.prototype.getDiv = function() {
   return this.htmlDiv_;
 };
 
@@ -592,7 +595,7 @@ Blockly.ToolboxCategory.prototype.getDiv = function() {
  *     of items to be displayed in the flyout.
  * @public
  */
-Blockly.ToolboxCategory.prototype.getContents = function() {
+ToolboxCategory.prototype.getContents = function() {
   return this.flyoutItems_;
 };
 
@@ -605,7 +608,7 @@ Blockly.ToolboxCategory.prototype.getContents = function() {
  *     dynamic category.
  * @public
  */
-Blockly.ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
+ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
   this.flyoutItems_ = [];
 
   if (typeof contents == 'string') {
@@ -623,7 +626,7 @@ Blockly.ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
 /**
  * @override
  */
-Blockly.ToolboxCategory.prototype.dispose = function() {
+ToolboxCategory.prototype.dispose = function() {
   Blockly.utils.dom.removeNode(this.htmlDiv_);
 };
 
@@ -707,4 +710,6 @@ Blockly.Css.register([
 ]);
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
-    Blockly.ToolboxCategory.registrationName, Blockly.ToolboxCategory);
+    ToolboxCategory.registrationName, ToolboxCategory);
+
+exports = ToolboxCategory;
diff --git a/tests/deps.js b/tests/deps.js
index c71382196..a563d81e7 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -169,7 +169,7 @@ goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry'
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});

From 3c564982fcd46944e7ef2fe51e0c123c4fa37570 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:44:42 -0700
Subject: [PATCH 205/291] Migrate core/toolbox/category.js named requires

---
 core/toolbox/category.js | 112 ++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 3613b5a75..590216637 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -13,31 +13,33 @@
 goog.module('Blockly.ToolboxCategory');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.Css');
-goog.require('Blockly.ISelectableToolboxItem');
-goog.require('Blockly.registry');
-goog.require('Blockly.ToolboxItem');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.ICollapsibleToolboxItem');
-goog.requireType('Blockly.IToolbox');
+const Blockly = goog.require('Blockly');
+const Css = goog.require('Blockly.Css');
+/* eslint-disable-next-line no-unused-vars */
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
+const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
+const ToolboxItem = goog.require('Blockly.ToolboxItem');
+const aria = goog.require('Blockly.utils.aria');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 
 
 /**
  * Class for a category in a toolbox.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The information needed
+ * @param {!toolbox.CategoryInfo} categoryDef The information needed
  *     to create a category in the toolbox.
- * @param {!Blockly.IToolbox} toolbox The parent toolbox for the category.
- * @param {Blockly.ICollapsibleToolboxItem=} opt_parent The parent category or null if
+ * @param {!IToolbox} toolbox The parent toolbox for the category.
+ * @param {ICollapsibleToolboxItem=} opt_parent The parent category or null if
  *     the category does not have a parent.
  * @constructor
- * @extends {Blockly.ToolboxItem}
- * @implements {Blockly.ISelectableToolboxItem}
+ * @extends {ToolboxItem}
+ * @implements {ISelectableToolboxItem}
  */
 const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   ToolboxCategory.superClass_.constructor.call(
@@ -48,7 +50,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
    * @type {string}
    * @protected
    */
-  this.name_ = Blockly.utils.replaceMessageReferences(categoryDef['name']);
+  this.name_ = utils.replaceMessageReferences(categoryDef['name']);
 
   /**
    * The colour of the category.
@@ -100,7 +102,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   this.cssConfig_ = this.makeDefaultCssConfig_();
 
   const cssConfig = categoryDef['cssconfig'] || categoryDef['cssConfig'];
-  Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
+  object.mixin(this.cssConfig_, cssConfig);
 
   /**
    * True if the category is meant to be hidden, false otherwise.
@@ -118,7 +120,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
 
   /**
    * The flyout items for this category.
-   * @type {string|!Blockly.utils.toolbox.FlyoutItemInfoArray}
+   * @type {string|!toolbox.FlyoutItemInfoArray}
    * @protected
    */
   this.flyoutItems_ = [];
@@ -126,7 +128,7 @@ const ToolboxCategory = function(categoryDef, toolbox, opt_parent) {
   this.parseContents_(categoryDef);
 };
 
-Blockly.utils.object.inherits(ToolboxCategory, Blockly.ToolboxItem);
+object.inherits(ToolboxCategory, ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a category.
@@ -191,7 +193,7 @@ ToolboxCategory.prototype.makeDefaultCssConfig_ = function() {
 /**
  * Parses the contents array depending on if the category is a dynamic category,
  * or if its contents are meant to be shown in the flyout.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The information needed
+ * @param {!toolbox.CategoryInfo} categoryDef The information needed
  *     to create a category.
  * @protected
  */
@@ -226,11 +228,11 @@ ToolboxCategory.prototype.init = function() {
  */
 ToolboxCategory.prototype.createDom_ = function() {
   this.htmlDiv_ = this.createContainer_();
-  Blockly.utils.aria.setRole(this.htmlDiv_, Blockly.utils.aria.Role.TREEITEM);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.SELECTED,false);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.LEVEL, this.level_);
+  aria.setRole(this.htmlDiv_, aria.Role.TREEITEM);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.SELECTED,false);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.LEVEL, this.level_);
 
   this.rowDiv_ = this.createRowContainer_();
   this.rowDiv_.style.pointerEvents = 'auto';
@@ -241,13 +243,13 @@ ToolboxCategory.prototype.createDom_ = function() {
   this.rowDiv_.appendChild(this.rowContents_);
 
   this.iconDom_ = this.createIconDom_();
-  Blockly.utils.aria.setRole(this.iconDom_, Blockly.utils.aria.Role.PRESENTATION);
+  aria.setRole(this.iconDom_, aria.Role.PRESENTATION);
   this.rowContents_.appendChild(this.iconDom_);
 
   this.labelDom_ = this.createLabelDom_(this.name_);
   this.rowContents_.appendChild(this.labelDom_);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.LABELLEDBY, this.labelDom_.getAttribute('id'));
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.LABELLEDBY, this.labelDom_.getAttribute('id'));
 
   this.addColourBorder_(this.colour_);
 
@@ -261,7 +263,7 @@ ToolboxCategory.prototype.createDom_ = function() {
  */
 ToolboxCategory.prototype.createContainer_ = function() {
   const container = document.createElement('div');
-  Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
+  dom.addClass(container, this.cssConfig_['container']);
   return container;
 };
 
@@ -273,7 +275,7 @@ ToolboxCategory.prototype.createContainer_ = function() {
  */
 ToolboxCategory.prototype.createRowContainer_ = function() {
   const rowDiv = document.createElement('div');
-  Blockly.utils.dom.addClass(rowDiv, this.cssConfig_['row']);
+  dom.addClass(rowDiv, this.cssConfig_['row']);
   let nestedPadding = ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
@@ -289,7 +291,7 @@ ToolboxCategory.prototype.createRowContainer_ = function() {
  */
 ToolboxCategory.prototype.createRowContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
-  Blockly.utils.dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
+  dom.addClass(contentsContainer, this.cssConfig_['rowcontentcontainer']);
   return contentsContainer;
 };
 
@@ -301,7 +303,7 @@ ToolboxCategory.prototype.createRowContentsContainer_ = function() {
 ToolboxCategory.prototype.createIconDom_ = function() {
   const toolboxIcon = document.createElement('span');
   if (!this.parentToolbox_.isHorizontal()) {
-    Blockly.utils.dom.addClass(toolboxIcon, this.cssConfig_['icon']);
+    dom.addClass(toolboxIcon, this.cssConfig_['icon']);
   }
 
   toolboxIcon.style.display = 'inline-block';
@@ -319,7 +321,7 @@ ToolboxCategory.prototype.createLabelDom_ = function(name) {
   const toolboxLabel = document.createElement('span');
   toolboxLabel.setAttribute('id', this.getId() + '.label');
   toolboxLabel.textContent = name;
-  Blockly.utils.dom.addClass(toolboxLabel, this.cssConfig_['label']);
+  dom.addClass(toolboxLabel, this.cssConfig_['label']);
   return toolboxLabel;
 };
 
@@ -328,7 +330,7 @@ ToolboxCategory.prototype.createLabelDom_ = function(name) {
  * @public
  */
 ToolboxCategory.prototype.refreshTheme = function() {
-  this.colour_ = this.getColour_(/** @type {Blockly.utils.toolbox.CategoryInfo} **/
+  this.colour_ = this.getColour_(/** @type {toolbox.CategoryInfo} **/
       (this.toolboxItemDef_));
   this.addColourBorder_(this.colour_);
 };
@@ -352,7 +354,7 @@ ToolboxCategory.prototype.addColourBorder_ = function(colour) {
 
 /**
  * Gets either the colour or the style for a category.
- * @param {!Blockly.utils.toolbox.CategoryInfo} categoryDef The object holding
+ * @param {!toolbox.CategoryInfo} categoryDef The object holding
  *    information on the category.
  * @return {string} The hex colour for the category.
  * @protected
@@ -415,7 +417,7 @@ ToolboxCategory.prototype.getClickTarget = function() {
 ToolboxCategory.prototype.parseColour_ = function(colourValue) {
   // Decode the colour for any potential message references
   // (eg. `%{BKY_MATH_HUE}`).
-  const colour = Blockly.utils.replaceMessageReferences(colourValue);
+  const colour = utils.replaceMessageReferences(colourValue);
   if (colour == null || colour === '') {
     // No attribute. No colour.
     return '';
@@ -424,7 +426,7 @@ ToolboxCategory.prototype.parseColour_ = function(colourValue) {
     if (!isNaN(hue)) {
       return Blockly.hueToHex(hue);
     } else {
-      const hex = Blockly.utils.colour.parse(colour);
+      const hex = utils.colour.parse(colour);
       if (hex) {
         return hex;
       } else {
@@ -445,8 +447,8 @@ ToolboxCategory.prototype.openIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
-  Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['closedicon']);
-  Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['openicon']);
+  dom.removeClasses(iconDiv, this.cssConfig_['closedicon']);
+  dom.addClass(iconDiv, this.cssConfig_['openicon']);
 };
 
 /**
@@ -458,8 +460,8 @@ ToolboxCategory.prototype.closeIcon_ = function(iconDiv) {
   if (!iconDiv) {
     return;
   }
-  Blockly.utils.dom.removeClasses(iconDiv, this.cssConfig_['openicon']);
-  Blockly.utils.dom.addClass(iconDiv, this.cssConfig_['closedicon']);
+  dom.removeClasses(iconDiv, this.cssConfig_['openicon']);
+  dom.addClass(iconDiv, this.cssConfig_['closedicon']);
 };
 
 /**
@@ -545,13 +547,13 @@ ToolboxCategory.prototype.setSelected = function(isSelected) {
     const defaultColour = this.parseColour_(
         ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
-    Blockly.utils.dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
+    dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
   } else {
     this.rowDiv_.style.backgroundColor = '';
-    Blockly.utils.dom.removeClass(this.rowDiv_, this.cssConfig_['selected']);
+    dom.removeClass(this.rowDiv_, this.cssConfig_['selected']);
   }
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      Blockly.utils.aria.State.SELECTED, isSelected);
+  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
+      aria.State.SELECTED, isSelected);
 };
 
 /**
@@ -591,7 +593,7 @@ ToolboxCategory.prototype.getDiv = function() {
 /**
  * Gets the contents of the category. These are items that are meant to be
  * displayed in the flyout.
- * @return {!Blockly.utils.toolbox.FlyoutItemInfoArray|string} The definition
+ * @return {!toolbox.FlyoutItemInfoArray|string} The definition
  *     of items to be displayed in the flyout.
  * @public
  */
@@ -603,7 +605,7 @@ ToolboxCategory.prototype.getContents = function() {
  * Updates the contents to be displayed in the flyout.
  * If the flyout is open when the contents are updated, refreshSelection on the
  * toolbox must also be called.
- * @param {!Blockly.utils.toolbox.FlyoutDefinition|string} contents The contents
+ * @param {!toolbox.FlyoutDefinition|string} contents The contents
  *     to be displayed in the flyout. A string can be supplied to create a
  *     dynamic category.
  * @public
@@ -617,23 +619,23 @@ ToolboxCategory.prototype.updateFlyoutContents = function(contents) {
     // Removes old custom field when contents is updated.
     delete this.toolboxItemDef_['custom'];
     this.toolboxItemDef_['contents'] =
-        Blockly.utils.toolbox.convertFlyoutDefToJsonArray(contents);
+        toolbox.convertFlyoutDefToJsonArray(contents);
   }
   this.parseContents_(
-      /** @type {Blockly.utils.toolbox.CategoryInfo} */ (this.toolboxItemDef_));
+      /** @type {toolbox.CategoryInfo} */ (this.toolboxItemDef_));
 };
 
 /**
  * @override
  */
 ToolboxCategory.prototype.dispose = function() {
-  Blockly.utils.dom.removeNode(this.htmlDiv_);
+  dom.removeNode(this.htmlDiv_);
 };
 
 /**
  * CSS for Toolbox.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyTreeRow:not(.blocklyTreeSelected):hover {',
     'background-color: rgba(255, 255, 255, 0.2);',
@@ -709,7 +711,7 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
+registry.register(registry.Type.TOOLBOX_ITEM,
     ToolboxCategory.registrationName, ToolboxCategory);
 
 exports = ToolboxCategory;

From f818f882bc6cc0083f803ff9d7bcdcf495a4fce9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 10:49:26 -0700
Subject: [PATCH 206/291] clang-format core/toolbox/category.js

---
 core/toolbox/category.js | 177 ++++++++++++++++++++-------------------
 1 file changed, 91 insertions(+), 86 deletions(-)

diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 590216637..5c8076383 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -205,7 +205,8 @@ ToolboxCategory.prototype.parseContents_ = function(categoryDef) {
   } else if (contents) {
     for (let i = 0; i < contents.length; i++) {
       const itemDef = contents[i];
-      const flyoutItem = /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
+      const flyoutItem =
+          /** @type {Blockly.utils.toolbox.FlyoutItemInfo} */ (itemDef);
       this.flyoutItems_.push(flyoutItem);
     }
   }
@@ -229,10 +230,10 @@ ToolboxCategory.prototype.init = function() {
 ToolboxCategory.prototype.createDom_ = function() {
   this.htmlDiv_ = this.createContainer_();
   aria.setRole(this.htmlDiv_, aria.Role.TREEITEM);
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.SELECTED,false);
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.LEVEL, this.level_);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.SELECTED, false);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.LEVEL, this.level_);
 
   this.rowDiv_ = this.createRowContainer_();
   this.rowDiv_.style.pointerEvents = 'auto';
@@ -248,8 +249,9 @@ ToolboxCategory.prototype.createDom_ = function() {
 
   this.labelDom_ = this.createLabelDom_(this.name_);
   this.rowContents_.appendChild(this.labelDom_);
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.LABELLEDBY, this.labelDom_.getAttribute('id'));
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.LABELLEDBY,
+      this.labelDom_.getAttribute('id'));
 
   this.addColourBorder_(this.colour_);
 
@@ -279,7 +281,7 @@ ToolboxCategory.prototype.createRowContainer_ = function() {
   let nestedPadding = ToolboxCategory.nestedPadding * this.getLevel();
   nestedPadding = nestedPadding.toString() + 'px';
   this.workspace_.RTL ? rowDiv.style.paddingRight = nestedPadding :
-      rowDiv.style.paddingLeft = nestedPadding;
+                        rowDiv.style.paddingLeft = nestedPadding;
   return rowDiv;
 };
 
@@ -331,7 +333,7 @@ ToolboxCategory.prototype.createLabelDom_ = function(name) {
  */
 ToolboxCategory.prototype.refreshTheme = function() {
   this.colour_ = this.getColour_(/** @type {toolbox.CategoryInfo} **/
-      (this.toolboxItemDef_));
+                                 (this.toolboxItemDef_));
   this.addColourBorder_(this.colour_);
 };
 
@@ -342,8 +344,8 @@ ToolboxCategory.prototype.refreshTheme = function() {
  */
 ToolboxCategory.prototype.addColourBorder_ = function(colour) {
   if (colour) {
-    const border = ToolboxCategory.borderWidth + 'px solid ' +
-        (colour || '#ddd');
+    const border =
+        ToolboxCategory.borderWidth + 'px solid ' + (colour || '#ddd');
     if (this.workspace_.RTL) {
       this.rowDiv_.style.borderRight = border;
     } else {
@@ -360,12 +362,13 @@ ToolboxCategory.prototype.addColourBorder_ = function(colour) {
  * @protected
  */
 ToolboxCategory.prototype.getColour_ = function(categoryDef) {
-  const styleName = categoryDef['categorystyle']
-      || categoryDef['categoryStyle'];
+  const styleName =
+      categoryDef['categorystyle'] || categoryDef['categoryStyle'];
   const colour = categoryDef['colour'];
 
   if (colour && styleName) {
-    console.warn('Toolbox category "' + this.name_ +
+    console.warn(
+        'Toolbox category "' + this.name_ +
         '" must not have both a style and a colour');
   } else if (styleName) {
     return this.getColourfromStyle_(styleName);
@@ -389,8 +392,8 @@ ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
     if (style && style.colour) {
       return this.parseColour_(style.colour);
     } else {
-      console.warn('Style "' + styleName +
-          '" must exist and contain a colour value');
+      console.warn(
+          'Style "' + styleName + '" must exist and contain a colour value');
     }
   }
   return '';
@@ -404,7 +407,7 @@ ToolboxCategory.prototype.getColourfromStyle_ = function(styleName) {
  * @public
  */
 ToolboxCategory.prototype.getClickTarget = function() {
-  return /** @type {!Element} */(this.rowDiv_);
+  return /** @type {!Element} */ (this.rowDiv_);
 };
 
 /**
@@ -430,7 +433,8 @@ ToolboxCategory.prototype.parseColour_ = function(colourValue) {
       if (hex) {
         return hex;
       } else {
-        console.warn('Toolbox category "' + this.name_ +
+        console.warn(
+            'Toolbox category "' + this.name_ +
             '" has unrecognized colour attribute: ' + colour);
         return '';
       }
@@ -496,7 +500,8 @@ ToolboxCategory.prototype.show = function() {
 
 /**
  * Whether the category is visible.
- * A category is only visible if all of its ancestors are expanded and isHidden_ is false.
+ * A category is only visible if all of its ancestors are expanded and isHidden_
+ * is false.
  * @return {boolean} True if the category is visible, false otherwise.
  * @public
  */
@@ -505,7 +510,8 @@ ToolboxCategory.prototype.isVisible = function() {
 };
 
 /**
- * Whether all ancestors of a category (parent and parent's parent, etc.) are expanded.
+ * Whether all ancestors of a category (parent and parent's parent, etc.) are
+ * expanded.
  * @return {boolean} True only if every ancestor is expanded
  * @protected
  */
@@ -544,16 +550,16 @@ ToolboxCategory.prototype.onClick = function(_e) {
  */
 ToolboxCategory.prototype.setSelected = function(isSelected) {
   if (isSelected) {
-    const defaultColour = this.parseColour_(
-        ToolboxCategory.defaultBackgroundColour);
+    const defaultColour =
+        this.parseColour_(ToolboxCategory.defaultBackgroundColour);
     this.rowDiv_.style.backgroundColor = this.colour_ || defaultColour;
     dom.addClass(this.rowDiv_, this.cssConfig_['selected']);
   } else {
     this.rowDiv_.style.backgroundColor = '';
     dom.removeClass(this.rowDiv_, this.cssConfig_['selected']);
   }
-  aria.setState(/** @type {!Element} */ (this.htmlDiv_),
-      aria.State.SELECTED, isSelected);
+  aria.setState(
+      /** @type {!Element} */ (this.htmlDiv_), aria.State.SELECTED, isSelected);
 };
 
 /**
@@ -564,7 +570,7 @@ ToolboxCategory.prototype.setDisabled = function(isDisabled) {
   this.isDisabled_ = isDisabled;
   this.getDiv().setAttribute('disabled', isDisabled);
   isDisabled ? this.getDiv().setAttribute('disabled', 'true') :
-      this.getDiv().removeAttribute('disabled');
+               this.getDiv().removeAttribute('disabled');
 };
 
 /**
@@ -636,82 +642,81 @@ ToolboxCategory.prototype.dispose = function() {
  * CSS for Toolbox.  See css.js for use.
  */
 Css.register([
-  /* eslint-disable indent */
-  '.blocklyTreeRow:not(.blocklyTreeSelected):hover {',
-    'background-color: rgba(255, 255, 255, 0.2);',
-  '}',
+  `.blocklyTreeRow:not(.blocklyTreeSelected):hover {
+  background-color: rgba(255, 255, 255, 0.2);
+}`,
 
-  '.blocklyToolboxDiv[layout="h"] .blocklyToolboxCategory {',
-    'margin: 1px 5px 1px 0;',
-  '}',
+  `.blocklyToolboxDiv[layout="h"] .blocklyToolboxCategory {
+  margin: 1px 5px 1px 0;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"][layout="h"] .blocklyToolboxCategory {',
-    'margin: 1px 0 1px 5px;',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"][layout="h"] .blocklyToolboxCategory {
+  margin: 1px 0 1px 5px;
+}`,
 
-  '.blocklyTreeRow {',
-    'height: 22px;',
-    'line-height: 22px;',
-    'margin-bottom: 3px;',
-    'padding-right: 8px;',
-    'white-space: nowrap;',
-  '}',
+  `.blocklyTreeRow {
+  height: 22px;
+  line-height: 22px;
+  margin-bottom: 3px;
+  padding-right: 8px;
+  white-space: nowrap;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {',
-    'margin-left: 8px;',
-    'padding-right: 0',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {
+  margin-left: 8px;
+  padding-right: 0;
+}`,
 
-  '.blocklyTreeIcon {',
-    'background-image: url(<<<PATH>>>/sprites.png);',
-    'height: 16px;',
-    'vertical-align: middle;',
-    'visibility: hidden;',
-    'width: 16px;',
-  '}',
+  `.blocklyTreeIcon {',
+  background-image: url(<<<PATH>>>/sprites.png);
+  height: 16px;
+  vertical-align: middle;
+  visibility: hidden;
+  width: 16px;
+}`,
 
-  '.blocklyTreeIconClosed {',
-    'background-position: -32px -1px;',
-  '}',
+  `.blocklyTreeIconClosed {
+  background-position: -32px -1px;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"] .blocklyTreeIconClosed {',
-    'background-position: 0 -1px;',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"] .blocklyTreeIconClosed {
+  background-position: 0 -1px;
+}`,
 
-  '.blocklyTreeSelected>.blocklyTreeIconClosed {',
-    'background-position: -32px -17px;',
-  '}',
+  `.blocklyTreeSelected>.blocklyTreeIconClosed {
+  background-position: -32px -17px;
+}`,
 
-  '.blocklyToolboxDiv[dir="RTL"] .blocklyTreeSelected>.blocklyTreeIconClosed {',
-    'background-position: 0 -17px;',
-  '}',
+  `.blocklyToolboxDiv[dir="RTL"] .blocklyTreeSelected>.blocklyTreeIconClosed {
+  background-position: 0 -17px;
+}`,
 
-  '.blocklyTreeIconOpen {',
-    'background-position: -16px -1px;',
-  '}',
+  `.blocklyTreeIconOpen {
+  background-position: -16px -1px;
+}`,
 
-  '.blocklyTreeSelected>.blocklyTreeIconOpen {',
-    'background-position: -16px -17px;',
-  '}',
+  `.blocklyTreeSelected>.blocklyTreeIconOpen {
+  background-position: -16px -17px;
+}`,
 
-  '.blocklyTreeLabel {',
-    'cursor: default;',
-    'font: 16px sans-serif;',
-    'padding: 0 3px;',
-    'vertical-align: middle;',
-  '}',
+  `.blocklyTreeLabel {
+  cursor: default;
+  font: 16px sans-serif;
+  padding: 0 3px;
+  vertical-align: middle;
+}`,
 
-  '.blocklyToolboxDelete .blocklyTreeLabel {',
-    'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
-  '}',
+  `.blocklyToolboxDelete .blocklyTreeLabel {
+  cursor: url("<<<PATH>>>/handdelete.cur"), auto;
+}`,
 
-  '.blocklyTreeSelected .blocklyTreeLabel {',
-    'color: #fff;',
-  '}'
-  /* eslint-enable indent */
+  `.blocklyTreeSelected .blocklyTreeLabel {
+  color: #fff;
+}`
 ]);
 
-registry.register(registry.Type.TOOLBOX_ITEM,
-    ToolboxCategory.registrationName, ToolboxCategory);
+registry.register(
+    registry.Type.TOOLBOX_ITEM, ToolboxCategory.registrationName,
+    ToolboxCategory);
 
 exports = ToolboxCategory;

From 2a137dff4c8cadc18e236ba4449d5c39c777a325 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:23:56 -0700
Subject: [PATCH 207/291] Migrate core/names.js to ES6 const/let

---
 core/names.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/core/names.js b/core/names.js
index a559321cf..ce57404d3 100644
--- a/core/names.js
+++ b/core/names.js
@@ -30,8 +30,8 @@ Blockly.Names = function(reservedWords, opt_variablePrefix) {
   this.variablePrefix_ = opt_variablePrefix || '';
   this.reservedDict_ = Object.create(null);
   if (reservedWords) {
-    var splitWords = reservedWords.split(',');
-    for (var i = 0; i < splitWords.length; i++) {
+    const splitWords = reservedWords.split(',');
+    for (let i = 0; i < splitWords.length; i++) {
       this.reservedDict_[splitWords[i]] = true;
     }
   }
@@ -91,7 +91,7 @@ Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
         'workspace.getVariableMap());');
     return null;
   }
-  var variable = this.variableMap_.getVariableById(id);
+  const variable = this.variableMap_.getVariableById(id);
   if (variable) {
     return variable.name;
   }
@@ -103,8 +103,8 @@ Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
  * @param {!Blockly.Workspace} workspace Workspace to generate variables from.
  */
 Blockly.Names.prototype.populateVariables = function(workspace) {
-  var variables = Blockly.Variables.allUsedVarModels(workspace);
-  for (var i = 0; i < variables.length; i++) {
+  const variables = Blockly.Variables.allUsedVarModels(workspace);
+  for (let i = 0; i < variables.length; i++) {
     this.getName(
         variables[i].getId(), Blockly.internalConstants.VARIABLE_CATEGORY_NAME);
   }
@@ -115,10 +115,10 @@ Blockly.Names.prototype.populateVariables = function(workspace) {
  * @param {!Blockly.Workspace} workspace Workspace to generate procedures from.
  */
 Blockly.Names.prototype.populateProcedures = function(workspace) {
-  var procedures = Blockly.Procedures.allProcedures(workspace);
+  let procedures = Blockly.Procedures.allProcedures(workspace);
   // Flatten the return vs no-return procedure lists.
   procedures = procedures[0].concat(procedures[1]);
-  for (var i = 0; i < procedures.length; i++) {
+  for (let i = 0; i < procedures.length; i++) {
     this.getName(
         procedures[i][0], Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
   }
@@ -133,28 +133,28 @@ Blockly.Names.prototype.populateProcedures = function(workspace) {
  * @return {string} An entity name that is legal in the exported language.
  */
 Blockly.Names.prototype.getName = function(nameOrId, realm) {
-  var name = nameOrId;
+  let name = nameOrId;
   if (realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME) {
-    var varName = this.getNameForUserVariable_(nameOrId);
+    const varName = this.getNameForUserVariable_(nameOrId);
     if (varName) {
       // Successful ID lookup.
       name = varName;
     }
   }
-  var normalizedName = name.toLowerCase();
+  const normalizedName = name.toLowerCase();
 
-  var isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
 
-  var prefix = isVar ? this.variablePrefix_ : '';
+  const prefix = isVar ? this.variablePrefix_ : '';
   if (!(realm in this.db_)) {
     this.db_[realm] = Object.create(null);
   }
-  var realmDb = this.db_[realm];
+  const realmDb = this.db_[realm];
   if (normalizedName in realmDb) {
     return prefix + realmDb[normalizedName];
   }
-  var safeName = this.getDistinctName(name, realm);
+  const safeName = this.getDistinctName(name, realm);
   realmDb[normalizedName] = safeName.substr(prefix.length);
   return safeName;
 };
@@ -166,7 +166,7 @@ Blockly.Names.prototype.getName = function(nameOrId, realm) {
  * @return {!Array<string>} A list of Blockly entity names (no constraints).
  */
 Blockly.Names.prototype.getUserNames = function(realm) {
-  var realmDb = this.db_[realm] || {};
+  const realmDb = this.db_[realm] || {};
   return Object.keys(realmDb);
 };
 
@@ -181,8 +181,8 @@ Blockly.Names.prototype.getUserNames = function(realm) {
  * @return {string} An entity name that is legal in the exported language.
  */
 Blockly.Names.prototype.getDistinctName = function(name, realm) {
-  var safeName = this.safeName_(name);
-  var i = '';
+  let safeName = this.safeName_(name);
+  let i = '';
   while (this.dbReverse_[safeName + i] ||
          (safeName + i) in this.reservedDict_) {
     // Collision with existing name.  Create a unique name.
@@ -190,9 +190,9 @@ Blockly.Names.prototype.getDistinctName = function(name, realm) {
   }
   safeName += i;
   this.dbReverse_[safeName] = true;
-  var isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
-  var prefix = isVar ? this.variablePrefix_ : '';
+  const prefix = isVar ? this.variablePrefix_ : '';
   return prefix + safeName;
 };
 

From 2ea6c4af7fa10f9399a589984d04b36393da9867 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:24:25 -0700
Subject: [PATCH 208/291] Migrate core/names.js to goog.module

---
 core/names.js | 41 ++++++++++++++++++++++++-----------------
 tests/deps.js |  2 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/core/names.js b/core/names.js
index ce57404d3..3653b2d3a 100644
--- a/core/names.js
+++ b/core/names.js
@@ -10,12 +10,17 @@
  */
 'use strict';
 
-goog.provide('Blockly.Names');
+goog.module('Blockly.Names');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.internalConstants');
 goog.require('Blockly.Msg');
+goog.require('Blockly.Variables');
 
+/** @suppress {extraRequire} */
+goog.requireType('Blockly.Procedures');
 goog.requireType('Blockly.VariableMap');
+goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -26,7 +31,7 @@ goog.requireType('Blockly.VariableMap');
  *     before all variable names (but not procedure names).
  * @constructor
  */
-Blockly.Names = function(reservedWords, opt_variablePrefix) {
+const Names = function(reservedWords, opt_variablePrefix) {
   this.variablePrefix_ = opt_variablePrefix || '';
   this.reservedDict_ = Object.create(null);
   if (reservedWords) {
@@ -45,7 +50,7 @@ Blockly.Names = function(reservedWords, opt_variablePrefix) {
  * will never be shown to the user in the workspace or stored in the variable
  * map.
  */
-Blockly.Names.DEVELOPER_VARIABLE_TYPE = 'DEVELOPER_VARIABLE';
+Names.DEVELOPER_VARIABLE_TYPE = 'DEVELOPER_VARIABLE';
 
 /**
  * When JavaScript (or most other languages) is generated, variable 'foo' and
@@ -59,7 +64,7 @@ Blockly.Names.DEVELOPER_VARIABLE_TYPE = 'DEVELOPER_VARIABLE';
 /**
  * Empty the database and start from scratch.  The reserved words are kept.
  */
-Blockly.Names.prototype.reset = function() {
+Names.prototype.reset = function() {
   this.db_ = Object.create(null);
   this.dbReverse_ = Object.create(null);
   this.variableMap_ = null;
@@ -69,7 +74,7 @@ Blockly.Names.prototype.reset = function() {
  * Set the variable map that maps from variable name to variable object.
  * @param {!Blockly.VariableMap} map The map to track.
  */
-Blockly.Names.prototype.setVariableMap = function(map) {
+Names.prototype.setVariableMap = function(map) {
   this.variableMap_ = map;
 };
 
@@ -82,9 +87,9 @@ Blockly.Names.prototype.setVariableMap = function(map) {
  *     no variable map or the variable was not found in the map.
  * @private
  */
-Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
+Names.prototype.getNameForUserVariable_ = function(id) {
   if (!this.variableMap_) {
-    console.warn('Deprecated call to Blockly.Names.prototype.getName without ' +
+    console.warn('Deprecated call to Names.prototype.getName without ' +
         'defining a variable map. To fix, add the following code in your ' +
         'generator\'s init() function:\n' +
         'Blockly.YourGeneratorName.nameDB_.setVariableMap(' +
@@ -102,7 +107,7 @@ Blockly.Names.prototype.getNameForUserVariable_ = function(id) {
  * Generate names for user variables, but only ones that are being used.
  * @param {!Blockly.Workspace} workspace Workspace to generate variables from.
  */
-Blockly.Names.prototype.populateVariables = function(workspace) {
+Names.prototype.populateVariables = function(workspace) {
   const variables = Blockly.Variables.allUsedVarModels(workspace);
   for (let i = 0; i < variables.length; i++) {
     this.getName(
@@ -114,8 +119,8 @@ Blockly.Names.prototype.populateVariables = function(workspace) {
  * Generate names for procedures.
  * @param {!Blockly.Workspace} workspace Workspace to generate procedures from.
  */
-Blockly.Names.prototype.populateProcedures = function(workspace) {
-  let procedures = Blockly.Procedures.allProcedures(workspace);
+Names.prototype.populateProcedures = function(workspace) {
+  let procedures = goog.module.get('Blockly.Procedures').allProcedures(workspace);
   // Flatten the return vs no-return procedure lists.
   procedures = procedures[0].concat(procedures[1]);
   for (let i = 0; i < procedures.length; i++) {
@@ -132,7 +137,7 @@ Blockly.Names.prototype.populateProcedures = function(workspace) {
  *     ('VARIABLE', 'PROCEDURE', 'DEVELOPER_VARIABLE', etc...).
  * @return {string} An entity name that is legal in the exported language.
  */
-Blockly.Names.prototype.getName = function(nameOrId, realm) {
+Names.prototype.getName = function(nameOrId, realm) {
   let name = nameOrId;
   if (realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME) {
     const varName = this.getNameForUserVariable_(nameOrId);
@@ -144,7 +149,7 @@ Blockly.Names.prototype.getName = function(nameOrId, realm) {
   const normalizedName = name.toLowerCase();
 
   const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
-      realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
+      realm == Names.DEVELOPER_VARIABLE_TYPE;
 
   const prefix = isVar ? this.variablePrefix_ : '';
   if (!(realm in this.db_)) {
@@ -165,7 +170,7 @@ Blockly.Names.prototype.getName = function(nameOrId, realm) {
  *     ('VARIABLE', 'PROCEDURE', 'DEVELOPER_VARIABLE', etc...).
  * @return {!Array<string>} A list of Blockly entity names (no constraints).
  */
-Blockly.Names.prototype.getUserNames = function(realm) {
+Names.prototype.getUserNames = function(realm) {
   const realmDb = this.db_[realm] || {};
   return Object.keys(realmDb);
 };
@@ -180,7 +185,7 @@ Blockly.Names.prototype.getUserNames = function(realm) {
  *     ('VARIABLE', 'PROCEDURE', 'DEVELOPER_VARIABLE', etc...).
  * @return {string} An entity name that is legal in the exported language.
  */
-Blockly.Names.prototype.getDistinctName = function(name, realm) {
+Names.prototype.getDistinctName = function(name, realm) {
   let safeName = this.safeName_(name);
   let i = '';
   while (this.dbReverse_[safeName + i] ||
@@ -191,7 +196,7 @@ Blockly.Names.prototype.getDistinctName = function(name, realm) {
   safeName += i;
   this.dbReverse_[safeName] = true;
   const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
-      realm == Blockly.Names.DEVELOPER_VARIABLE_TYPE;
+      realm == Names.DEVELOPER_VARIABLE_TYPE;
   const prefix = isVar ? this.variablePrefix_ : '';
   return prefix + safeName;
 };
@@ -204,7 +209,7 @@ Blockly.Names.prototype.getDistinctName = function(name, realm) {
  * @return {string} Safe entity name.
  * @private
  */
-Blockly.Names.prototype.safeName_ = function(name) {
+Names.prototype.safeName_ = function(name) {
   if (!name) {
     name = Blockly.Msg['UNNAMED_KEY'] || 'unnamed';
   } else {
@@ -227,7 +232,9 @@ Blockly.Names.prototype.safeName_ = function(name) {
  * @param {string} name2 Second name.
  * @return {boolean} True if names are the same.
  */
-Blockly.Names.equals = function(name1, name2) {
+Names.equals = function(name1, name2) {
   // name1.localeCompare(name2) is slower.
   return name1.toLowerCase() == name2.toLowerCase();
 };
+
+exports = Names;
diff --git a/tests/deps.js b/tests/deps.js
index a563d81e7..1d8aaa3ac 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -116,7 +116,7 @@ goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.uti
 goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']);
+goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.Variables', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);

From 03d4d4265f3de7fe375b3bd1f286b31cd256e849 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:46:37 -0700
Subject: [PATCH 209/291] Migrate core/names.js named requires

---
 core/names.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/core/names.js b/core/names.js
index 3653b2d3a..eeee8391a 100644
--- a/core/names.js
+++ b/core/names.js
@@ -13,14 +13,15 @@
 goog.module('Blockly.Names');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.Variables');
-
+const Msg = goog.require('Blockly.Msg');
+/* eslint-disable-next-line no-unused-vars */
+const VariableMap = goog.requireType('Blockly.VariableMap');
+const Variables = goog.require('Blockly.Variables');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const internalConstants = goog.require('Blockly.internalConstants');
 /** @suppress {extraRequire} */
 goog.requireType('Blockly.Procedures');
-goog.requireType('Blockly.VariableMap');
-goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -72,7 +73,7 @@ Names.prototype.reset = function() {
 
 /**
  * Set the variable map that maps from variable name to variable object.
- * @param {!Blockly.VariableMap} map The map to track.
+ * @param {!VariableMap} map The map to track.
  */
 Names.prototype.setVariableMap = function(map) {
   this.variableMap_ = map;
@@ -81,7 +82,7 @@ Names.prototype.setVariableMap = function(map) {
 /**
  * Get the name for a user-defined variable, based on its ID.
  * This should only be used for variables of realm
- * Blockly.internalConstants.VARIABLE_CATEGORY_NAME.
+ * internalConstants.VARIABLE_CATEGORY_NAME.
  * @param {string} id The ID to look up in the variable map.
  * @return {?string} The name of the referenced variable, or null if there was
  *     no variable map or the variable was not found in the map.
@@ -105,19 +106,19 @@ Names.prototype.getNameForUserVariable_ = function(id) {
 
 /**
  * Generate names for user variables, but only ones that are being used.
- * @param {!Blockly.Workspace} workspace Workspace to generate variables from.
+ * @param {!Workspace} workspace Workspace to generate variables from.
  */
 Names.prototype.populateVariables = function(workspace) {
-  const variables = Blockly.Variables.allUsedVarModels(workspace);
+  const variables = Variables.allUsedVarModels(workspace);
   for (let i = 0; i < variables.length; i++) {
     this.getName(
-        variables[i].getId(), Blockly.internalConstants.VARIABLE_CATEGORY_NAME);
+        variables[i].getId(), internalConstants.VARIABLE_CATEGORY_NAME);
   }
 };
 
 /**
  * Generate names for procedures.
- * @param {!Blockly.Workspace} workspace Workspace to generate procedures from.
+ * @param {!Workspace} workspace Workspace to generate procedures from.
  */
 Names.prototype.populateProcedures = function(workspace) {
   let procedures = goog.module.get('Blockly.Procedures').allProcedures(workspace);
@@ -125,7 +126,7 @@ Names.prototype.populateProcedures = function(workspace) {
   procedures = procedures[0].concat(procedures[1]);
   for (let i = 0; i < procedures.length; i++) {
     this.getName(
-        procedures[i][0], Blockly.internalConstants.PROCEDURE_CATEGORY_NAME);
+        procedures[i][0], internalConstants.PROCEDURE_CATEGORY_NAME);
   }
 };
 
@@ -139,7 +140,7 @@ Names.prototype.populateProcedures = function(workspace) {
  */
 Names.prototype.getName = function(nameOrId, realm) {
   let name = nameOrId;
-  if (realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME) {
+  if (realm == internalConstants.VARIABLE_CATEGORY_NAME) {
     const varName = this.getNameForUserVariable_(nameOrId);
     if (varName) {
       // Successful ID lookup.
@@ -148,7 +149,7 @@ Names.prototype.getName = function(nameOrId, realm) {
   }
   const normalizedName = name.toLowerCase();
 
-  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Names.DEVELOPER_VARIABLE_TYPE;
 
   const prefix = isVar ? this.variablePrefix_ : '';
@@ -195,7 +196,7 @@ Names.prototype.getDistinctName = function(name, realm) {
   }
   safeName += i;
   this.dbReverse_[safeName] = true;
-  const isVar = realm == Blockly.internalConstants.VARIABLE_CATEGORY_NAME ||
+  const isVar = realm == internalConstants.VARIABLE_CATEGORY_NAME ||
       realm == Names.DEVELOPER_VARIABLE_TYPE;
   const prefix = isVar ? this.variablePrefix_ : '';
   return prefix + safeName;
@@ -211,7 +212,7 @@ Names.prototype.getDistinctName = function(name, realm) {
  */
 Names.prototype.safeName_ = function(name) {
   if (!name) {
-    name = Blockly.Msg['UNNAMED_KEY'] || 'unnamed';
+    name = Msg['UNNAMED_KEY'] || 'unnamed';
   } else {
     // Unfortunately names in non-latin characters will look like
     // _E9_9F_B3_E4_B9_90 which is pretty meaningless.

From 20531314d857101840a97e105d97bfc5b8eb81cc Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:46:59 -0700
Subject: [PATCH 210/291] clang-format core/names.js

---
 core/names.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/names.js b/core/names.js
index eeee8391a..b66da4c37 100644
--- a/core/names.js
+++ b/core/names.js
@@ -90,7 +90,8 @@ Names.prototype.setVariableMap = function(map) {
  */
 Names.prototype.getNameForUserVariable_ = function(id) {
   if (!this.variableMap_) {
-    console.warn('Deprecated call to Names.prototype.getName without ' +
+    console.warn(
+        'Deprecated call to Names.prototype.getName without ' +
         'defining a variable map. To fix, add the following code in your ' +
         'generator\'s init() function:\n' +
         'Blockly.YourGeneratorName.nameDB_.setVariableMap(' +
@@ -121,12 +122,12 @@ Names.prototype.populateVariables = function(workspace) {
  * @param {!Workspace} workspace Workspace to generate procedures from.
  */
 Names.prototype.populateProcedures = function(workspace) {
-  let procedures = goog.module.get('Blockly.Procedures').allProcedures(workspace);
+  let procedures =
+      goog.module.get('Blockly.Procedures').allProcedures(workspace);
   // Flatten the return vs no-return procedure lists.
   procedures = procedures[0].concat(procedures[1]);
   for (let i = 0; i < procedures.length; i++) {
-    this.getName(
-        procedures[i][0], internalConstants.PROCEDURE_CATEGORY_NAME);
+    this.getName(procedures[i][0], internalConstants.PROCEDURE_CATEGORY_NAME);
   }
 };
 

From 1376f1e6c2c75b7bc9a9aade923b9c1013d971cb Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 5 Aug 2021 11:53:38 -0700
Subject: [PATCH 211/291] Revert "fix: update tag module workflow to add labels
 instead of setting one label"

---
 .github/workflows/tag_module_cleanup.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 9cec19500..94e7ec692 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -5,14 +5,14 @@ name: Tag module cleanup
 
 # Trigger on pull requests against goog_module branch only
 # Uses pull_request_target to get write permissions so that it can write labels.
-on:
+on: 
   pull_request_target:
     branches:
       - goog_module
 
 jobs:
   tag-module-cleanup:
-
+  
     # Add the type: cleanup label
     runs-on: ubuntu-latest
     steps:
@@ -23,22 +23,13 @@ jobs:
             // https://github.com/google/blockly/milestone/18
             const milestoneNumber = 18;
             // Note that pull requests are accessed through the issues API.
-
-            const issueGetParams = {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number
-            }
-
-            const issueInfo = await github.issues.get(issueGetParams)
-
-            const issuesUpdateParams = {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
+            const issuesUpdateParams = { 
+              owner: context.repo.owner, 
+              repo: context.repo.repo, 
               // Adds the milestone
-              milestone: milestoneNumber,
+              milestone: milestoneNumber, 
               issue_number: context.issue.number,
               // Sets the labels
-              labels: [...issueInfo.labels, 'type: cleanup']
+              labels: ['type: cleanup']
             }
             await github.issues.update(issuesUpdateParams)

From 2b6d275440783cad68faaeb97b875833b45702d2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Thu, 5 Aug 2021 13:57:16 -0700
Subject: [PATCH 212/291] Migrate core/renderers/measurables/types.js to
 goog.module syntax (#5309)

* Migrate core/renderers/measurables/types.js to goog.module

* Migrate core/renderers/measurables/types.js to named requires

* clang-format core/renderers/measurables/types.js
---
 core/renderers/measurables/types.js | 232 ++++++++++++++--------------
 tests/deps.js                       |   2 +-
 2 files changed, 116 insertions(+), 118 deletions(-)

diff --git a/core/renderers/measurables/types.js b/core/renderers/measurables/types.js
index 19cacceca..655375569 100644
--- a/core/renderers/measurables/types.js
+++ b/core/renderers/measurables/types.js
@@ -11,42 +11,45 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.Types');
+goog.module('Blockly.blockRendering.Types');
+goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.blockRendering.Measurable');
-goog.requireType('Blockly.blockRendering.Row');
+/* eslint-disable-next-line no-unused-vars */
+const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
+/* eslint-disable-next-line no-unused-vars */
+const Row = goog.requireType('Blockly.blockRendering.Row');
 
 
 /**
  * Types of rendering elements.
  * @enum {number}
  */
-Blockly.blockRendering.Types = {
-  NONE: 0,                      // None
-  FIELD: 1 << 0,                // Field.
-  HAT: 1 << 1,                  // Hat.
-  ICON: 1 << 2,                 // Icon.
-  SPACER: 1 << 3,               // Spacer.
-  BETWEEN_ROW_SPACER: 1 << 4,   // Between Row Spacer.
-  IN_ROW_SPACER: 1 << 5,        // In Row Spacer.
-  EXTERNAL_VALUE_INPUT: 1 << 6, // External Value Input.
-  INPUT: 1 << 7,                // Input.
-  INLINE_INPUT: 1 << 8,         // Inline Input.
-  STATEMENT_INPUT: 1 << 9,      // Statement Input.
-  CONNECTION: 1 << 10,          // Connection.
-  PREVIOUS_CONNECTION: 1 << 11, // Previous Connection.
-  NEXT_CONNECTION: 1 << 12,     // Next Connection.
-  OUTPUT_CONNECTION: 1 << 13,   // Output Connection.
-  CORNER: 1 << 14,              // Corner.
-  LEFT_SQUARE_CORNER: 1 << 15,  // Square Corner.
-  LEFT_ROUND_CORNER: 1 << 16,   // Round Corner.
-  RIGHT_SQUARE_CORNER: 1 << 17, // Right Square Corner.
-  RIGHT_ROUND_CORNER: 1 << 18,  // Right Round Corner.
-  JAGGED_EDGE: 1 << 19,         // Jagged Edge.
-  ROW: 1 << 20,                 // Row.
-  TOP_ROW: 1 << 21,             // Top Row.
-  BOTTOM_ROW: 1 << 22,          // Bottom Row.
-  INPUT_ROW: 1 << 23            // Input Row.
+const Types = {
+  NONE: 0,                       // None
+  FIELD: 1 << 0,                 // Field.
+  HAT: 1 << 1,                   // Hat.
+  ICON: 1 << 2,                  // Icon.
+  SPACER: 1 << 3,                // Spacer.
+  BETWEEN_ROW_SPACER: 1 << 4,    // Between Row Spacer.
+  IN_ROW_SPACER: 1 << 5,         // In Row Spacer.
+  EXTERNAL_VALUE_INPUT: 1 << 6,  // External Value Input.
+  INPUT: 1 << 7,                 // Input.
+  INLINE_INPUT: 1 << 8,          // Inline Input.
+  STATEMENT_INPUT: 1 << 9,       // Statement Input.
+  CONNECTION: 1 << 10,           // Connection.
+  PREVIOUS_CONNECTION: 1 << 11,  // Previous Connection.
+  NEXT_CONNECTION: 1 << 12,      // Next Connection.
+  OUTPUT_CONNECTION: 1 << 13,    // Output Connection.
+  CORNER: 1 << 14,               // Corner.
+  LEFT_SQUARE_CORNER: 1 << 15,   // Square Corner.
+  LEFT_ROUND_CORNER: 1 << 16,    // Round Corner.
+  RIGHT_SQUARE_CORNER: 1 << 17,  // Right Square Corner.
+  RIGHT_ROUND_CORNER: 1 << 18,   // Right Round Corner.
+  JAGGED_EDGE: 1 << 19,          // Jagged Edge.
+  ROW: 1 << 20,                  // Row.
+  TOP_ROW: 1 << 21,              // Top Row.
+  BOTTOM_ROW: 1 << 22,           // Bottom Row.
+  INPUT_ROW: 1 << 23             // Input Row.
 };
 
 /**
@@ -55,9 +58,7 @@ Blockly.blockRendering.Types = {
  * @const
  * @package
  */
-Blockly.blockRendering.Types.LEFT_CORNER =
-    Blockly.blockRendering.Types.LEFT_SQUARE_CORNER |
-    Blockly.blockRendering.Types.LEFT_ROUND_CORNER;
+Types.LEFT_CORNER = Types.LEFT_SQUARE_CORNER | Types.LEFT_ROUND_CORNER;
 
 /**
  * A Right Corner Union Type.
@@ -65,19 +66,17 @@ Blockly.blockRendering.Types.LEFT_CORNER =
  * @const
  * @package
  */
-Blockly.blockRendering.Types.RIGHT_CORNER =
-    Blockly.blockRendering.Types.RIGHT_SQUARE_CORNER |
-    Blockly.blockRendering.Types.RIGHT_ROUND_CORNER;
+Types.RIGHT_CORNER = Types.RIGHT_SQUARE_CORNER | Types.RIGHT_ROUND_CORNER;
 
 /**
  * Next flag value to use for custom rendering element types.
  * This must be updated to reflect the next enum flag value
  * to use if additional elements are added to
- * `Blockly.blockRendering.Types`.
+ * `Types`.
  * @type {number}
  * @private
  */
-Blockly.blockRendering.Types.nextTypeValue_ = 1 << 24;
+Types.nextTypeValue_ = 1 << 24;
 
 /**
  * Get the enum flag value of an existing type or register a new type.
@@ -85,268 +84,267 @@ Blockly.blockRendering.Types.nextTypeValue_ = 1 << 24;
  * @return {!number} The enum flag value associated with that type.
  * @package
  */
-Blockly.blockRendering.Types.getType = function(type) {
-  if (!Object.prototype.hasOwnProperty.call(Blockly.blockRendering.Types, type)) {
-    Blockly.blockRendering.Types[type] =
-      Blockly.blockRendering.Types.nextTypeValue_;
-    Blockly.blockRendering.Types.nextTypeValue_ <<= 1;
+Types.getType = function(type) {
+  if (!Object.prototype.hasOwnProperty.call(Types, type)) {
+    Types[type] = Types.nextTypeValue_;
+    Types.nextTypeValue_ <<= 1;
   }
-  return Blockly.blockRendering.Types[type];
+  return Types[type];
 };
 
 /**
  * Whether a measurable stores information about a field.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a field.
  * @package
  */
-Blockly.blockRendering.Types.isField = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.FIELD;
+Types.isField = function(elem) {
+  return elem.type & Types.FIELD;
 };
 
 /**
  * Whether a measurable stores information about a hat.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a hat.
  * @package
  */
-Blockly.blockRendering.Types.isHat = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.HAT;
+Types.isHat = function(elem) {
+  return elem.type & Types.HAT;
 };
 
 /**
  * Whether a measurable stores information about an icon.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an icon.
  * @package
  */
-Blockly.blockRendering.Types.isIcon = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.ICON;
+Types.isIcon = function(elem) {
+  return elem.type & Types.ICON;
 };
 
 /**
  * Whether a measurable stores information about a spacer.
- * @param {!Blockly.blockRendering.Measurable|!Blockly.blockRendering.Row} elem
+ * @param {!Measurable|!Row} elem
  *     The element to check.
  * @return {number} 1 if the object stores information about a spacer.
  * @package
  */
-Blockly.blockRendering.Types.isSpacer = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.SPACER;
+Types.isSpacer = function(elem) {
+  return elem.type & Types.SPACER;
 };
 
 /**
  * Whether a measurable stores information about an in-row spacer.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an
  *   in-row spacer.
  * @package
  */
-Blockly.blockRendering.Types.isInRowSpacer = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.IN_ROW_SPACER;
+Types.isInRowSpacer = function(elem) {
+  return elem.type & Types.IN_ROW_SPACER;
 };
 
 /**
  * Whether a measurable stores information about an input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an input.
  * @package
  */
-Blockly.blockRendering.Types.isInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.INPUT;
+Types.isInput = function(elem) {
+  return elem.type & Types.INPUT;
 };
 
 /**
  * Whether a measurable stores information about an external input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an
  *   external input.
  * @package
  */
-Blockly.blockRendering.Types.isExternalInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
+Types.isExternalInput = function(elem) {
+  return elem.type & Types.EXTERNAL_VALUE_INPUT;
 };
 
 /**
  * Whether a measurable stores information about an inline input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about an
  *   inline input.
  * @package
  */
-Blockly.blockRendering.Types.isInlineInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.INLINE_INPUT;
+Types.isInlineInput = function(elem) {
+  return elem.type & Types.INLINE_INPUT;
 };
 
 /**
  * Whether a measurable stores information about a statement input.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   statement input.
  * @package
  */
-Blockly.blockRendering.Types.isStatementInput = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.STATEMENT_INPUT;
+Types.isStatementInput = function(elem) {
+  return elem.type & Types.STATEMENT_INPUT;
 };
 
 /**
  * Whether a measurable stores information about a previous connection.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   previous connection.
  * @package
  */
-Blockly.blockRendering.Types.isPreviousConnection = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.PREVIOUS_CONNECTION;
+Types.isPreviousConnection = function(elem) {
+  return elem.type & Types.PREVIOUS_CONNECTION;
 };
 
 /**
  * Whether a measurable stores information about a next connection.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   next connection.
  * @package
  */
-Blockly.blockRendering.Types.isNextConnection = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.NEXT_CONNECTION;
+Types.isNextConnection = function(elem) {
+  return elem.type & Types.NEXT_CONNECTION;
 };
 
 /**
  * Whether a measurable stores information about a previous or next connection.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a previous or
  *   next connection.
  * @package
  */
-Blockly.blockRendering.Types.isPreviousOrNextConnection = function(elem) {
-  return elem.type & (Blockly.blockRendering.Types.PREVIOUS_CONNECTION |
-      Blockly.blockRendering.Types.NEXT_CONNECTION);
+Types.isPreviousOrNextConnection = function(elem) {
+  return elem.type & (Types.PREVIOUS_CONNECTION | Types.NEXT_CONNECTION);
 };
 
 /**
  * Whether a measurable stores information about a left round corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   left round corner.
  * @package
  */
-Blockly.blockRendering.Types.isLeftRoundedCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.LEFT_ROUND_CORNER;
+Types.isLeftRoundedCorner = function(elem) {
+  return elem.type & Types.LEFT_ROUND_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a right round corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   right round corner.
  * @package
  */
-Blockly.blockRendering.Types.isRightRoundedCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.RIGHT_ROUND_CORNER;
+Types.isRightRoundedCorner = function(elem) {
+  return elem.type & Types.RIGHT_ROUND_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a left square corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   left square corner.
  * @package
  */
-Blockly.blockRendering.Types.isLeftSquareCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.LEFT_SQUARE_CORNER;
+Types.isLeftSquareCorner = function(elem) {
+  return elem.type & Types.LEFT_SQUARE_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a right square corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   right square corner.
  * @package
  */
-Blockly.blockRendering.Types.isRightSquareCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.RIGHT_SQUARE_CORNER;
+Types.isRightSquareCorner = function(elem) {
+  return elem.type & Types.RIGHT_SQUARE_CORNER;
 };
 
 /**
  * Whether a measurable stores information about a corner.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a
  *   corner.
  * @package
  */
-Blockly.blockRendering.Types.isCorner = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.CORNER;
+Types.isCorner = function(elem) {
+  return elem.type & Types.CORNER;
 };
 
 /**
  * Whether a measurable stores information about a jagged edge.
- * @param {!Blockly.blockRendering.Measurable} elem The element to check.
+ * @param {!Measurable} elem The element to check.
  * @return {number} 1 if the object stores information about a jagged edge.
  * @package
  */
-Blockly.blockRendering.Types.isJaggedEdge = function(elem) {
-  return elem.type & Blockly.blockRendering.Types.JAGGED_EDGE;
+Types.isJaggedEdge = function(elem) {
+  return elem.type & Types.JAGGED_EDGE;
 };
 
 /**
  * Whether a measurable stores information about a row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a row.
  * @package
  */
-Blockly.blockRendering.Types.isRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.ROW;
+Types.isRow = function(row) {
+  return row.type & Types.ROW;
 };
 
 /**
  * Whether a measurable stores information about a between-row spacer.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a
  *   between-row spacer.
  * @package
  */
-Blockly.blockRendering.Types.isBetweenRowSpacer = function(row) {
-  return row.type & Blockly.blockRendering.Types.BETWEEN_ROW_SPACER;
+Types.isBetweenRowSpacer = function(row) {
+  return row.type & Types.BETWEEN_ROW_SPACER;
 };
 
 /**
  * Whether a measurable stores information about a top row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a top row.
  * @package
  */
-Blockly.blockRendering.Types.isTopRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.TOP_ROW;
+Types.isTopRow = function(row) {
+  return row.type & Types.TOP_ROW;
 };
 
 /**
  * Whether a measurable stores information about a bottom row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a bottom row.
  * @package
  */
-Blockly.blockRendering.Types.isBottomRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.BOTTOM_ROW;
+Types.isBottomRow = function(row) {
+  return row.type & Types.BOTTOM_ROW;
 };
 
 /**
  * Whether a measurable stores information about a top or bottom row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about a top or
  *   bottom row.
  * @package
  */
-Blockly.blockRendering.Types.isTopOrBottomRow = function(row) {
-  return row.type & (Blockly.blockRendering.Types.TOP_ROW |
-      Blockly.blockRendering.Types.BOTTOM_ROW);
+Types.isTopOrBottomRow = function(row) {
+  return row.type & (Types.TOP_ROW | Types.BOTTOM_ROW);
 };
 
 /**
  * Whether a measurable stores information about an input row.
- * @param {!Blockly.blockRendering.Row} row The row to check.
+ * @param {!Row} row The row to check.
  * @return {number} 1 if the object stores information about an input row.
  * @package
  */
-Blockly.blockRendering.Types.isInputRow = function(row) {
-  return row.type & Blockly.blockRendering.Types.INPUT_ROW;
+Types.isInputRow = function(row) {
+  return row.type & Types.INPUT_ROW;
 };
+
+exports = Types;
diff --git a/tests/deps.js b/tests/deps.js
index 1d8aaa3ac..ff7e2926e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -144,7 +144,7 @@ goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.
 goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], []);
+goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);

From 23a0b89fc10b404a5eea46f5552f969d8d9d2c42 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Fri, 6 Aug 2021 12:30:30 -0700
Subject: [PATCH 213/291] Migrate core/block.js to goog.module syntax (#5322)

* Migrate core/block.js to ES6 const/let

* Migrate core/block.js to goog.module

* Migrate core/block.js to ES6 const/let

* Migrate core/block.js to goog.module

* Migrate core/block.js to named requires

* clang-format core/block.js

* Add missing period to comment in core/block.js
---
 core/block.js | 865 +++++++++++++++++++++++++-------------------------
 tests/deps.js |   2 +-
 2 files changed, 439 insertions(+), 428 deletions(-)

diff --git a/core/block.js b/core/block.js
index cfeaddebd..adddfe5ec 100644
--- a/core/block.js
+++ b/core/block.js
@@ -10,15 +10,40 @@
  */
 'use strict';
 
-goog.provide('Blockly.Block');
+goog.module('Blockly.Block');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.Blocks');
-goog.require('Blockly.Connection');
-goog.require('Blockly.connectionTypes');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+const ASTNode = goog.require('Blockly.ASTNode');
+const Blocks = goog.require('Blockly.Blocks');
+/* eslint-disable-next-line no-unused-vars */
+const Comment = goog.requireType('Blockly.Comment');
+const Connection = goog.require('Blockly.Connection');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const Extensions = goog.require('Blockly.Extensions');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.Field');
+/* eslint-disable-next-line no-unused-vars */
+const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
+const IDeletable = goog.require('Blockly.IDeletable');
+const Input = goog.require('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const Mutator = goog.requireType('Blockly.Mutator');
+const Size = goog.require('Blockly.utils.Size');
+const Tooltip = goog.require('Blockly.Tooltip');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const constants = goog.require('Blockly.constants');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
+const inputTypes = goog.require('Blockly.inputTypes');
+const object = goog.require('Blockly.utils.object');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
 /** @suppress {extraRequire} */
@@ -27,59 +52,41 @@ goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.BlockDelete');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
-goog.require('Blockly.Extensions');
-goog.require('Blockly.fieldRegistry');
-goog.require('Blockly.IASTNodeLocation');
-goog.require('Blockly.IDeletable');
-goog.require('Blockly.Input');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.Tooltip');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.Workspace');
-
-goog.requireType('Blockly.Comment');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.Mutator');
-goog.requireType('Blockly.utils.Size');
-goog.requireType('Blockly.VariableModel');
 
 
 /**
  * Class for one block.
  * Not normally called directly, workspace.newBlock() is preferred.
- * @param {!Blockly.Workspace} workspace The block's workspace.
+ * @param {!Workspace} workspace The block's workspace.
  * @param {!string} prototypeName Name of the language object containing
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
  * @constructor
- * @implements {Blockly.IASTNodeLocation}
- * @implements {Blockly.IDeletable}
+ * @implements {IASTNodeLocation}
+ * @implements {IDeletable}
  * @throws When the prototypeName is not valid or not allowed.
  */
-Blockly.Block = function(workspace, prototypeName, opt_id) {
-  if (Blockly.Generator &&
-      typeof Blockly.Generator.prototype[prototypeName] != 'undefined') {
+const Block = function(workspace, prototypeName, opt_id) {
+  const Generator = goog.module.get('Blockly.Generator');
+  if (Generator && typeof Generator.prototype[prototypeName] != 'undefined') {
     // Occluding Generator class members is not allowed.
-    throw Error('Block prototypeName "' + prototypeName +
+    throw Error(
+        'Block prototypeName "' + prototypeName +
         '" conflicts with Blockly.Generator members.');
   }
 
   /** @type {string} */
-  this.id = (opt_id && !workspace.getBlockById(opt_id)) ?
-      opt_id : Blockly.utils.genUid();
+  this.id =
+      (opt_id && !workspace.getBlockById(opt_id)) ? opt_id : utils.genUid();
   workspace.setBlockById(this.id, this);
-  /** @type {Blockly.Connection} */
+  /** @type {Connection} */
   this.outputConnection = null;
-  /** @type {Blockly.Connection} */
+  /** @type {Connection} */
   this.nextConnection = null;
-  /** @type {Blockly.Connection} */
+  /** @type {Connection} */
   this.previousConnection = null;
-  /** @type {!Array<!Blockly.Input>} */
+  /** @type {!Array<!Input>} */
   this.inputList = [];
   /** @type {boolean|undefined} */
   this.inputsInline = undefined;
@@ -88,19 +95,19 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
    * @private
    */
   this.disabled = false;
-  /** @type {!Blockly.Tooltip.TipInfo} */
+  /** @type {!Tooltip.TipInfo} */
   this.tooltip = '';
   /** @type {boolean} */
   this.contextMenu = true;
 
   /**
-   * @type {Blockly.Block}
+   * @type {Block}
    * @protected
    */
   this.parentBlock_ = null;
 
   /**
-   * @type {!Array<!Blockly.Block>}
+   * @type {!Array<!Block>}
    * @protected
    */
   this.childBlocks_ = [];
@@ -143,31 +150,27 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
 
   /**
    * A string representing the comment attached to this block.
-   * @type {string|Blockly.Comment}
+   * @type {string|Comment}
    * @deprecated August 2019. Use getCommentText instead.
    */
   this.comment = null;
 
   /**
    * A model of the comment attached to this block.
-   * @type {!Blockly.Block.CommentModel}
+   * @type {!Block.CommentModel}
    * @package
    */
-  this.commentModel = {
-    text: null,
-    pinned: false,
-    size: new Blockly.utils.Size(160, 80)
-  };
+  this.commentModel = {text: null, pinned: false, size: new Size(160, 80)};
 
   /**
    * The block's position in workspace units.  (0, 0) is at the workspace's
    * origin; scale does not change this value.
-   * @type {!Blockly.utils.Coordinate}
+   * @type {!Coordinate}
    * @private
    */
-  this.xy_ = new Blockly.utils.Coordinate(0, 0);
+  this.xy_ = new Coordinate(0, 0);
 
-  /** @type {!Blockly.Workspace} */
+  /** @type {!Workspace} */
   this.workspace = workspace;
   /** @type {boolean} */
   this.isInFlyout = workspace.isFlyout;
@@ -204,11 +207,11 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
   if (prototypeName) {
     /** @type {string} */
     this.type = prototypeName;
-    var prototype = Blockly.Blocks[prototypeName];
+    const prototype = Blocks[prototypeName];
     if (!prototype || typeof prototype != 'object') {
       throw TypeError('Unknown block type: ' + prototypeName);
     }
-    Blockly.utils.object.mixin(this, prototype);
+    object.mixin(this, prototype);
   }
 
   workspace.addTopBlock(this);
@@ -217,32 +220,31 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
   // All events fired should be part of the same group.
   // Any events fired during init should not be undoable,
   // so that block creation is atomic.
-  var existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Events.getGroup();
   if (!existingGroup) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
   }
-  var initialUndoFlag = Blockly.Events.recordUndo;
+  const initialUndoFlag = Events.recordUndo;
 
   try {
     // Call an initialization function, if it exists.
     if (typeof this.init == 'function') {
-      Blockly.Events.recordUndo = false;
+      Events.recordUndo = false;
       this.init();
-      Blockly.Events.recordUndo = initialUndoFlag;
+      Events.recordUndo = initialUndoFlag;
     }
 
     // Fire a create event.
-    if (Blockly.Events.isEnabled()) {
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(
-          this));
+    if (Events.isEnabled()) {
+      Events.fire(new (Events.get(Events.BLOCK_CREATE))(this));
     }
 
   } finally {
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
     // In case init threw, recordUndo flag should still be reset.
-    Blockly.Events.recordUndo = initialUndoFlag;
+    Events.recordUndo = initialUndoFlag;
   }
 
   // Record initial inline state.
@@ -259,36 +261,36 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
  * @typedef {{
  *            text:?string,
  *            pinned:boolean,
- *            size:Blockly.utils.Size
+ *            size:Size
  *          }}
  */
-Blockly.Block.CommentModel;
+Block.CommentModel;
 
 /**
  * The language-neutral ID given to the collapsed input.
  * @const {string}
  */
-Blockly.Block.COLLAPSED_INPUT_NAME = Blockly.constants.COLLAPSED_INPUT_NAME;
+Block.COLLAPSED_INPUT_NAME = constants.COLLAPSED_INPUT_NAME;
 
 /**
  * The language-neutral ID given to the collapsed field.
  * @const {string}
  */
-Blockly.Block.COLLAPSED_FIELD_NAME = Blockly.constants.COLLAPSED_FIELD_NAME;
+Block.COLLAPSED_FIELD_NAME = constants.COLLAPSED_FIELD_NAME;
 
 /**
  * Optional text data that round-trips between blocks and XML.
  * Has no effect. May be used by 3rd parties for meta information.
  * @type {?string}
  */
-Blockly.Block.prototype.data = null;
+Block.prototype.data = null;
 
 /**
  * Has this block been disposed of?
  * @type {boolean}
  * @package
  */
-Blockly.Block.prototype.disposed = false;
+Block.prototype.disposed = false;
 
 /**
  * Colour of the block as HSV hue value (0-360)
@@ -296,56 +298,56 @@ Blockly.Block.prototype.disposed = false;
  * @type {?number}
  * @private
  */
-Blockly.Block.prototype.hue_ = null;
+Block.prototype.hue_ = null;
 
 /**
  * Colour of the block in '#RRGGBB' format.
  * @type {string}
  * @protected
  */
-Blockly.Block.prototype.colour_ = '#000000';
+Block.prototype.colour_ = '#000000';
 
 /**
  * Name of the block style.
  * @type {string}
  * @protected
  */
-Blockly.Block.prototype.styleName_ = '';
+Block.prototype.styleName_ = '';
 
 /**
  * An optional method called during initialization.
  * @type {?function()}
  */
-Blockly.Block.prototype.init;
+Block.prototype.init;
 
 /**
  * An optional callback method to use whenever the block's parent workspace
  * changes. This is usually only called from the constructor, the block type
  * initializer function, or an extension initializer function.
- * @type {?function(Blockly.Events.Abstract)}
+ * @type {?function(Abstract)}
  */
-Blockly.Block.prototype.onchange;
+Block.prototype.onchange;
 
 /**
  * An optional serialization method for defining how to serialize the
  * mutation state. This must be coupled with defining `domToMutation`.
  * @type {?function(...):!Element}
  */
-Blockly.Block.prototype.mutationToDom;
+Block.prototype.mutationToDom;
 
 /**
  * An optional deserialization method for defining how to deserialize the
  * mutation state. This must be coupled with defining `mutationToDom`.
  * @type {?function(!Element)}
  */
-Blockly.Block.prototype.domToMutation;
+Block.prototype.domToMutation;
 
 /**
  * An optional property for suppressing adding STATEMENT_PREFIX and
  * STATEMENT_SUFFIX to generated code.
  * @type {?boolean}
  */
-Blockly.Block.prototype.suppressPrefixSuffix;
+Block.prototype.suppressPrefixSuffix;
 
 /**
  * An optional property for declaring developer variables.  Return a list of
@@ -353,7 +355,7 @@ Blockly.Block.prototype.suppressPrefixSuffix;
  * the user, but are declared as global variables in the generated code.
  * @type {?function():!Array<string>}
  */
-Blockly.Block.prototype.getDeveloperVariables;
+Block.prototype.getDeveloperVariables;
 
 /**
  * Dispose of this block.
@@ -362,7 +364,7 @@ Blockly.Block.prototype.getDeveloperVariables;
  *     all children of this block.
  * @suppress {checkTypes}
  */
-Blockly.Block.prototype.dispose = function(healStack) {
+Block.prototype.dispose = function(healStack) {
   if (!this.workspace) {
     // Already deleted.
     return;
@@ -373,11 +375,10 @@ Blockly.Block.prototype.dispose = function(healStack) {
   }
 
   this.unplug(healStack);
-  if (Blockly.Events.isEnabled()) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_DELETE))(
-        this));
+  if (Events.isEnabled()) {
+    Events.fire(new (Events.get(Events.BLOCK_DELETE))(this));
   }
-  Blockly.Events.disable();
+  Events.disable();
 
   try {
     // This block is now at the top of the workspace.
@@ -399,22 +400,22 @@ Blockly.Block.prototype.dispose = function(healStack) {
     }
 
     // First, dispose of all my children.
-    for (var i = this.childBlocks_.length - 1; i >= 0; i--) {
+    for (let i = this.childBlocks_.length - 1; i >= 0; i--) {
       this.childBlocks_[i].dispose(false);
     }
     // Then dispose of myself.
     // Dispose of all inputs and their fields.
-    for (var i = 0, input; (input = this.inputList[i]); i++) {
+    for (let i = 0, input; (input = this.inputList[i]); i++) {
       input.dispose();
     }
     this.inputList.length = 0;
     // Dispose of any remaining connections (next/previous/output).
-    var connections = this.getConnections_(true);
-    for (var i = 0, connection; (connection = connections[i]); i++) {
+    const connections = this.getConnections_(true);
+    for (let i = 0, connection; (connection = connections[i]); i++) {
       connection.dispose();
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
     this.disposed = true;
   }
 };
@@ -428,9 +429,9 @@ Blockly.Block.prototype.dispose = function(healStack) {
  * change).
  * @public
  */
-Blockly.Block.prototype.initModel = function() {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+Block.prototype.initModel = function() {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.initModel) {
         field.initModel();
       }
@@ -444,7 +445,7 @@ Blockly.Block.prototype.initModel = function() {
  * @param {boolean=} opt_healStack Disconnect child statement and reconnect
  *   stack.  Defaults to false.
  */
-Blockly.Block.prototype.unplug = function(opt_healStack) {
+Block.prototype.unplug = function(opt_healStack) {
   if (this.outputConnection) {
     this.unplugFromRow_(opt_healStack);
   } else if (this.previousConnection) {
@@ -459,8 +460,8 @@ Blockly.Block.prototype.unplug = function(opt_healStack) {
  *     left-side block.  Defaults to false.
  * @private
  */
-Blockly.Block.prototype.unplugFromRow_ = function(opt_healStack) {
-  var parentConnection = null;
+Block.prototype.unplugFromRow_ = function(opt_healStack) {
+  let parentConnection = null;
   if (this.outputConnection.isConnected()) {
     parentConnection = this.outputConnection.targetConnection;
     // Disconnect from any superior block.
@@ -472,21 +473,20 @@ Blockly.Block.prototype.unplugFromRow_ = function(opt_healStack) {
     return;
   }
 
-  var thisConnection = this.getOnlyValueConnection_();
-  if (!thisConnection ||
-      !thisConnection.isConnected() ||
+  const thisConnection = this.getOnlyValueConnection_();
+  if (!thisConnection || !thisConnection.isConnected() ||
       thisConnection.targetBlock().isShadow()) {
     // Too many or too few possible connections on this block, or there's
     // nothing on the other side of this connection.
     return;
   }
 
-  var childConnection = thisConnection.targetConnection;
+  const childConnection = thisConnection.targetConnection;
   // Disconnect the child block.
   childConnection.disconnect();
   // Connect child to the parent if possible, otherwise bump away.
   if (this.workspace.connectionChecker.canConnect(
-      childConnection, parentConnection, false)) {
+          childConnection, parentConnection, false)) {
     parentConnection.connect(childConnection);
   } else {
     childConnection.onFailedConnect(parentConnection);
@@ -500,15 +500,14 @@ Blockly.Block.prototype.unplugFromRow_ = function(opt_healStack) {
  * Since only one block can be displaced and attached to the insertion marker
  * this should only ever return one connection.
  *
- * @return {?Blockly.Connection} The connection on the value input, or null.
+ * @return {?Connection} The connection on the value input, or null.
  * @private
  */
-Blockly.Block.prototype.getOnlyValueConnection_ = function() {
-  var connection = null;
-  for (var i = 0; i < this.inputList.length; i++) {
-    var thisConnection = this.inputList[i].connection;
-    if (thisConnection &&
-        thisConnection.type == Blockly.connectionTypes.INPUT_VALUE &&
+Block.prototype.getOnlyValueConnection_ = function() {
+  let connection = null;
+  for (let i = 0; i < this.inputList.length; i++) {
+    const thisConnection = this.inputList[i].connection;
+    if (thisConnection && thisConnection.type == connectionTypes.INPUT_VALUE &&
         thisConnection.targetConnection) {
       if (connection) {
         return null;  // More than one value input found.
@@ -526,18 +525,18 @@ Blockly.Block.prototype.getOnlyValueConnection_ = function() {
  *   stack.  Defaults to false.
  * @private
  */
-Blockly.Block.prototype.unplugFromStack_ = function(opt_healStack) {
-  var previousTarget = null;
+Block.prototype.unplugFromStack_ = function(opt_healStack) {
+  let previousTarget = null;
   if (this.previousConnection.isConnected()) {
     // Remember the connection that any next statements need to connect to.
     previousTarget = this.previousConnection.targetConnection;
     // Detach this block from the parent's tree.
     this.previousConnection.disconnect();
   }
-  var nextBlock = this.getNextBlock();
+  const nextBlock = this.getNextBlock();
   if (opt_healStack && nextBlock && !nextBlock.isShadow()) {
     // Disconnect the next statement.
-    var nextTarget = this.nextConnection.targetConnection;
+    const nextTarget = this.nextConnection.targetConnection;
     nextTarget.disconnect();
     if (previousTarget &&
         this.workspace.connectionChecker.canConnect(
@@ -551,11 +550,11 @@ Blockly.Block.prototype.unplugFromStack_ = function(opt_healStack) {
 /**
  * Returns all connections originating from this block.
  * @param {boolean} _all If true, return all connections even hidden ones.
- * @return {!Array<!Blockly.Connection>} Array of connections.
+ * @return {!Array<!Connection>} Array of connections.
  * @package
  */
-Blockly.Block.prototype.getConnections_ = function(_all) {
-  var myConnections = [];
+Block.prototype.getConnections_ = function(_all) {
+  const myConnections = [];
   if (this.outputConnection) {
     myConnections.push(this.outputConnection);
   }
@@ -565,7 +564,7 @@ Blockly.Block.prototype.getConnections_ = function(_all) {
   if (this.nextConnection) {
     myConnections.push(this.nextConnection);
   }
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection) {
       myConnections.push(input.connection);
     }
@@ -578,13 +577,13 @@ Blockly.Block.prototype.getConnections_ = function(_all) {
  * @param {boolean} ignoreShadows If true,the last connection on a non-shadow
  *     block will be returned. If false, this will follow shadows to find the
  *     last connection.
- * @return {?Blockly.Connection} The last next connection on the stack, or null.
+ * @return {?Connection} The last next connection on the stack, or null.
  * @package
  */
-Blockly.Block.prototype.lastConnectionInStack = function(ignoreShadows) {
-  var nextConnection = this.nextConnection;
+Block.prototype.lastConnectionInStack = function(ignoreShadows) {
+  let nextConnection = this.nextConnection;
   while (nextConnection) {
-    var nextBlock = nextConnection.targetBlock();
+    const nextBlock = nextConnection.targetBlock();
     if (!nextBlock || (ignoreShadows && nextBlock.isShadow())) {
       return nextConnection;
     }
@@ -597,28 +596,29 @@ Blockly.Block.prototype.lastConnectionInStack = function(ignoreShadows) {
  * Bump unconnected blocks out of alignment.  Two blocks which aren't actually
  * connected should not coincidentally line up on screen.
  */
-Blockly.Block.prototype.bumpNeighbours = function() {
+Block.prototype.bumpNeighbours = function() {
   // noop.
 };
 
 /**
  * Return the parent block or null if this block is at the top level. The parent
- * block is either the block connected to the previous connection (for a statement
- * block) or the block connected to the output connection (for a value block).
- * @return {?Blockly.Block} The block (if any) that holds the current block.
+ * block is either the block connected to the previous connection (for a
+ * statement block) or the block connected to the output connection (for a value
+ * block).
+ * @return {?Block} The block (if any) that holds the current block.
  */
-Blockly.Block.prototype.getParent = function() {
+Block.prototype.getParent = function() {
   return this.parentBlock_;
 };
 
 /**
  * Return the input that connects to the specified block.
- * @param {!Blockly.Block} block A block connected to an input on this block.
- * @return {?Blockly.Input} The input (if any) that connects to the specified
+ * @param {!Block} block A block connected to an input on this block.
+ * @return {?Input} The input (if any) that connects to the specified
  *     block.
  */
-Blockly.Block.prototype.getInputWithBlock = function(block) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.getInputWithBlock = function(block) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection && input.connection.targetBlock() == block) {
       return input;
     }
@@ -630,12 +630,13 @@ Blockly.Block.prototype.getInputWithBlock = function(block) {
  * Return the parent block that surrounds the current block, or null if this
  * block has no surrounding block.  A parent block might just be the previous
  * statement, whereas the surrounding block is an if statement, while loop, etc.
- * @return {?Blockly.Block} The block (if any) that surrounds the current block.
+ * @return {?Block} The block (if any) that surrounds the current block.
  */
-Blockly.Block.prototype.getSurroundParent = function() {
-  var block = this;
+Block.prototype.getSurroundParent = function() {
+  let block = this;
+  let prevBlock;
   do {
-    var prevBlock = block;
+    prevBlock = block;
     block = block.getParent();
     if (!block) {
       // Ran off the top.
@@ -648,30 +649,30 @@ Blockly.Block.prototype.getSurroundParent = function() {
 
 /**
  * Return the next statement block directly connected to this block.
- * @return {?Blockly.Block} The next statement block or null.
+ * @return {?Block} The next statement block or null.
  */
-Blockly.Block.prototype.getNextBlock = function() {
+Block.prototype.getNextBlock = function() {
   return this.nextConnection && this.nextConnection.targetBlock();
 };
 
 /**
  * Returns the block connected to the previous connection.
- * @return {?Blockly.Block} The previous statement block or null.
+ * @return {?Block} The previous statement block or null.
  */
-Blockly.Block.prototype.getPreviousBlock = function() {
+Block.prototype.getPreviousBlock = function() {
   return this.previousConnection && this.previousConnection.targetBlock();
 };
 
 /**
  * Return the connection on the first statement input on this block, or null if
  * there are none.
- * @return {?Blockly.Connection} The first statement connection or null.
+ * @return {?Connection} The first statement connection or null.
  * @package
  */
-Blockly.Block.prototype.getFirstStatementConnection = function() {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.getFirstStatementConnection = function() {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection &&
-        input.connection.type == Blockly.connectionTypes.NEXT_STATEMENT) {
+        input.connection.type == connectionTypes.NEXT_STATEMENT) {
       return input.connection;
     }
   }
@@ -681,11 +682,11 @@ Blockly.Block.prototype.getFirstStatementConnection = function() {
 /**
  * Return the top-most block in this block's tree.
  * This will return itself if this block is at the top level.
- * @return {!Blockly.Block} The root block.
+ * @return {!Block} The root block.
  */
-Blockly.Block.prototype.getRootBlock = function() {
-  var rootBlock;
-  var block = this;
+Block.prototype.getRootBlock = function() {
+  let rootBlock;
+  let block = this;
   do {
     rootBlock = block;
     block = rootBlock.parentBlock_;
@@ -697,13 +698,14 @@ Blockly.Block.prototype.getRootBlock = function() {
  * Walk up from the given block up through the stack of blocks to find
  * the top block of the sub stack. If we are nested in a statement input only
  * find the top-most nested block. Do not go all the way to the root block.
- * @return {!Blockly.Block} The top block in a stack.
+ * @return {!Block} The top block in a stack.
  * @package
  */
-Blockly.Block.prototype.getTopStackBlock = function() {
-  var block = this;
+Block.prototype.getTopStackBlock = function() {
+  let block = this;
+  let previous;
   do {
-    var previous = block.getPreviousBlock();
+    previous = block.getPreviousBlock();
   } while (previous && previous.getNextBlock() == block && (block = previous));
   return block;
 };
@@ -714,22 +716,22 @@ Blockly.Block.prototype.getTopStackBlock = function() {
  * Excludes any connection on an output tab or any preceding statement.
  * Blocks are optionally sorted by position; top to bottom.
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} Array of blocks.
+ * @return {!Array<!Block>} Array of blocks.
  */
-Blockly.Block.prototype.getChildren = function(ordered) {
+Block.prototype.getChildren = function(ordered) {
   if (!ordered) {
     return this.childBlocks_;
   }
-  var blocks = [];
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  const blocks = [];
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.connection) {
-      var child = input.connection.targetBlock();
+      const child = input.connection.targetBlock();
       if (child) {
         blocks.push(child);
       }
     }
   }
-  var next = this.getNextBlock();
+  const next = this.getNextBlock();
   if (next) {
     blocks.push(next);
   }
@@ -738,31 +740,32 @@ Blockly.Block.prototype.getChildren = function(ordered) {
 
 /**
  * Set parent of this block to be a new block or null.
- * @param {Blockly.Block} newParent New parent block.
+ * @param {Block} newParent New parent block.
  * @package
  */
-Blockly.Block.prototype.setParent = function(newParent) {
+Block.prototype.setParent = function(newParent) {
   if (newParent === this.parentBlock_) {
     return;
   }
 
   // Check that block is connected to new parent if new parent is not null and
   //    that block is not connected to superior one if new parent is null.
-  var connection = this.previousConnection || this.outputConnection;
-  var isConnected = !!(connection && connection.targetBlock());
+  const connection = this.previousConnection || this.outputConnection;
+  const isConnected = !!(connection && connection.targetBlock());
 
   if (isConnected && newParent && connection.targetBlock() !== newParent) {
     throw Error('Block connected to superior one that is not new parent.');
   } else if (!isConnected && newParent) {
     throw Error('Block not connected to new parent.');
   } else if (isConnected && !newParent) {
-    throw Error('Cannot set parent to null while block is still connected to' +
+    throw Error(
+        'Cannot set parent to null while block is still connected to' +
         ' superior block.');
   }
 
   if (this.parentBlock_) {
     // Remove this block from the old parent's child list.
-    Blockly.utils.arrayRemove(this.parentBlock_.childBlocks_, this);
+    utils.arrayRemove(this.parentBlock_.childBlocks_, this);
 
     // This block hasn't actually moved on-screen, so there's no need to update
     //     its connection locations.
@@ -788,12 +791,12 @@ Blockly.Block.prototype.setParent = function(newParent) {
  * Excludes any connection on an output tab or any preceding statements.
  * Blocks are optionally sorted by position; top to bottom.
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} Flattened array of blocks.
+ * @return {!Array<!Block>} Flattened array of blocks.
  */
-Blockly.Block.prototype.getDescendants = function(ordered) {
-  var blocks = [this];
-  var childBlocks = this.getChildren(ordered);
-  for (var child, i = 0; (child = childBlocks[i]); i++) {
+Block.prototype.getDescendants = function(ordered) {
+  const blocks = [this];
+  const childBlocks = this.getChildren(ordered);
+  for (let child, i = 0; (child = childBlocks[i]); i++) {
     blocks.push.apply(blocks, child.getDescendants(ordered));
   }
   return blocks;
@@ -803,7 +806,7 @@ Blockly.Block.prototype.getDescendants = function(ordered) {
  * Get whether this block is deletable or not.
  * @return {boolean} True if deletable.
  */
-Blockly.Block.prototype.isDeletable = function() {
+Block.prototype.isDeletable = function() {
   return this.deletable_ && !this.isShadow_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -812,7 +815,7 @@ Blockly.Block.prototype.isDeletable = function() {
  * Set whether this block is deletable or not.
  * @param {boolean} deletable True if deletable.
  */
-Blockly.Block.prototype.setDeletable = function(deletable) {
+Block.prototype.setDeletable = function(deletable) {
   this.deletable_ = deletable;
 };
 
@@ -820,7 +823,7 @@ Blockly.Block.prototype.setDeletable = function(deletable) {
  * Get whether this block is movable or not.
  * @return {boolean} True if movable.
  */
-Blockly.Block.prototype.isMovable = function() {
+Block.prototype.isMovable = function() {
   return this.movable_ && !this.isShadow_ &&
       !(this.workspace && this.workspace.options.readOnly);
 };
@@ -829,7 +832,7 @@ Blockly.Block.prototype.isMovable = function() {
  * Set whether this block is movable or not.
  * @param {boolean} movable True if movable.
  */
-Blockly.Block.prototype.setMovable = function(movable) {
+Block.prototype.setMovable = function(movable) {
   this.movable_ = movable;
 };
 
@@ -840,19 +843,19 @@ Blockly.Block.prototype.setMovable = function(movable) {
  * type over their maxInstances this block is not duplicatable.
  * @return {boolean} True if duplicatable.
  */
-Blockly.Block.prototype.isDuplicatable = function() {
+Block.prototype.isDuplicatable = function() {
   if (!this.workspace.hasBlockLimits()) {
     return true;
   }
   return this.workspace.isCapacityAvailable(
-      Blockly.utils.getBlockTypeCounts(this, true));
+      utils.getBlockTypeCounts(this, true));
 };
 
 /**
  * Get whether this block is a shadow block or not.
  * @return {boolean} True if a shadow.
  */
-Blockly.Block.prototype.isShadow = function() {
+Block.prototype.isShadow = function() {
   return this.isShadow_;
 };
 
@@ -861,7 +864,7 @@ Blockly.Block.prototype.isShadow = function() {
  * @param {boolean} shadow True if a shadow.
  * @package
  */
-Blockly.Block.prototype.setShadow = function(shadow) {
+Block.prototype.setShadow = function(shadow) {
   this.isShadow_ = shadow;
 };
 
@@ -869,7 +872,7 @@ Blockly.Block.prototype.setShadow = function(shadow) {
  * Get whether this block is an insertion marker block or not.
  * @return {boolean} True if an insertion marker.
  */
-Blockly.Block.prototype.isInsertionMarker = function() {
+Block.prototype.isInsertionMarker = function() {
   return this.isInsertionMarker_;
 };
 
@@ -879,7 +882,7 @@ Blockly.Block.prototype.isInsertionMarker = function() {
  * @param {boolean} insertionMarker True if an insertion marker.
  * @package
  */
-Blockly.Block.prototype.setInsertionMarker = function(insertionMarker) {
+Block.prototype.setInsertionMarker = function(insertionMarker) {
   this.isInsertionMarker_ = insertionMarker;
 };
 
@@ -887,7 +890,7 @@ Blockly.Block.prototype.setInsertionMarker = function(insertionMarker) {
  * Get whether this block is editable or not.
  * @return {boolean} True if editable.
  */
-Blockly.Block.prototype.isEditable = function() {
+Block.prototype.isEditable = function() {
   return this.editable_ && !(this.workspace && this.workspace.options.readOnly);
 };
 
@@ -895,10 +898,10 @@ Blockly.Block.prototype.isEditable = function() {
  * Set whether this block is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.Block.prototype.setEditable = function(editable) {
+Block.prototype.setEditable = function(editable) {
   this.editable_ = editable;
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       field.updateEditable();
     }
   }
@@ -908,7 +911,7 @@ Blockly.Block.prototype.setEditable = function(editable) {
  * Returns if this block has been disposed of / deleted.
  * @return {boolean} True if this block has been disposed of / deleted.
  */
-Blockly.Block.prototype.isDisposed = function() {
+Block.prototype.isDisposed = function() {
   return this.disposed;
 };
 
@@ -916,18 +919,18 @@ Blockly.Block.prototype.isDisposed = function() {
  * Find the connection on this block that corresponds to the given connection
  * on the other block.
  * Used to match connections between a block and its insertion marker.
- * @param {!Blockly.Block} otherBlock The other block to match against.
- * @param {!Blockly.Connection} conn The other connection to match.
- * @return {?Blockly.Connection} The matching connection on this block, or null.
+ * @param {!Block} otherBlock The other block to match against.
+ * @param {!Connection} conn The other connection to match.
+ * @return {?Connection} The matching connection on this block, or null.
  * @package
  */
-Blockly.Block.prototype.getMatchingConnection = function(otherBlock, conn) {
-  var connections = this.getConnections_(true);
-  var otherConnections = otherBlock.getConnections_(true);
+Block.prototype.getMatchingConnection = function(otherBlock, conn) {
+  const connections = this.getConnections_(true);
+  const otherConnections = otherBlock.getConnections_(true);
   if (connections.length != otherConnections.length) {
-    throw Error("Connection lists did not match in length.");
+    throw Error('Connection lists did not match in length.');
   }
-  for (var i = 0; i < otherConnections.length; i++) {
+  for (let i = 0; i < otherConnections.length; i++) {
     if (otherConnections[i] == conn) {
       return connections[i];
     }
@@ -940,17 +943,17 @@ Blockly.Block.prototype.getMatchingConnection = function(otherBlock, conn) {
  * @param {string|Function} url URL string for block help, or function that
  *     returns a URL.  Null for no help.
  */
-Blockly.Block.prototype.setHelpUrl = function(url) {
+Block.prototype.setHelpUrl = function(url) {
   this.helpUrl = url;
 };
 
 /**
  * Sets the tooltip for this block.
- * @param {!Blockly.Tooltip.TipInfo} newTip The text for the tooltip, a function
+ * @param {!Tooltip.TipInfo} newTip The text for the tooltip, a function
  *     that returns the text for the tooltip, or a parent object whose tooltip
  *     will be used. To not display a tooltip pass the empty string.
  */
-Blockly.Block.prototype.setTooltip = function(newTip) {
+Block.prototype.setTooltip = function(newTip) {
   this.tooltip = newTip;
 };
 
@@ -958,15 +961,15 @@ Blockly.Block.prototype.setTooltip = function(newTip) {
  * Returns the tooltip text for this block.
  * @return {!string} The tooltip text for this block.
  */
-Blockly.Block.prototype.getTooltip = function() {
-  return Blockly.Tooltip.getTooltipOfObject(this);
+Block.prototype.getTooltip = function() {
+  return Tooltip.getTooltipOfObject(this);
 };
 
 /**
  * Get the colour of a block.
  * @return {string} #RRGGBB string.
  */
-Blockly.Block.prototype.getColour = function() {
+Block.prototype.getColour = function() {
   return this.colour_;
 };
 
@@ -974,7 +977,7 @@ Blockly.Block.prototype.getColour = function() {
  * Get the name of the block style.
  * @return {string} Name of the block style.
  */
-Blockly.Block.prototype.getStyleName = function() {
+Block.prototype.getStyleName = function() {
   return this.styleName_;
 };
 
@@ -982,7 +985,7 @@ Blockly.Block.prototype.getStyleName = function() {
  * Get the HSV hue value of a block.  Null if hue not set.
  * @return {?number} Hue value (0-360).
  */
-Blockly.Block.prototype.getHue = function() {
+Block.prototype.getHue = function() {
   return this.hue_;
 };
 
@@ -991,8 +994,8 @@ Blockly.Block.prototype.getHue = function() {
  * @param {number|string} colour HSV hue value (0 to 360), #RRGGBB string,
  *     or a message reference string pointing to one of those two values.
  */
-Blockly.Block.prototype.setColour = function(colour) {
-  var parsed = Blockly.utils.parseBlockColour(colour);
+Block.prototype.setColour = function(colour) {
+  const parsed = utils.parseBlockColour(colour);
   this.hue_ = parsed.hue;
   this.colour_ = parsed.hex;
 };
@@ -1001,7 +1004,7 @@ Blockly.Block.prototype.setColour = function(colour) {
  * Set the style and colour values of a block.
  * @param {string} blockStyleName Name of the block style.
  */
-Blockly.Block.prototype.setStyle = function(blockStyleName) {
+Block.prototype.setStyle = function(blockStyleName) {
   this.styleName_ = blockStyleName;
 };
 
@@ -1010,11 +1013,11 @@ Blockly.Block.prototype.setStyle = function(blockStyleName) {
  * changes, replacing any prior onchange handler. This is usually only called
  * from the constructor, the block type initializer function, or an extension
  * initializer function.
- * @param {function(Blockly.Events.Abstract)} onchangeFn The callback to call
+ * @param {function(Abstract)} onchangeFn The callback to call
  *     when the block's workspace changes.
  * @throws {Error} if onchangeFn is not falsey and not a function.
  */
-Blockly.Block.prototype.setOnChange = function(onchangeFn) {
+Block.prototype.setOnChange = function(onchangeFn) {
   if (onchangeFn && typeof onchangeFn != 'function') {
     throw Error('onchange must be a function.');
   }
@@ -1031,17 +1034,18 @@ Blockly.Block.prototype.setOnChange = function(onchangeFn) {
 /**
  * Returns the named field from a block.
  * @param {string} name The name of the field.
- * @return {?Blockly.Field} Named field, or null if field does not exist.
+ * @return {?Field} Named field, or null if field does not exist.
  */
-Blockly.Block.prototype.getField = function(name) {
+Block.prototype.getField = function(name) {
   if (typeof name !== 'string') {
-    throw TypeError('Blockly.Block.prototype.getField expects a string ' +
-      'with the field name but received ' +
-      (name === undefined ? 'nothing' : name + ' of type ' + typeof name) +
-      ' instead');
+    throw TypeError(
+        'Block.prototype.getField expects a string ' +
+        'with the field name but received ' +
+        (name === undefined ? 'nothing' : name + ' of type ' + typeof name) +
+        ' instead');
   }
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.name === name) {
         return field;
       }
@@ -1054,10 +1058,10 @@ Blockly.Block.prototype.getField = function(name) {
  * Return all variables referenced by this block.
  * @return {!Array<string>} List of variable names.
  */
-Blockly.Block.prototype.getVars = function() {
-  var vars = [];
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+Block.prototype.getVars = function() {
+  const vars = [];
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.referencesVariables()) {
         vars.push(field.getValue());
       }
@@ -1068,15 +1072,15 @@ Blockly.Block.prototype.getVars = function() {
 
 /**
  * Return all variables referenced by this block.
- * @return {!Array<!Blockly.VariableModel>} List of variable models.
+ * @return {!Array<!VariableModel>} List of variable models.
  * @package
  */
-Blockly.Block.prototype.getVarModels = function() {
-  var vars = [];
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
+Block.prototype.getVarModels = function() {
+  const vars = [];
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
       if (field.referencesVariables()) {
-        var model = this.workspace.getVariableById(
+        const model = this.workspace.getVariableById(
             /** @type {string} */ (field.getValue()));
         // Check if the variable actually exists (and isn't just a potential
         // variable).
@@ -1092,14 +1096,13 @@ Blockly.Block.prototype.getVarModels = function() {
 /**
  * Notification that a variable is renaming but keeping the same ID.  If the
  * variable is in use on this block, rerender to show the new name.
- * @param {!Blockly.VariableModel} variable The variable being renamed.
+ * @param {!VariableModel} variable The variable being renamed.
  * @package
  */
-Blockly.Block.prototype.updateVarName = function(variable) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
-      if (field.referencesVariables() &&
-          variable.getId() == field.getValue()) {
+Block.prototype.updateVarName = function(variable) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
+      if (field.referencesVariables() && variable.getId() == field.getValue()) {
         field.refreshVariableName();
       }
     }
@@ -1113,11 +1116,10 @@ Blockly.Block.prototype.updateVarName = function(variable) {
  * @param {string} newId ID of new variable.  May be the same as oldId, but with
  *     an updated name.
  */
-Blockly.Block.prototype.renameVarById = function(oldId, newId) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
-      if (field.referencesVariables() &&
-          oldId == field.getValue()) {
+Block.prototype.renameVarById = function(oldId, newId) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
+    for (let j = 0, field; (field = input.fieldRow[j]); j++) {
+      if (field.referencesVariables() && oldId == field.getValue()) {
         field.setValue(newId);
       }
     }
@@ -1129,8 +1131,8 @@ Blockly.Block.prototype.renameVarById = function(oldId, newId) {
  * @param {string} name The name of the field.
  * @return {*} Value of the field or null if field does not exist.
  */
-Blockly.Block.prototype.getFieldValue = function(name) {
-  var field = this.getField(name);
+Block.prototype.getFieldValue = function(name) {
+  const field = this.getField(name);
   if (field) {
     return field.getValue();
   }
@@ -1142,8 +1144,8 @@ Blockly.Block.prototype.getFieldValue = function(name) {
  * @param {*} newValue The value to set.
  * @param {string} name The name of the field to set the value of.
  */
-Blockly.Block.prototype.setFieldValue = function(newValue, name) {
-  var field = this.getField(name);
+Block.prototype.setFieldValue = function(newValue, name) {
+  const field = this.getField(name);
   if (!field) {
     throw Error('Field "' + name + '" not found.');
   }
@@ -1156,24 +1158,26 @@ Blockly.Block.prototype.setFieldValue = function(newValue, name) {
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.Block.prototype.setPreviousStatement = function(newBoolean, opt_check) {
+Block.prototype.setPreviousStatement = function(newBoolean, opt_check) {
   if (newBoolean) {
     if (opt_check === undefined) {
       opt_check = null;
     }
     if (!this.previousConnection) {
       if (this.outputConnection) {
-        throw Error('Remove output connection prior to adding previous ' +
+        throw Error(
+            'Remove output connection prior to adding previous ' +
             'connection.');
       }
       this.previousConnection =
-          this.makeConnection_(Blockly.connectionTypes.PREVIOUS_STATEMENT);
+          this.makeConnection_(connectionTypes.PREVIOUS_STATEMENT);
     }
     this.previousConnection.setCheck(opt_check);
   } else {
     if (this.previousConnection) {
       if (this.previousConnection.isConnected()) {
-        throw Error('Must disconnect previous statement before removing ' +
+        throw Error(
+            'Must disconnect previous statement before removing ' +
             'connection.');
       }
       this.previousConnection.dispose();
@@ -1188,20 +1192,21 @@ Blockly.Block.prototype.setPreviousStatement = function(newBoolean, opt_check) {
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.Block.prototype.setNextStatement = function(newBoolean, opt_check) {
+Block.prototype.setNextStatement = function(newBoolean, opt_check) {
   if (newBoolean) {
     if (opt_check === undefined) {
       opt_check = null;
     }
     if (!this.nextConnection) {
       this.nextConnection =
-          this.makeConnection_(Blockly.connectionTypes.NEXT_STATEMENT);
+          this.makeConnection_(connectionTypes.NEXT_STATEMENT);
     }
     this.nextConnection.setCheck(opt_check);
   } else {
     if (this.nextConnection) {
       if (this.nextConnection.isConnected()) {
-        throw Error('Must disconnect next statement before removing ' +
+        throw Error(
+            'Must disconnect next statement before removing ' +
             'connection.');
       }
       this.nextConnection.dispose();
@@ -1217,18 +1222,19 @@ Blockly.Block.prototype.setNextStatement = function(newBoolean, opt_check) {
  *     of returned types.  Null or undefined if any type could be returned
  *     (e.g. variable get).
  */
-Blockly.Block.prototype.setOutput = function(newBoolean, opt_check) {
+Block.prototype.setOutput = function(newBoolean, opt_check) {
   if (newBoolean) {
     if (opt_check === undefined) {
       opt_check = null;
     }
     if (!this.outputConnection) {
       if (this.previousConnection) {
-        throw Error('Remove previous connection prior to adding output ' +
+        throw Error(
+            'Remove previous connection prior to adding output ' +
             'connection.');
       }
       this.outputConnection =
-          this.makeConnection_(Blockly.connectionTypes.OUTPUT_VALUE);
+          this.makeConnection_(connectionTypes.OUTPUT_VALUE);
     }
     this.outputConnection.setCheck(opt_check);
   } else {
@@ -1246,9 +1252,9 @@ Blockly.Block.prototype.setOutput = function(newBoolean, opt_check) {
  * Set whether value inputs are arranged horizontally or vertically.
  * @param {boolean} newBoolean True if inputs are horizontal.
  */
-Blockly.Block.prototype.setInputsInline = function(newBoolean) {
+Block.prototype.setInputsInline = function(newBoolean) {
   if (this.inputsInline != newBoolean) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         this, 'inline', null, this.inputsInline, newBoolean));
     this.inputsInline = newBoolean;
   }
@@ -1258,22 +1264,22 @@ Blockly.Block.prototype.setInputsInline = function(newBoolean) {
  * Get whether value inputs are arranged horizontally or vertically.
  * @return {boolean} True if inputs are horizontal.
  */
-Blockly.Block.prototype.getInputsInline = function() {
+Block.prototype.getInputsInline = function() {
   if (this.inputsInline != undefined) {
     // Set explicitly.
     return this.inputsInline;
   }
   // Not defined explicitly.  Figure out what would look best.
-  for (var i = 1; i < this.inputList.length; i++) {
-    if (this.inputList[i - 1].type == Blockly.inputTypes.DUMMY &&
-        this.inputList[i].type == Blockly.inputTypes.DUMMY) {
+  for (let i = 1; i < this.inputList.length; i++) {
+    if (this.inputList[i - 1].type == inputTypes.DUMMY &&
+        this.inputList[i].type == inputTypes.DUMMY) {
       // Two dummy inputs in a row.  Don't inline them.
       return false;
     }
   }
-  for (var i = 1; i < this.inputList.length; i++) {
-    if (this.inputList[i - 1].type == Blockly.inputTypes.VALUE &&
-        this.inputList[i].type == Blockly.inputTypes.DUMMY) {
+  for (let i = 1; i < this.inputList.length; i++) {
+    if (this.inputList[i - 1].type == inputTypes.VALUE &&
+        this.inputList[i].type == inputTypes.DUMMY) {
       // Dummy input after a value input.  Inline them.
       return true;
     }
@@ -1285,7 +1291,7 @@ Blockly.Block.prototype.getInputsInline = function() {
  * Set the block's output shape.
  * @param {?number} outputShape Value representing an output shape.
  */
-Blockly.Block.prototype.setOutputShape = function(outputShape) {
+Block.prototype.setOutputShape = function(outputShape) {
   this.outputShape_ = outputShape;
 };
 
@@ -1293,7 +1299,7 @@ Blockly.Block.prototype.setOutputShape = function(outputShape) {
  * Get the block's output shape.
  * @return {?number} Value representing output shape if one exists.
  */
-Blockly.Block.prototype.getOutputShape = function() {
+Block.prototype.getOutputShape = function() {
   return this.outputShape_;
 };
 
@@ -1301,7 +1307,7 @@ Blockly.Block.prototype.getOutputShape = function() {
  * Get whether this block is enabled or not.
  * @return {boolean} True if enabled.
  */
-Blockly.Block.prototype.isEnabled = function() {
+Block.prototype.isEnabled = function() {
   return !this.disabled;
 };
 
@@ -1309,9 +1315,9 @@ Blockly.Block.prototype.isEnabled = function() {
  * Set whether the block is enabled or not.
  * @param {boolean} enabled True if enabled.
  */
-Blockly.Block.prototype.setEnabled = function(enabled) {
+Block.prototype.setEnabled = function(enabled) {
   if (this.isEnabled() != enabled) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         this, 'disabled', null, this.disabled, !enabled));
     this.disabled = !enabled;
   }
@@ -1322,8 +1328,8 @@ Blockly.Block.prototype.setEnabled = function(enabled) {
  * The block's own disabled property is not considered.
  * @return {boolean} True if disabled.
  */
-Blockly.Block.prototype.getInheritedDisabled = function() {
-  var ancestor = this.getSurroundParent();
+Block.prototype.getInheritedDisabled = function() {
+  let ancestor = this.getSurroundParent();
   while (ancestor) {
     if (ancestor.disabled) {
       return true;
@@ -1338,7 +1344,7 @@ Blockly.Block.prototype.getInheritedDisabled = function() {
  * Get whether the block is collapsed or not.
  * @return {boolean} True if collapsed.
  */
-Blockly.Block.prototype.isCollapsed = function() {
+Block.prototype.isCollapsed = function() {
   return this.collapsed_;
 };
 
@@ -1346,9 +1352,9 @@ Blockly.Block.prototype.isCollapsed = function() {
  * Set whether the block is collapsed or not.
  * @param {boolean} collapsed True if collapsed.
  */
-Blockly.Block.prototype.setCollapsed = function(collapsed) {
+Block.prototype.setCollapsed = function(collapsed) {
   if (this.collapsed_ != collapsed) {
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+    Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
         this, 'collapsed', null, this.collapsed_, collapsed));
     this.collapsed_ = collapsed;
   }
@@ -1361,29 +1367,29 @@ Blockly.Block.prototype.setCollapsed = function(collapsed) {
  *     empty field. If not specified, '?' is used.
  * @return {string} Text of block.
  */
-Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
-  var text = [];
-  var emptyFieldPlaceholder = opt_emptyToken || '?';
+Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
+  let text = [];
+  const emptyFieldPlaceholder = opt_emptyToken || '?';
 
   // Temporarily set flag to navigate to all fields.
-  var prevNavigateFields = Blockly.ASTNode.NAVIGATE_ALL_FIELDS;
-  Blockly.ASTNode.NAVIGATE_ALL_FIELDS = true;
+  const prevNavigateFields = ASTNode.NAVIGATE_ALL_FIELDS;
+  ASTNode.NAVIGATE_ALL_FIELDS = true;
 
-  var node = Blockly.ASTNode.createBlockNode(this);
-  var rootNode = node;
+  let node = ASTNode.createBlockNode(this);
+  const rootNode = node;
 
   /**
    * Whether or not to add parentheses around an input.
-   * @param {!Blockly.Connection} connection The connection.
+   * @param {!Connection} connection The connection.
    * @return {boolean} True if we should add parentheses around the input.
    */
   function shouldAddParentheses(connection) {
-    var checks = connection.getCheck();
+    let checks = connection.getCheck();
     if (!checks && connection.targetConnection) {
       checks = connection.targetConnection.getCheck();
     }
-    return !!checks && (checks.indexOf('Boolean') != -1 ||
-        checks.indexOf('Number') != -1);
+    return !!checks &&
+        (checks.indexOf('Boolean') != -1 || checks.indexOf('Number') != -1);
   }
 
   /**
@@ -1399,23 +1405,25 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
   // Traverse the AST building up our text string.
   while (node) {
     switch (node.getType()) {
-      case Blockly.ASTNode.types.INPUT:
-        var connection = /** @type {!Blockly.Connection} */ (node.getLocation());
+      case ASTNode.types.INPUT: {
+        const connection = /** @type {!Connection} */ (node.getLocation());
         if (!node.in()) {
           text.push(emptyFieldPlaceholder);
         } else if (shouldAddParentheses(connection)) {
           text.push('(');
         }
         break;
-      case Blockly.ASTNode.types.FIELD:
-        var field = /** @type {Blockly.Field} */ (node.getLocation());
-        if (field.name != Blockly.constants.COLLAPSED_FIELD_NAME) {
+      }
+      case ASTNode.types.FIELD: {
+        const field = /** @type {Field} */ (node.getLocation());
+        if (field.name != constants.COLLAPSED_FIELD_NAME) {
           text.push(field.getText());
         }
         break;
+      }
     }
 
-    var current = node;
+    const current = node;
     node = current.in() || current.next();
     if (!node) {
       // Can't go in or next, keep going out until we can go next.
@@ -1425,9 +1433,9 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
         node = node.out();
         checkRoot();
         // If we hit an input on the way up, possibly close out parentheses.
-        if (node && node.getType() == Blockly.ASTNode.types.INPUT &&
+        if (node && node.getType() == ASTNode.types.INPUT &&
             shouldAddParentheses(
-                /** @type {!Blockly.Connection} */ (node.getLocation()))) {
+                /** @type {!Connection} */ (node.getLocation()))) {
           text.push(')');
         }
       }
@@ -1438,12 +1446,12 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
   }
 
   // Restore state of NAVIGATE_ALL_FIELDS.
-  Blockly.ASTNode.NAVIGATE_ALL_FIELDS = prevNavigateFields;
+  ASTNode.NAVIGATE_ALL_FIELDS = prevNavigateFields;
 
   // Run through our text array and simplify expression to remove parentheses
   // around single field blocks.
   // E.g. ['repeat', '(', '10', ')', 'times', 'do', '?']
-  for (var i = 2; i < text.length; i++) {
+  for (let i = 2; i < text.length; i++) {
     if (text[i - 2] == '(' && text[i] == ')') {
       text[i - 2] = text[i - 1];
       text.splice(i - 1, 2);
@@ -1470,30 +1478,30 @@ Blockly.Block.prototype.toString = function(opt_maxLength, opt_emptyToken) {
  * Shortcut for appending a value input row.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  */
-Blockly.Block.prototype.appendValueInput = function(name) {
-  return this.appendInput_(Blockly.inputTypes.VALUE, name);
+Block.prototype.appendValueInput = function(name) {
+  return this.appendInput_(inputTypes.VALUE, name);
 };
 
 /**
  * Shortcut for appending a statement input row.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  */
-Blockly.Block.prototype.appendStatementInput = function(name) {
-  return this.appendInput_(Blockly.inputTypes.STATEMENT, name);
+Block.prototype.appendStatementInput = function(name) {
+  return this.appendInput_(inputTypes.STATEMENT, name);
 };
 
 /**
  * Shortcut for appending a dummy input row.
  * @param {string=} opt_name Language-neutral identifier which may used to find
  *     this input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  */
-Blockly.Block.prototype.appendDummyInput = function(opt_name) {
-  return this.appendInput_(Blockly.inputTypes.DUMMY, opt_name || '');
+Block.prototype.appendDummyInput = function(opt_name) {
+  return this.appendInput_(inputTypes.DUMMY, opt_name || '');
 };
 
 /**
@@ -1501,12 +1509,13 @@ Blockly.Block.prototype.appendDummyInput = function(opt_name) {
  * JSON description.
  * @param {!Object} json Structured data describing the block.
  */
-Blockly.Block.prototype.jsonInit = function(json) {
-  var warningPrefix = json['type'] ? 'Block "' + json['type'] + '": ' : '';
+Block.prototype.jsonInit = function(json) {
+  const warningPrefix = json['type'] ? 'Block "' + json['type'] + '": ' : '';
 
   // Validate inputs.
   if (json['output'] && json['previousStatement']) {
-    throw Error(warningPrefix +
+    throw Error(
+        warningPrefix +
         'Must not have both an output and a previousStatement.');
   }
 
@@ -1527,10 +1536,11 @@ Blockly.Block.prototype.jsonInit = function(json) {
   }
 
   // Interpolate the message blocks.
-  var i = 0;
+  let i = 0;
   while (json['message' + i] !== undefined) {
-    this.interpolate_(json['message' + i], json['args' + i] || [],
-        json['lastDummyAlign' + i], warningPrefix);
+    this.interpolate_(
+        json['message' + i], json['args' + i] || [], json['lastDummyAlign' + i],
+        warningPrefix);
     i++;
   }
 
@@ -1551,17 +1561,17 @@ Blockly.Block.prototype.jsonInit = function(json) {
     this.setNextStatement(true, json['nextStatement']);
   }
   if (json['tooltip'] !== undefined) {
-    var rawValue = json['tooltip'];
-    var localizedText = Blockly.utils.replaceMessageReferences(rawValue);
+    const rawValue = json['tooltip'];
+    const localizedText = utils.replaceMessageReferences(rawValue);
     this.setTooltip(localizedText);
   }
   if (json['enableContextMenu'] !== undefined) {
-    var rawValue = json['enableContextMenu'];
+    const rawValue = json['enableContextMenu'];
     this.contextMenu = !!rawValue;
   }
   if (json['helpUrl'] !== undefined) {
-    var rawValue = json['helpUrl'];
-    var localizedValue = Blockly.utils.replaceMessageReferences(rawValue);
+    const rawValue = json['helpUrl'];
+    const localizedValue = utils.replaceMessageReferences(rawValue);
     this.setHelpUrl(localizedValue);
   }
   if (typeof json['extensions'] == 'string') {
@@ -1574,13 +1584,13 @@ Blockly.Block.prototype.jsonInit = function(json) {
 
   // Add the mutator to the block.
   if (json['mutator'] !== undefined) {
-    Blockly.Extensions.apply(json['mutator'], this, true);
+    Extensions.apply(json['mutator'], this, true);
   }
 
-  var extensionNames = json['extensions'];
+  const extensionNames = json['extensions'];
   if (Array.isArray(extensionNames)) {
-    for (var j = 0; j < extensionNames.length; ++j) {
-      Blockly.Extensions.apply(extensionNames[j], this, false);
+    for (let j = 0; j < extensionNames.length; ++j) {
+      Extensions.apply(extensionNames[j], this, false);
     }
   }
 };
@@ -1591,12 +1601,12 @@ Blockly.Block.prototype.jsonInit = function(json) {
  * @param {string} warningPrefix Warning prefix string identifying block.
  * @private
  */
-Blockly.Block.prototype.jsonInitColour_ = function(json, warningPrefix) {
+Block.prototype.jsonInitColour_ = function(json, warningPrefix) {
   if ('colour' in json) {
     if (json['colour'] === undefined) {
       console.warn(warningPrefix + 'Undefined colour value.');
     } else {
-      var rawValue = json['colour'];
+      const rawValue = json['colour'];
       try {
         this.setColour(rawValue);
       } catch (e) {
@@ -1612,8 +1622,8 @@ Blockly.Block.prototype.jsonInitColour_ = function(json, warningPrefix) {
  * @param {string} warningPrefix Warning prefix string identifying block.
  * @private
  */
-Blockly.Block.prototype.jsonInitStyle_ = function(json, warningPrefix) {
-  var blockStyleName = json['style'];
+Block.prototype.jsonInitStyle_ = function(json, warningPrefix) {
+  const blockStyleName = json['style'];
   try {
     this.setStyle(blockStyleName);
   } catch (styleError) {
@@ -1630,23 +1640,23 @@ Blockly.Block.prototype.jsonInitStyle_ = function(json, warningPrefix) {
  * @param {!Object} mixinObj The key/values pairs to add to this block object.
  * @param {boolean=} opt_disableCheck Option flag to disable overwrite checks.
  */
-Blockly.Block.prototype.mixin = function(mixinObj, opt_disableCheck) {
+Block.prototype.mixin = function(mixinObj, opt_disableCheck) {
   if (opt_disableCheck !== undefined && typeof opt_disableCheck != 'boolean') {
     throw Error('opt_disableCheck must be a boolean if provided');
   }
   if (!opt_disableCheck) {
-    var overwrites = [];
-    for (var key in mixinObj) {
+    const overwrites = [];
+    for (let key in mixinObj) {
       if (this[key] !== undefined) {
         overwrites.push(key);
       }
     }
     if (overwrites.length) {
-      throw Error('Mixin will overwrite block members: ' +
-          JSON.stringify(overwrites));
+      throw Error(
+          'Mixin will overwrite block members: ' + JSON.stringify(overwrites));
     }
   }
-  Blockly.utils.object.mixin(this, mixinObj);
+  object.mixin(this, mixinObj);
 };
 
 /**
@@ -1659,27 +1669,27 @@ Blockly.Block.prototype.mixin = function(mixinObj, opt_disableCheck) {
  * @param {string} warningPrefix Warning prefix string identifying block.
  * @private
  */
-Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign,
-    warningPrefix) {
-  var tokens = Blockly.utils.tokenizeInterpolation(message);
+Block.prototype.interpolate_ = function(
+    message, args, lastDummyAlign, warningPrefix) {
+  const tokens = utils.tokenizeInterpolation(message);
   this.validateTokens_(tokens, args.length);
-  var elements = this.interpolateArguments_(tokens, args, lastDummyAlign);
+  const elements = this.interpolateArguments_(tokens, args, lastDummyAlign);
 
   // An array of [field, fieldName] tuples.
-  var fieldStack = [];
-  for (var i = 0, element; (element = elements[i]); i++) {
+  const fieldStack = [];
+  for (let i = 0, element; (element = elements[i]); i++) {
     if (this.isInputKeyword_(element['type'])) {
-      var input = this.inputFromJson_(element, warningPrefix);
+      const input = this.inputFromJson_(element, warningPrefix);
       // Should never be null, but just in case.
       if (input) {
-        for (var j = 0, tuple; (tuple = fieldStack[j]); j++) {
+        for (let j = 0, tuple; (tuple = fieldStack[j]); j++) {
           input.appendField(tuple[0], tuple[1]);
         }
         fieldStack.length = 0;
       }
     } else {
       // All other types, including ones starting with 'input_' get routed here.
-      var field = this.fieldFromJson_(element);
+      const field = this.fieldFromJson_(element);
       if (field) {
         fieldStack.push([field, element['name']]);
       }
@@ -1695,27 +1705,30 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign,
  * @param {number} argsCount The number of args that need to be referred to.
  * @private
  */
-Blockly.Block.prototype.validateTokens_ = function(tokens, argsCount) {
-  var visitedArgsHash = [];
-  var visitedArgsCount = 0;
-  for (var i = 0; i < tokens.length; i++) {
-    var token = tokens[i];
+Block.prototype.validateTokens_ = function(tokens, argsCount) {
+  const visitedArgsHash = [];
+  let visitedArgsCount = 0;
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
     if (typeof token != 'number') {
       continue;
     }
     if (token < 1 || token > argsCount) {
-      throw Error('Block "' + this.type + '": ' +
+      throw Error(
+          'Block "' + this.type + '": ' +
           'Message index %' + token + ' out of range.');
     }
     if (visitedArgsHash[token]) {
-      throw Error('Block "' + this.type + '": ' +
+      throw Error(
+          'Block "' + this.type + '": ' +
           'Message index %' + token + ' duplicated.');
     }
     visitedArgsHash[token] = true;
     visitedArgsCount++;
   }
   if (visitedArgsCount != argsCount) {
-    throw Error('Block "' + this.type + '": ' +
+    throw Error(
+        'Block "' + this.type + '": ' +
         'Message does not reference all ' + argsCount + ' arg(s).');
   }
 };
@@ -1732,35 +1745,34 @@ Blockly.Block.prototype.validateTokens_ = function(tokens, argsCount) {
  *     to the block.
  * @private
  */
-Blockly.Block.prototype.interpolateArguments_ =
-    function(tokens, args, lastDummyAlign) {
-      var elements = [];
-      for (var i = 0; i < tokens.length; i++) {
-        var element = tokens[i];
-        if (typeof element == 'number') {
-          element = args[element - 1];
-        }
-        // Args can be strings, which is why this isn't elseif.
-        if (typeof element == 'string') {
-          element = this.stringToFieldJson_(element);
-          if (!element) {
-            continue;
-          }
-        }
-        elements.push(element);
+Block.prototype.interpolateArguments_ = function(tokens, args, lastDummyAlign) {
+  const elements = [];
+  for (let i = 0; i < tokens.length; i++) {
+    let element = tokens[i];
+    if (typeof element == 'number') {
+      element = args[element - 1];
+    }
+    // Args can be strings, which is why this isn't elseif.
+    if (typeof element == 'string') {
+      element = this.stringToFieldJson_(element);
+      if (!element) {
+        continue;
       }
+    }
+    elements.push(element);
+  }
 
-      var length = elements.length;
-      if (length && !this.isInputKeyword_(elements[length - 1]['type'])) {
-        var dummyInput = {'type': 'input_dummy'};
-        if (lastDummyAlign) {
-          dummyInput['align'] = lastDummyAlign;
-        }
-        elements.push(dummyInput);
-      }
+  const length = elements.length;
+  if (length && !this.isInputKeyword_(elements[length - 1]['type'])) {
+    const dummyInput = {'type': 'input_dummy'};
+    if (lastDummyAlign) {
+      dummyInput['align'] = lastDummyAlign;
+    }
+    elements.push(dummyInput);
+  }
 
-      return elements;
-    };
+  return elements;
+};
 
 /**
  * Creates a field from the JSON definition of a field. If a field with the
@@ -1768,15 +1780,15 @@ Blockly.Block.prototype.interpolateArguments_ =
  * the 'alt' property of the JSON definition (if it exists).
  * @param {{alt:(string|undefined)}} element The element to try to turn into a
  *     field.
- * @return {?Blockly.Field} The field defined by the JSON, or null if one
+ * @return {?Field} The field defined by the JSON, or null if one
  *     couldn't be created.
  * @private
  */
-Blockly.Block.prototype.fieldFromJson_ = function(element) {
-  var field = Blockly.fieldRegistry.fromJson(element);
+Block.prototype.fieldFromJson_ = function(element) {
+  const field = fieldRegistry.fromJson(element);
   if (!field && element['alt']) {
     if (typeof element['alt'] == 'string') {
-      var json = this.stringToFieldJson_(element['alt']);
+      const json = this.stringToFieldJson_(element['alt']);
       return json ? this.fieldFromJson_(json) : null;
     }
     return this.fieldFromJson_(element['alt']);
@@ -1790,19 +1802,19 @@ Blockly.Block.prototype.fieldFromJson_ = function(element) {
  * @param {!Object} element The JSON to turn into an input.
  * @param {string} warningPrefix The prefix to add to warnings to help the
  *     developer debug.
- * @return {?Blockly.Input} The input that has been created, or null if one
+ * @return {?Input} The input that has been created, or null if one
  *     could not be created for some reason (should never happen).
  * @private
  */
-Blockly.Block.prototype.inputFromJson_ = function(element, warningPrefix) {
-  var alignmentLookup = {
-    'LEFT': Blockly.constants.ALIGN.LEFT,
-    'RIGHT': Blockly.constants.ALIGN.RIGHT,
-    'CENTRE': Blockly.constants.ALIGN.CENTRE,
-    'CENTER': Blockly.constants.ALIGN.CENTRE
+Block.prototype.inputFromJson_ = function(element, warningPrefix) {
+  const alignmentLookup = {
+    'LEFT': constants.ALIGN.LEFT,
+    'RIGHT': constants.ALIGN.RIGHT,
+    'CENTRE': constants.ALIGN.CENTRE,
+    'CENTER': constants.ALIGN.CENTRE
   };
 
-  var input = null;
+  let input = null;
   switch (element['type']) {
     case 'input_value':
       input = this.appendValueInput(element['name']);
@@ -1823,10 +1835,9 @@ Blockly.Block.prototype.inputFromJson_ = function(element, warningPrefix) {
     input.setCheck(element['check']);
   }
   if (element['align']) {
-    var alignment = alignmentLookup[element['align'].toUpperCase()];
+    const alignment = alignmentLookup[element['align'].toUpperCase()];
     if (alignment === undefined) {
-      console.warn(warningPrefix + 'Illegal align value: ',
-          element['align']);
+      console.warn(warningPrefix + 'Illegal align value: ', element['align']);
     } else {
       input.setAlign(alignment);
     }
@@ -1841,9 +1852,8 @@ Blockly.Block.prototype.inputFromJson_ = function(element, warningPrefix) {
  *     false otherwise.
  * @private
  */
-Blockly.Block.prototype.isInputKeyword_ = function(str) {
-  return str == 'input_value' ||
-      str == 'input_statement' ||
+Block.prototype.isInputKeyword_ = function(str) {
+  return str == 'input_value' || str == 'input_statement' ||
       str == 'input_dummy';
 };
 
@@ -1854,7 +1864,7 @@ Blockly.Block.prototype.isInputKeyword_ = function(str) {
  * @return {?{text: string, type: string}} The JSON definition or null.
  * @private
  */
-Blockly.Block.prototype.stringToFieldJson_ = function(str) {
+Block.prototype.stringToFieldJson_ = function(str) {
   str = str.trim();
   if (str) {
     return {
@@ -1870,19 +1880,18 @@ Blockly.Block.prototype.stringToFieldJson_ = function(str) {
  * @param {number} type One of Blockly.inputTypes.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  * @protected
  */
-Blockly.Block.prototype.appendInput_ = function(type, name) {
-  var connection = null;
-  if (type == Blockly.inputTypes.VALUE ||
-      type == Blockly.inputTypes.STATEMENT) {
+Block.prototype.appendInput_ = function(type, name) {
+  let connection = null;
+  if (type == inputTypes.VALUE || type == inputTypes.STATEMENT) {
     connection = this.makeConnection_(type);
   }
-  if (type == Blockly.inputTypes.STATEMENT) {
+  if (type == inputTypes.STATEMENT) {
     this.statementInputCount++;
   }
-  var input = new Blockly.Input(type, name, this, connection);
+  const input = new Input(type, name, this, connection);
   // Append input to list.
   this.inputList.push(input);
   return input;
@@ -1894,14 +1903,14 @@ Blockly.Block.prototype.appendInput_ = function(type, name) {
  * @param {?string} refName Name of input that should be after the moved input,
  *   or null to be the input at the end.
  */
-Blockly.Block.prototype.moveInputBefore = function(name, refName) {
+Block.prototype.moveInputBefore = function(name, refName) {
   if (name == refName) {
     return;
   }
   // Find both inputs.
-  var inputIndex = -1;
-  var refIndex = refName ? -1 : this.inputList.length;
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  let inputIndex = -1;
+  let refIndex = refName ? -1 : this.inputList.length;
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name == name) {
       inputIndex = i;
       if (refIndex != -1) {
@@ -1928,8 +1937,7 @@ Blockly.Block.prototype.moveInputBefore = function(name, refName) {
  * @param {number} inputIndex Index of the input to move.
  * @param {number} refIndex Index of input that should be after the moved input.
  */
-Blockly.Block.prototype.moveNumberedInputBefore = function(
-    inputIndex, refIndex) {
+Block.prototype.moveNumberedInputBefore = function(inputIndex, refIndex) {
   // Validate arguments.
   if (inputIndex == refIndex) {
     throw Error('Can\'t move input to itself.');
@@ -1941,7 +1949,7 @@ Blockly.Block.prototype.moveNumberedInputBefore = function(
     throw RangeError('Reference input ' + refIndex + ' out of bounds.');
   }
   // Remove input.
-  var input = this.inputList[inputIndex];
+  const input = this.inputList[inputIndex];
   this.inputList.splice(inputIndex, 1);
   if (inputIndex < refIndex) {
     refIndex--;
@@ -1954,13 +1962,14 @@ Blockly.Block.prototype.moveNumberedInputBefore = function(
  * Remove an input from this block.
  * @param {string} name The name of the input.
  * @param {boolean=} opt_quiet True to prevent an error if input is not present.
- * @return {boolean} True if operation succeeds, false if input is not present and opt_quiet is true
+ * @return {boolean} True if operation succeeds, false if input is not present
+ *     and opt_quiet is true.
  * @throws {Error} if the input is not present and opt_quiet is not true.
  */
-Blockly.Block.prototype.removeInput = function(name, opt_quiet) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.removeInput = function(name, opt_quiet) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name == name) {
-      if (input.type == Blockly.inputTypes.STATEMENT) {
+      if (input.type == inputTypes.STATEMENT) {
         this.statementInputCount--;
       }
       input.dispose();
@@ -1977,10 +1986,10 @@ Blockly.Block.prototype.removeInput = function(name, opt_quiet) {
 /**
  * Fetches the named input object.
  * @param {string} name The name of the input.
- * @return {?Blockly.Input} The input object, or null if input does not exist.
+ * @return {?Input} The input object, or null if input does not exist.
  */
-Blockly.Block.prototype.getInput = function(name) {
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+Block.prototype.getInput = function(name) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name == name) {
       return input;
     }
@@ -1992,11 +2001,11 @@ Blockly.Block.prototype.getInput = function(name) {
 /**
  * Fetches the block attached to the named input.
  * @param {string} name The name of the input.
- * @return {?Blockly.Block} The attached value block, or null if the input is
+ * @return {?Block} The attached value block, or null if the input is
  *     either disconnected or if the input does not exist.
  */
-Blockly.Block.prototype.getInputTargetBlock = function(name) {
-  var input = this.getInput(name);
+Block.prototype.getInputTargetBlock = function(name) {
+  const input = this.getInput(name);
   return input && input.connection && input.connection.targetBlock();
 };
 
@@ -2004,7 +2013,7 @@ Blockly.Block.prototype.getInputTargetBlock = function(name) {
  * Returns the comment on this block (or null if there is no comment).
  * @return {?string} Block's comment.
  */
-Blockly.Block.prototype.getCommentText = function() {
+Block.prototype.getCommentText = function() {
   return this.commentModel.text;
 };
 
@@ -2012,11 +2021,11 @@ Blockly.Block.prototype.getCommentText = function() {
  * Set this block's comment text.
  * @param {?string} text The text, or null to delete.
  */
-Blockly.Block.prototype.setCommentText = function(text) {
+Block.prototype.setCommentText = function(text) {
   if (this.commentModel.text == text) {
     return;
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+  Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
       this, 'comment', null, this.commentModel.text, text));
   this.commentModel.text = text;
   this.comment = text;  // For backwards compatibility.
@@ -2028,25 +2037,25 @@ Blockly.Block.prototype.setCommentText = function(text) {
  * @param {string=} _opt_id An optional ID for the warning text to be able to
  *     maintain multiple warnings.
  */
-Blockly.Block.prototype.setWarningText = function(_text, _opt_id) {
+Block.prototype.setWarningText = function(_text, _opt_id) {
   // NOP.
 };
 
 /**
  * Give this block a mutator dialog.
- * @param {Blockly.Mutator} _mutator A mutator dialog instance or null to
+ * @param {Mutator} _mutator A mutator dialog instance or null to
  *     remove.
  */
-Blockly.Block.prototype.setMutator = function(_mutator) {
+Block.prototype.setMutator = function(_mutator) {
   // NOP.
 };
 
 /**
  * Return the coordinates of the top-left corner of this block relative to the
  * drawing surface's origin (0,0), in workspace units.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  */
-Blockly.Block.prototype.getRelativeToSurfaceXY = function() {
+Block.prototype.getRelativeToSurfaceXY = function() {
   return this.xy_;
 };
 
@@ -2055,24 +2064,24 @@ Blockly.Block.prototype.getRelativeToSurfaceXY = function() {
  * @param {number} dx Horizontal offset, in workspace units.
  * @param {number} dy Vertical offset, in workspace units.
  */
-Blockly.Block.prototype.moveBy = function(dx, dy) {
+Block.prototype.moveBy = function(dx, dy) {
   if (this.parentBlock_) {
     throw Error('Block has parent.');
   }
-  var event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(this);
+  const event = new (Events.get(Events.BLOCK_MOVE))(this);
   this.xy_.translate(dx, dy);
   event.recordNew();
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
  * Create a connection of the specified type.
  * @param {number} type The type of the connection to create.
- * @return {!Blockly.Connection} A new connection of the specified type.
+ * @return {!Connection} A new connection of the specified type.
  * @protected
  */
-Blockly.Block.prototype.makeConnection_ = function(type) {
-  return new Blockly.Connection(this, type);
+Block.prototype.makeConnection_ = function(type) {
+  return new Connection(this, type);
 };
 
 /**
@@ -2082,7 +2091,7 @@ Blockly.Block.prototype.makeConnection_ = function(type) {
  *     whether shadow blocks are counted as filled. Defaults to true.
  * @return {boolean} True if all inputs are filled, false otherwise.
  */
-Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
+Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
   // Account for the shadow block filledness toggle.
   if (opt_shadowBlocksAreFilled === undefined) {
     opt_shadowBlocksAreFilled = true;
@@ -2092,18 +2101,18 @@ Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
   }
 
   // Recursively check each input block of the current block.
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (!input.connection) {
       continue;
     }
-    var target = input.connection.targetBlock();
+    const target = input.connection.targetBlock();
     if (!target || !target.allInputsFilled(opt_shadowBlocksAreFilled)) {
       return false;
     }
   }
 
   // Recursively check the next block after the current block.
-  var next = this.getNextBlock();
+  const next = this.getNextBlock();
   if (next) {
     return next.allInputsFilled(opt_shadowBlocksAreFilled);
   }
@@ -2117,13 +2126,15 @@ Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
  *
  * Intended to on be used in console logs and errors. If you need a string that
  * uses the user's native language (including block text, field values, and
- * child blocks), use [toString()]{@link Blockly.Block#toString}.
+ * child blocks), use [toString()]{@link Block#toString}.
  * @return {string} The description.
  */
-Blockly.Block.prototype.toDevString = function() {
-  var msg = this.type ? '"' + this.type + '" block' : 'Block';
+Block.prototype.toDevString = function() {
+  let msg = this.type ? '"' + this.type + '" block' : 'Block';
   if (this.id) {
     msg += ' (id="' + this.id + '")';
   }
   return msg;
 };
+
+exports = Block;
diff --git a/tests/deps.js b/tests/deps.js
index ff7e2926e..641b435a5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,7 +7,7 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.Workspace', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});

From 7974ff51592ac2eea3f1ab7f2a50f257ef50b143 Mon Sep 17 00:00:00 2001
From: Monica Kozbial <6621618+moniika@users.noreply.github.com>
Date: Fri, 6 Aug 2021 15:46:21 -0700
Subject: [PATCH 214/291] Add labels instead of setting in github action
 (#5324)

Update `tag_module_cleanup.yml` logic to add labels instead of setting labels list.

Fixes: https://github.com/google/blockly/issues/5298
---
 .github/workflows/tag_module_cleanup.yml | 27 +++++++++++++-----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/tag_module_cleanup.yml b/.github/workflows/tag_module_cleanup.yml
index 94e7ec692..0265070af 100644
--- a/.github/workflows/tag_module_cleanup.yml
+++ b/.github/workflows/tag_module_cleanup.yml
@@ -19,17 +19,20 @@ jobs:
       - uses: actions/github-script@a3e7071a34d7e1f219a8a4de9a5e0a34d1ee1293
         with:
           script: |
-            // 2021 q3 release milestone.
-            // https://github.com/google/blockly/milestone/18
-            const milestoneNumber = 18;
-            // Note that pull requests are accessed through the issues API.
-            const issuesUpdateParams = { 
-              owner: context.repo.owner, 
-              repo: context.repo.repo, 
-              // Adds the milestone
-              milestone: milestoneNumber, 
+            // Note that pull requests are considered issues and "shared"
+            // actions for both features, like manipulating labels and
+            // milestones are provided within the issues API.
+            await github.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              // 2021 q3 release milestone.
+              // https://github.com/google/blockly/milestone/18
+              milestone: 18
+            })
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
               issue_number: context.issue.number,
-              // Sets the labels
               labels: ['type: cleanup']
-            }
-            await github.issues.update(issuesUpdateParams)
+            })

From 0a9d7c3c79103c3e8f2bd2a9a3e7b8a2d3fa7881 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 15:37:53 -0700
Subject: [PATCH 215/291] Migrate core/events/events_abstract.js to ES6
 const/let

---
 core/events/events_abstract.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 719f6d937..67287121d 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -62,7 +62,7 @@ Blockly.Events.Abstract.prototype.isUiEvent = false;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.Abstract.prototype.toJson = function() {
-  var json = {
+  const json = {
     'type': this.type
   };
   if (this.group) {
@@ -103,8 +103,9 @@ Blockly.Events.Abstract.prototype.run = function(_forward) {
  * @protected
  */
 Blockly.Events.Abstract.prototype.getEventWorkspace_ = function() {
+  let workspace;
   if (this.workspaceId) {
-    var workspace = Blockly.Workspace.getById(this.workspaceId);
+    workspace = Blockly.Workspace.getById(this.workspaceId);
   }
   if (!workspace) {
     throw Error('Workspace is null. Event must have been generated from real' +

From bbc5ce4e89baad6a40d662deb91e4e96cbff229b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 15:39:58 -0700
Subject: [PATCH 216/291] Migrate core/events/events_abstract.js to goog.module

---
 core/events/events_abstract.js | 22 ++++++++++++----------
 tests/deps.js                  |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 67287121d..0b4da07c2 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -11,10 +11,10 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Abstract');
+goog.module('Blockly.Events.Abstract');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
-
 goog.requireType('Blockly.Workspace');
 
 
@@ -22,7 +22,7 @@ goog.requireType('Blockly.Workspace');
  * Abstract class for an event.
  * @constructor
  */
-Blockly.Events.Abstract = function() {
+const Abstract = function() {
 
   /**
    * Whether or not the event is blank (to be populated by fromJson).
@@ -55,13 +55,13 @@ Blockly.Events.Abstract = function() {
  * Whether or not the event is a UI event.
  * @type {boolean}
  */
-Blockly.Events.Abstract.prototype.isUiEvent = false;
+Abstract.prototype.isUiEvent = false;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Abstract.prototype.toJson = function() {
+Abstract.prototype.toJson = function() {
   const json = {
     'type': this.type
   };
@@ -75,7 +75,7 @@ Blockly.Events.Abstract.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Abstract.prototype.fromJson = function(json) {
+Abstract.prototype.fromJson = function(json) {
   this.isBlank = false;
   this.group = json['group'];
 };
@@ -84,7 +84,7 @@ Blockly.Events.Abstract.prototype.fromJson = function(json) {
  * Does this event record any change of state?
  * @return {boolean} True if null, false if something changed.
  */
-Blockly.Events.Abstract.prototype.isNull = function() {
+Abstract.prototype.isNull = function() {
   return false;
 };
 
@@ -92,7 +92,7 @@ Blockly.Events.Abstract.prototype.isNull = function() {
  * Run an event.
  * @param {boolean} _forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.Abstract.prototype.run = function(_forward) {
+Abstract.prototype.run = function(_forward) {
   // Defined by subclasses.
 };
 
@@ -102,10 +102,10 @@ Blockly.Events.Abstract.prototype.run = function(_forward) {
  * @throws {Error} if workspace is null.
  * @protected
  */
-Blockly.Events.Abstract.prototype.getEventWorkspace_ = function() {
+Abstract.prototype.getEventWorkspace_ = function() {
   let workspace;
   if (this.workspaceId) {
-    workspace = Blockly.Workspace.getById(this.workspaceId);
+    workspace = goog.module.get('Blockly.Workspace').getById(this.workspaceId);
   }
   if (!workspace) {
     throw Error('Workspace is null. Event must have been generated from real' +
@@ -113,3 +113,5 @@ Blockly.Events.Abstract.prototype.getEventWorkspace_ = function() {
   }
   return workspace;
 };
+
+exports = Abstract;
diff --git a/tests/deps.js b/tests/deps.js
index 641b435a5..9a432a8ee 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -36,7 +36,7 @@ goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockl
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
-goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events']);
+goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 9fdc8bab151b9bc439f533f1760b621f8b714b5a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 14:55:32 -0700
Subject: [PATCH 217/291] Migrate core/events/events_abstract.js named requires

---
 core/events/events_abstract.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 0b4da07c2..315ae3014 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -14,8 +14,9 @@
 goog.module('Blockly.Events.Abstract');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.requireType('Blockly.Workspace');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
 
 
 /**
@@ -42,13 +43,13 @@ const Abstract = function() {
    * perspective, and should be undone together.
    * @type {string}
    */
-  this.group = Blockly.Events.getGroup();
+  this.group = Events.getGroup();
 
   /**
    * Sets whether the event should be added to the undo stack.
    * @type {boolean}
    */
-  this.recordUndo = Blockly.Events.recordUndo;
+  this.recordUndo = Events.recordUndo;
 };
 
 /**
@@ -98,7 +99,7 @@ Abstract.prototype.run = function(_forward) {
 
 /**
  * Get workspace the event belongs to.
- * @return {!Blockly.Workspace} The workspace the event belongs to.
+ * @return {!Workspace} The workspace the event belongs to.
  * @throws {Error} if workspace is null.
  * @protected
  */

From 50a99ce5155670453568c77b422d157398575c7f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 14:55:38 -0700
Subject: [PATCH 218/291] clang-format core/events/events_abstract.js

---
 core/events/events_abstract.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 315ae3014..9a14e82b2 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -24,7 +24,6 @@ const Workspace = goog.requireType('Blockly.Workspace');
  * @constructor
  */
 const Abstract = function() {
-
   /**
    * Whether or not the event is blank (to be populated by fromJson).
    * @type {?boolean}
@@ -63,9 +62,7 @@ Abstract.prototype.isUiEvent = false;
  * @return {!Object} JSON representation.
  */
 Abstract.prototype.toJson = function() {
-  const json = {
-    'type': this.type
-  };
+  const json = {'type': this.type};
   if (this.group) {
     json['group'] = this.group;
   }
@@ -109,7 +106,8 @@ Abstract.prototype.getEventWorkspace_ = function() {
     workspace = goog.module.get('Blockly.Workspace').getById(this.workspaceId);
   }
   if (!workspace) {
-    throw Error('Workspace is null. Event must have been generated from real' +
+    throw Error(
+        'Workspace is null. Event must have been generated from real' +
         ' Blockly events.');
   }
   return workspace;

From b834d9026b17886f862418181983965db5879b19 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 09:35:12 -0700
Subject: [PATCH 219/291] Add requireType calls for Blockly.WorkspaceComment
 and Blockly.WorkspaceCommentSvg

---
 core/bubble_dragger.js           |  4 ++-
 core/contextmenu.js              | 17 +++++----
 core/events/ws_comment_events.js |  4 ++-
 core/inject.js                   |  5 ++-
 core/workspace.js                |  3 +-
 core/workspace_comment.js        | 15 +++++---
 core/workspace_comment_svg.js    | 61 ++++++++++++--------------------
 core/workspace_svg.js            |  6 ++--
 core/xml.js                      | 16 ++++++---
 tests/deps.js                    |  2 +-
 10 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index d06c2fdc0..d879e4748 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -25,6 +25,8 @@ const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
 /* eslint-disable-next-line no-unused-vars */
 const IDragTarget = goog.requireType('Blockly.IDragTarget');
 /* eslint-disable-next-line no-unused-vars */
+const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
@@ -236,7 +238,7 @@ BubbleDragger.prototype.fireMoveEvent_ = function() {
   if (this.draggingBubble_.isComment) {
     // TODO (adodson): Resolve build errors when requiring WorkspaceCommentSvg.
     const event = new (Events.get(Events.COMMENT_MOVE))(
-        /** @type {!Blockly.WorkspaceCommentSvg} */ (this.draggingBubble_));
+        /** @type {!WorkspaceCommentSvg} */ (this.draggingBubble_));
     event.setOldCoordinate(this.startXY_);
     event.recordNew();
     Events.fire(event);
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 39d4a8319..cc02adc25 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -33,6 +33,8 @@ const dom = goog.require('Blockly.utils.dom');
 const internalConstants = goog.require('Blockly.internalConstants');
 const userAgent = goog.require('Blockly.utils.userAgent');
 const utils = goog.require('Blockly.utils');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 
@@ -242,7 +244,7 @@ exports.callbackFactory = callbackFactory;
 
 /**
  * Make a context menu option for deleting the current workspace comment.
- * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
+ * @param {!WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
  */
@@ -252,7 +254,7 @@ const commentDeleteOption = function(comment) {
     enabled: true,
     callback: function() {
       Events.setGroup(true);
-      comment.dispose(true, true);
+      comment.dispose();
       Events.setGroup(false);
     }
   };
@@ -263,7 +265,7 @@ exports.commentDeleteOption = commentDeleteOption;
 
 /**
  * Make a context menu option for duplicating the current workspace comment.
- * @param {!Blockly.WorkspaceCommentSvg} comment The workspace comment where the
+ * @param {!WorkspaceCommentSvg} comment The workspace comment where the
  *     right-click originated.
  * @return {!Object} A menu option, containing text, enabled, and a callback.
  */
@@ -291,16 +293,17 @@ exports.commentDuplicateOption = commentDuplicateOption;
  *     comments are not bundled in.
  */
 const workspaceCommentOption = function(ws, e) {
-  if (!Blockly.WorkspaceCommentSvg) {
+  const WorkspaceCommentSvg = goog.module.get('Blockly.WorkspaceCommentSvg');
+  if (!WorkspaceCommentSvg) {
     throw Error('Missing require for Blockly.WorkspaceCommentSvg');
   }
   // Helper function to create and position a comment correctly based on the
   // location of the mouse event.
   const addWsComment = function() {
-    const comment = new Blockly.WorkspaceCommentSvg(
+    const comment = new WorkspaceCommentSvg(
         ws, Msg['WORKSPACE_COMMENT_DEFAULT_TEXT'],
-        Blockly.WorkspaceCommentSvg.DEFAULT_SIZE,
-        Blockly.WorkspaceCommentSvg.DEFAULT_SIZE);
+        WorkspaceCommentSvg.DEFAULT_SIZE,
+        WorkspaceCommentSvg.DEFAULT_SIZE);
 
     const injectionDiv = ws.getInjectionDiv();
     // Bounding rect coordinates are in client coordinates, meaning that they
diff --git a/core/events/ws_comment_events.js b/core/events/ws_comment_events.js
index a77c36428..e54441ec7 100644
--- a/core/events/ws_comment_events.js
+++ b/core/events/ws_comment_events.js
@@ -24,6 +24,8 @@ goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.xml');
 goog.require('Blockly.Xml');
 
+goog.requireType('Blockly.WorkspaceComment');
+
 
 /**
  * Abstract class for a comment event.
@@ -232,7 +234,7 @@ Blockly.Events.CommentCreateDeleteHelper = function(event, create) {
   } else {
     var comment = workspace.getCommentById(event.commentId);
     if (comment) {
-      comment.dispose(false, false);
+      comment.dispose();
     } else {
       // Only complain about root-level block.
       console.warn("Can't uncreate non-existent comment: " + event.commentId);
diff --git a/core/inject.js b/core/inject.js
index a1bdffbe1..62be9633e 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -36,6 +36,7 @@ goog.require('Blockly.WidgetDiv');
 
 goog.requireType('Blockly.BlocklyOptions');
 goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.WorkspaceCommentSvg');
 
 
 /**
@@ -215,7 +216,9 @@ Blockly.extractObjectFromEvent_ = function(workspace, e) {
       break;
     case Blockly.Events.COMMENT_CREATE:
     case Blockly.Events.COMMENT_MOVE:
-      object = workspace.getCommentById(e.commentId);
+      object = (
+          /** @type {?Blockly.WorkspaceCommentSvg} */
+          (workspace.getCommentById(e.commentId)));
       break;
   }
   return object;
diff --git a/core/workspace.js b/core/workspace.js
index 4c35f5b83..296989d81 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -29,6 +29,7 @@ goog.requireType('Blockly.Events.Abstract');
 goog.requireType('Blockly.IConnectionChecker');
 goog.requireType('Blockly.utils.toolbox');
 goog.requireType('Blockly.VariableModel');
+goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
@@ -369,7 +370,7 @@ Blockly.Workspace.prototype.clear = function() {
       this.topBlocks_[0].dispose(false);
     }
     while (this.topComments_.length) {
-      this.topComments_[this.topComments_.length - 1].dispose(false);
+      this.topComments_[this.topComments_.length - 1].dispose();
     }
     if (!existingGroup) {
       Blockly.Events.setGroup(false);
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 8d9009f94..e7660e44b 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -57,14 +57,14 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   /**
    * The comment's height in workspace units.  Scale does not change this value.
    * @type {number}
-   * @private
+   * @protected
    */
   this.height_ = height;
 
   /**
    * The comment's width in workspace units.  Scale does not change this value.
    * @type {number}
-   * @private
+   * @protected
    */
   this.width_ = width;
 
@@ -103,6 +103,12 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
    */
   this.content_ = content;
 
+  /**
+   * @protected
+   * @type {boolean}
+   */
+  this.disposed_ = false;
+
   /**
    * @package
    * @type {boolean}
@@ -117,8 +123,7 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
  * @package
  */
 WorkspaceComment.prototype.dispose = function() {
-  if (!this.workspace) {
-    // The comment has already been deleted.
+  if (this.disposed_) {
     return;
   }
 
@@ -128,7 +133,7 @@ WorkspaceComment.prototype.dispose = function() {
 
   // Remove from the list of top comments and the comment database.
   this.workspace.removeTopComment(this);
-  this.workspace = null;
+  this.disposed_ = true;
 };
 
 // Height, width, x, and y are all stored on even non-rendered comments, to
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 77e8c713d..5702cc14c 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -30,7 +30,7 @@ const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
 /* eslint-disable-next-line no-unused-vars */
-const Workspace = goog.requireType('Blockly.Workspace');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const WorkspaceComment = goog.require('Blockly.WorkspaceComment');
 const browserEvents = goog.require('Blockly.browserEvents');
 const dom = goog.require('Blockly.utils.dom');
@@ -69,7 +69,7 @@ const TEXTAREA_OFFSET = 2;
 
 /**
  * Class for a workspace comment's SVG representation.
- * @param {!Workspace} workspace The block's workspace.
+ * @param {!WorkspaceSvg} workspace The block's workspace.
  * @param {string} content The content of this workspace comment.
  * @param {number} height Height of the comment.
  * @param {number} width Width of the comment.
@@ -83,6 +83,11 @@ const TEXTAREA_OFFSET = 2;
  */
 const WorkspaceCommentSvg = function(
     workspace, content, height, width, opt_id) {
+  /**
+   * @type {!WorkspaceSvg}
+   */
+  this.workspace;
+
   /**
    * Mouse up event data.
    * @type {?browserEvents.Data}
@@ -128,7 +133,7 @@ const WorkspaceCommentSvg = function(
    * @type {boolean}
    * @private
    */
-  this.useDragSurface_ = utils.is3dSupported() && !!workspace.blockDragSurface_;
+  this.useDragSurface_ = utils.is3dSupported() && !!workspace.getBlockDragSurface();
 
   WorkspaceCommentSvg.superClass_.constructor.call(
       this, workspace, content, height, width, opt_id);
@@ -158,8 +163,7 @@ WorkspaceCommentSvg.TOP_OFFSET = 10;
  * @package
  */
 WorkspaceCommentSvg.prototype.dispose = function() {
-  if (!this.workspace) {
-    // The comment has already been deleted.
+  if (this.disposed_) {
     return;
   }
   // If this comment is being dragged, unlink the mouse events.
@@ -173,9 +177,6 @@ WorkspaceCommentSvg.prototype.dispose = function() {
   }
 
   dom.removeNode(this.svgGroup_);
-  // Sever JavaScript to DOM connections.
-  this.svgGroup_ = null;
-  this.svgRect_ = null;
   // Dispose of any rendered components
   this.disposeInternal_();
 
@@ -343,21 +344,21 @@ WorkspaceCommentSvg.prototype.getRelativeToSurfaceXY = function() {
   let y = 0;
 
   const dragSurfaceGroup =
-      this.useDragSurface_ ? this.workspace.blockDragSurface_.getGroup() : null;
+      this.useDragSurface_ ? this.workspace.getBlockDragSurface().getGroup() : null;
 
   let element = this.getSvgRoot();
   if (element) {
     do {
       // Loop through this comment and every parent.
-      const xy = utils.getRelativeXY(element);
+      const xy = utils.getRelativeXY(/** @type {!Element} */ (element));
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
       // the translation of the drag surface itself.
       if (this.useDragSurface_ &&
-          this.workspace.blockDragSurface_.getCurrentBlock() == element) {
+          this.workspace.getBlockDragSurface().getCurrentBlock() == element) {
         const surfaceTranslation =
-            this.workspace.blockDragSurface_.getSurfaceTranslation();
+            this.workspace.getBlockDragSurface().getSurfaceTranslation();
         x += surfaceTranslation.x;
         y += surfaceTranslation.y;
       }
@@ -414,26 +415,9 @@ WorkspaceCommentSvg.prototype.moveToDragSurface = function() {
   // This is in workspace coordinates.
   const xy = this.getRelativeToSurfaceXY();
   this.clearTransformAttributes_();
-  this.workspace.blockDragSurface_.translateSurface(xy.x, xy.y);
+  this.workspace.getBlockDragSurface().translateSurface(xy.x, xy.y);
   // Execute the move on the top-level SVG component
-  this.workspace.blockDragSurface_.setBlocksAndShow(this.getSvgRoot());
-};
-
-/**
- * Move this comment back to the workspace block canvas.
- * Generally should be called at the same time as setDragging(false).
- * Does nothing if useDragSurface_ is false.
- * @param {!Coordinate} newXY The position the comment should take
- *     on on the workspace canvas, in workspace coordinates.
- * @private
- */
-WorkspaceCommentSvg.prototype.moveOffDragSurface = function(newXY) {
-  if (!this.useDragSurface_) {
-    return;
-  }
-  // Translate to current position, turning off 3d.
-  this.translate(newXY.x, newXY.y);
-  this.workspace.blockDragSurface_.clearAndHide(this.workspace.getCanvas());
+  this.workspace.getBlockDragSurface().setBlocksAndShow(this.getSvgRoot());
 };
 
 /**
@@ -616,7 +600,7 @@ WorkspaceCommentSvg.prototype.setAutoLayout = function(_enable) {
 /**
  * Decode an XML comment tag and create a rendered comment on the workspace.
  * @param {!Element} xmlComment XML comment element.
- * @param {!Workspace} workspace The workspace.
+ * @param {!WorkspaceSvg} workspace The workspace.
  * @param {number=} opt_wsWidth The width of the workspace, which is used to
  *     position comments correctly in RTL.
  * @return {!WorkspaceCommentSvg} The created workspace comment.
@@ -632,7 +616,7 @@ WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
         workspace, info.content, info.h, info.w, info.id);
     if (workspace.rendered) {
       comment.initSvg(true);
-      comment.render(false);
+      comment.render();
     }
     // Position the comment correctly, taking into account the width of a
     // rendered RTL workspace.
@@ -647,9 +631,10 @@ WorkspaceCommentSvg.fromXml = function(xmlComment, workspace, opt_wsWidth) {
   } finally {
     Events.enable();
   }
-  WorkspaceComment.fireCreateEvent(comment);
 
-  return comment;
+  WorkspaceComment.fireCreateEvent(
+      /** @type {!WorkspaceCommentSvg} */ (comment));
+  return (/** @type {!WorkspaceCommentSvg} */ (comment));
 };
 
 /**
@@ -921,7 +906,7 @@ WorkspaceCommentSvg.prototype.deleteMouseOut_ = function(_e) {
  */
 WorkspaceCommentSvg.prototype.deleteMouseUp_ = function(e) {
   // Delete this comment.
-  this.dispose(true, true);
+  this.dispose();
   // This event has been handled.  No need to bubble up to the document.
   e.stopPropagation();
 };
@@ -943,10 +928,10 @@ WorkspaceCommentSvg.prototype.unbindDragEvents_ = function() {
 
 /**
  * Handle a mouse-up event while dragging a comment's border or resize handle.
- * @param {!Event} e Mouse up event.
+ * @param {!Event} _e Mouse up event.
  * @private
  */
-WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(/* e */) {
+WorkspaceCommentSvg.prototype.resizeMouseUp_ = function(_e) {
   Touch.clearTouchIdentifier();
   this.unbindDragEvents_();
 };
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index e4aa50229..e979e8f51 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -71,6 +71,8 @@ goog.requireType('Blockly.ScrollbarPair');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.Trashcan');
 goog.requireType('Blockly.VariableModel');
+goog.requireType('Blockly.WorkspaceCommentSvg');
+goog.requireType('Blockly.WorkspaceComment');
 goog.requireType('Blockly.ZoomControls');
 
 
@@ -1565,7 +1567,7 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
 Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
   Blockly.Events.disable();
   try {
-    var comment = Blockly.WorkspaceCommentSvg.fromXml(xmlComment, this);
+    var comment = goog.module.get('Blockly.WorkspaceCommentSvg').fromXml(xmlComment, this);
     // Move the duplicate to original position.
     var commentX = parseInt(xmlComment.getAttribute('x'), 10);
     var commentY = parseInt(xmlComment.getAttribute('y'), 10);
@@ -1584,7 +1586,7 @@ Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
     Blockly.Events.enable();
   }
   if (Blockly.Events.isEnabled()) {
-    Blockly.WorkspaceComment.fireCreateEvent(comment);
+    goog.module.get('Blockly.WorkspaceComment').fireCreateEvent(comment);
   }
   comment.select();
 };
diff --git a/core/xml.js b/core/xml.js
index e581bfd01..b32489f0f 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -28,6 +28,8 @@ goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.Field');
 goog.requireType('Blockly.VariableModel');
 goog.requireType('Blockly.Workspace');
+goog.requireType('Blockly.WorkspaceComment');
+goog.requireType('Blockly.WorkspaceCommentSvg');
 
 
 /**
@@ -440,19 +442,23 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
         throw TypeError('Shadow block cannot be a top-level block.');
       } else if (name == 'comment') {
         if (workspace.rendered) {
-          if (!Blockly.WorkspaceCommentSvg) {
+          const WorkspaceCommentSvg =
+              goog.module.get('Blockly.WorkspaceCommentSvg');
+          if (!WorkspaceCommentSvg) {
             console.warn('Missing require for Blockly.WorkspaceCommentSvg, ' +
                 'ignoring workspace comment.');
           } else {
-            Blockly.WorkspaceCommentSvg.fromXml(
-                xmlChildElement, workspace, width);
+            WorkspaceCommentSvg.fromXml(
+                xmlChildElement,
+                /** @type {!Blockly.WorkspaceSvg} */ (workspace), width);
           }
         } else {
-          if (!Blockly.WorkspaceComment) {
+          const WorkspaceComment = goog.module.get('Blockly.WorkspaceComment');
+          if (!WorkspaceComment) {
             console.warn('Missing require for Blockly.WorkspaceComment, ' +
                 'ignoring workspace comment.');
           } else {
-            Blockly.WorkspaceComment.fromXml(xmlChildElement, workspace);
+            WorkspaceComment.fromXml(xmlChildElement, workspace);
           }
         }
       } else if (name == 'variables') {
diff --git a/tests/deps.js b/tests/deps.js
index 9a432a8ee..a54d2acc2 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -212,7 +212,7 @@ goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCom
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml']);
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From b636c79ac03923ca457928902caefe0924c7bca7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 18:00:35 -0700
Subject: [PATCH 220/291] Add description and reorder requires

---
 core/workspace_comment.js | 1 +
 core/workspace_svg.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index e7660e44b..78019bc80 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -104,6 +104,7 @@ const WorkspaceComment = function(workspace, content, height, width, opt_id) {
   this.content_ = content;
 
   /**
+   * Whether this comment has been disposed.
    * @protected
    * @type {boolean}
    */
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index e979e8f51..6def3fc5c 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -71,8 +71,8 @@ goog.requireType('Blockly.ScrollbarPair');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.Trashcan');
 goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.WorkspaceCommentSvg');
 goog.requireType('Blockly.WorkspaceComment');
+goog.requireType('Blockly.WorkspaceCommentSvg');
 goog.requireType('Blockly.ZoomControls');
 
 

From 0ffdc6106d87c80628258b87a9fc75808be638de Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 12:24:06 -0700
Subject: [PATCH 221/291] Migrate core/block_svg.js to goog.module syntax
 (#5323)

* Migrate core/block_svg.js to ES6 const/let

* Migrate core/block_svg.js to goog.module

* Migrate core/block_svg.js to named requires

* clang-format core/block_svg.js

* Migrate to goog.module.get for optional Comment/Warning in core/block_svg.js

* Lint changes in core/block_svg.js
---
 core/block_svg.js | 836 +++++++++++++++++++++++-----------------------
 tests/deps.js     |   2 +-
 2 files changed, 420 insertions(+), 418 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index fbd3dd5dc..027b0c71b 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -10,93 +10,110 @@
  */
 'use strict';
 
-goog.provide('Blockly.BlockSvg');
+goog.module('Blockly.BlockSvg');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.ASTNode');
-goog.require('Blockly.Block');
-goog.require('Blockly.blockAnimations');
-goog.require('Blockly.blockRendering.IPathObject');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.common');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.constants');
-goog.require('Blockly.ContextMenu');
-goog.require('Blockly.ContextMenuRegistry');
-goog.require('Blockly.Events');
+const ASTNode = goog.require('Blockly.ASTNode');
+const Block = goog.require('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlockRenderingDebug = goog.requireType('Blockly.blockRendering.Debug');
+/* eslint-disable-next-line no-unused-vars */
+const Comment = goog.requireType('Blockly.Comment');
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
+const ContextMenu = goog.require('Blockly.ContextMenu');
+const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.Field');
+const FieldLabel = goog.require('Blockly.FieldLabel');
+/* eslint-disable-next-line no-unused-vars */
+const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+/* eslint-disable-next-line no-unused-vars */
+const IBoundedElement = goog.require('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const ICopyable = goog.require('Blockly.ICopyable');
+/* eslint-disable-next-line no-unused-vars */
+const IDraggable = goog.require('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
+const IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+/* eslint-disable-next-line no-unused-vars */
+const Icon = goog.requireType('Blockly.Icon');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const MarkerManager = goog.require('Blockly.MarkerManager');
+const Msg = goog.require('Blockly.Msg');
+/* eslint-disable-next-line no-unused-vars */
+const Mutator = goog.requireType('Blockly.Mutator');
+const Rect = goog.require('Blockly.utils.Rect');
+const RenderedConnection = goog.require('Blockly.RenderedConnection');
+const Svg = goog.require('Blockly.utils.Svg');
+const TabNavigateCursor = goog.require('Blockly.TabNavigateCursor');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const Tooltip = goog.require('Blockly.Tooltip');
+/* eslint-disable-next-line no-unused-vars */
+const Warning = goog.requireType('Blockly.Warning');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const Xml = goog.require('Blockly.Xml');
+const blockAnimations = goog.require('Blockly.blockAnimations');
+const browserEvents = goog.require('Blockly.browserEvents');
+const common = goog.require('Blockly.common');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const constants = goog.require('Blockly.constants');
+const deprecation = goog.require('Blockly.utils.deprecation');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
+const userAgent = goog.require('Blockly.utils.userAgent');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockMove');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.Selected');
-goog.require('Blockly.IASTNodeLocationSvg');
-goog.require('Blockly.IBoundedElement');
-goog.require('Blockly.ICopyable');
-goog.require('Blockly.IDraggable');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.RenderedConnection');
-goog.require('Blockly.TabNavigateCursor');
-goog.require('Blockly.Tooltip');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.deprecation');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.userAgent');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.blockRendering.Debug');
-goog.requireType('Blockly.Comment');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.Input');
-goog.requireType('Blockly.Mutator');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.Warning');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a block's SVG representation.
  * Not normally called directly, workspace.newBlock() is preferred.
- * @param {!Blockly.WorkspaceSvg} workspace The block's workspace.
+ * @param {!WorkspaceSvg} workspace The block's workspace.
  * @param {?string} prototypeName Name of the language object containing
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @extends {Blockly.Block}
- * @implements {Blockly.IASTNodeLocationSvg}
- * @implements {Blockly.IBoundedElement}
- * @implements {Blockly.ICopyable}
- * @implements {Blockly.IDraggable}
+ * @extends {Block}
+ * @implements {IASTNodeLocationSvg}
+ * @implements {IBoundedElement}
+ * @implements {ICopyable}
+ * @implements {IDraggable}
  * @constructor
  */
-Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
+const BlockSvg = function(workspace, prototypeName, opt_id) {
   // Create core elements for the block.
   /**
    * @type {!SVGGElement}
    * @private
    */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G, {}, null);
+  this.svgGroup_ = dom.createSvgElement(Svg.G, {}, null);
   this.svgGroup_.translate_ = '';
 
   /**
    * A block style object.
-   * @type {!Blockly.Theme.BlockStyle}
+   * @type {!Theme.BlockStyle}
    */
   this.style = workspace.getRenderer().getConstants().getBlockStyle(null);
 
   /**
    * The renderer's path object.
-   * @type {Blockly.blockRendering.IPathObject}
+   * @type {IPathObject}
    * @package
    */
-  this.pathObject = workspace.getRenderer().makePathObject(
-      this.svgGroup_, this.style);
+  this.pathObject =
+      workspace.getRenderer().makePathObject(this.svgGroup_, this.style);
 
   /** @type {boolean} */
   this.rendered = false;
@@ -109,14 +126,14 @@ Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
   this.renderIsInProgress_ = false;
 
 
-  /** @type {!Blockly.WorkspaceSvg} */
+  /** @type {!WorkspaceSvg} */
   this.workspace = workspace;
 
-  /** @type {Blockly.RenderedConnection} */
+  /** @type {RenderedConnection} */
   this.outputConnection = null;
-  /** @type {Blockly.RenderedConnection} */
+  /** @type {RenderedConnection} */
   this.nextConnection = null;
-  /** @type {Blockly.RenderedConnection} */
+  /** @type {RenderedConnection} */
   this.previousConnection = null;
 
   /**
@@ -126,36 +143,35 @@ Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
    * @private
    */
   this.useDragSurface_ =
-      Blockly.utils.is3dSupported() && !!workspace.getBlockDragSurface();
+      utils.is3dSupported() && !!workspace.getBlockDragSurface();
 
-  var svgPath = this.pathObject.svgPath;
+  const svgPath = this.pathObject.svgPath;
   svgPath.tooltip = this;
-  Blockly.Tooltip.bindMouseEvents(svgPath);
-  Blockly.BlockSvg.superClass_.constructor.call(this,
-      workspace, prototypeName, opt_id);
+  Tooltip.bindMouseEvents(svgPath);
+  BlockSvg.superClass_.constructor.call(this, workspace, prototypeName, opt_id);
 
   // Expose this block's ID on its top-level SVG group.
   if (this.svgGroup_.dataset) {
     this.svgGroup_.dataset['id'] = this.id;
-  } else if (Blockly.utils.userAgent.IE) {
+  } else if (userAgent.IE) {
     // SVGElement.dataset is not available on IE11, but data-* properties
     // can be set with setAttribute().
     this.svgGroup_.setAttribute('data-id', this.id);
   }
 };
-Blockly.utils.object.inherits(Blockly.BlockSvg, Blockly.Block);
+object.inherits(BlockSvg, Block);
 
 /**
  * Height of this block, not including any statement blocks above or below.
  * Height is in workspace units.
  */
-Blockly.BlockSvg.prototype.height = 0;
+BlockSvg.prototype.height = 0;
 
 /**
  * Width of this block, including any connected value blocks.
  * Width is in workspace units.
  */
-Blockly.BlockSvg.prototype.width = 0;
+BlockSvg.prototype.width = 0;
 
 /**
  * Map from IDs for warnings text to PIDs of functions to apply them.
@@ -163,14 +179,14 @@ Blockly.BlockSvg.prototype.width = 0;
  * @type {Object<string, number>}
  * @private
  */
-Blockly.BlockSvg.prototype.warningTextDb_ = null;
+BlockSvg.prototype.warningTextDb_ = null;
 
 /**
  * Constant for identifying rows that are to be rendered inline.
  * Don't collide with Blockly.inputTypes.
  * @const
  */
-Blockly.BlockSvg.INLINE = -1;
+BlockSvg.INLINE = -1;
 
 /**
  * ID to give the "collapsed warnings" warning. Allows us to remove the
@@ -179,7 +195,7 @@ Blockly.BlockSvg.INLINE = -1;
  * @type {string}
  * @const
  */
-Blockly.BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
+BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
 
 /**
  * An optional method called when a mutator dialog is first opened.
@@ -188,53 +204,52 @@ Blockly.BlockSvg.COLLAPSED_WARNING_ID = 'TEMP_COLLAPSED_WARNING_';
  * block with any sub-blocks which are appropriate. This method must also be
  * coupled with defining a `compose` method for the default mutation dialog
  * button and UI to appear.
- * @type {?function(Blockly.WorkspaceSvg):!Blockly.BlockSvg}
+ * @type {?function(WorkspaceSvg):!BlockSvg}
  */
-Blockly.BlockSvg.prototype.decompose;
+BlockSvg.prototype.decompose;
 
 /**
  * An optional method called when a mutator dialog saves its content.
  * This function is called to modify the original block according to new
  * settings. This method must also be coupled with defining a `decompose`
  * method for the default mutation dialog button and UI to appear.
- * @type {?function(!Blockly.BlockSvg)}
+ * @type {?function(!BlockSvg)}
  */
-Blockly.BlockSvg.prototype.compose;
+BlockSvg.prototype.compose;
 
 /**
  * An optional method for defining custom block context menu items.
  * @type {?function(!Array<!Object>)}
  */
-Blockly.BlockSvg.prototype.customContextMenu;
+BlockSvg.prototype.customContextMenu;
 
 /**
  * An property used internally to reference the block's rendering debugger.
- * @type {?Blockly.blockRendering.Debug}
+ * @type {?BlockRenderingDebug}
  * @package
  */
-Blockly.BlockSvg.prototype.renderingDebugger;
+BlockSvg.prototype.renderingDebugger;
 
 /**
  * Create and initialize the SVG representation of the block.
  * May be called more than once.
  */
-Blockly.BlockSvg.prototype.initSvg = function() {
+BlockSvg.prototype.initSvg = function() {
   if (!this.workspace.rendered) {
     throw TypeError('Workspace is headless.');
   }
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     input.init();
   }
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].createIcon();
   }
   this.applyColour();
   this.pathObject.updateMovable(this.isMovable());
-  var svg = this.getSvgRoot();
+  const svg = this.getSvgRoot();
   if (!this.workspace.options.readOnly && !this.eventsInit_ && svg) {
-    Blockly.browserEvents.conditionalBind(
-        svg, 'mousedown', this, this.onMouseDown_);
+    browserEvents.conditionalBind(svg, 'mousedown', this, this.onMouseDown_);
   }
   this.eventsInit_ = true;
 
@@ -247,7 +262,7 @@ Blockly.BlockSvg.prototype.initSvg = function() {
  * Get the secondary colour of a block.
  * @return {?string} #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.getColourSecondary = function() {
+BlockSvg.prototype.getColourSecondary = function() {
   return this.style.colourSecondary;
 };
 
@@ -255,7 +270,7 @@ Blockly.BlockSvg.prototype.getColourSecondary = function() {
  * Get the tertiary colour of a block.
  * @return {?string} #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.getColourTertiary = function() {
+BlockSvg.prototype.getColourTertiary = function() {
   return this.style.colourTertiary;
 };
 
@@ -264,11 +279,9 @@ Blockly.BlockSvg.prototype.getColourTertiary = function() {
  * @return {?string} #RRGGBB string.
  * @deprecated Use style.colourSecondary. (2020 January 21)
  */
-Blockly.BlockSvg.prototype.getColourShadow = function() {
-  Blockly.utils.deprecation.warn(
-      'BlockSvg.prototype.getColourShadow',
-      'January 2020',
-      'January 2021',
+BlockSvg.prototype.getColourShadow = function() {
+  deprecation.warn(
+      'BlockSvg.prototype.getColourShadow', 'January 2020', 'January 2021',
       'style.colourSecondary');
   return this.getColourSecondary();
 };
@@ -282,25 +295,19 @@ Blockly.BlockSvg.prototype.getColourShadow = function() {
  *     attributes will be defined (#RRGGBB strings).
  * @deprecated Use style.colourTertiary. (2020 January 21)
  */
-Blockly.BlockSvg.prototype.getColourBorder = function() {
-  Blockly.utils.deprecation.warn(
-      'BlockSvg.prototype.getColourBorder',
-      'January 2020',
-      'January 2021',
+BlockSvg.prototype.getColourBorder = function() {
+  deprecation.warn(
+      'BlockSvg.prototype.getColourBorder', 'January 2020', 'January 2021',
       'style.colourTertiary');
-  var colourTertiary = this.getColourTertiary();
-  return {
-    colourBorder: colourTertiary,
-    colourLight: null,
-    colourDark: null
-  };
+  const colourTertiary = this.getColourTertiary();
+  return {colourBorder: colourTertiary, colourLight: null, colourDark: null};
 };
 
 /**
  * Selects this block. Highlights the block visually and fires a select event
  * if the block is not already selected.
  */
-Blockly.BlockSvg.prototype.select = function() {
+BlockSvg.prototype.select = function() {
   if (this.isShadow() && this.getParent()) {
     // Shadow blocks should not be selected.
     this.getParent().select();
@@ -309,20 +316,20 @@ Blockly.BlockSvg.prototype.select = function() {
   if (Blockly.selected == this) {
     return;
   }
-  var oldId = null;
+  let oldId = null;
   if (Blockly.selected) {
     oldId = Blockly.selected.id;
     // Unselect any previously selected block.
-    Blockly.Events.disable();
+    Events.disable();
     try {
       Blockly.selected.unselect();
     } finally {
-      Blockly.Events.enable();
+      Events.enable();
     }
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(oldId, this.id,
-      this.workspace.id);
-  Blockly.Events.fire(event);
+  const event =
+      new (Events.get(Events.SELECTED))(oldId, this.id, this.workspace.id);
+  Events.fire(event);
   Blockly.selected = this;
   this.addSelect();
 };
@@ -331,50 +338,50 @@ Blockly.BlockSvg.prototype.select = function() {
  * Unselects this block. Unhighlights the block and fires a select (false) event
  * if the block is currently selected.
  */
-Blockly.BlockSvg.prototype.unselect = function() {
+BlockSvg.prototype.unselect = function() {
   if (Blockly.selected != this) {
     return;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.SELECTED))(this.id, null,
-      this.workspace.id);
+  const event =
+      new (Events.get(Events.SELECTED))(this.id, null, this.workspace.id);
   event.workspaceId = this.workspace.id;
-  Blockly.Events.fire(event);
+  Events.fire(event);
   Blockly.selected = null;
   this.removeSelect();
 };
 
 /**
  * Block's mutator icon (if any).
- * @type {?Blockly.Mutator}
+ * @type {?Mutator}
  */
-Blockly.BlockSvg.prototype.mutator = null;
+BlockSvg.prototype.mutator = null;
 
 /**
  * Block's comment icon (if any).
- * @type {?Blockly.Comment}
+ * @type {?Comment}
  * @deprecated August 2019. Use getCommentIcon instead.
  */
-Blockly.BlockSvg.prototype.comment = null;
+BlockSvg.prototype.comment = null;
 
 /**
  * Block's comment icon (if any).
- * @type {?Blockly.Comment}
+ * @type {?Comment}
  * @private
  */
-Blockly.BlockSvg.prototype.commentIcon_ = null;
+BlockSvg.prototype.commentIcon_ = null;
 
 /**
  * Block's warning icon (if any).
- * @type {?Blockly.Warning}
+ * @type {?Warning}
  */
-Blockly.BlockSvg.prototype.warning = null;
+BlockSvg.prototype.warning = null;
 
 /**
  * Returns a list of mutator, comment, and warning icons.
- * @return {!Array<!Blockly.Icon>} List of icons.
+ * @return {!Array<!Icon>} List of icons.
  */
-Blockly.BlockSvg.prototype.getIcons = function() {
-  var icons = [];
+BlockSvg.prototype.getIcons = function() {
+  const icons = [];
   if (this.mutator) {
     icons.push(this.mutator);
   }
@@ -389,21 +396,21 @@ Blockly.BlockSvg.prototype.getIcons = function() {
 
 /**
  * Sets the parent of this block to be a new block or null.
- * @param {?Blockly.Block} newParent New parent block.
+ * @param {?Block} newParent New parent block.
  * @package
  * @override
  */
-Blockly.BlockSvg.prototype.setParent = function(newParent) {
-  var oldParent = this.parentBlock_;
+BlockSvg.prototype.setParent = function(newParent) {
+  const oldParent = this.parentBlock_;
   if (newParent == oldParent) {
     return;
   }
 
-  Blockly.utils.dom.startTextWidthCache();
-  Blockly.BlockSvg.superClass_.setParent.call(this, newParent);
-  Blockly.utils.dom.stopTextWidthCache();
+  dom.startTextWidthCache();
+  BlockSvg.superClass_.setParent.call(this, newParent);
+  dom.stopTextWidthCache();
 
-  var svgRoot = this.getSvgRoot();
+  const svgRoot = this.getSvgRoot();
 
   // Bail early if workspace is clearing, or we aren't rendered.
   // We won't need to reattach ourselves anywhere.
@@ -411,10 +418,10 @@ Blockly.BlockSvg.prototype.setParent = function(newParent) {
     return;
   }
 
-  var oldXY = this.getRelativeToSurfaceXY();
+  const oldXY = this.getRelativeToSurfaceXY();
   if (newParent) {
     newParent.getSvgRoot().appendChild(svgRoot);
-    var newXY = this.getRelativeToSurfaceXY();
+    const newXY = this.getRelativeToSurfaceXY();
     // Move the connections to match the child's new position.
     this.moveConnections(newXY.x - oldXY.x, newXY.y - oldXY.y);
   }
@@ -434,37 +441,38 @@ Blockly.BlockSvg.prototype.setParent = function(newParent) {
  * If the block is on the workspace, (0, 0) is the origin of the workspace
  * coordinate system.
  * This does not change with workspace scale.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties in
+ * @return {!Coordinate} Object with .x and .y properties in
  *     workspace coordinates.
  */
-Blockly.BlockSvg.prototype.getRelativeToSurfaceXY = function() {
-  var x = 0;
-  var y = 0;
+BlockSvg.prototype.getRelativeToSurfaceXY = function() {
+  let x = 0;
+  let y = 0;
 
-  var dragSurfaceGroup = this.useDragSurface_ ?
-      this.workspace.getBlockDragSurface().getGroup() : null;
+  const dragSurfaceGroup = this.useDragSurface_ ?
+      this.workspace.getBlockDragSurface().getGroup() :
+      null;
 
-  var element = this.getSvgRoot();
+  let element = this.getSvgRoot();
   if (element) {
     do {
       // Loop through this block and every parent.
-      var xy = Blockly.utils.getRelativeXY(element);
+      const xy = utils.getRelativeXY(element);
       x += xy.x;
       y += xy.y;
       // If this element is the current element on the drag surface, include
       // the translation of the drag surface itself.
       if (this.useDragSurface_ &&
           this.workspace.getBlockDragSurface().getCurrentBlock() == element) {
-        var surfaceTranslation =
+        const surfaceTranslation =
             this.workspace.getBlockDragSurface().getSurfaceTranslation();
         x += surfaceTranslation.x;
         y += surfaceTranslation.y;
       }
       element = /** @type {!SVGElement} */ (element.parentNode);
     } while (element && element != this.workspace.getCanvas() &&
-        element != dragSurfaceGroup);
+             element != dragSurfaceGroup);
   }
-  return new Blockly.utils.Coordinate(x, y);
+  return new Coordinate(x, y);
 };
 
 /**
@@ -472,20 +480,21 @@ Blockly.BlockSvg.prototype.getRelativeToSurfaceXY = function() {
  * @param {number} dx Horizontal offset in workspace units.
  * @param {number} dy Vertical offset in workspace units.
  */
-Blockly.BlockSvg.prototype.moveBy = function(dx, dy) {
+BlockSvg.prototype.moveBy = function(dx, dy) {
   if (this.parentBlock_) {
     throw Error('Block has parent.');
   }
-  var eventsEnabled = Blockly.Events.isEnabled();
+  const eventsEnabled = Events.isEnabled();
+  let event;
   if (eventsEnabled) {
-    var event = new (Blockly.Events.get(Blockly.Events.BLOCK_MOVE))(this);
+    event = new (Events.get(Events.BLOCK_MOVE))(this);
   }
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.translate(xy.x + dx, xy.y + dy);
   this.moveConnections(dx, dy);
   if (eventsEnabled) {
     event.recordNew();
-    Blockly.Events.fire(event);
+    Events.fire(event);
   }
   this.workspace.resizeContents();
 };
@@ -496,9 +505,8 @@ Blockly.BlockSvg.prototype.moveBy = function(dx, dy) {
  * @param {number} x The x coordinate of the translation in workspace units.
  * @param {number} y The y coordinate of the translation in workspace units.
  */
-Blockly.BlockSvg.prototype.translate = function(x, y) {
-  this.getSvgRoot().setAttribute('transform',
-      'translate(' + x + ',' + y + ')');
+BlockSvg.prototype.translate = function(x, y) {
+  this.getSvgRoot().setAttribute('transform', 'translate(' + x + ',' + y + ')');
 };
 
 /**
@@ -507,7 +515,7 @@ Blockly.BlockSvg.prototype.translate = function(x, y) {
  * Does nothing if useDragSurface_ is false.
  * @package
  */
-Blockly.BlockSvg.prototype.moveToDragSurface = function() {
+BlockSvg.prototype.moveToDragSurface = function() {
   if (!this.useDragSurface_) {
     return;
   }
@@ -515,11 +523,11 @@ Blockly.BlockSvg.prototype.moveToDragSurface = function() {
   // is equal to the current relative-to-surface position,
   // to keep the position in sync as it move on/off the surface.
   // This is in workspace coordinates.
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   this.clearTransformAttributes_();
   this.workspace.getBlockDragSurface().translateSurface(xy.x, xy.y);
   // Execute the move on the top-level SVG component
-  var svg = this.getSvgRoot();
+  const svg = this.getSvgRoot();
   if (svg) {
     this.workspace.getBlockDragSurface().setBlocksAndShow(svg);
   }
@@ -527,10 +535,10 @@ Blockly.BlockSvg.prototype.moveToDragSurface = function() {
 
 /**
  * Move a block to a position.
- * @param {Blockly.utils.Coordinate} xy The position to move to in workspace units.
+ * @param {Coordinate} xy The position to move to in workspace units.
  */
-Blockly.BlockSvg.prototype.moveTo = function(xy) {
-  var curXY = this.getRelativeToSurfaceXY();
+BlockSvg.prototype.moveTo = function(xy) {
+  const curXY = this.getRelativeToSurfaceXY();
   this.moveBy(xy.x - curXY.x, xy.y - curXY.y);
 };
 
@@ -538,11 +546,11 @@ Blockly.BlockSvg.prototype.moveTo = function(xy) {
  * Move this block back to the workspace block canvas.
  * Generally should be called at the same time as setDragging_(false).
  * Does nothing if useDragSurface_ is false.
- * @param {!Blockly.utils.Coordinate} newXY The position the block should take on
+ * @param {!Coordinate} newXY The position the block should take on
  *     on the workspace canvas, in workspace coordinates.
  * @package
  */
-Blockly.BlockSvg.prototype.moveOffDragSurface = function(newXY) {
+BlockSvg.prototype.moveOffDragSurface = function(newXY) {
   if (!this.useDragSurface_) {
     return;
   }
@@ -555,17 +563,17 @@ Blockly.BlockSvg.prototype.moveOffDragSurface = function(newXY) {
  * Move this block during a drag, taking into account whether we are using a
  * drag surface to translate blocks.
  * This block must be a top-level block.
- * @param {!Blockly.utils.Coordinate} newLoc The location to translate to, in
+ * @param {!Coordinate} newLoc The location to translate to, in
  *     workspace coordinates.
  * @package
  */
-Blockly.BlockSvg.prototype.moveDuringDrag = function(newLoc) {
+BlockSvg.prototype.moveDuringDrag = function(newLoc) {
   if (this.useDragSurface_) {
     this.workspace.getBlockDragSurface().translateSurface(newLoc.x, newLoc.y);
   } else {
     this.svgGroup_.translate_ = 'translate(' + newLoc.x + ',' + newLoc.y + ')';
-    this.svgGroup_.setAttribute('transform',
-        this.svgGroup_.translate_ + this.svgGroup_.skew_);
+    this.svgGroup_.setAttribute(
+        'transform', this.svgGroup_.translate_ + this.svgGroup_.skew_);
   }
 };
 
@@ -574,14 +582,14 @@ Blockly.BlockSvg.prototype.moveDuringDrag = function(newLoc) {
  * Used when the block is switching from 3d to 2d transform or vice versa.
  * @private
  */
-Blockly.BlockSvg.prototype.clearTransformAttributes_ = function() {
+BlockSvg.prototype.clearTransformAttributes_ = function() {
   this.getSvgRoot().removeAttribute('transform');
 };
 
 /**
  * Snap this block to the nearest grid point.
  */
-Blockly.BlockSvg.prototype.snapToGrid = function() {
+BlockSvg.prototype.snapToGrid = function() {
   if (!this.workspace) {
     return;  // Deleted block.
   }
@@ -594,18 +602,18 @@ Blockly.BlockSvg.prototype.snapToGrid = function() {
   if (this.isInFlyout) {
     return;  // Don't move blocks around in a flyout.
   }
-  var grid = this.workspace.getGrid();
+  const grid = this.workspace.getGrid();
   if (!grid || !grid.shouldSnap()) {
     return;  // Config says no snapping.
   }
-  var spacing = grid.getSpacing();
-  var half = spacing / 2;
-  var xy = this.getRelativeToSurfaceXY();
-  var dx = Math.round((xy.x - half) / spacing) * spacing + half - xy.x;
-  var dy = Math.round((xy.y - half) / spacing) * spacing + half - xy.y;
-  dx = Math.round(dx);
-  dy = Math.round(dy);
-  if (dx != 0 || dy != 0) {
+  const spacing = grid.getSpacing();
+  const half = spacing / 2;
+  const xy = this.getRelativeToSurfaceXY();
+  const dx =
+      Math.round(Math.round((xy.x - half) / spacing) * spacing + half - xy.x);
+  const dy =
+      Math.round(Math.round((xy.y - half) / spacing) * spacing + half - xy.y);
+  if (dx || dy) {
     this.moveBy(dx, dy);
   }
 };
@@ -614,12 +622,13 @@ Blockly.BlockSvg.prototype.snapToGrid = function() {
  * Returns the coordinates of a bounding box describing the dimensions of this
  * block and any blocks stacked below it.
  * Coordinate system: workspace coordinates.
- * @return {!Blockly.utils.Rect} Object with coordinates of the bounding box.
+ * @return {!Rect} Object with coordinates of the bounding box.
  */
-Blockly.BlockSvg.prototype.getBoundingRectangle = function() {
-  var blockXY = this.getRelativeToSurfaceXY();
-  var blockBounds = this.getHeightWidth();
-  var left, right;
+BlockSvg.prototype.getBoundingRectangle = function() {
+  const blockXY = this.getRelativeToSurfaceXY();
+  const blockBounds = this.getHeightWidth();
+  let left;
+  let right;
   if (this.RTL) {
     left = blockXY.x - blockBounds.width;
     right = blockXY.x;
@@ -627,19 +636,18 @@ Blockly.BlockSvg.prototype.getBoundingRectangle = function() {
     left = blockXY.x;
     right = blockXY.x + blockBounds.width;
   }
-  return new Blockly.utils.Rect(
-      blockXY.y, blockXY.y + blockBounds.height, left, right);
+  return new Rect(blockXY.y, blockXY.y + blockBounds.height, left, right);
 };
 
 /**
  * Notify every input on this block to mark its fields as dirty.
  * A dirty field is a field that needs to be re-rendered.
  */
-Blockly.BlockSvg.prototype.markDirty = function() {
-  this.pathObject.constants =
-    (/** @type {!Blockly.WorkspaceSvg} */ (this.workspace))
-        .getRenderer().getConstants();
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+BlockSvg.prototype.markDirty = function() {
+  this.pathObject.constants = (/** @type {!WorkspaceSvg} */ (this.workspace))
+      .getRenderer()
+      .getConstants();
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     input.markDirty();
   }
 };
@@ -648,11 +656,11 @@ Blockly.BlockSvg.prototype.markDirty = function() {
  * Set whether the block is collapsed or not.
  * @param {boolean} collapsed True if collapsed.
  */
-Blockly.BlockSvg.prototype.setCollapsed = function(collapsed) {
+BlockSvg.prototype.setCollapsed = function(collapsed) {
   if (this.collapsed_ == collapsed) {
     return;
   }
-  Blockly.BlockSvg.superClass_.setCollapsed.call(this, collapsed);
+  BlockSvg.superClass_.setCollapsed.call(this, collapsed);
   if (!collapsed) {
     this.updateCollapsed_();
   } else if (this.rendered) {
@@ -667,12 +675,12 @@ Blockly.BlockSvg.prototype.setCollapsed = function(collapsed) {
  * for that state.
  * @private
  */
-Blockly.BlockSvg.prototype.updateCollapsed_ = function() {
-  var collapsed = this.isCollapsed();
-  var collapsedInputName = Blockly.constants.COLLAPSED_INPUT_NAME;
-  var collapsedFieldName = Blockly.constants.COLLAPSED_FIELD_NAME;
+BlockSvg.prototype.updateCollapsed_ = function() {
+  const collapsed = this.isCollapsed();
+  const collapsedInputName = constants.COLLAPSED_INPUT_NAME;
+  const collapsedFieldName = constants.COLLAPSED_FIELD_NAME;
 
-  for (var i = 0, input; (input = this.inputList[i]); i++) {
+  for (let i = 0, input; (input = this.inputList[i]); i++) {
     if (input.name != collapsedInputName) {
       input.setVisible(!collapsed);
     }
@@ -684,31 +692,31 @@ Blockly.BlockSvg.prototype.updateCollapsed_ = function() {
     return;
   }
 
-  var icons = this.getIcons();
-  for (var i = 0, icon; (icon = icons[i]); i++) {
+  const icons = this.getIcons();
+  for (let i = 0, icon; (icon = icons[i]); i++) {
     icon.setVisible(false);
   }
 
-  var text = this.toString(Blockly.internalConstants.COLLAPSE_CHARS);
-  var field = this.getField(collapsedFieldName);
+  const text = this.toString(internalConstants.COLLAPSE_CHARS);
+  const field = this.getField(collapsedFieldName);
   if (field) {
     field.setValue(text);
     return;
   }
-  var input = this.getInput(collapsedInputName) ||
+  const input = this.getInput(collapsedInputName) ||
       this.appendDummyInput(collapsedInputName);
-  input.appendField(new Blockly.FieldLabel(text), collapsedFieldName);
+  input.appendField(new FieldLabel(text), collapsedFieldName);
 };
 
 /**
  * Open the next (or previous) FieldTextInput.
- * @param {!Blockly.Field} start Current field.
+ * @param {!Field} start Current field.
  * @param {boolean} forward If true go forward, otherwise backward.
  */
-Blockly.BlockSvg.prototype.tab = function(start, forward) {
-  var tabCursor = new Blockly.TabNavigateCursor();
-  tabCursor.setCurNode(Blockly.ASTNode.createFieldNode(start));
-  var currentNode = tabCursor.getCurNode();
+BlockSvg.prototype.tab = function(start, forward) {
+  const tabCursor = new TabNavigateCursor();
+  tabCursor.setCurNode(ASTNode.createFieldNode(start));
+  const currentNode = tabCursor.getCurNode();
 
   if (forward) {
     tabCursor.next();
@@ -716,9 +724,9 @@ Blockly.BlockSvg.prototype.tab = function(start, forward) {
     tabCursor.prev();
   }
 
-  var nextNode = tabCursor.getCurNode();
+  const nextNode = tabCursor.getCurNode();
   if (nextNode && nextNode !== currentNode) {
-    var nextField = /** @type {!Blockly.Field} */ (nextNode.getLocation());
+    const nextField = /** @type {!Field} */ (nextNode.getLocation());
     nextField.showEditor();
 
     // Also move the cursor if we're in keyboard nav mode.
@@ -733,8 +741,8 @@ Blockly.BlockSvg.prototype.tab = function(start, forward) {
  * @param {!Event} e Mouse down event or touch start event.
  * @private
  */
-Blockly.BlockSvg.prototype.onMouseDown_ = function(e) {
-  var gesture = this.workspace && this.workspace.getGesture(e);
+BlockSvg.prototype.onMouseDown_ = function(e) {
+  const gesture = this.workspace && this.workspace.getGesture(e);
   if (gesture) {
     gesture.handleBlockStart(e, this);
   }
@@ -744,8 +752,9 @@ Blockly.BlockSvg.prototype.onMouseDown_ = function(e) {
  * Load the block's help page in a new window.
  * @package
  */
-Blockly.BlockSvg.prototype.showHelp = function() {
-  var url = (typeof this.helpUrl == 'function') ? this.helpUrl() : this.helpUrl;
+BlockSvg.prototype.showHelp = function() {
+  const url =
+      (typeof this.helpUrl == 'function') ? this.helpUrl() : this.helpUrl;
   if (url) {
     window.open(url);
   }
@@ -756,12 +765,12 @@ Blockly.BlockSvg.prototype.showHelp = function() {
  * @return {?Array<!Object>} Context menu options or null if no menu.
  * @protected
  */
-Blockly.BlockSvg.prototype.generateContextMenu = function() {
+BlockSvg.prototype.generateContextMenu = function() {
   if (this.workspace.options.readOnly || !this.contextMenu) {
     return null;
   }
-  var menuOptions = Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
-      Blockly.ContextMenuRegistry.ScopeType.BLOCK, {block: this});
+  const menuOptions = ContextMenuRegistry.registry.getContextMenuOptions(
+      ContextMenuRegistry.ScopeType.BLOCK, {block: this});
 
   // Allow the block to add or modify menuOptions.
   if (this.customContextMenu) {
@@ -776,12 +785,12 @@ Blockly.BlockSvg.prototype.generateContextMenu = function() {
  * @param {!Event} e Mouse event.
  * @package
  */
-Blockly.BlockSvg.prototype.showContextMenu = function(e) {
-  var menuOptions = this.generateContextMenu();
+BlockSvg.prototype.showContextMenu = function(e) {
+  const menuOptions = this.generateContextMenu();
 
   if (menuOptions && menuOptions.length) {
-    Blockly.ContextMenu.show(e, menuOptions, this.RTL);
-    Blockly.ContextMenu.setCurrentBlock(this);
+    ContextMenu.show(e, menuOptions, this.RTL);
+    ContextMenu.setCurrentBlock(this);
   }
 };
 
@@ -794,23 +803,23 @@ Blockly.BlockSvg.prototype.showContextMenu = function(e) {
  *     units.
  * @package
  */
-Blockly.BlockSvg.prototype.moveConnections = function(dx, dy) {
+BlockSvg.prototype.moveConnections = function(dx, dy) {
   if (!this.rendered) {
     // Rendering is required to lay out the blocks.
     // This is probably an invisible block attached to a collapsed block.
     return;
   }
-  var myConnections = this.getConnections_(false);
-  for (var i = 0; i < myConnections.length; i++) {
+  const myConnections = this.getConnections_(false);
+  for (let i = 0; i < myConnections.length; i++) {
     myConnections[i].moveBy(dx, dy);
   }
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].computeIconLocation();
   }
 
   // Recurse through all blocks attached under this one.
-  for (var i = 0; i < this.childBlocks_.length; i++) {
+  for (let i = 0; i < this.childBlocks_.length; i++) {
     this.childBlocks_[i].moveConnections(dx, dy);
   }
 };
@@ -820,21 +829,21 @@ Blockly.BlockSvg.prototype.moveConnections = function(dx, dy) {
  * @param {boolean} adding True if adding, false if removing.
  * @package
  */
-Blockly.BlockSvg.prototype.setDragging = function(adding) {
+BlockSvg.prototype.setDragging = function(adding) {
   if (adding) {
-    var group = this.getSvgRoot();
+    const group = this.getSvgRoot();
     group.translate_ = '';
     group.skew_ = '';
-    Blockly.common.draggingConnections.push(...this.getConnections_(true));
-    Blockly.utils.dom.addClass(
+    common.draggingConnections.push(...this.getConnections_(true));
+    dom.addClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   } else {
-    Blockly.common.draggingConnections.length = 0;
-    Blockly.utils.dom.removeClass(
+    common.draggingConnections.length = 0;
+    dom.removeClass(
         /** @type {!Element} */ (this.svgGroup_), 'blocklyDragging');
   }
   // Recurse through all blocks attached under this one.
-  for (var i = 0; i < this.childBlocks_.length; i++) {
+  for (let i = 0; i < this.childBlocks_.length; i++) {
     this.childBlocks_[i].setDragging(adding);
   }
 };
@@ -843,8 +852,8 @@ Blockly.BlockSvg.prototype.setDragging = function(adding) {
  * Set whether this block is movable or not.
  * @param {boolean} movable True if movable.
  */
-Blockly.BlockSvg.prototype.setMovable = function(movable) {
-  Blockly.BlockSvg.superClass_.setMovable.call(this, movable);
+BlockSvg.prototype.setMovable = function(movable) {
+  BlockSvg.superClass_.setMovable.call(this, movable);
   this.pathObject.updateMovable(movable);
 };
 
@@ -852,10 +861,10 @@ Blockly.BlockSvg.prototype.setMovable = function(movable) {
  * Set whether this block is editable or not.
  * @param {boolean} editable True if editable.
  */
-Blockly.BlockSvg.prototype.setEditable = function(editable) {
-  Blockly.BlockSvg.superClass_.setEditable.call(this, editable);
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+BlockSvg.prototype.setEditable = function(editable) {
+  BlockSvg.superClass_.setEditable.call(this, editable);
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].updateEditable();
   }
 };
@@ -865,8 +874,8 @@ Blockly.BlockSvg.prototype.setEditable = function(editable) {
  * @param {boolean} shadow True if a shadow.
  * @package
  */
-Blockly.BlockSvg.prototype.setShadow = function(shadow) {
-  Blockly.BlockSvg.superClass_.setShadow.call(this, shadow);
+BlockSvg.prototype.setShadow = function(shadow) {
+  BlockSvg.superClass_.setShadow.call(this, shadow);
   this.applyColour();
 };
 
@@ -876,14 +885,14 @@ Blockly.BlockSvg.prototype.setShadow = function(shadow) {
  * @param {boolean} insertionMarker True if an insertion marker.
  * @package
  */
-Blockly.BlockSvg.prototype.setInsertionMarker = function(insertionMarker) {
+BlockSvg.prototype.setInsertionMarker = function(insertionMarker) {
   if (this.isInsertionMarker_ == insertionMarker) {
     return;  // No change.
   }
   this.isInsertionMarker_ = insertionMarker;
   if (this.isInsertionMarker_) {
-    this.setColour(this.workspace.getRenderer().getConstants().
-        INSERTION_MARKER_COLOUR);
+    this.setColour(
+        this.workspace.getRenderer().getConstants().INSERTION_MARKER_COLOUR);
     this.pathObject.updateInsertionMarker(true);
   }
 };
@@ -892,7 +901,7 @@ Blockly.BlockSvg.prototype.setInsertionMarker = function(insertionMarker) {
  * Return the root node of the SVG or null if none exists.
  * @return {!SVGGElement} The root SVG node (probably a group).
  */
-Blockly.BlockSvg.prototype.getSvgRoot = function() {
+BlockSvg.prototype.getSvgRoot = function() {
   return this.svgGroup_;
 };
 
@@ -904,76 +913,76 @@ Blockly.BlockSvg.prototype.getSvgRoot = function() {
  * @param {boolean=} animate If true, show a disposal animation and sound.
  * @suppress {checkTypes}
  */
-Blockly.BlockSvg.prototype.dispose = function(healStack, animate) {
+BlockSvg.prototype.dispose = function(healStack, animate) {
   if (!this.workspace) {
     // The block has already been deleted.
     return;
   }
-  Blockly.Tooltip.dispose();
-  Blockly.Tooltip.unbindMouseEvents(this.pathObject.svgPath);
-  Blockly.utils.dom.startTextWidthCache();
+  Tooltip.dispose();
+  Tooltip.unbindMouseEvents(this.pathObject.svgPath);
+  dom.startTextWidthCache();
   // Save the block's workspace temporarily so we can resize the
   // contents once the block is disposed.
-  var blockWorkspace = this.workspace;
+  const blockWorkspace = this.workspace;
   // If this block is being dragged, unlink the mouse events.
   if (Blockly.selected == this) {
     this.unselect();
     this.workspace.cancelCurrentGesture();
   }
   // If this block has a context menu open, close it.
-  if (Blockly.ContextMenu.getCurrentBlock() == this) {
-    Blockly.ContextMenu.hide();
+  if (ContextMenu.getCurrentBlock() == this) {
+    ContextMenu.hide();
   }
 
   if (animate && this.rendered) {
     this.unplug(healStack);
-    Blockly.blockAnimations.disposeUiEffect(this);
+    blockAnimations.disposeUiEffect(this);
   }
   // Stop rerendering.
   this.rendered = false;
 
   // Clear pending warnings.
   if (this.warningTextDb_) {
-    for (var n in this.warningTextDb_) {
+    for (const n in this.warningTextDb_) {
       clearTimeout(this.warningTextDb_[n]);
     }
     this.warningTextDb_ = null;
   }
 
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].dispose();
   }
-  Blockly.BlockSvg.superClass_.dispose.call(this, !!healStack);
+  BlockSvg.superClass_.dispose.call(this, !!healStack);
 
-  Blockly.utils.dom.removeNode(this.svgGroup_);
+  dom.removeNode(this.svgGroup_);
   blockWorkspace.resizeContents();
   // Sever JavaScript to DOM connections.
   this.svgGroup_ = null;
-  Blockly.utils.dom.stopTextWidthCache();
+  dom.stopTextWidthCache();
 };
 
 /**
  * Encode a block for copying.
- * @return {?Blockly.ICopyable.CopyData} Copy metadata, or null if the block is
+ * @return {?ICopyable.CopyData} Copy metadata, or null if the block is
  *     an insertion marker.
  * @package
  */
-Blockly.BlockSvg.prototype.toCopyData = function() {
+BlockSvg.prototype.toCopyData = function() {
   if (this.isInsertionMarker_) {
     return null;
   }
-  var xml = /** @type {!Element} */ (Blockly.Xml.blockToDom(this, true));
+  const xml = /** @type {!Element} */ (Xml.blockToDom(this, true));
   // Copy only the selected block and internal blocks.
-  Blockly.Xml.deleteNext(xml);
+  Xml.deleteNext(xml);
   // Encode start position in XML.
-  var xy = this.getRelativeToSurfaceXY();
+  const xy = this.getRelativeToSurfaceXY();
   xml.setAttribute('x', this.RTL ? -xy.x : xy.x);
   xml.setAttribute('y', xy.y);
   return {
     xml: xml,
     source: this.workspace,
-    typeCounts: Blockly.utils.getBlockTypeCounts(this, true)
+    typeCounts: utils.getBlockTypeCounts(this, true)
   };
 };
 
@@ -981,16 +990,16 @@ Blockly.BlockSvg.prototype.toCopyData = function() {
  * Updates the colour of the block to match the block's state.
  * @package
  */
-Blockly.BlockSvg.prototype.applyColour = function() {
+BlockSvg.prototype.applyColour = function() {
   this.pathObject.applyColour(this);
 
-  var icons = this.getIcons();
-  for (var i = 0; i < icons.length; i++) {
+  const icons = this.getIcons();
+  for (let i = 0; i < icons.length; i++) {
     icons[i].applyColour();
   }
 
-  for (var x = 0, input; (input = this.inputList[x]); x++) {
-    for (var y = 0, field; (field = input.fieldRow[y]); y++) {
+  for (let x = 0, input; (input = this.inputList[x]); x++) {
+    for (let y = 0, field; (field = input.fieldRow[y]); y++) {
       field.applyColour();
     }
   }
@@ -1001,13 +1010,13 @@ Blockly.BlockSvg.prototype.applyColour = function() {
  * state.
  * @package
  */
-Blockly.BlockSvg.prototype.updateDisabled = function() {
-  var children = this.getChildren(false);
+BlockSvg.prototype.updateDisabled = function() {
+  const children = this.getChildren(false);
   this.applyColour();
   if (this.isCollapsed()) {
     return;
   }
-  for (var i = 0, child; (child = children[i]); i++) {
+  for (let i = 0, child; (child = children[i]); i++) {
     if (child.rendered) {
       child.updateDisabled();
     }
@@ -1017,9 +1026,9 @@ Blockly.BlockSvg.prototype.updateDisabled = function() {
 /**
  * Get the comment icon attached to this block, or null if the block has no
  * comment.
- * @return {?Blockly.Comment} The comment icon attached to this block, or null.
+ * @return {?Comment} The comment icon attached to this block, or null.
  */
-Blockly.BlockSvg.prototype.getCommentIcon = function() {
+BlockSvg.prototype.getCommentIcon = function() {
   return this.commentIcon_;
 };
 
@@ -1027,16 +1036,17 @@ Blockly.BlockSvg.prototype.getCommentIcon = function() {
  * Set this block's comment text.
  * @param {?string} text The text, or null to delete.
  */
-Blockly.BlockSvg.prototype.setCommentText = function(text) {
-  if (!Blockly.Comment) {
+BlockSvg.prototype.setCommentText = function(text) {
+  const Comment = goog.module.get('Blockly.Comment');
+  if (!Comment) {
     throw Error('Missing require for Blockly.Comment');
   }
   if (this.commentModel.text == text) {
     return;
   }
-  Blockly.BlockSvg.superClass_.setCommentText.call(this, text);
+  BlockSvg.superClass_.setCommentText.call(this, text);
 
-  var shouldHaveComment = text != null;
+  const shouldHaveComment = text != null;
   if (!!this.commentIcon_ == shouldHaveComment) {
     // If the comment's state of existence is correct, but the text is new
     // that means we're just updating a comment.
@@ -1044,7 +1054,7 @@ Blockly.BlockSvg.prototype.setCommentText = function(text) {
     return;
   }
   if (shouldHaveComment) {
-    this.commentIcon_ = new Blockly.Comment(this);
+    this.commentIcon_ = new Comment(this);
     this.comment = this.commentIcon_;  // For backwards compatibility.
   } else {
     this.commentIcon_.dispose();
@@ -1064,8 +1074,9 @@ Blockly.BlockSvg.prototype.setCommentText = function(text) {
  * @param {string=} opt_id An optional ID for the warning text to be able to
  *     maintain multiple warnings.
  */
-Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
-  if (!Blockly.Warning) {
+BlockSvg.prototype.setWarningText = function(text, opt_id) {
+  const Warning = goog.module.get('Blockly.Warning');
+  if (!Warning) {
     throw Error('Missing require for Blockly.Warning');
   }
   if (!this.warningTextDb_) {
@@ -1073,10 +1084,10 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
     // Only runs once per block (and only those with warnings).
     this.warningTextDb_ = Object.create(null);
   }
-  var id = opt_id || '';
+  const id = opt_id || '';
   if (!id) {
     // Kill all previous pending processes, this edit supersedes them all.
-    for (var n in this.warningTextDb_) {
+    for (const n of Object.keys(this.warningTextDb_)) {
       clearTimeout(this.warningTextDb_[n]);
       delete this.warningTextDb_[n];
     }
@@ -1088,7 +1099,7 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
   if (this.workspace.isDragging()) {
     // Don't change the warning text during a drag.
     // Wait until the drag finishes.
-    var thisBlock = this;
+    const thisBlock = this;
     this.warningTextDb_[id] = setTimeout(function() {
       if (thisBlock.workspace) {  // Check block wasn't deleted.
         delete thisBlock.warningTextDb_[id];
@@ -1101,11 +1112,11 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
     text = null;
   }
 
-  var changedState = false;
+  let changedState = false;
   if (typeof text == 'string') {
     // Bubble up to add a warning on top-most collapsed block.
-    var parent = this.getSurroundParent();
-    var collapsedParent = null;
+    let parent = this.getSurroundParent();
+    let collapsedParent = null;
     while (parent) {
       if (parent.isCollapsed()) {
         collapsedParent = parent;
@@ -1113,12 +1124,12 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
       parent = parent.getSurroundParent();
     }
     if (collapsedParent) {
-      collapsedParent.setWarningText(Blockly.Msg['COLLAPSED_WARNINGS_WARNING'],
-          Blockly.BlockSvg.COLLAPSED_WARNING_ID);
+      collapsedParent.setWarningText(
+          Msg['COLLAPSED_WARNINGS_WARNING'], BlockSvg.COLLAPSED_WARNING_ID);
     }
 
     if (!this.warning) {
-      this.warning = new Blockly.Warning(this);
+      this.warning = new Warning(this);
       changedState = true;
     }
     this.warning.setText(/** @type {string} */ (text), id);
@@ -1128,9 +1139,9 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
       this.warning.dispose();
       changedState = true;
     } else if (this.warning) {
-      var oldText = this.warning.getText();
+      const oldText = this.warning.getText();
       this.warning.setText('', id);
-      var newText = this.warning.getText();
+      const newText = this.warning.getText();
       if (!newText) {
         this.warning.dispose();
       }
@@ -1146,9 +1157,9 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
 
 /**
  * Give this block a mutator dialog.
- * @param {?Blockly.Mutator} mutator A mutator dialog instance or null to remove.
+ * @param {?Mutator} mutator A mutator dialog instance or null to remove.
  */
-Blockly.BlockSvg.prototype.setMutator = function(mutator) {
+BlockSvg.prototype.setMutator = function(mutator) {
   if (this.mutator && this.mutator !== mutator) {
     this.mutator.dispose();
   }
@@ -1168,9 +1179,9 @@ Blockly.BlockSvg.prototype.setMutator = function(mutator) {
  * Set whether the block is enabled or not.
  * @param {boolean} enabled True if enabled.
  */
-Blockly.BlockSvg.prototype.setEnabled = function(enabled) {
+BlockSvg.prototype.setEnabled = function(enabled) {
   if (this.isEnabled() != enabled) {
-    Blockly.BlockSvg.superClass_.setEnabled.call(this, enabled);
+    BlockSvg.superClass_.setEnabled.call(this, enabled);
     if (this.rendered && !this.getInheritedDisabled()) {
       this.updateDisabled();
     }
@@ -1182,7 +1193,7 @@ Blockly.BlockSvg.prototype.setEnabled = function(enabled) {
  * often used to visually mark blocks currently being executed.
  * @param {boolean} highlighted True if highlighted.
  */
-Blockly.BlockSvg.prototype.setHighlighted = function(highlighted) {
+BlockSvg.prototype.setHighlighted = function(highlighted) {
   if (!this.rendered) {
     return;
   }
@@ -1192,18 +1203,18 @@ Blockly.BlockSvg.prototype.setHighlighted = function(highlighted) {
 /**
  * Adds the visual "select" effect to the block, but does not actually select
  * it or fire an event.
- * @see Blockly.BlockSvg#select
+ * @see BlockSvg#select
  */
-Blockly.BlockSvg.prototype.addSelect = function() {
+BlockSvg.prototype.addSelect = function() {
   this.pathObject.updateSelected(true);
 };
 
 /**
  * Removes the visual "select" effect from the block, but does not actually
  * unselect it or fire an event.
- * @see Blockly.BlockSvg#unselect
+ * @see BlockSvg#unselect
  */
-Blockly.BlockSvg.prototype.removeSelect = function() {
+BlockSvg.prototype.removeSelect = function() {
   this.pathObject.updateSelected(false);
 };
 
@@ -1213,7 +1224,7 @@ Blockly.BlockSvg.prototype.removeSelect = function() {
  *     otherwise.
  * @package
  */
-Blockly.BlockSvg.prototype.setDeleteStyle = function(enable) {
+BlockSvg.prototype.setDeleteStyle = function(enable) {
   this.pathObject.updateDraggingDelete(enable);
 };
 
@@ -1224,7 +1235,7 @@ Blockly.BlockSvg.prototype.setDeleteStyle = function(enable) {
  * Get the colour of a block.
  * @return {string} #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.getColour = function() {
+BlockSvg.prototype.getColour = function() {
   return this.style.colourPrimary;
 };
 
@@ -1232,10 +1243,11 @@ Blockly.BlockSvg.prototype.getColour = function() {
  * Change the colour of a block.
  * @param {number|string} colour HSV hue value, or #RRGGBB string.
  */
-Blockly.BlockSvg.prototype.setColour = function(colour) {
-  Blockly.BlockSvg.superClass_.setColour.call(this, colour);
-  var styleObj = this.workspace.getRenderer().getConstants()
-      .getBlockStyleForColour(this.colour_);
+BlockSvg.prototype.setColour = function(colour) {
+  BlockSvg.superClass_.setColour.call(this, colour);
+  const styleObj =
+      this.workspace.getRenderer().getConstants().getBlockStyleForColour(
+          this.colour_);
 
   this.pathObject.setStyle(styleObj.style);
   this.style = styleObj.style;
@@ -1249,9 +1261,9 @@ Blockly.BlockSvg.prototype.setColour = function(colour) {
  * @param {string} blockStyleName Name of the block style.
  * @throws {Error} if the block style does not exist.
  */
-Blockly.BlockSvg.prototype.setStyle = function(blockStyleName) {
-  var blockStyle = this.workspace.getRenderer()
-      .getConstants().getBlockStyle(blockStyleName);
+BlockSvg.prototype.setStyle = function(blockStyleName) {
+  const blockStyle =
+      this.workspace.getRenderer().getConstants().getBlockStyle(blockStyleName);
   this.styleName_ = blockStyleName;
 
   if (blockStyle) {
@@ -1274,12 +1286,12 @@ Blockly.BlockSvg.prototype.setStyle = function(blockStyleName) {
  * block group's <g>, it will render on top of any other blocks.
  * @package
  */
-Blockly.BlockSvg.prototype.bringToFront = function() {
-  var block = this;
+BlockSvg.prototype.bringToFront = function() {
+  let block = this;
   do {
-    var root = block.getSvgRoot();
-    var parent = root.parentNode;
-    var childNodes = parent.childNodes;
+    const root = block.getSvgRoot();
+    const parent = root.parentNode;
+    const childNodes = parent.childNodes;
     // Avoid moving the block if it's already at the bottom.
     if (childNodes[childNodes.length - 1] !== root) {
       parent.appendChild(root);
@@ -1294,10 +1306,8 @@ Blockly.BlockSvg.prototype.bringToFront = function() {
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.BlockSvg.prototype.setPreviousStatement = function(newBoolean,
-    opt_check) {
-  Blockly.BlockSvg.superClass_.setPreviousStatement.call(this, newBoolean,
-      opt_check);
+BlockSvg.prototype.setPreviousStatement = function(newBoolean, opt_check) {
+  BlockSvg.superClass_.setPreviousStatement.call(this, newBoolean, opt_check);
 
   if (this.rendered) {
     this.render();
@@ -1311,9 +1321,8 @@ Blockly.BlockSvg.prototype.setPreviousStatement = function(newBoolean,
  * @param {(string|Array<string>|null)=} opt_check Statement type or
  *     list of statement types.  Null/undefined if any type could be connected.
  */
-Blockly.BlockSvg.prototype.setNextStatement = function(newBoolean, opt_check) {
-  Blockly.BlockSvg.superClass_.setNextStatement.call(this, newBoolean,
-      opt_check);
+BlockSvg.prototype.setNextStatement = function(newBoolean, opt_check) {
+  BlockSvg.superClass_.setNextStatement.call(this, newBoolean, opt_check);
 
   if (this.rendered) {
     this.render();
@@ -1328,8 +1337,8 @@ Blockly.BlockSvg.prototype.setNextStatement = function(newBoolean, opt_check) {
  *     of returned types.  Null or undefined if any type could be returned
  *     (e.g. variable get).
  */
-Blockly.BlockSvg.prototype.setOutput = function(newBoolean, opt_check) {
-  Blockly.BlockSvg.superClass_.setOutput.call(this, newBoolean, opt_check);
+BlockSvg.prototype.setOutput = function(newBoolean, opt_check) {
+  BlockSvg.superClass_.setOutput.call(this, newBoolean, opt_check);
 
   if (this.rendered) {
     this.render();
@@ -1341,8 +1350,8 @@ Blockly.BlockSvg.prototype.setOutput = function(newBoolean, opt_check) {
  * Set whether value inputs are arranged horizontally or vertically.
  * @param {boolean} newBoolean True if inputs are horizontal.
  */
-Blockly.BlockSvg.prototype.setInputsInline = function(newBoolean) {
-  Blockly.BlockSvg.superClass_.setInputsInline.call(this, newBoolean);
+BlockSvg.prototype.setInputsInline = function(newBoolean) {
+  BlockSvg.superClass_.setInputsInline.call(this, newBoolean);
 
   if (this.rendered) {
     this.render();
@@ -1354,12 +1363,12 @@ Blockly.BlockSvg.prototype.setInputsInline = function(newBoolean) {
  * Remove an input from this block.
  * @param {string} name The name of the input.
  * @param {boolean=} opt_quiet True to prevent error if input is not present.
- * @return {boolean} True if operation succeeds, false if input is not present and opt_quiet is true
- * @throws {Error} if the input is not present and
- *     opt_quiet is not true.
+ * @return {boolean} True if operation succeeds, false if input is not present
+ *     and opt_quiet is true
+ * @throws {Error} if the input is not present and opt_quiet is not true.
  */
-Blockly.BlockSvg.prototype.removeInput = function(name, opt_quiet) {
-  var removed = Blockly.BlockSvg.superClass_.removeInput.call(this, name, opt_quiet);
+BlockSvg.prototype.removeInput = function(name, opt_quiet) {
+  const removed = BlockSvg.superClass_.removeInput.call(this, name, opt_quiet);
 
   if (this.rendered) {
     this.render();
@@ -1375,10 +1384,8 @@ Blockly.BlockSvg.prototype.removeInput = function(name, opt_quiet) {
  * @param {number} inputIndex Index of the input to move.
  * @param {number} refIndex Index of input that should be after the moved input.
  */
-Blockly.BlockSvg.prototype.moveNumberedInputBefore = function(
-    inputIndex, refIndex) {
-  Blockly.BlockSvg.superClass_.moveNumberedInputBefore.call(this, inputIndex,
-      refIndex);
+BlockSvg.prototype.moveNumberedInputBefore = function(inputIndex, refIndex) {
+  BlockSvg.superClass_.moveNumberedInputBefore.call(this, inputIndex, refIndex);
 
   if (this.rendered) {
     this.render();
@@ -1392,12 +1399,12 @@ Blockly.BlockSvg.prototype.moveNumberedInputBefore = function(
  * @param {number} type One of Blockly.inputTypes.
  * @param {string} name Language-neutral identifier which may used to find this
  *     input again.  Should be unique to this block.
- * @return {!Blockly.Input} The input object created.
+ * @return {!Input} The input object created.
  * @protected
  * @override
  */
-Blockly.BlockSvg.prototype.appendInput_ = function(type, name) {
-  var input = Blockly.BlockSvg.superClass_.appendInput_.call(this, type, name);
+BlockSvg.prototype.appendInput_ = function(type, name) {
+  const input = BlockSvg.superClass_.appendInput_.call(this, type, name);
 
   if (this.rendered) {
     this.render();
@@ -1416,7 +1423,7 @@ Blockly.BlockSvg.prototype.appendInput_ = function(type, name) {
  * @param {boolean} track If true, start tracking. If false, stop tracking.
  * @package
  */
-Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
+BlockSvg.prototype.setConnectionTracking = function(track) {
   if (this.previousConnection) {
     this.previousConnection.setTracking(track);
   }
@@ -1425,7 +1432,7 @@ Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
   }
   if (this.nextConnection) {
     this.nextConnection.setTracking(track);
-    var child = this.nextConnection.targetBlock();
+    const child = this.nextConnection.targetBlock();
     if (child) {
       child.setConnectionTracking(track);
     }
@@ -1438,13 +1445,13 @@ Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
     return;
   }
 
-  for (var i = 0; i < this.inputList.length; i++) {
-    var conn = this.inputList[i].connection;
+  for (let i = 0; i < this.inputList.length; i++) {
+    const conn = this.inputList[i].connection;
     if (conn) {
       conn.setTracking(track);
 
       // Pass tracking on down the chain.
-      var block = conn.targetBlock();
+      const block = conn.targetBlock();
       if (block) {
         block.setConnectionTracking(track);
       }
@@ -1457,11 +1464,11 @@ Blockly.BlockSvg.prototype.setConnectionTracking = function(track) {
  * @param {boolean} all If true, return all connections even hidden ones.
  *     Otherwise, for a non-rendered block return an empty list, and for a
  *     collapsed block don't return inputs connections.
- * @return {!Array<!Blockly.RenderedConnection>} Array of connections.
+ * @return {!Array<!RenderedConnection>} Array of connections.
  * @package
  */
-Blockly.BlockSvg.prototype.getConnections_ = function(all) {
-  var myConnections = [];
+BlockSvg.prototype.getConnections_ = function(all) {
+  const myConnections = [];
   if (all || this.rendered) {
     if (this.outputConnection) {
       myConnections.push(this.outputConnection);
@@ -1473,7 +1480,7 @@ Blockly.BlockSvg.prototype.getConnections_ = function(all) {
       myConnections.push(this.nextConnection);
     }
     if (all || !this.collapsed_) {
-      for (var i = 0, input; (input = this.inputList[i]); i++) {
+      for (let i = 0, input; (input = this.inputList[i]); i++) {
         if (input.connection) {
           myConnections.push(input.connection);
         }
@@ -1488,78 +1495,72 @@ Blockly.BlockSvg.prototype.getConnections_ = function(all) {
  * @param {boolean} ignoreShadows If true,the last connection on a non-shadow
  *     block will be returned. If false, this will follow shadows to find the
  *     last connection.
- * @return {?Blockly.RenderedConnection} The last next connection on the stack,
+ * @return {?RenderedConnection} The last next connection on the stack,
  *     or null.
  * @package
  * @override
  */
-Blockly.BlockSvg.prototype.lastConnectionInStack = function(ignoreShadows) {
-  return /** @type {Blockly.RenderedConnection} */ (
-    Blockly.BlockSvg.superClass_
-        .lastConnectionInStack.call(this, ignoreShadows));
+BlockSvg.prototype.lastConnectionInStack = function(ignoreShadows) {
+  return /** @type {RenderedConnection} */ (
+      BlockSvg.superClass_.lastConnectionInStack.call(this, ignoreShadows));
 };
 
 /**
  * Find the connection on this block that corresponds to the given connection
  * on the other block.
  * Used to match connections between a block and its insertion marker.
- * @param {!Blockly.Block} otherBlock The other block to match against.
- * @param {!Blockly.Connection} conn The other connection to match.
- * @return {?Blockly.RenderedConnection} The matching connection on this block,
+ * @param {!Block} otherBlock The other block to match against.
+ * @param {!Connection} conn The other connection to match.
+ * @return {?RenderedConnection} The matching connection on this block,
  *     or null.
  * @package
  * @override
  */
-Blockly.BlockSvg.prototype.getMatchingConnection = function(otherBlock, conn) {
-  return /** @type {Blockly.RenderedConnection} */ (
-    Blockly.BlockSvg.superClass_.getMatchingConnection.call(this,
-        otherBlock, conn));
+BlockSvg.prototype.getMatchingConnection = function(otherBlock, conn) {
+  return /** @type {RenderedConnection} */ (
+      BlockSvg.superClass_.getMatchingConnection.call(this, otherBlock, conn));
 };
 
 /**
  * Create a connection of the specified type.
  * @param {number} type The type of the connection to create.
- * @return {!Blockly.RenderedConnection} A new connection of the specified type.
+ * @return {!RenderedConnection} A new connection of the specified type.
  * @protected
  */
-Blockly.BlockSvg.prototype.makeConnection_ = function(type) {
-  return new Blockly.RenderedConnection(this, type);
+BlockSvg.prototype.makeConnection_ = function(type) {
+  return new RenderedConnection(this, type);
 };
 
 /**
  * Bump unconnected blocks out of alignment.  Two blocks which aren't actually
  * connected should not coincidentally line up on screen.
  */
-Blockly.BlockSvg.prototype.bumpNeighbours = function() {
+BlockSvg.prototype.bumpNeighbours = function() {
   if (!this.workspace) {
     return;  // Deleted block.
   }
   if (this.workspace.isDragging()) {
     return;  // Don't bump blocks during a drag.
   }
-  var rootBlock = this.getRootBlock();
+  const rootBlock = this.getRootBlock();
   if (rootBlock.isInFlyout) {
     return;  // Don't move blocks around in a flyout.
   }
   // Loop through every connection on this block.
-  var myConnections = this.getConnections_(false);
-  for (var i = 0, connection; (connection = myConnections[i]); i++) {
-
+  const myConnections = this.getConnections_(false);
+  for (let i = 0, connection; (connection = myConnections[i]); i++) {
     // Spider down from this block bumping all sub-blocks.
     if (connection.isConnected() && connection.isSuperior()) {
       connection.targetBlock().bumpNeighbours();
     }
 
-    var neighbours =
-        connection.neighbours(Blockly.internalConstants.SNAP_RADIUS);
-    for (var j = 0, otherConnection; (otherConnection = neighbours[j]); j++) {
-
+    const neighbours = connection.neighbours(internalConstants.SNAP_RADIUS);
+    for (let j = 0, otherConnection; (otherConnection = neighbours[j]); j++) {
       // If both connections are connected, that's probably fine.  But if
       // either one of them is unconnected, then there could be confusion.
       if (!connection.isConnected() || !otherConnection.isConnected()) {
         // Only bump blocks if they are from different tree structures.
         if (otherConnection.getSourceBlock().getRootBlock() != rootBlock) {
-
           // Always bump the inferior block.
           if (connection.isSuperior()) {
             otherConnection.bumpAwayFrom(connection);
@@ -1577,42 +1578,42 @@ Blockly.BlockSvg.prototype.bumpNeighbours = function() {
  * delay.
  * @package
  */
-Blockly.BlockSvg.prototype.scheduleSnapAndBump = function() {
-  var block = this;
+BlockSvg.prototype.scheduleSnapAndBump = function() {
+  const block = this;
   // Ensure that any snap and bump are part of this move's event group.
-  var group = Blockly.Events.getGroup();
+  const group = Events.getGroup();
 
   setTimeout(function() {
-    Blockly.Events.setGroup(group);
+    Events.setGroup(group);
     block.snapToGrid();
-    Blockly.Events.setGroup(false);
-  }, Blockly.internalConstants.BUMP_DELAY / 2);
+    Events.setGroup(false);
+  }, internalConstants.BUMP_DELAY / 2);
 
   setTimeout(function() {
-    Blockly.Events.setGroup(group);
+    Events.setGroup(group);
     block.bumpNeighbours();
-    Blockly.Events.setGroup(false);
-  }, Blockly.internalConstants.BUMP_DELAY);
+    Events.setGroup(false);
+  }, internalConstants.BUMP_DELAY);
 };
 
 /**
  * Position a block so that it doesn't move the target block when connected.
  * The block to position is usually either the first block in a dragged stack or
  * an insertion marker.
- * @param {!Blockly.RenderedConnection} sourceConnection The connection on the
+ * @param {!RenderedConnection} sourceConnection The connection on the
  *     moving block's stack.
- * @param {!Blockly.RenderedConnection} targetConnection The connection that
+ * @param {!RenderedConnection} targetConnection The connection that
  *     should stay stationary as this block is positioned.
  * @package
  */
-Blockly.BlockSvg.prototype.positionNearConnection = function(sourceConnection,
-    targetConnection) {
+BlockSvg.prototype.positionNearConnection = function(
+    sourceConnection, targetConnection) {
   // We only need to position the new block if it's before the existing one,
   // otherwise its position is set by the previous block.
-  if (sourceConnection.type == Blockly.connectionTypes.NEXT_STATEMENT ||
-      sourceConnection.type == Blockly.connectionTypes.INPUT_VALUE) {
-    var dx = targetConnection.x - sourceConnection.x;
-    var dy = targetConnection.y - sourceConnection.y;
+  if (sourceConnection.type == connectionTypes.NEXT_STATEMENT ||
+      sourceConnection.type == connectionTypes.INPUT_VALUE) {
+    const dx = targetConnection.x - sourceConnection.x;
+    const dy = targetConnection.y - sourceConnection.y;
 
     this.moveBy(dx, dy);
   }
@@ -1620,23 +1621,22 @@ Blockly.BlockSvg.prototype.positionNearConnection = function(sourceConnection,
 
 /**
  * Return the parent block or null if this block is at the top level.
- * @return {?Blockly.BlockSvg} The block (if any) that holds the current block.
+ * @return {?BlockSvg} The block (if any) that holds the current block.
  * @override
  */
-Blockly.BlockSvg.prototype.getParent = function() {
-  return /** @type {!Blockly.BlockSvg} */ (
-    Blockly.BlockSvg.superClass_.getParent.call(this));
+BlockSvg.prototype.getParent = function() {
+  return /** @type {!BlockSvg} */ (BlockSvg.superClass_.getParent.call(this));
 };
 
 /**
  * Return the top-most block in this block's tree.
  * This will return itself if this block is at the top level.
- * @return {!Blockly.BlockSvg} The root block.
+ * @return {!BlockSvg} The root block.
  * @override
  */
-Blockly.BlockSvg.prototype.getRootBlock = function() {
-  return /** @type {!Blockly.BlockSvg} */ (
-    Blockly.BlockSvg.superClass_.getRootBlock.call(this));
+BlockSvg.prototype.getRootBlock = function() {
+  return /** @type {!BlockSvg} */ (
+      BlockSvg.superClass_.getRootBlock.call(this));
 };
 
 /**
@@ -1644,14 +1644,14 @@ Blockly.BlockSvg.prototype.getRootBlock = function() {
  * @param {boolean=} opt_bubble If false, just render this block.
  *   If true, also render block's parent, grandparent, etc.  Defaults to true.
  */
-Blockly.BlockSvg.prototype.render = function(opt_bubble) {
+BlockSvg.prototype.render = function(opt_bubble) {
   if (this.renderIsInProgress_) {
     return;  // Don't allow recursive renders.
   }
   this.renderIsInProgress_ = true;
   try {
     this.rendered = true;
-    Blockly.utils.dom.startTextWidthCache();
+    dom.startTextWidthCache();
 
     if (this.isCollapsed()) {
       this.updateCollapsed_();
@@ -1660,7 +1660,7 @@ Blockly.BlockSvg.prototype.render = function(opt_bubble) {
     this.updateConnectionLocations_();
 
     if (opt_bubble !== false) {
-      var parentBlock = this.getParent();
+      const parentBlock = this.getParent();
       if (parentBlock) {
         parentBlock.render(true);
       } else {
@@ -1669,7 +1669,7 @@ Blockly.BlockSvg.prototype.render = function(opt_bubble) {
       }
     }
 
-    Blockly.utils.dom.stopTextWidthCache();
+    dom.stopTextWidthCache();
     this.updateMarkers_();
   } finally {
     this.renderIsInProgress_ = false;
@@ -1680,13 +1680,13 @@ Blockly.BlockSvg.prototype.render = function(opt_bubble) {
  * Redraw any attached marker or cursor svgs if needed.
  * @protected
  */
-Blockly.BlockSvg.prototype.updateMarkers_ = function() {
+BlockSvg.prototype.updateMarkers_ = function() {
   if (this.workspace.keyboardAccessibilityMode && this.pathObject.cursorSvg) {
     this.workspace.getCursor().draw();
   }
   if (this.workspace.keyboardAccessibilityMode && this.pathObject.markerSvg) {
     // TODO(#4592): Update all markers on the block.
-    this.workspace.getMarker(Blockly.MarkerManager.LOCAL_MARKER).draw();
+    this.workspace.getMarker(MarkerManager.LOCAL_MARKER).draw();
   }
 };
 
@@ -1696,8 +1696,8 @@ Blockly.BlockSvg.prototype.updateMarkers_ = function() {
  * connection locations.
  * @private
  */
-Blockly.BlockSvg.prototype.updateConnectionLocations_ = function() {
-  var blockTL = this.getRelativeToSurfaceXY();
+BlockSvg.prototype.updateConnectionLocations_ = function() {
+  const blockTL = this.getRelativeToSurfaceXY();
   // Don't tighten previous or output connections because they are inferior
   // connections.
   if (this.previousConnection) {
@@ -1707,8 +1707,8 @@ Blockly.BlockSvg.prototype.updateConnectionLocations_ = function() {
     this.outputConnection.moveToOffset(blockTL);
   }
 
-  for (var i = 0; i < this.inputList.length; i++) {
-    var conn = this.inputList[i].connection;
+  for (let i = 0; i < this.inputList.length; i++) {
+    const conn = this.inputList[i].connection;
     if (conn) {
       conn.moveToOffset(blockTL);
       if (conn.isConnected()) {
@@ -1731,7 +1731,7 @@ Blockly.BlockSvg.prototype.updateConnectionLocations_ = function() {
  *     block SVG group.
  * @package
  */
-Blockly.BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
+BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
   this.pathObject.setCursorSvg(cursorSvg);
 };
 
@@ -1741,7 +1741,7 @@ Blockly.BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
  *     block SVG group.
  * @package
  */
-Blockly.BlockSvg.prototype.setMarkerSvg = function(markerSvg) {
+BlockSvg.prototype.setMarkerSvg = function(markerSvg) {
   this.pathObject.setMarkerSvg(markerSvg);
 };
 
@@ -1752,15 +1752,15 @@ Blockly.BlockSvg.prototype.setMarkerSvg = function(markerSvg) {
  *    properties in workspace units.
  * @package
  */
-Blockly.BlockSvg.prototype.getHeightWidth = function() {
-  var height = this.height;
-  var width = this.width;
+BlockSvg.prototype.getHeightWidth = function() {
+  let height = this.height;
+  let width = this.width;
   // Recursively add size of subsequent blocks.
-  var nextBlock = this.getNextBlock();
+  const nextBlock = this.getNextBlock();
   if (nextBlock) {
-    var nextHeightWidth = nextBlock.getHeightWidth();
-    var workspace = /** @type {!Blockly.WorkspaceSvg} */ (this.workspace);
-    var tabHeight = workspace.getRenderer().getConstants().NOTCH_HEIGHT;
+    const nextHeightWidth = nextBlock.getHeightWidth();
+    const workspace = /** @type {!WorkspaceSvg} */ (this.workspace);
+    const tabHeight = workspace.getRenderer().getConstants().NOTCH_HEIGHT;
     height += nextHeightWidth.height - tabHeight;
     width = Math.max(width, nextHeightWidth.width);
   }
@@ -1773,17 +1773,19 @@ Blockly.BlockSvg.prototype.getHeightWidth = function() {
  * @param {boolean} add True if highlighting should be added.
  * @package
  */
-Blockly.BlockSvg.prototype.fadeForReplacement = function(add) {
+BlockSvg.prototype.fadeForReplacement = function(add) {
   this.pathObject.updateReplacementFade(add);
 };
 
 /**
  * Visual effect to show that if the dragging block is dropped it will connect
  * to this input.
- * @param {Blockly.Connection} conn The connection on the input to highlight.
+ * @param {Connection} conn The connection on the input to highlight.
  * @param {boolean} add True if highlighting should be added.
  * @package
  */
-Blockly.BlockSvg.prototype.highlightShapeForInput = function(conn, add) {
+BlockSvg.prototype.highlightShapeForInput = function(conn, add) {
   this.pathObject.updateShapeForInputHighlight(conn, add);
 };
+
+exports = BlockSvg;
diff --git a/tests/deps.js b/tests/deps.js
index a54d2acc2..2dceb7137 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -11,7 +11,7 @@ goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode',
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6'});
+goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});

From b5444b4e89287d34b21ce1f2cf5dc36b54dcf519 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 12:30:07 -0700
Subject: [PATCH 222/291] Migrate core/renderers/geras/path_object.js to
 goog.module syntax (#5306)

* Migrate core/renderers/geras/path_object.js to goog.module

* Migrate core/renderers/geras/path_object.js to named requires

* clang-format core/renderers/geras/path_object.js
---
 core/renderers/geras/path_object.js | 78 ++++++++++++++---------------
 tests/deps.js                       |  2 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js
index 474cad3c0..9d50c672c 100644
--- a/core/renderers/geras/path_object.js
+++ b/core/renderers/geras/path_object.js
@@ -11,32 +11,35 @@
 
 'use strict';
 
-goog.provide('Blockly.geras.PathObject');
+goog.module('Blockly.geras.PathObject');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.PathObject');
-goog.require('Blockly.geras.ConstantProvider');
-goog.require('Blockly.Theme');
-goog.require('Blockly.utils.colour');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Svg');
+const BasePathObject = goog.require('Blockly.blockRendering.PathObject');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.geras.ConstantProvider');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const colour = goog.require('Blockly.utils.colour');
+const dom = goog.require('Blockly.utils.dom');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that handles creating and setting each of the SVG elements
  * used by the renderer.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @param {!Blockly.geras.ConstantProvider} constants The renderer's constants.
+ * @param {!ConstantProvider} constants The renderer's constants.
  * @constructor
- * @extends {Blockly.blockRendering.PathObject}
+ * @extends {BasePathObject}
  * @package
  */
-Blockly.geras.PathObject = function(root, style, constants) {
+const PathObject = function(root, style, constants) {
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.geras.ConstantProvider}
+   * @type {!ConstantProvider}
    */
   this.constants = constants;
 
@@ -50,9 +53,8 @@ Blockly.geras.PathObject = function(root, style, constants) {
    * @type {SVGElement}
    * @package
    */
-  this.svgPathDark = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
-      {'class': 'blocklyPathDark', 'transform': 'translate(1,1)'},
+  this.svgPathDark = dom.createSvgElement(
+      Svg.PATH, {'class': 'blocklyPathDark', 'transform': 'translate(1,1)'},
       this.svgRoot);
 
   /**
@@ -60,18 +62,16 @@ Blockly.geras.PathObject = function(root, style, constants) {
    * @type {!SVGElement}
    * @package
    */
-  this.svgPath = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
-      {'class': 'blocklyPath'}, this.svgRoot);
+  this.svgPath =
+      dom.createSvgElement(Svg.PATH, {'class': 'blocklyPath'}, this.svgRoot);
 
   /**
    * The light path of the block.
    * @type {SVGElement}
    * @package
    */
-  this.svgPathLight = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.PATH,
-      {'class': 'blocklyPathLight'}, this.svgRoot);
+  this.svgPathLight = dom.createSvgElement(
+      Svg.PATH, {'class': 'blocklyPathLight'}, this.svgRoot);
 
   /**
    * The colour of the dark path on the block in '#RRGGBB' format.
@@ -82,18 +82,17 @@ Blockly.geras.PathObject = function(root, style, constants) {
 
   /**
    * The style object to use when colouring block paths.
-   * @type {!Blockly.Theme.BlockStyle}
+   * @type {!Theme.BlockStyle}
    * @package
    */
   this.style = style;
 };
-Blockly.utils.object.inherits(Blockly.geras.PathObject,
-    Blockly.blockRendering.PathObject);
+object.inherits(PathObject, BasePathObject);
 
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.setPath = function(mainPath) {
+PathObject.prototype.setPath = function(mainPath) {
   this.svgPath.setAttribute('d', mainPath);
   this.svgPathDark.setAttribute('d', mainPath);
 };
@@ -103,14 +102,14 @@ Blockly.geras.PathObject.prototype.setPath = function(mainPath) {
  * @param {string} highlightPath The highlight path.
  * @package
  */
-Blockly.geras.PathObject.prototype.setHighlightPath = function(highlightPath) {
+PathObject.prototype.setHighlightPath = function(highlightPath) {
   this.svgPathLight.setAttribute('d', highlightPath);
 };
 
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.flipRTL = function() {
+PathObject.prototype.flipRTL = function() {
   // Mirror the block's path.
   this.svgPath.setAttribute('transform', 'scale(-1 1)');
   this.svgPathLight.setAttribute('transform', 'scale(-1 1)');
@@ -120,13 +119,13 @@ Blockly.geras.PathObject.prototype.flipRTL = function() {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.applyColour = function(block) {
+PathObject.prototype.applyColour = function(block) {
   this.svgPathLight.style.display = '';
   this.svgPathDark.style.display = '';
   this.svgPathLight.setAttribute('stroke', this.style.colourTertiary);
   this.svgPathDark.setAttribute('fill', this.colourDark);
 
-  Blockly.geras.PathObject.superClass_.applyColour.call(this, block);
+  PathObject.superClass_.applyColour.call(this, block);
 
   this.svgPath.setAttribute('stroke', 'none');
 };
@@ -134,20 +133,19 @@ Blockly.geras.PathObject.prototype.applyColour = function(block) {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.setStyle = function(blockStyle) {
+PathObject.prototype.setStyle = function(blockStyle) {
   this.style = blockStyle;
   this.colourDark =
-      Blockly.utils.colour.blend('#000', this.style.colourPrimary, 0.2) ||
-      this.colourDark;
+      colour.blend('#000', this.style.colourPrimary, 0.2) || this.colourDark;
 };
 
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.updateHighlighted = function(highlighted) {
+PathObject.prototype.updateHighlighted = function(highlighted) {
   if (highlighted) {
-    this.svgPath.setAttribute('filter',
-        'url(#' + this.constants.embossFilterId + ')');
+    this.svgPath.setAttribute(
+        'filter', 'url(#' + this.constants.embossFilterId + ')');
     this.svgPathLight.style.display = 'none';
   } else {
     this.svgPath.setAttribute('filter', 'none');
@@ -158,7 +156,7 @@ Blockly.geras.PathObject.prototype.updateHighlighted = function(highlighted) {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.updateShadow_ = function(shadow) {
+PathObject.prototype.updateShadow_ = function(shadow) {
   if (shadow) {
     this.svgPathLight.style.display = 'none';
     this.svgPathDark.setAttribute('fill', this.style.colourSecondary);
@@ -170,9 +168,11 @@ Blockly.geras.PathObject.prototype.updateShadow_ = function(shadow) {
 /**
  * @override
  */
-Blockly.geras.PathObject.prototype.updateDisabled_ = function(disabled) {
-  Blockly.geras.PathObject.superClass_.updateDisabled_.call(this, disabled);
+PathObject.prototype.updateDisabled_ = function(disabled) {
+  PathObject.superClass_.updateDisabled_.call(this, disabled);
   if (disabled) {
     this.svgPath.setAttribute('stroke', 'none');
   }
 };
+
+exports = PathObject;
diff --git a/tests/deps.js b/tests/deps.js
index 2dceb7137..d979a3cbe 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -137,7 +137,7 @@ goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockl
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.Theme', 'Blockly.blockRendering.PathObject', 'Blockly.geras.ConstantProvider', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From fbd7c8ab79459cee6a629dc7ade9aed993c928f4 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 12:43:06 -0700
Subject: [PATCH 223/291] Migrate core/events/workspace_events.js to
 goog.module syntax (#5274)

* Migrate core/events/workspace_events.js to ES6 const/let

* Migrate core/events/workspace_events.js to goog.module

* Migrate core/events/workspace_events.js to named requires

* clang-format core/events/workspace_events.js

* Update build artifact sizes in check_metadata.sh

* Add comment about root cause of build artifact size change

* Migrate core/events/workspace_events.js to ES6 const/let

* Migrate core/events/workspace_events.js to goog.module

* Migrate core/events/workspace_events.js to named requires

* clang-format core/events/workspace_events.js

* Clarify require name for Blockly.Events.Abstract
---
 core/events/workspace_events.js | 41 +++++++++++++++++----------------
 tests/deps.js                   |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/core/events/workspace_events.js b/core/events/workspace_events.js
index bb22097a0..df832602e 100644
--- a/core/events/workspace_events.js
+++ b/core/events/workspace_events.js
@@ -10,14 +10,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.FinishedLoading');
+goog.module('Blockly.Events.FinishedLoading');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Workspace');
+const Events = goog.require('Blockly.Events');
+const EventsAbstract = goog.require('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -25,13 +26,12 @@ goog.requireType('Blockly.Workspace');
  * Used to notify the developer when the workspace has finished loading (i.e
  * domToWorkspace).
  * Finished loading events do not record undo or redo.
- * @param {!Blockly.Workspace=} opt_workspace The workspace that has finished
+ * @param {!Workspace=} opt_workspace The workspace that has finished
  *    loading.  Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {EventsAbstract}
  * @constructor
  */
-Blockly.Events.FinishedLoading = function(opt_workspace) {
-
+const FinishedLoading = function(opt_workspace) {
   /**
    * Whether or not the event is blank (to be populated by fromJson).
    * @type {boolean}
@@ -50,26 +50,25 @@ Blockly.Events.FinishedLoading = function(opt_workspace) {
    * perspective, and should be undone together.
    * @type {string}
    */
-  this.group = Blockly.Events.getGroup();
+  this.group = Events.getGroup();
 
   // Workspace events do not undo or redo.
   this.recordUndo = false;
 };
-Blockly.utils.object.inherits(Blockly.Events.FinishedLoading,
-    Blockly.Events.Abstract);
+object.inherits(FinishedLoading, EventsAbstract);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.FinishedLoading.prototype.type = Blockly.Events.FINISHED_LOADING;
+FinishedLoading.prototype.type = Events.FINISHED_LOADING;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.FinishedLoading.prototype.toJson = function() {
-  var json = {
+FinishedLoading.prototype.toJson = function() {
+  const json = {
     'type': this.type,
   };
   if (this.group) {
@@ -85,11 +84,13 @@ Blockly.Events.FinishedLoading.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.FinishedLoading.prototype.fromJson = function(json) {
+FinishedLoading.prototype.fromJson = function(json) {
   this.isBlank = false;
   this.workspaceId = json['workspaceId'];
   this.group = json['group'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.FINISHED_LOADING, Blockly.Events.FinishedLoading);
+registry.register(
+    registry.Type.EVENT, Events.FINISHED_LOADING, FinishedLoading);
+
+exports = FinishedLoading;
diff --git a/tests/deps.js b/tests/deps.js
index d979a3cbe..9a5b768a6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -48,7 +48,7 @@ goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'});
+goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});

From 5f669a76071b96175a18dda745fde640b83e2234 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 11:18:14 -0700
Subject: [PATCH 224/291] Migrate core/workspace.js to ES6 const/let

---
 core/workspace.js | 59 +++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 296989d81..427eebaae 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -53,7 +53,7 @@ Blockly.Workspace = function(opt_options) {
   /** @type {Blockly.utils.toolbox.Position} */
   this.toolboxPosition = this.options.toolboxPosition;
 
-  var connectionCheckerClass = Blockly.registry.getClassFromOptions(
+  const connectionCheckerClass = Blockly.registry.getClassFromOptions(
       Blockly.registry.Type.CONNECTION_CHECKER, this.options, true);
   /**
    * An object that encapsulates logic for safety, type, and dragging checks.
@@ -182,8 +182,8 @@ Blockly.Workspace.SCAN_ANGLE = 3;
  * @private
  */
 Blockly.Workspace.prototype.sortObjects_ = function(a, b) {
-  var aXY = a.getRelativeToSurfaceXY();
-  var bXY = b.getRelativeToSurfaceXY();
+  const aXY = a.getRelativeToSurfaceXY();
+  const bXY = b.getRelativeToSurfaceXY();
   return (aXY.y + Blockly.Workspace.prototype.sortObjects_.offset * aXY.x) -
       (bXY.y + Blockly.Workspace.prototype.sortObjects_.offset * bXY.x);
 };
@@ -214,7 +214,7 @@ Blockly.Workspace.prototype.removeTopBlock = function(block) {
  */
 Blockly.Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
-  var blocks = [].concat(this.topBlocks_);
+  const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
         Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
@@ -260,7 +260,7 @@ Blockly.Workspace.prototype.getBlocksByType = function(type, ordered) {
   if (!this.typedBlocksDB_[type]) {
     return [];
   }
-  var blocks = this.typedBlocksDB_[type].slice(0);
+  const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
         Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
@@ -313,7 +313,7 @@ Blockly.Workspace.prototype.removeTopComment = function(comment) {
  */
 Blockly.Workspace.prototype.getTopComments = function(ordered) {
   // Copy the topComments_ list.
-  var comments = [].concat(this.topComments_);
+  const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
     this.sortObjects_.offset =
         Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
@@ -332,24 +332,25 @@ Blockly.Workspace.prototype.getTopComments = function(ordered) {
  * @return {!Array<!Blockly.Block>} Array of blocks.
  */
 Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
+  let blocks;
   if (ordered) {
     // Slow, but ordered.
-    var topBlocks = this.getTopBlocks(true);
-    var blocks = [];
-    for (var i = 0; i < topBlocks.length; i++) {
+    const topBlocks = this.getTopBlocks(true);
+    blocks = [];
+    for (let i = 0; i < topBlocks.length; i++) {
       blocks.push.apply(blocks, topBlocks[i].getDescendants(true));
     }
   } else {
     // Fast, but in no particular order.
-    var blocks = this.getTopBlocks(false);
-    for (var i = 0; i < blocks.length; i++) {
+    blocks = this.getTopBlocks(false);
+    for (let i = 0; i < blocks.length; i++) {
       blocks.push.apply(blocks, blocks[i].getChildren(false));
     }
   }
 
   // Insertion markers exist on the workspace for rendering reasons, but aren't
   // "real" blocks from a developer perspective.
-  var filtered = blocks.filter(function(block) {
+  const filtered = blocks.filter(function (block) {
     return !block.isInsertionMarker();
   });
 
@@ -362,7 +363,7 @@ Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
 Blockly.Workspace.prototype.clear = function() {
   this.isClearing = true;
   try {
-    var existingGroup = Blockly.Events.getGroup();
+    const existingGroup = Blockly.Events.getGroup();
     if (!existingGroup) {
       Blockly.Events.setGroup(true);
     }
@@ -533,7 +534,7 @@ Blockly.Workspace.prototype.remainingCapacityOfType = function(type) {
     return Infinity;
   }
 
-  var maxInstanceOfType = (this.options.maxInstances[type] !== undefined) ?
+  const maxInstanceOfType = (this.options.maxInstances[type] !== undefined) ?
       this.options.maxInstances[type] : Infinity;
 
   return maxInstanceOfType - this.getBlocksByType(type, false).length;
@@ -553,8 +554,8 @@ Blockly.Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
   if (!this.hasBlockLimits()) {
     return true;
   }
-  var copyableBlocksCount = 0;
-  for (var type in typeCountsMap) {
+  let copyableBlocksCount = 0;
+  for (const type in typeCountsMap) {
     if (typeCountsMap[type] > this.remainingCapacityOfType(type)) {
       return false;
     }
@@ -598,26 +599,28 @@ Blockly.Workspace.prototype.getRedoStack = function() {
  * @param {boolean} redo False if undo, true if redo.
  */
 Blockly.Workspace.prototype.undo = function(redo) {
-  var inputStack = redo ? this.redoStack_ : this.undoStack_;
-  var outputStack = redo ? this.undoStack_ : this.redoStack_;
-  var inputEvent = inputStack.pop();
+  const inputStack = redo ? this.redoStack_ : this.undoStack_;
+  const outputStack = redo ? this.undoStack_ : this.redoStack_;
+  const inputEvent = inputStack.pop();
   if (!inputEvent) {
     return;
   }
-  var events = [inputEvent];
+  let events = [inputEvent];
   // Do another undo/redo if the next one is of the same group.
   while (inputStack.length && inputEvent.group &&
       inputEvent.group == inputStack[inputStack.length - 1].group) {
     events.push(inputStack.pop());
   }
   // Push these popped events on the opposite stack.
-  for (var i = 0, event; (event = events[i]); i++) {
+  for (let i = 0; i < events.length; i++) {
+    const event = events[i];
     outputStack.push(event);
   }
   events = Blockly.Events.filter(events, redo);
   Blockly.Events.recordUndo = false;
   try {
-    for (var i = 0, event; (event = events[i]); i++) {
+    for (let i = 0; i < events.length; i++) {
+      const event = events[i];
       event.run(redo);
     }
   } finally {
@@ -668,7 +671,8 @@ Blockly.Workspace.prototype.fireChangeListener = function(event) {
       this.undoStack_.shift();
     }
   }
-  for (var i = 0, func; (func = this.listeners_[i]); i++) {
+  for (let i = 0; i < this.listeners_.length; i++) {
+    const func = this.listeners_[i];
     func(event);
   }
 };
@@ -721,8 +725,9 @@ Blockly.Workspace.prototype.getCommentById = function(id) {
  */
 Blockly.Workspace.prototype.allInputsFilled = function(
     opt_shadowBlocksAreFilled) {
-  var blocks = this.getTopBlocks(false);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+  const blocks = this.getTopBlocks(false);
+  for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i];
     if (!block.allInputsFilled(opt_shadowBlocksAreFilled)) {
       return false;
     }
@@ -786,8 +791,8 @@ Blockly.Workspace.getById = function(id) {
  * @return {!Array<!Blockly.Workspace>} Array of workspaces.
  */
 Blockly.Workspace.getAll = function() {
-  var workspaces = [];
-  for (var workspaceId in Blockly.Workspace.WorkspaceDB_) {
+  const workspaces = [];
+  for (const workspaceId in Blockly.Workspace.WorkspaceDB_) {
     workspaces.push(Blockly.Workspace.WorkspaceDB_[workspaceId]);
   }
   return workspaces;

From ac4fa41cb39401a8c24729a7a3b23df4dbc9cdfa Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 11:25:25 -0700
Subject: [PATCH 225/291] Migrate core/workspace.js to goog.module

---
 core/workspace.js | 140 ++++++++++++++++++++++++----------------------
 tests/deps.js     |   2 +-
 2 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 427eebaae..5061e238a 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Workspace');
+goog.module('Blockly.Workspace');
+goog.module.declareLegacyNamespace();
 
 /** @suppress {extraRequire} */
 goog.require('Blockly.ConnectionChecker');
@@ -39,10 +40,10 @@ goog.requireType('Blockly.WorkspaceComment');
  * @constructor
  * @implements {Blockly.IASTNodeLocation}
  */
-Blockly.Workspace = function(opt_options) {
+const Workspace = function(opt_options) {
   /** @type {string} */
   this.id = Blockly.utils.genUid();
-  Blockly.Workspace.WorkspaceDB_[this.id] = this;
+  Workspace.WorkspaceDB_[this.id] = this;
   /** @type {!Blockly.Options} */
   this.options = opt_options ||
       new Blockly.Options(/** @type {!Blockly.BlocklyOptions} */ ({}));
@@ -128,38 +129,38 @@ Blockly.Workspace = function(opt_options) {
  * Returns `true` if the workspace is visible and `false` if it's headless.
  * @type {boolean}
  */
-Blockly.Workspace.prototype.rendered = false;
+Workspace.prototype.rendered = false;
 
 /**
  * Returns `true` if the workspace is currently in the process of a bulk clear.
  * @type {boolean}
  * @package
  */
-Blockly.Workspace.prototype.isClearing = false;
+Workspace.prototype.isClearing = false;
 
 /**
  * Maximum number of undo events in stack. `0` turns off undo, `Infinity` sets
  * it to unlimited.
  * @type {number}
  */
-Blockly.Workspace.prototype.MAX_UNDO = 1024;
+Workspace.prototype.MAX_UNDO = 1024;
 
 /**
  * Set of databases for rapid lookup of connection locations.
  * @type {Array<!Blockly.ConnectionDB>}
  */
-Blockly.Workspace.prototype.connectionDBList = null;
+Workspace.prototype.connectionDBList = null;
 
 /**
  * Dispose of this workspace.
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.Workspace.prototype.dispose = function() {
+Workspace.prototype.dispose = function() {
   this.listeners_.length = 0;
   this.clear();
   // Remove from workspace database.
-  delete Blockly.Workspace.WorkspaceDB_[this.id];
+  delete Workspace.WorkspaceDB_[this.id];
 };
 
 /**
@@ -168,7 +169,7 @@ Blockly.Workspace.prototype.dispose = function() {
  * a left to right bias (reversed in RTL).  Units are in degrees.
  * See: https://tvtropes.org/pmwiki/pmwiki.php/Main/DiagonalBilling
  */
-Blockly.Workspace.SCAN_ANGLE = 3;
+Workspace.SCAN_ANGLE = 3;
 
 /**
  * Compare function for sorting objects (blocks, comments, etc) by position;
@@ -181,18 +182,18 @@ Blockly.Workspace.SCAN_ANGLE = 3;
  *    object a's index.
  * @private
  */
-Blockly.Workspace.prototype.sortObjects_ = function(a, b) {
+Workspace.prototype.sortObjects_ = function(a, b) {
   const aXY = a.getRelativeToSurfaceXY();
   const bXY = b.getRelativeToSurfaceXY();
-  return (aXY.y + Blockly.Workspace.prototype.sortObjects_.offset * aXY.x) -
-      (bXY.y + Blockly.Workspace.prototype.sortObjects_.offset * bXY.x);
+  return (aXY.y + Workspace.prototype.sortObjects_.offset * aXY.x) -
+      (bXY.y + Workspace.prototype.sortObjects_.offset * bXY.x);
 };
 
 /**
  * Adds a block to the list of top blocks.
  * @param {!Blockly.Block} block Block to add.
  */
-Blockly.Workspace.prototype.addTopBlock = function(block) {
+Workspace.prototype.addTopBlock = function(block) {
   this.topBlocks_.push(block);
 };
 
@@ -200,7 +201,7 @@ Blockly.Workspace.prototype.addTopBlock = function(block) {
  * Removes a block from the list of top blocks.
  * @param {!Blockly.Block} block Block to remove.
  */
-Blockly.Workspace.prototype.removeTopBlock = function(block) {
+Workspace.prototype.removeTopBlock = function(block) {
   if (!Blockly.utils.arrayRemove(this.topBlocks_, block)) {
     throw Error('Block not present in workspace\'s list of top-most blocks.');
   }
@@ -212,12 +213,12 @@ Blockly.Workspace.prototype.removeTopBlock = function(block) {
  * @param {boolean} ordered Sort the list if true.
  * @return {!Array<!Blockly.Block>} The top-level block objects.
  */
-Blockly.Workspace.prototype.getTopBlocks = function(ordered) {
+Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
   const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -230,7 +231,7 @@ Blockly.Workspace.prototype.getTopBlocks = function(ordered) {
  * Add a block to the list of blocks keyed by type.
  * @param {!Blockly.Block} block Block to add.
  */
-Blockly.Workspace.prototype.addTypedBlock = function(block) {
+Workspace.prototype.addTypedBlock = function(block) {
   if (!this.typedBlocksDB_[block.type]) {
     this.typedBlocksDB_[block.type] = [];
   }
@@ -241,7 +242,7 @@ Blockly.Workspace.prototype.addTypedBlock = function(block) {
  * Remove a block from the list of blocks keyed by type.
  * @param {!Blockly.Block} block Block to remove.
  */
-Blockly.Workspace.prototype.removeTypedBlock = function(block) {
+Workspace.prototype.removeTypedBlock = function(block) {
   this.typedBlocksDB_[block.type].splice(this.typedBlocksDB_[block.type]
       .indexOf(block), 1);
   if (!this.typedBlocksDB_[block.type].length) {
@@ -256,14 +257,14 @@ Blockly.Workspace.prototype.removeTypedBlock = function(block) {
  * @param {boolean} ordered Sort the list if true.
  * @return {!Array<!Blockly.Block>} The blocks of the given type.
  */
-Blockly.Workspace.prototype.getBlocksByType = function(type, ordered) {
+Workspace.prototype.getBlocksByType = function(type, ordered) {
   if (!this.typedBlocksDB_[type]) {
     return [];
   }
   const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -277,7 +278,7 @@ Blockly.Workspace.prototype.getBlocksByType = function(type, ordered) {
  * @param {!Blockly.WorkspaceComment} comment comment to add.
  * @package
  */
-Blockly.Workspace.prototype.addTopComment = function(comment) {
+Workspace.prototype.addTopComment = function(comment) {
   this.topComments_.push(comment);
 
   // Note: If the comment database starts to hold block comments, this may need
@@ -294,7 +295,7 @@ Blockly.Workspace.prototype.addTopComment = function(comment) {
  * @param {!Blockly.WorkspaceComment} comment comment to remove.
  * @package
  */
-Blockly.Workspace.prototype.removeTopComment = function(comment) {
+Workspace.prototype.removeTopComment = function(comment) {
   if (!Blockly.utils.arrayRemove(this.topComments_, comment)) {
     throw Error('Comment not present in workspace\'s list of top-most ' +
         'comments.');
@@ -311,12 +312,12 @@ Blockly.Workspace.prototype.removeTopComment = function(comment) {
  * @return {!Array<!Blockly.WorkspaceComment>} The top-level comment objects.
  * @package
  */
-Blockly.Workspace.prototype.getTopComments = function(ordered) {
+Workspace.prototype.getTopComments = function(ordered) {
   // Copy the topComments_ list.
   const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Blockly.Workspace.SCAN_ANGLE));
+        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -331,7 +332,7 @@ Blockly.Workspace.prototype.getTopComments = function(ordered) {
  * @param {boolean} ordered Sort the list if true.
  * @return {!Array<!Blockly.Block>} Array of blocks.
  */
-Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
+Workspace.prototype.getAllBlocks = function(ordered) {
   let blocks;
   if (ordered) {
     // Slow, but ordered.
@@ -360,7 +361,7 @@ Blockly.Workspace.prototype.getAllBlocks = function(ordered) {
 /**
  * Dispose of all blocks and comments in workspace.
  */
-Blockly.Workspace.prototype.clear = function() {
+Workspace.prototype.clear = function() {
   this.isClearing = true;
   try {
     const existingGroup = Blockly.Events.getGroup();
@@ -392,7 +393,7 @@ Blockly.Workspace.prototype.clear = function() {
  * @param {string} id ID of the variable to rename.
  * @param {string} newName New variable name.
  */
-Blockly.Workspace.prototype.renameVariableById = function(id, newName) {
+Workspace.prototype.renameVariableById = function(id, newName) {
   this.variableMap_.renameVariableById(id, newName);
 };
 
@@ -407,7 +408,7 @@ Blockly.Workspace.prototype.renameVariableById = function(id, newName) {
  *     a UUID.
  * @return {!Blockly.VariableModel} The newly created variable.
  */
-Blockly.Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
+Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
   return this.variableMap_.createVariable(name, opt_type, opt_id);
 };
 
@@ -416,7 +417,7 @@ Blockly.Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
  * @param {string} id ID of the variable to find.
  * @return {!Array<!Blockly.Block>} Array of block usages.
  */
-Blockly.Workspace.prototype.getVariableUsesById = function(id) {
+Workspace.prototype.getVariableUsesById = function(id) {
   return this.variableMap_.getVariableUsesById(id);
 };
 
@@ -425,7 +426,7 @@ Blockly.Workspace.prototype.getVariableUsesById = function(id) {
  * workspace. May prompt the user for confirmation.
  * @param {string} id ID of variable to delete.
  */
-Blockly.Workspace.prototype.deleteVariableById = function(id) {
+Workspace.prototype.deleteVariableById = function(id) {
   this.variableMap_.deleteVariableById(id);
 };
 
@@ -437,7 +438,7 @@ Blockly.Workspace.prototype.deleteVariableById = function(id) {
  * @return {?Blockly.VariableModel} The variable with the given name.
  */
 // TODO (#1559): Possibly delete this function after resolving #1559.
-Blockly.Workspace.prototype.getVariable = function(name, opt_type) {
+Workspace.prototype.getVariable = function(name, opt_type) {
   return this.variableMap_.getVariable(name, opt_type);
 };
 
@@ -446,7 +447,7 @@ Blockly.Workspace.prototype.getVariable = function(name, opt_type) {
  * @param {string} id The ID to check for.
  * @return {?Blockly.VariableModel} The variable with the given ID.
  */
-Blockly.Workspace.prototype.getVariableById = function(id) {
+Workspace.prototype.getVariableById = function(id) {
   return this.variableMap_.getVariableById(id);
 };
 
@@ -457,7 +458,7 @@ Blockly.Workspace.prototype.getVariableById = function(id) {
  * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
-Blockly.Workspace.prototype.getVariablesOfType = function(type) {
+Workspace.prototype.getVariablesOfType = function(type) {
   return this.variableMap_.getVariablesOfType(type);
 };
 
@@ -466,7 +467,7 @@ Blockly.Workspace.prototype.getVariablesOfType = function(type) {
  * @return {!Array<string>} List of variable types.
  * @package
  */
-Blockly.Workspace.prototype.getVariableTypes = function() {
+Workspace.prototype.getVariableTypes = function() {
   return this.variableMap_.getVariableTypes(this);
 };
 
@@ -474,7 +475,7 @@ Blockly.Workspace.prototype.getVariableTypes = function() {
  * Return all variables of all types.
  * @return {!Array<!Blockly.VariableModel>} List of variable models.
  */
-Blockly.Workspace.prototype.getAllVariables = function() {
+Workspace.prototype.getAllVariables = function() {
   return this.variableMap_.getAllVariables();
 };
 
@@ -482,7 +483,7 @@ Blockly.Workspace.prototype.getAllVariables = function() {
  * Returns all variable names of all types.
  * @return {!Array<string>} List of all variable names of all types.
  */
-Blockly.Workspace.prototype.getAllVariableNames = function() {
+Workspace.prototype.getAllVariableNames = function() {
   return this.variableMap_.getAllVariableNames();
 };
 
@@ -494,7 +495,7 @@ Blockly.Workspace.prototype.getAllVariableNames = function() {
  * Not relevant for a headless workspace.
  * @return {number} Width.
  */
-Blockly.Workspace.prototype.getWidth = function() {
+Workspace.prototype.getWidth = function() {
   return 0;
 };
 
@@ -506,8 +507,9 @@ Blockly.Workspace.prototype.getWidth = function() {
  *     create a new ID.
  * @return {!Blockly.Block} The created block.
  */
-Blockly.Workspace.prototype.newBlock = function(prototypeName, opt_id) {
-  return new Blockly.Block(this, prototypeName, opt_id);
+Workspace.prototype.newBlock = function(prototypeName, opt_id) {
+  const Block = goog.module.get('Blockly.Block');
+  return new Block(this, prototypeName, opt_id);
 };
 
 /**
@@ -515,7 +517,7 @@ Blockly.Workspace.prototype.newBlock = function(prototypeName, opt_id) {
  *     the maxBlocks.
  * @return {number} Number of blocks left.
  */
-Blockly.Workspace.prototype.remainingCapacity = function() {
+Workspace.prototype.remainingCapacity = function() {
   if (isNaN(this.options.maxBlocks)) {
     return Infinity;
   }
@@ -529,7 +531,7 @@ Blockly.Workspace.prototype.remainingCapacity = function() {
  * @param {string} type Type of block to return capacity for.
  * @return {number} Number of blocks of type left.
  */
-Blockly.Workspace.prototype.remainingCapacityOfType = function(type) {
+Workspace.prototype.remainingCapacityOfType = function(type) {
   if (!this.options.maxInstances) {
     return Infinity;
   }
@@ -550,7 +552,7 @@ Blockly.Workspace.prototype.remainingCapacityOfType = function(type) {
  * @return {boolean} True if there is capacity for the given map,
  *    false otherwise.
  */
-Blockly.Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
+Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
   if (!this.hasBlockLimits()) {
     return true;
   }
@@ -572,7 +574,7 @@ Blockly.Workspace.prototype.isCapacityAvailable = function(typeCountsMap) {
  *    or the maximum number of blocks of specific types.
  * @return {boolean} True if it has block limits, false otherwise.
  */
-Blockly.Workspace.prototype.hasBlockLimits = function() {
+Workspace.prototype.hasBlockLimits = function() {
   return this.options.maxBlocks != Infinity || !!this.options.maxInstances;
 };
 
@@ -581,7 +583,7 @@ Blockly.Workspace.prototype.hasBlockLimits = function() {
  * @return {!Array<!Blockly.Events.Abstract>} undo stack
  * @package
  */
-Blockly.Workspace.prototype.getUndoStack = function() {
+Workspace.prototype.getUndoStack = function() {
   return this.undoStack_;
 };
 
@@ -590,7 +592,7 @@ Blockly.Workspace.prototype.getUndoStack = function() {
  * @return {!Array<!Blockly.Events.Abstract>} redo stack
  * @package
  */
-Blockly.Workspace.prototype.getRedoStack = function() {
+Workspace.prototype.getRedoStack = function() {
   return this.redoStack_;
 };
 
@@ -598,7 +600,7 @@ Blockly.Workspace.prototype.getRedoStack = function() {
  * Undo or redo the previous action.
  * @param {boolean} redo False if undo, true if redo.
  */
-Blockly.Workspace.prototype.undo = function(redo) {
+Workspace.prototype.undo = function(redo) {
   const inputStack = redo ? this.redoStack_ : this.undoStack_;
   const outputStack = redo ? this.undoStack_ : this.redoStack_;
   const inputEvent = inputStack.pop();
@@ -631,7 +633,7 @@ Blockly.Workspace.prototype.undo = function(redo) {
 /**
  * Clear the undo/redo stacks.
  */
-Blockly.Workspace.prototype.clearUndo = function() {
+Workspace.prototype.clearUndo = function() {
   this.undoStack_.length = 0;
   this.redoStack_.length = 0;
   // Stop any events already in the firing queue from being undoable.
@@ -646,7 +648,7 @@ Blockly.Workspace.prototype.clearUndo = function() {
  * @param {!Function} func Function to call.
  * @return {!Function} Obsolete return value, ignore.
  */
-Blockly.Workspace.prototype.addChangeListener = function(func) {
+Workspace.prototype.addChangeListener = function(func) {
   this.listeners_.push(func);
   return func;
 };
@@ -655,7 +657,7 @@ Blockly.Workspace.prototype.addChangeListener = function(func) {
  * Stop listening for this workspace's changes.
  * @param {!Function} func Function to stop calling.
  */
-Blockly.Workspace.prototype.removeChangeListener = function(func) {
+Workspace.prototype.removeChangeListener = function(func) {
   Blockly.utils.arrayRemove(this.listeners_, func);
 };
 
@@ -663,7 +665,7 @@ Blockly.Workspace.prototype.removeChangeListener = function(func) {
  * Fire a change event.
  * @param {!Blockly.Events.Abstract} event Event to fire.
  */
-Blockly.Workspace.prototype.fireChangeListener = function(event) {
+Workspace.prototype.fireChangeListener = function(event) {
   if (event.recordUndo) {
     this.undoStack_.push(event);
     this.redoStack_.length = 0;
@@ -682,7 +684,7 @@ Blockly.Workspace.prototype.fireChangeListener = function(event) {
  * @param {string} id ID of block to find.
  * @return {?Blockly.Block} The sought after block, or null if not found.
  */
-Blockly.Workspace.prototype.getBlockById = function(id) {
+Workspace.prototype.getBlockById = function(id) {
   return this.blockDB_[id] || null;
 };
 
@@ -692,7 +694,7 @@ Blockly.Workspace.prototype.getBlockById = function(id) {
  * @param {Blockly.Block} block The block to set.
  * @package
  */
-Blockly.Workspace.prototype.setBlockById = function(id, block) {
+Workspace.prototype.setBlockById = function(id, block) {
   this.blockDB_[id] = block;
 };
 
@@ -701,7 +703,7 @@ Blockly.Workspace.prototype.setBlockById = function(id, block) {
  * @param {string} id ID of block to delete.
  * @package
  */
-Blockly.Workspace.prototype.removeBlockById = function(id) {
+Workspace.prototype.removeBlockById = function(id) {
   delete this.blockDB_[id];
 };
 
@@ -712,7 +714,7 @@ Blockly.Workspace.prototype.removeBlockById = function(id) {
  *     found.
  * @package
  */
-Blockly.Workspace.prototype.getCommentById = function(id) {
+Workspace.prototype.getCommentById = function(id) {
   return this.commentDB_[id] || null;
 };
 
@@ -723,7 +725,7 @@ Blockly.Workspace.prototype.getCommentById = function(id) {
  *     whether shadow blocks are counted as filled. Defaults to true.
  * @return {boolean} True if all inputs are filled, false otherwise.
  */
-Blockly.Workspace.prototype.allInputsFilled = function(
+Workspace.prototype.allInputsFilled = function(
     opt_shadowBlocksAreFilled) {
   const blocks = this.getTopBlocks(false);
   for (let i = 0; i < blocks.length; i++) {
@@ -741,7 +743,7 @@ Blockly.Workspace.prototype.allInputsFilled = function(
  * @return {?Blockly.VariableMap} The potential variable map.
  * @package
  */
-Blockly.Workspace.prototype.getPotentialVariableMap = function() {
+Workspace.prototype.getPotentialVariableMap = function() {
   return this.potentialVariableMap_;
 };
 
@@ -749,7 +751,7 @@ Blockly.Workspace.prototype.getPotentialVariableMap = function() {
  * Create and store the potential variable map for this workspace.
  * @package
  */
-Blockly.Workspace.prototype.createPotentialVariableMap = function() {
+Workspace.prototype.createPotentialVariableMap = function() {
   this.potentialVariableMap_ = new Blockly.VariableMap(this);
 };
 
@@ -757,7 +759,7 @@ Blockly.Workspace.prototype.createPotentialVariableMap = function() {
  * Return the map of all variables on the workspace.
  * @return {!Blockly.VariableMap} The variable map.
  */
-Blockly.Workspace.prototype.getVariableMap = function() {
+Workspace.prototype.getVariableMap = function() {
   return this.variableMap_;
 };
 
@@ -766,7 +768,7 @@ Blockly.Workspace.prototype.getVariableMap = function() {
  * @param {!Blockly.VariableMap} variableMap The variable map.
  * @package
  */
-Blockly.Workspace.prototype.setVariableMap = function(variableMap) {
+Workspace.prototype.setVariableMap = function(variableMap) {
   this.variableMap_ = variableMap;
 };
 
@@ -775,25 +777,27 @@ Blockly.Workspace.prototype.setVariableMap = function(variableMap) {
  * Database of all workspaces.
  * @private
  */
-Blockly.Workspace.WorkspaceDB_ = Object.create(null);
+Workspace.WorkspaceDB_ = Object.create(null);
 
 /**
  * Find the workspace with the specified ID.
  * @param {string} id ID of workspace to find.
- * @return {?Blockly.Workspace} The sought after workspace or null if not found.
+ * @return {?Workspace} The sought after workspace or null if not found.
  */
-Blockly.Workspace.getById = function(id) {
-  return Blockly.Workspace.WorkspaceDB_[id] || null;
+Workspace.getById = function(id) {
+  return Workspace.WorkspaceDB_[id] || null;
 };
 
 /**
  * Find all workspaces.
- * @return {!Array<!Blockly.Workspace>} Array of workspaces.
+ * @return {!Array<!Workspace>} Array of workspaces.
  */
-Blockly.Workspace.getAll = function() {
+Workspace.getAll = function() {
   const workspaces = [];
-  for (const workspaceId in Blockly.Workspace.WorkspaceDB_) {
-    workspaces.push(Blockly.Workspace.WorkspaceDB_[workspaceId]);
+  for (const workspaceId in Workspace.WorkspaceDB_) {
+    workspaces.push(Workspace.WorkspaceDB_[workspaceId]);
   }
   return workspaces;
 };
+
+exports = Workspace;
diff --git a/tests/deps.js b/tests/deps.js
index 9a5b768a6..74832d0ff 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -205,7 +205,7 @@ goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.B
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math']);
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 74b5a12c6d77790cf6dce19207969f890203a628 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 12:08:45 -0700
Subject: [PATCH 226/291] Migrate core/workspace.js named requires

---
 core/workspace.js | 159 ++++++++++++++++++++++++----------------------
 1 file changed, 83 insertions(+), 76 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 5061e238a..a14568a3e 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -13,62 +13,69 @@
 goog.module('Blockly.Workspace');
 goog.module.declareLegacyNamespace();
 
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+/* eslint-disable-next-line no-unused-vars */
+const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
+const Events = goog.require('Blockly.Events');
+const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+/* eslint-disable-next-line no-unused-vars */
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
+const Options = goog.require('Blockly.Options');
+const VariableMap = goog.require('Blockly.VariableMap');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+const math = goog.require('Blockly.utils.math');
+const registry = goog.require('Blockly.registry');
+/* eslint-disable-next-line no-unused-vars */
+const toolbox = goog.requireType('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.ConnectionChecker');
-goog.require('Blockly.Events');
-goog.require('Blockly.IASTNodeLocation');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.math');
-goog.require('Blockly.VariableMap');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.ConnectionDB');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.IConnectionChecker');
-goog.requireType('Blockly.utils.toolbox');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.WorkspaceComment');
 
 
 /**
  * Class for a workspace.  This is a data structure that contains blocks.
  * There is no UI, and can be created headlessly.
- * @param {!Blockly.Options=} opt_options Dictionary of options.
+ * @param {!Options=} opt_options Dictionary of options.
  * @constructor
- * @implements {Blockly.IASTNodeLocation}
+ * @implements {IASTNodeLocation}
  */
 const Workspace = function(opt_options) {
   /** @type {string} */
-  this.id = Blockly.utils.genUid();
+  this.id = utils.genUid();
   Workspace.WorkspaceDB_[this.id] = this;
-  /** @type {!Blockly.Options} */
+  /** @type {!Options} */
   this.options = opt_options ||
-      new Blockly.Options(/** @type {!Blockly.BlocklyOptions} */ ({}));
+      new Options(/** @type {!BlocklyOptions} */ ({}));
   /** @type {boolean} */
   this.RTL = !!this.options.RTL;
   /** @type {boolean} */
   this.horizontalLayout = !!this.options.horizontalLayout;
-  /** @type {Blockly.utils.toolbox.Position} */
+  /** @type {toolbox.Position} */
   this.toolboxPosition = this.options.toolboxPosition;
 
-  const connectionCheckerClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.CONNECTION_CHECKER, this.options, true);
+  const connectionCheckerClass = registry.getClassFromOptions(
+      registry.Type.CONNECTION_CHECKER, this.options, true);
   /**
    * An object that encapsulates logic for safety, type, and dragging checks.
-   * @type {!Blockly.IConnectionChecker}
+   * @type {!IConnectionChecker}
    */
   this.connectionChecker = new connectionCheckerClass(this);
 
   /**
-   * @type {!Array<!Blockly.Block>}
+   * @type {!Array<!Block>}
    * @private
    */
   this.topBlocks_ = [];
   /**
-   * @type {!Array<!Blockly.WorkspaceComment>}
+   * @type {!Array<!WorkspaceComment>}
    * @private
    */
   this.topComments_ = [];
@@ -83,12 +90,12 @@ const Workspace = function(opt_options) {
    */
   this.listeners_ = [];
   /**
-   * @type {!Array<!Blockly.Events.Abstract>}
+   * @type {!Array<!Abstract>}
    * @protected
    */
   this.undoStack_ = [];
   /**
-   * @type {!Array<!Blockly.Events.Abstract>}
+   * @type {!Array<!Abstract>}
    * @protected
    */
   this.redoStack_ = [];
@@ -107,19 +114,19 @@ const Workspace = function(opt_options) {
    * A map from variable type to list of variable names.  The lists contain all
    * of the named variables in the workspace, including variables
    * that are not currently in use.
-   * @type {!Blockly.VariableMap}
+   * @type {!VariableMap}
    * @private
    */
-  this.variableMap_ = new Blockly.VariableMap(this);
+  this.variableMap_ = new VariableMap(this);
 
   /**
    * Blocks in the flyout can refer to variables that don't exist in the main
    * workspace.  For instance, the "get item in list" block refers to an "item"
    * variable regardless of whether the variable has been created yet.
-   * A FieldVariable must always refer to a Blockly.VariableModel.  We reconcile
+   * A FieldVariable must always refer to a VariableModel.  We reconcile
    * these by tracking "potential" variables in the flyout.  These variables
    * become real when references to them are dragged into the main workspace.
-   * @type {?Blockly.VariableMap}
+   * @type {?VariableMap}
    * @private
    */
   this.potentialVariableMap_ = null;
@@ -147,7 +154,7 @@ Workspace.prototype.MAX_UNDO = 1024;
 
 /**
  * Set of databases for rapid lookup of connection locations.
- * @type {Array<!Blockly.ConnectionDB>}
+ * @type {Array<!ConnectionDB>}
  */
 Workspace.prototype.connectionDBList = null;
 
@@ -174,9 +181,9 @@ Workspace.SCAN_ANGLE = 3;
 /**
  * Compare function for sorting objects (blocks, comments, etc) by position;
  *    top to bottom (with slight LTR or RTL bias).
- * @param {!Blockly.Block | !Blockly.WorkspaceComment} a The first object to
+ * @param {!Block | !WorkspaceComment} a The first object to
  *    compare.
- * @param {!Blockly.Block | !Blockly.WorkspaceComment} b The second object to
+ * @param {!Block | !WorkspaceComment} b The second object to
  *    compare.
  * @return {number} The comparison value. This tells Array.sort() how to change
  *    object a's index.
@@ -191,7 +198,7 @@ Workspace.prototype.sortObjects_ = function(a, b) {
 
 /**
  * Adds a block to the list of top blocks.
- * @param {!Blockly.Block} block Block to add.
+ * @param {!Block} block Block to add.
  */
 Workspace.prototype.addTopBlock = function(block) {
   this.topBlocks_.push(block);
@@ -199,10 +206,10 @@ Workspace.prototype.addTopBlock = function(block) {
 
 /**
  * Removes a block from the list of top blocks.
- * @param {!Blockly.Block} block Block to remove.
+ * @param {!Block} block Block to remove.
  */
 Workspace.prototype.removeTopBlock = function(block) {
-  if (!Blockly.utils.arrayRemove(this.topBlocks_, block)) {
+  if (!utils.arrayRemove(this.topBlocks_, block)) {
     throw Error('Block not present in workspace\'s list of top-most blocks.');
   }
 };
@@ -211,14 +218,14 @@ Workspace.prototype.removeTopBlock = function(block) {
  * Finds the top-level blocks and returns them.  Blocks are optionally sorted
  * by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} The top-level block objects.
+ * @return {!Array<!Block>} The top-level block objects.
  */
 Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
   const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
+        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -229,7 +236,7 @@ Workspace.prototype.getTopBlocks = function(ordered) {
 
 /**
  * Add a block to the list of blocks keyed by type.
- * @param {!Blockly.Block} block Block to add.
+ * @param {!Block} block Block to add.
  */
 Workspace.prototype.addTypedBlock = function(block) {
   if (!this.typedBlocksDB_[block.type]) {
@@ -240,7 +247,7 @@ Workspace.prototype.addTypedBlock = function(block) {
 
 /**
  * Remove a block from the list of blocks keyed by type.
- * @param {!Blockly.Block} block Block to remove.
+ * @param {!Block} block Block to remove.
  */
 Workspace.prototype.removeTypedBlock = function(block) {
   this.typedBlocksDB_[block.type].splice(this.typedBlocksDB_[block.type]
@@ -255,7 +262,7 @@ Workspace.prototype.removeTypedBlock = function(block) {
  * optionally sorted by position; top to bottom (with slight LTR or RTL bias).
  * @param {string} type The type of block to search for.
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} The blocks of the given type.
+ * @return {!Array<!Block>} The blocks of the given type.
  */
 Workspace.prototype.getBlocksByType = function(type, ordered) {
   if (!this.typedBlocksDB_[type]) {
@@ -264,7 +271,7 @@ Workspace.prototype.getBlocksByType = function(type, ordered) {
   const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
+        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -275,7 +282,7 @@ Workspace.prototype.getBlocksByType = function(type, ordered) {
 
 /**
  * Adds a comment to the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to add.
+ * @param {!WorkspaceComment} comment comment to add.
  * @package
  */
 Workspace.prototype.addTopComment = function(comment) {
@@ -292,11 +299,11 @@ Workspace.prototype.addTopComment = function(comment) {
 
 /**
  * Removes a comment from the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to remove.
+ * @param {!WorkspaceComment} comment comment to remove.
  * @package
  */
 Workspace.prototype.removeTopComment = function(comment) {
-  if (!Blockly.utils.arrayRemove(this.topComments_, comment)) {
+  if (!utils.arrayRemove(this.topComments_, comment)) {
     throw Error('Comment not present in workspace\'s list of top-most ' +
         'comments.');
   }
@@ -309,7 +316,7 @@ Workspace.prototype.removeTopComment = function(comment) {
  * Finds the top-level comments and returns them.  Comments are optionally
  * sorted by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.WorkspaceComment>} The top-level comment objects.
+ * @return {!Array<!WorkspaceComment>} The top-level comment objects.
  * @package
  */
 Workspace.prototype.getTopComments = function(ordered) {
@@ -317,7 +324,7 @@ Workspace.prototype.getTopComments = function(ordered) {
   const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
     this.sortObjects_.offset =
-        Math.sin(Blockly.utils.math.toRadians(Workspace.SCAN_ANGLE));
+        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -330,7 +337,7 @@ Workspace.prototype.getTopComments = function(ordered) {
  * Find all blocks in workspace.  Blocks are optionally sorted
  * by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.Block>} Array of blocks.
+ * @return {!Array<!Block>} Array of blocks.
  */
 Workspace.prototype.getAllBlocks = function(ordered) {
   let blocks;
@@ -364,9 +371,9 @@ Workspace.prototype.getAllBlocks = function(ordered) {
 Workspace.prototype.clear = function() {
   this.isClearing = true;
   try {
-    const existingGroup = Blockly.Events.getGroup();
+    const existingGroup = Events.getGroup();
     if (!existingGroup) {
-      Blockly.Events.setGroup(true);
+      Events.setGroup(true);
     }
     while (this.topBlocks_.length) {
       this.topBlocks_[0].dispose(false);
@@ -375,7 +382,7 @@ Workspace.prototype.clear = function() {
       this.topComments_[this.topComments_.length - 1].dispose();
     }
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
     this.variableMap_.clear();
     if (this.potentialVariableMap_) {
@@ -406,7 +413,7 @@ Workspace.prototype.renameVariableById = function(id, newName) {
  *     their type. This will default to '' which is a specific type.
  * @param {?string=} opt_id The unique ID of the variable. This will default to
  *     a UUID.
- * @return {!Blockly.VariableModel} The newly created variable.
+ * @return {!VariableModel} The newly created variable.
  */
 Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
   return this.variableMap_.createVariable(name, opt_type, opt_id);
@@ -415,7 +422,7 @@ Workspace.prototype.createVariable = function(name, opt_type, opt_id) {
 /**
  * Find all the uses of the given variable, which is identified by ID.
  * @param {string} id ID of the variable to find.
- * @return {!Array<!Blockly.Block>} Array of block usages.
+ * @return {!Array<!Block>} Array of block usages.
  */
 Workspace.prototype.getVariableUsesById = function(id) {
   return this.variableMap_.getVariableUsesById(id);
@@ -435,7 +442,7 @@ Workspace.prototype.deleteVariableById = function(id) {
  * @param {string} name The name to check for.
  * @param {string=} opt_type The type of the variable.  If not provided it
  *     defaults to the empty string, which is a specific type.
- * @return {?Blockly.VariableModel} The variable with the given name.
+ * @return {?VariableModel} The variable with the given name.
  */
 // TODO (#1559): Possibly delete this function after resolving #1559.
 Workspace.prototype.getVariable = function(name, opt_type) {
@@ -445,7 +452,7 @@ Workspace.prototype.getVariable = function(name, opt_type) {
 /**
  * Find the variable by the given ID and return it. Return null if not found.
  * @param {string} id The ID to check for.
- * @return {?Blockly.VariableModel} The variable with the given ID.
+ * @return {?VariableModel} The variable with the given ID.
  */
 Workspace.prototype.getVariableById = function(id) {
   return this.variableMap_.getVariableById(id);
@@ -455,7 +462,7 @@ Workspace.prototype.getVariableById = function(id) {
  * Find the variable with the specified type. If type is null, return list of
  *     variables with empty string type.
  * @param {?string} type Type of the variables to find.
- * @return {!Array<!Blockly.VariableModel>} The sought after variables of the
+ * @return {!Array<!VariableModel>} The sought after variables of the
  *     passed in type. An empty array if none are found.
  */
 Workspace.prototype.getVariablesOfType = function(type) {
@@ -473,7 +480,7 @@ Workspace.prototype.getVariableTypes = function() {
 
 /**
  * Return all variables of all types.
- * @return {!Array<!Blockly.VariableModel>} List of variable models.
+ * @return {!Array<!VariableModel>} List of variable models.
  */
 Workspace.prototype.getAllVariables = function() {
   return this.variableMap_.getAllVariables();
@@ -505,7 +512,7 @@ Workspace.prototype.getWidth = function() {
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @return {!Blockly.Block} The created block.
+ * @return {!Block} The created block.
  */
 Workspace.prototype.newBlock = function(prototypeName, opt_id) {
   const Block = goog.module.get('Blockly.Block');
@@ -580,7 +587,7 @@ Workspace.prototype.hasBlockLimits = function() {
 
 /**
  * Gets the undo stack for workplace.
- * @return {!Array<!Blockly.Events.Abstract>} undo stack
+ * @return {!Array<!Abstract>} undo stack
  * @package
  */
 Workspace.prototype.getUndoStack = function() {
@@ -589,7 +596,7 @@ Workspace.prototype.getUndoStack = function() {
 
 /**
  * Gets the redo stack for workplace.
- * @return {!Array<!Blockly.Events.Abstract>} redo stack
+ * @return {!Array<!Abstract>} redo stack
  * @package
  */
 Workspace.prototype.getRedoStack = function() {
@@ -618,15 +625,15 @@ Workspace.prototype.undo = function(redo) {
     const event = events[i];
     outputStack.push(event);
   }
-  events = Blockly.Events.filter(events, redo);
-  Blockly.Events.recordUndo = false;
+  events = Events.filter(events, redo);
+  Events.recordUndo = false;
   try {
     for (let i = 0; i < events.length; i++) {
       const event = events[i];
       event.run(redo);
     }
   } finally {
-    Blockly.Events.recordUndo = true;
+    Events.recordUndo = true;
   }
 };
 
@@ -637,7 +644,7 @@ Workspace.prototype.clearUndo = function() {
   this.undoStack_.length = 0;
   this.redoStack_.length = 0;
   // Stop any events already in the firing queue from being undoable.
-  Blockly.Events.clearPendingUndo();
+  Events.clearPendingUndo();
 };
 
 /**
@@ -658,12 +665,12 @@ Workspace.prototype.addChangeListener = function(func) {
  * @param {!Function} func Function to stop calling.
  */
 Workspace.prototype.removeChangeListener = function(func) {
-  Blockly.utils.arrayRemove(this.listeners_, func);
+  utils.arrayRemove(this.listeners_, func);
 };
 
 /**
  * Fire a change event.
- * @param {!Blockly.Events.Abstract} event Event to fire.
+ * @param {!Abstract} event Event to fire.
  */
 Workspace.prototype.fireChangeListener = function(event) {
   if (event.recordUndo) {
@@ -682,7 +689,7 @@ Workspace.prototype.fireChangeListener = function(event) {
 /**
  * Find the block on this workspace with the specified ID.
  * @param {string} id ID of block to find.
- * @return {?Blockly.Block} The sought after block, or null if not found.
+ * @return {?Block} The sought after block, or null if not found.
  */
 Workspace.prototype.getBlockById = function(id) {
   return this.blockDB_[id] || null;
@@ -691,7 +698,7 @@ Workspace.prototype.getBlockById = function(id) {
 /**
  * Set a block on this workspace with the specified ID.
  * @param {string} id ID of block to set.
- * @param {Blockly.Block} block The block to set.
+ * @param {Block} block The block to set.
  * @package
  */
 Workspace.prototype.setBlockById = function(id, block) {
@@ -710,7 +717,7 @@ Workspace.prototype.removeBlockById = function(id) {
 /**
  * Find the comment on this workspace with the specified ID.
  * @param {string} id ID of comment to find.
- * @return {?Blockly.WorkspaceComment} The sought after comment, or null if not
+ * @return {?WorkspaceComment} The sought after comment, or null if not
  *     found.
  * @package
  */
@@ -740,7 +747,7 @@ Workspace.prototype.allInputsFilled = function(
 /**
  * Return the variable map that contains "potential" variables.
  * These exist in the flyout but not in the workspace.
- * @return {?Blockly.VariableMap} The potential variable map.
+ * @return {?VariableMap} The potential variable map.
  * @package
  */
 Workspace.prototype.getPotentialVariableMap = function() {
@@ -752,12 +759,12 @@ Workspace.prototype.getPotentialVariableMap = function() {
  * @package
  */
 Workspace.prototype.createPotentialVariableMap = function() {
-  this.potentialVariableMap_ = new Blockly.VariableMap(this);
+  this.potentialVariableMap_ = new VariableMap(this);
 };
 
 /**
  * Return the map of all variables on the workspace.
- * @return {!Blockly.VariableMap} The variable map.
+ * @return {!VariableMap} The variable map.
  */
 Workspace.prototype.getVariableMap = function() {
   return this.variableMap_;
@@ -765,7 +772,7 @@ Workspace.prototype.getVariableMap = function() {
 
 /**
  * Set the map of all variables on the workspace.
- * @param {!Blockly.VariableMap} variableMap The variable map.
+ * @param {!VariableMap} variableMap The variable map.
  * @package
  */
 Workspace.prototype.setVariableMap = function(variableMap) {

From e10be5444f7dce26b616dde94f75778d0870fb16 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 13:11:13 -0700
Subject: [PATCH 227/291] clang-format core/workspace.js

---
 core/workspace.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index a14568a3e..25ac6ee5d 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -52,8 +52,8 @@ const Workspace = function(opt_options) {
   this.id = utils.genUid();
   Workspace.WorkspaceDB_[this.id] = this;
   /** @type {!Options} */
-  this.options = opt_options ||
-      new Options(/** @type {!BlocklyOptions} */ ({}));
+  this.options =
+      opt_options || new Options(/** @type {!BlocklyOptions} */ ({}));
   /** @type {boolean} */
   this.RTL = !!this.options.RTL;
   /** @type {boolean} */
@@ -224,8 +224,7 @@ Workspace.prototype.getTopBlocks = function(ordered) {
   // Copy the topBlocks_ list.
   const blocks = [].concat(this.topBlocks_);
   if (ordered && blocks.length > 1) {
-    this.sortObjects_.offset =
-        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
+    this.sortObjects_.offset = Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -250,8 +249,8 @@ Workspace.prototype.addTypedBlock = function(block) {
  * @param {!Block} block Block to remove.
  */
 Workspace.prototype.removeTypedBlock = function(block) {
-  this.typedBlocksDB_[block.type].splice(this.typedBlocksDB_[block.type]
-      .indexOf(block), 1);
+  this.typedBlocksDB_[block.type].splice(
+      this.typedBlocksDB_[block.type].indexOf(block), 1);
   if (!this.typedBlocksDB_[block.type].length) {
     delete this.typedBlocksDB_[block.type];
   }
@@ -270,8 +269,7 @@ Workspace.prototype.getBlocksByType = function(type, ordered) {
   }
   const blocks = this.typedBlocksDB_[type].slice(0);
   if (ordered && blocks.length > 1) {
-    this.sortObjects_.offset =
-        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
+    this.sortObjects_.offset = Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -291,7 +289,8 @@ Workspace.prototype.addTopComment = function(comment) {
   // Note: If the comment database starts to hold block comments, this may need
   // to move to a separate function.
   if (this.commentDB_[comment.id]) {
-    console.warn('Overriding an existing comment on this workspace, with id "' +
+    console.warn(
+        'Overriding an existing comment on this workspace, with id "' +
         comment.id + '"');
   }
   this.commentDB_[comment.id] = comment;
@@ -304,7 +303,8 @@ Workspace.prototype.addTopComment = function(comment) {
  */
 Workspace.prototype.removeTopComment = function(comment) {
   if (!utils.arrayRemove(this.topComments_, comment)) {
-    throw Error('Comment not present in workspace\'s list of top-most ' +
+    throw Error(
+        'Comment not present in workspace\'s list of top-most ' +
         'comments.');
   }
   // Note: If the comment database starts to hold block comments, this may need
@@ -323,8 +323,7 @@ Workspace.prototype.getTopComments = function(ordered) {
   // Copy the topComments_ list.
   const comments = [].concat(this.topComments_);
   if (ordered && comments.length > 1) {
-    this.sortObjects_.offset =
-        Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
+    this.sortObjects_.offset = Math.sin(math.toRadians(Workspace.SCAN_ANGLE));
     if (this.RTL) {
       this.sortObjects_.offset *= -1;
     }
@@ -358,7 +357,7 @@ Workspace.prototype.getAllBlocks = function(ordered) {
 
   // Insertion markers exist on the workspace for rendering reasons, but aren't
   // "real" blocks from a developer perspective.
-  const filtered = blocks.filter(function (block) {
+  const filtered = blocks.filter(function(block) {
     return !block.isInsertionMarker();
   });
 
@@ -544,7 +543,8 @@ Workspace.prototype.remainingCapacityOfType = function(type) {
   }
 
   const maxInstanceOfType = (this.options.maxInstances[type] !== undefined) ?
-      this.options.maxInstances[type] : Infinity;
+      this.options.maxInstances[type] :
+      Infinity;
 
   return maxInstanceOfType - this.getBlocksByType(type, false).length;
 };
@@ -617,7 +617,7 @@ Workspace.prototype.undo = function(redo) {
   let events = [inputEvent];
   // Do another undo/redo if the next one is of the same group.
   while (inputStack.length && inputEvent.group &&
-      inputEvent.group == inputStack[inputStack.length - 1].group) {
+         inputEvent.group == inputStack[inputStack.length - 1].group) {
     events.push(inputStack.pop());
   }
   // Push these popped events on the opposite stack.
@@ -732,8 +732,7 @@ Workspace.prototype.getCommentById = function(id) {
  *     whether shadow blocks are counted as filled. Defaults to true.
  * @return {boolean} True if all inputs are filled, false otherwise.
  */
-Workspace.prototype.allInputsFilled = function(
-    opt_shadowBlocksAreFilled) {
+Workspace.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
   const blocks = this.getTopBlocks(false);
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];

From 7eedf623d5458aeee08063d6ef5dc842b4878344 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:52:53 -0700
Subject: [PATCH 228/291] Change private static variable to local variable.

---
 core/workspace.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/core/workspace.js b/core/workspace.js
index 25ac6ee5d..c1115e011 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -40,6 +40,12 @@ const utils = goog.require('Blockly.utils');
 goog.require('Blockly.ConnectionChecker');
 
 
+/**
+ * Database of all workspaces.
+ * @private
+ */
+const WorkspaceDB_ = Object.create(null);
+
 /**
  * Class for a workspace.  This is a data structure that contains blocks.
  * There is no UI, and can be created headlessly.
@@ -50,7 +56,7 @@ goog.require('Blockly.ConnectionChecker');
 const Workspace = function(opt_options) {
   /** @type {string} */
   this.id = utils.genUid();
-  Workspace.WorkspaceDB_[this.id] = this;
+  WorkspaceDB_[this.id] = this;
   /** @type {!Options} */
   this.options =
       opt_options || new Options(/** @type {!BlocklyOptions} */ ({}));
@@ -167,7 +173,7 @@ Workspace.prototype.dispose = function() {
   this.listeners_.length = 0;
   this.clear();
   // Remove from workspace database.
-  delete Workspace.WorkspaceDB_[this.id];
+  delete WorkspaceDB_[this.id];
 };
 
 /**
@@ -778,20 +784,13 @@ Workspace.prototype.setVariableMap = function(variableMap) {
   this.variableMap_ = variableMap;
 };
 
-
-/**
- * Database of all workspaces.
- * @private
- */
-Workspace.WorkspaceDB_ = Object.create(null);
-
 /**
  * Find the workspace with the specified ID.
  * @param {string} id ID of workspace to find.
  * @return {?Workspace} The sought after workspace or null if not found.
  */
 Workspace.getById = function(id) {
-  return Workspace.WorkspaceDB_[id] || null;
+  return WorkspaceDB_[id] || null;
 };
 
 /**
@@ -800,8 +799,8 @@ Workspace.getById = function(id) {
  */
 Workspace.getAll = function() {
   const workspaces = [];
-  for (const workspaceId in Workspace.WorkspaceDB_) {
-    workspaces.push(Workspace.WorkspaceDB_[workspaceId]);
+  for (const workspaceId in WorkspaceDB_) {
+    workspaces.push(WorkspaceDB_[workspaceId]);
   }
   return workspaces;
 };

From 08a8c0be6d291b2c355669bfbdb0a2da54ea2e76 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 9 Aug 2021 15:02:03 -0700
Subject: [PATCH 229/291] Migrate core/contextmenu_registry.js to goog.module
 syntax (#5149)

* Migrate core/contextmenu_registry.js to ES6 const/let

* Migrate core/contextmenu_registry.js to goog.module

* Migrate core/contextmenu_registry.js to named requires

* clang-format core/contextmenu_registry.js

* Make core/contextmenu_registry.js constructor private
---
 core/contextmenu_registry.js | 108 +++++++++++++++++++----------------
 tests/deps.js                |   2 +-
 2 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js
index 38cf08d3c..a97dc30f4 100644
--- a/core/contextmenu_registry.js
+++ b/core/contextmenu_registry.js
@@ -11,91 +11,97 @@
 'use strict';
 
 /**
- * @name Blockly.ContextMenuRegistry
+ * @name ContextMenuRegistry
  * @namespace
  */
-goog.provide('Blockly.ContextMenuRegistry');
+goog.module('Blockly.ContextMenuRegistry');
+goog.module.declareLegacyNamespace();
 
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for the registry of context menu items. This is intended to be a
  * singleton. You should not create a new instance, and only access this class
- * from Blockly.ContextMenuRegistry.registry.
+ * from ContextMenuRegistry.registry.
  * @constructor
+ * @private
  */
-Blockly.ContextMenuRegistry = function() {
+const ContextMenuRegistry = function() {
   // Singleton instance should be registered once.
-  Blockly.ContextMenuRegistry.registry = this;
+  ContextMenuRegistry.registry = this;
 
   /**
    * Registry of all registered RegistryItems, keyed by ID.
-   * @type {!Object<string, !Blockly.ContextMenuRegistry.RegistryItem>}
+   * @type {!Object<string, !ContextMenuRegistry.RegistryItem>}
    * @private
    */
   this.registry_ = Object.create(null);
 };
 
 /**
- * Where this menu item should be rendered. If the menu item should be rendered in multiple
- * scopes, e.g. on both a block and a workspace, it should be registered for each scope.
+ * Where this menu item should be rendered. If the menu item should be rendered
+ * in multiple scopes, e.g. on both a block and a workspace, it should be
+ * registered for each scope.
  * @enum {string}
  */
-Blockly.ContextMenuRegistry.ScopeType = {
+ContextMenuRegistry.ScopeType = {
   BLOCK: 'block',
   WORKSPACE: 'workspace',
 };
 
 /**
- * The actual workspace/block where the menu is being rendered. This is passed to callback and
- * displayText functions that depend on this information.
+ * The actual workspace/block where the menu is being rendered. This is passed
+ * to callback and displayText functions that depend on this information.
  * @typedef {{
- *    block: (Blockly.BlockSvg|undefined),
- *    workspace: (Blockly.WorkspaceSvg|undefined)
+ *    block: (BlockSvg|undefined),
+ *    workspace: (WorkspaceSvg|undefined)
  * }}
  */
-Blockly.ContextMenuRegistry.Scope;
+ContextMenuRegistry.Scope;
 
 /**
  * A menu item as entered in the registry.
  * @typedef {{
- *    callback: function(!Blockly.ContextMenuRegistry.Scope),
- *    scopeType: !Blockly.ContextMenuRegistry.ScopeType,
- *    displayText: ((function(!Blockly.ContextMenuRegistry.Scope):string)|string),
- *    preconditionFn: function(!Blockly.ContextMenuRegistry.Scope):string,
+ *    callback: function(!ContextMenuRegistry.Scope),
+ *    scopeType: !ContextMenuRegistry.ScopeType,
+ *    displayText: ((function(!ContextMenuRegistry.Scope):string)|string),
+ *    preconditionFn: function(!ContextMenuRegistry.Scope):string,
  *    weight: number,
  *    id: string
  * }}
-*/
-Blockly.ContextMenuRegistry.RegistryItem;
+ */
+ContextMenuRegistry.RegistryItem;
 
 /**
  * A menu item as presented to contextmenu.js.
  * @typedef {{
  *    text: string,
  *    enabled: boolean,
- *    callback: function(!Blockly.ContextMenuRegistry.Scope),
- *    scope: !Blockly.ContextMenuRegistry.Scope,
+ *    callback: function(!ContextMenuRegistry.Scope),
+ *    scope: !ContextMenuRegistry.Scope,
  *    weight: number
  * }}
  */
-Blockly.ContextMenuRegistry.ContextMenuOption;
+ContextMenuRegistry.ContextMenuOption;
 
 /**
  * Singleton instance of this class. All interactions with this class should be
  * done on this object.
- * @type {?Blockly.ContextMenuRegistry}
+ * @type {?ContextMenuRegistry}
  */
-Blockly.ContextMenuRegistry.registry = null;
+ContextMenuRegistry.registry = null;
 
 /**
  * Registers a RegistryItem.
- * @param {!Blockly.ContextMenuRegistry.RegistryItem} item Context menu item to register.
+ * @param {!ContextMenuRegistry.RegistryItem} item Context menu item to
+ *     register.
  * @throws {Error} if an item with the given ID already exists.
  */
-Blockly.ContextMenuRegistry.prototype.register = function(item) {
+ContextMenuRegistry.prototype.register = function(item) {
   if (this.registry_[item.id]) {
     throw Error('Menu item with ID "' + item.id + '" is already registered.');
   }
@@ -107,7 +113,7 @@ Blockly.ContextMenuRegistry.prototype.register = function(item) {
  * @param {string} id The ID of the RegistryItem to remove.
  * @throws {Error} if an item with the given ID does not exist.
  */
-Blockly.ContextMenuRegistry.prototype.unregister = function(id) {
+ContextMenuRegistry.prototype.unregister = function(id) {
   if (!this.registry_[id]) {
     throw new Error('Menu item with ID "' + id + '" not found.');
   }
@@ -116,33 +122,37 @@ Blockly.ContextMenuRegistry.prototype.unregister = function(id) {
 
 /**
  * @param {string} id The ID of the RegistryItem to get.
- * @return {?Blockly.ContextMenuRegistry.RegistryItem} RegistryItem or null if not found
+ * @return {?ContextMenuRegistry.RegistryItem} RegistryItem or null if not found
  */
-Blockly.ContextMenuRegistry.prototype.getItem = function(id) {
+ContextMenuRegistry.prototype.getItem = function(id) {
   return this.registry_[id] || null;
 };
 
 /**
- * Gets the valid context menu options for the given scope type (e.g. block or workspace) and scope.
- * Blocks are only shown if the preconditionFn shows they should not be hidden.
- * @param {!Blockly.ContextMenuRegistry.ScopeType} scopeType Type of scope where menu should be
- *     shown (e.g. on a block or on a workspace)
- * @param {!Blockly.ContextMenuRegistry.Scope} scope Current scope of context menu
+ * Gets the valid context menu options for the given scope type (e.g. block or
+ * workspace) and scope. Blocks are only shown if the preconditionFn shows they
+ * should not be hidden.
+ * @param {!ContextMenuRegistry.ScopeType} scopeType Type of scope where menu
+ *     should be shown (e.g. on a block or on a workspace)
+ * @param {!ContextMenuRegistry.Scope} scope Current scope of context menu
  *     (i.e., the exact workspace or block being clicked on)
- * @return {!Array<!Blockly.ContextMenuRegistry.ContextMenuOption>} the list of ContextMenuOptions
+ * @return {!Array<!ContextMenuRegistry.ContextMenuOption>} the list of
+ *     ContextMenuOptions
  */
-Blockly.ContextMenuRegistry.prototype.getContextMenuOptions = function(scopeType, scope) {
-  var menuOptions = [];
-  var registry = this.registry_;
+ContextMenuRegistry.prototype.getContextMenuOptions = function(
+    scopeType, scope) {
+  const menuOptions = [];
+  const registry = this.registry_;
   Object.keys(registry).forEach(function(id) {
-    var item = registry[id];
+    const item = registry[id];
     if (scopeType == item.scopeType) {
-      var precondition = item.preconditionFn(scope);
+      const precondition = item.preconditionFn(scope);
       if (precondition != 'hidden') {
-        var displayText = typeof item.displayText == 'function' ?
-                            item.displayText(scope) : item.displayText;
-        /** @type {!Blockly.ContextMenuRegistry.ContextMenuOption} */
-        var menuOption = {
+        const displayText = typeof item.displayText == 'function' ?
+            item.displayText(scope) :
+            item.displayText;
+        /** @type {!ContextMenuRegistry.ContextMenuOption} */
+        const menuOption = {
           text: displayText,
           enabled: (precondition == 'enabled'),
           callback: item.callback,
@@ -160,4 +170,6 @@ Blockly.ContextMenuRegistry.prototype.getContextMenuOptions = function(scopeType
 };
 
 // Creates and assigns the singleton instance.
-new Blockly.ContextMenuRegistry();
+new ContextMenuRegistry();
+
+exports = ContextMenuRegistry;
diff --git a/tests/deps.js b/tests/deps.js
index 74832d0ff..2a958d44f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -29,7 +29,7 @@ goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes']
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es5'});
+goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});

From 440be28b4a454aeb7b0c07652070785665cb86b7 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:26:08 -0700
Subject: [PATCH 230/291] Migrate core/renderers/common/block_rendering.js to
 ES6 const/let

---
 core/renderers/common/block_rendering.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index d1ee94a14..8ff48cb86 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -75,9 +75,9 @@ Blockly.blockRendering.stopDebugger = function() {
  */
 
 Blockly.blockRendering.init = function(name, theme, opt_rendererOverrides) {
-  var rendererClass = Blockly.registry.getClass(
+  const rendererClass = Blockly.registry.getClass(
       Blockly.registry.Type.RENDERER, name);
-  var renderer = new rendererClass(name);
+  const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;
 };

From a4a3b6a068536f5662469e103dda81cbf682fe8e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:36:00 -0700
Subject: [PATCH 231/291] Migrate core/renderers/common/block_rendering.js to
 goog.module

---
 core/renderers/common/block_rendering.js | 37 ++++++++++++++++++------
 core/renderers/common/drawer.js          |  2 +-
 core/renderers/common/renderer.js        |  2 +-
 core/renderers/geras/drawer.js           |  2 +-
 core/renderers/zelos/drawer.js           |  2 +-
 tests/deps.js                            |  2 +-
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index 8ff48cb86..5dc8d33f8 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -14,7 +14,8 @@
  * The top level namespace for block rendering.
  * @namespace Blockly.blockRendering
  */
-goog.provide('Blockly.blockRendering');
+goog.module('Blockly.blockRendering');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.registry');
 
@@ -27,7 +28,16 @@ goog.requireType('Blockly.Theme');
  * @type {boolean}
  * @package
  */
-Blockly.blockRendering.useDebugger = false;
+let useDebugger = false;
+/**
+ * Returns whether the debugger is turned on.
+ * @return {boolean} Whether the debugger is turned on.
+ */
+const isDebuggerEnabled = function() {
+  return useDebugger;
+};
+/** @package */
+exports.isDebuggerEnabled = isDebuggerEnabled;
 
 /**
  * Registers a new renderer.
@@ -36,33 +46,40 @@ Blockly.blockRendering.useDebugger = false;
  *     to register.
  * @throws {Error} if a renderer with the same name has already been registered.
  */
-Blockly.blockRendering.register = function(name, rendererClass) {
+const register = function(name, rendererClass) {
   Blockly.registry.register(Blockly.registry.Type.RENDERER, name,
       rendererClass);
 };
+exports.register = register;
 
 /**
  * Unregisters the renderer registered with the given name.
  * @param {string} name The name of the renderer.
  */
-Blockly.blockRendering.unregister = function(name) {
+const unregister = function(name) {
   Blockly.registry.unregister(Blockly.registry.Type.RENDERER, name);
 };
+exports.unregister = unregister;
+
 /**
  * Turn on the blocks debugger.
  * @package
  */
-Blockly.blockRendering.startDebugger = function() {
-  Blockly.blockRendering.useDebugger = true;
+const startDebugger = function() {
+  useDebugger = true;
 };
+/** @package */
+exports.startDebugger = startDebugger;
 
 /**
  * Turn off the blocks debugger.
  * @package
  */
-Blockly.blockRendering.stopDebugger = function() {
-  Blockly.blockRendering.useDebugger = false;
+const stopDebugger = function() {
+  useDebugger = false;
 };
+/** @package */
+exports.stopDebugger = stopDebugger;
 
 /**
  * Initialize anything needed for rendering (constants, etc).
@@ -74,10 +91,12 @@ Blockly.blockRendering.stopDebugger = function() {
  * @package
  */
 
-Blockly.blockRendering.init = function(name, theme, opt_rendererOverrides) {
+const init = function(name, theme, opt_rendererOverrides) {
   const rendererClass = Blockly.registry.getClass(
       Blockly.registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;
 };
+/** @package */
+exports.init = init;
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 2dde92d3f..92e659ab7 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -73,7 +73,7 @@ Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     this.block_.pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.useDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 37e4a883a..b4be1af87 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -285,7 +285,7 @@ Blockly.blockRendering.Renderer.prototype.getConnectionPreviewMethod = function(
  * @package
  */
 Blockly.blockRendering.Renderer.prototype.render = function(block) {
-  if (Blockly.blockRendering.useDebugger && !block.renderingDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
   var info = this.makeRenderInfo_(block);
diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index 360d123ce..b1ebc59a6 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -54,7 +54,7 @@ Blockly.geras.Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.useDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index 20bad30e4..be1a4fa04 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -53,7 +53,7 @@ Blockly.zelos.Drawer.prototype.draw = function() {
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.useDebugger) {
+  if (Blockly.blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
diff --git a/tests/deps.js b/tests/deps.js
index 2a958d44f..4ab382ba8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -122,7 +122,7 @@ goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'],
 goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
+goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
 goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});

From f565120efb6919ff6d3046d860514e7260ce3d9c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:39:58 -0700
Subject: [PATCH 232/291] Migrate core/renderers/common/block_rendering.js
 named requires

---
 core/renderers/common/block_rendering.js | 25 +++++++++++-------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index 5dc8d33f8..f91802584 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -10,17 +10,14 @@
  */
 'use strict';
 
-/**
- * The top level namespace for block rendering.
- * @namespace Blockly.blockRendering
- */
 goog.module('Blockly.blockRendering');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.registry');
-
-goog.requireType('Blockly.blockRendering.Renderer');
-goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -47,7 +44,7 @@ exports.isDebuggerEnabled = isDebuggerEnabled;
  * @throws {Error} if a renderer with the same name has already been registered.
  */
 const register = function(name, rendererClass) {
-  Blockly.registry.register(Blockly.registry.Type.RENDERER, name,
+  registry.register(registry.Type.RENDERER, name,
       rendererClass);
 };
 exports.register = register;
@@ -57,7 +54,7 @@ exports.register = register;
  * @param {string} name The name of the renderer.
  */
 const unregister = function(name) {
-  Blockly.registry.unregister(Blockly.registry.Type.RENDERER, name);
+  registry.unregister(registry.Type.RENDERER, name);
 };
 exports.unregister = unregister;
 
@@ -84,16 +81,16 @@ exports.stopDebugger = stopDebugger;
 /**
  * Initialize anything needed for rendering (constants, etc).
  * @param {!string} name Name of the renderer to initialize.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
- * @return {!Blockly.blockRendering.Renderer} The new instance of a renderer.
+ * @return {!Renderer} The new instance of a renderer.
  *     Already initialized.
  * @package
  */
 
 const init = function(name, theme, opt_rendererOverrides) {
-  const rendererClass = Blockly.registry.getClass(
-      Blockly.registry.Type.RENDERER, name);
+  const rendererClass = registry.getClass(
+      registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;

From 70d8ca2a2071f745ec802f8b90cedac7d41c63e0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 14:40:06 -0700
Subject: [PATCH 233/291] clang-format core/renderers/common/block_rendering.js

---
 core/renderers/common/block_rendering.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index f91802584..77b2e8ced 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -44,8 +44,7 @@ exports.isDebuggerEnabled = isDebuggerEnabled;
  * @throws {Error} if a renderer with the same name has already been registered.
  */
 const register = function(name, rendererClass) {
-  registry.register(registry.Type.RENDERER, name,
-      rendererClass);
+  registry.register(registry.Type.RENDERER, name, rendererClass);
 };
 exports.register = register;
 
@@ -89,8 +88,7 @@ exports.stopDebugger = stopDebugger;
  */
 
 const init = function(name, theme, opt_rendererOverrides) {
-  const rendererClass = registry.getClass(
-      registry.Type.RENDERER, name);
+  const rendererClass = registry.getClass(registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);
   renderer.init(theme, opt_rendererOverrides);
   return renderer;

From 1487698343a349bd5baff96cdbb38daf13a06fb3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:27:40 -0700
Subject: [PATCH 234/291] Remove extra newline and remove unecessary package
 annotation

---
 core/renderers/common/block_rendering.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js
index 77b2e8ced..c00d58523 100644
--- a/core/renderers/common/block_rendering.js
+++ b/core/renderers/common/block_rendering.js
@@ -23,7 +23,6 @@ const registry = goog.require('Blockly.registry');
 /**
  * Whether or not the debugger is turned on.
  * @type {boolean}
- * @package
  */
 let useDebugger = false;
 /**
@@ -86,7 +85,6 @@ exports.stopDebugger = stopDebugger;
  *     Already initialized.
  * @package
  */
-
 const init = function(name, theme, opt_rendererOverrides) {
   const rendererClass = registry.getClass(registry.Type.RENDERER, name);
   const renderer = new rendererClass(name);

From abbc1b3de38b71cf367c805259520be38f4beb4e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 14:05:30 -0700
Subject: [PATCH 235/291] Split classes from core/events/block_events.js into
 multiple files

---
 core/events/block_events.js        | 573 -----------------------------
 core/events/events_block_base.js   |  66 ++++
 core/events/events_block_change.js | 143 +++++++
 core/events/events_block_create.js | 107 ++++++
 core/events/events_block_delete.js | 111 ++++++
 core/events/events_block_move.js   | 187 ++++++++++
 tests/deps.js                      |   6 +-
 tests/mocha/event_test.js          | 193 ++--------
 tests/mocha/trashcan_test.js       |   2 +-
 9 files changed, 652 insertions(+), 736 deletions(-)
 delete mode 100644 core/events/block_events.js
 create mode 100644 core/events/events_block_base.js
 create mode 100644 core/events/events_block_change.js
 create mode 100644 core/events/events_block_create.js
 create mode 100644 core/events/events_block_delete.js
 create mode 100644 core/events/events_block_move.js

diff --git a/core/events/block_events.js b/core/events/block_events.js
deleted file mode 100644
index 8be1dae30..000000000
--- a/core/events/block_events.js
+++ /dev/null
@@ -1,573 +0,0 @@
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Classes for all types of block events.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-'use strict';
-
-goog.provide('Blockly.Events.BlockBase');
-goog.provide('Blockly.Events.BlockChange');
-goog.provide('Blockly.Events.BlockCreate');
-goog.provide('Blockly.Events.BlockDelete');
-goog.provide('Blockly.Events.BlockMove');
-goog.provide('Blockly.Events.Change');  // Deprecated.
-goog.provide('Blockly.Events.Create');  // Deprecated.
-goog.provide('Blockly.Events.Delete');  // Deprecated.
-goog.provide('Blockly.Events.Move');  // Deprecated.
-
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-
-
-/**
- * Abstract class for a block event.
- * @param {!Blockly.Block=} opt_block The block this event corresponds to.
- *     Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
- * @constructor
- */
-Blockly.Events.BlockBase = function(opt_block) {
-  Blockly.Events.BlockBase.superClass_.constructor.call(this);
-  this.isBlank = typeof opt_block == 'undefined';
-
-  /**
-   * The block ID for the block this event pertains to
-   * @type {string}
-   */
-  this.blockId = this.isBlank ? '' : opt_block.id;
-
-  /**
-   * The workspace identifier for this event.
-   * @type {string}
-   */
-  this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
-};
-Blockly.utils.object.inherits(Blockly.Events.BlockBase,
-    Blockly.Events.Abstract);
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.BlockBase.prototype.toJson = function() {
-  var json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
-  json['blockId'] = this.blockId;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.BlockBase.prototype.fromJson = function(json) {
-  Blockly.Events.BlockBase.superClass_.fromJson.call(this, json);
-  this.blockId = json['blockId'];
-};
-
-/**
- * Class for a block change event.
- * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
- *     event.
- * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
- * @param {?string=} opt_name Name of input or field affected, or null.
- * @param {*=} opt_oldValue Previous value of element.
- * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
-    opt_newValue) {
-  Blockly.Events.Change.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  this.element = typeof opt_element == 'undefined' ? '' : opt_element;
-  this.name = typeof opt_name == 'undefined' ? '' : opt_name;
-  this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
-  this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
-};
-Blockly.utils.object.inherits(Blockly.Events.BlockChange, Blockly.Events.BlockBase);
-
-/**
- * Class for a block change event.
- * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
- *     event.
- * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
- * @param {?string=} opt_name Name of input or field affected, or null.
- * @param {*=} opt_oldValue Previous value of element.
- * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Change = Blockly.Events.BlockChange;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.BlockChange.prototype.type = Blockly.Events.CHANGE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.BlockChange.prototype.toJson = function() {
-  var json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
-  json['element'] = this.element;
-  if (this.name) {
-    json['name'] = this.name;
-  }
-  json['oldValue'] = this.oldValue;
-  json['newValue'] = this.newValue;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.BlockChange.prototype.fromJson = function(json) {
-  Blockly.Events.BlockChange.superClass_.fromJson.call(this, json);
-  this.element = json['element'];
-  this.name = json['name'];
-  this.oldValue = json['oldValue'];
-  this.newValue = json['newValue'];
-};
-
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-Blockly.Events.BlockChange.prototype.isNull = function() {
-  return this.oldValue == this.newValue;
-};
-
-/**
- * Run a change event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.BlockChange.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  if (!block) {
-    console.warn("Can't change non-existent block: " + this.blockId);
-    return;
-  }
-  if (block.mutator) {
-    // Close the mutator (if open) since we don't want to update it.
-    block.mutator.setVisible(false);
-  }
-  var value = forward ? this.newValue : this.oldValue;
-  switch (this.element) {
-    case 'field':
-      var field = block.getField(this.name);
-      if (field) {
-        field.setValue(value);
-      } else {
-        console.warn("Can't set non-existent field: " + this.name);
-      }
-      break;
-    case 'comment':
-      block.setCommentText(/** @type {string} */ (value) || null);
-      break;
-    case 'collapsed':
-      block.setCollapsed(!!value);
-      break;
-    case 'disabled':
-      block.setEnabled(!value);
-      break;
-    case 'inline':
-      block.setInputsInline(!!value);
-      break;
-    case 'mutation':
-      var oldMutation = '';
-      if (block.mutationToDom) {
-        var oldMutationDom = block.mutationToDom();
-        oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
-      }
-      if (block.domToMutation) {
-        var dom = Blockly.Xml.textToDom(/** @type {string} */ (value) || '<mutation/>');
-        block.domToMutation(dom);
-      }
-      Blockly.Events.fire(new Blockly.Events.BlockChange(
-          block, 'mutation', null, oldMutation, value));
-      break;
-    default:
-      console.warn('Unknown change type: ' + this.element);
-  }
-};
-
-/**
- * Class for a block creation event.
- * @param {!Blockly.Block=} opt_block The created block.  Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Create = function(opt_block) {
-  Blockly.Events.Create.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.isShadow()) {
-    // Moving shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  if (opt_block.workspace.rendered) {
-    this.xml = Blockly.Xml.blockToDomWithXY(opt_block);
-  } else {
-    this.xml = Blockly.Xml.blockToDom(opt_block);
-  }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
-};
-Blockly.utils.object.inherits(Blockly.Events.Create, Blockly.Events.BlockBase);
-
-/**
- * Class for a block creation event.
- * @param {!Blockly.Block=} block The created block. Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockCreate = Blockly.Events.Create;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.Create.prototype.type = Blockly.Events.CREATE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.Create.prototype.toJson = function() {
-  var json = Blockly.Events.Create.superClass_.toJson.call(this);
-  json['xml'] = Blockly.Xml.domToText(this.xml);
-  json['ids'] = this.ids;
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.Create.prototype.fromJson = function(json) {
-  Blockly.Events.Create.superClass_.fromJson.call(this, json);
-  this.xml = Blockly.Xml.textToDom(json['xml']);
-  this.ids = json['ids'];
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
-  }
-};
-
-/**
- * Run a creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.Create.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    var xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.xml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
-  } else {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
-      if (block) {
-        block.dispose(false);
-      } else if (id == this.blockId) {
-        // Only complain about root-level block.
-        console.warn("Can't uncreate non-existent block: " + id);
-      }
-    }
-  }
-};
-
-/**
- * Class for a block deletion event.
- * @param {!Blockly.Block=} opt_block The deleted block.  Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Delete = function(opt_block) {
-  Blockly.Events.Delete.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.getParent()) {
-    throw Error('Connected blocks cannot be deleted.');
-  }
-  if (opt_block.isShadow()) {
-    // Respawning shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  if (opt_block.workspace.rendered) {
-    this.oldXml = Blockly.Xml.blockToDomWithXY(opt_block);
-  } else {
-    this.oldXml = Blockly.Xml.blockToDom(opt_block);
-  }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
-};
-Blockly.utils.object.inherits(Blockly.Events.Delete, Blockly.Events.BlockBase);
-
-/**
- * Class for a block deletion event.
- * @param {?Blockly.Block} block The deleted block.  Null for a blank event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockDelete = Blockly.Events.Delete;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.Delete.prototype.type = Blockly.Events.DELETE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.Delete.prototype.toJson = function() {
-  var json = Blockly.Events.Delete.superClass_.toJson.call(this);
-  json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
-  json['ids'] = this.ids;
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.Delete.prototype.fromJson = function(json) {
-  Blockly.Events.Delete.superClass_.fromJson.call(this, json);
-  this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
-  this.ids = json['ids'];
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
-  }
-};
-
-/**
- * Run a deletion event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.Delete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
-      if (block) {
-        block.dispose(false);
-      } else if (id == this.blockId) {
-        // Only complain about root-level block.
-        console.warn("Can't delete non-existent block: " + id);
-      }
-    }
-  } else {
-    var xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.oldXml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
-  }
-};
-
-/**
- * Class for a block move event.  Created before the move.
- * @param {!Blockly.Block=} opt_block The moved block.  Undefined for a blank
- *     event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.Move = function(opt_block) {
-  Blockly.Events.Move.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.isShadow()) {
-    // Moving shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  var location = this.currentLocation_();
-  this.oldParentId = location.parentId;
-  this.oldInputName = location.inputName;
-  this.oldCoordinate = location.coordinate;
-};
-Blockly.utils.object.inherits(Blockly.Events.Move, Blockly.Events.BlockBase);
-
-/**
- * Class for a block move event.  Created before the move.
- * @param {?Blockly.Block} block The moved block.  Null for a blank event.
- * @extends {Blockly.Events.BlockBase}
- * @constructor
- */
-Blockly.Events.BlockMove = Blockly.Events.Move;
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.Move.prototype.type = Blockly.Events.MOVE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.Move.prototype.toJson = function() {
-  var json = Blockly.Events.Move.superClass_.toJson.call(this);
-  if (this.newParentId) {
-    json['newParentId'] = this.newParentId;
-  }
-  if (this.newInputName) {
-    json['newInputName'] = this.newInputName;
-  }
-  if (this.newCoordinate) {
-    json['newCoordinate'] = Math.round(this.newCoordinate.x) + ',' +
-        Math.round(this.newCoordinate.y);
-  }
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
-  }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.Move.prototype.fromJson = function(json) {
-  Blockly.Events.Move.superClass_.fromJson.call(this, json);
-  this.newParentId = json['newParentId'];
-  this.newInputName = json['newInputName'];
-  if (json['newCoordinate']) {
-    var xy = json['newCoordinate'].split(',');
-    this.newCoordinate =
-        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
-  }
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
-  }
-};
-
-/**
- * Record the block's new location.  Called after the move.
- */
-Blockly.Events.Move.prototype.recordNew = function() {
-  var location = this.currentLocation_();
-  this.newParentId = location.parentId;
-  this.newInputName = location.inputName;
-  this.newCoordinate = location.coordinate;
-};
-
-/**
- * Returns the parentId and input if the block is connected,
- *   or the XY location if disconnected.
- * @return {!Object} Collection of location info.
- * @private
- */
-Blockly.Events.Move.prototype.currentLocation_ = function() {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  var location = {};
-  var parent = block.getParent();
-  if (parent) {
-    location.parentId = parent.id;
-    var input = parent.getInputWithBlock(block);
-    if (input) {
-      location.inputName = input.name;
-    }
-  } else {
-    location.coordinate = block.getRelativeToSurfaceXY();
-  }
-  return location;
-};
-
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-Blockly.Events.Move.prototype.isNull = function() {
-  return this.oldParentId == this.newParentId &&
-      this.oldInputName == this.newInputName &&
-      Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
-};
-
-/**
- * Run a move event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.Move.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  if (!block) {
-    console.warn("Can't move non-existent block: " + this.blockId);
-    return;
-  }
-  var parentId = forward ? this.newParentId : this.oldParentId;
-  var inputName = forward ? this.newInputName : this.oldInputName;
-  var coordinate = forward ? this.newCoordinate : this.oldCoordinate;
-  var parentBlock = null;
-  if (parentId) {
-    parentBlock = workspace.getBlockById(parentId);
-    if (!parentBlock) {
-      console.warn("Can't connect to non-existent block: " + parentId);
-      return;
-    }
-  }
-  if (block.getParent()) {
-    block.unplug();
-  }
-  if (coordinate) {
-    var xy = block.getRelativeToSurfaceXY();
-    block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
-  } else {
-    var blockConnection = block.outputConnection || block.previousConnection;
-    var parentConnection;
-    var connectionType = blockConnection.type;
-    if (inputName) {
-      var input = parentBlock.getInput(inputName);
-      if (input) {
-        parentConnection = input.connection;
-      }
-    } else if (connectionType == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
-      parentConnection = parentBlock.nextConnection;
-    }
-    if (parentConnection) {
-      blockConnection.connect(parentConnection);
-    } else {
-      console.warn("Can't connect to non-existent input: " + inputName);
-    }
-  }
-};
-
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
-    Blockly.Events.Create);
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
-    Blockly.Events.Delete);
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
-    Blockly.Events.BlockChange);
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
-    Blockly.Events.Move);
diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
new file mode 100644
index 000000000..c1c0ebb61
--- /dev/null
+++ b/core/events/events_block_base.js
@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Base class for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockBase');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Abstract class for a block event.
+ * @param {!Blockly.Block=} opt_block The block this event corresponds to.
+ *     Undefined for a blank event.
+ * @extends {Blockly.Events.Abstract}
+ * @constructor
+ */
+Blockly.Events.BlockBase = function(opt_block) {
+  Blockly.Events.BlockBase.superClass_.constructor.call(this);
+  this.isBlank = typeof opt_block == 'undefined';
+
+  /**
+   * The block ID for the block this event pertains to
+   * @type {string}
+   */
+  this.blockId = this.isBlank ? '' : opt_block.id;
+
+  /**
+   * The workspace identifier for this event.
+   * @type {string}
+   */
+  this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockBase,
+    Blockly.Events.Abstract);
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockBase.prototype.toJson = function() {
+  var json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
+  json['blockId'] = this.blockId;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockBase.prototype.fromJson = function(json) {
+  Blockly.Events.BlockBase.superClass_.fromJson.call(this, json);
+  this.blockId = json['blockId'];
+};
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
new file mode 100644
index 000000000..82868aac2
--- /dev/null
+++ b/core/events/events_block_change.js
@@ -0,0 +1,143 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockChange');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.utils.object');
+goog.require('Blockly.Xml');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block change event.
+ * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
+ *     event.
+ * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
+ * @param {?string=} opt_name Name of input or field affected, or null.
+ * @param {*=} opt_oldValue Previous value of element.
+ * @param {*=} opt_newValue New value of element.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
+    opt_newValue) {
+  Blockly.Events.BlockChange.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  this.element = typeof opt_element == 'undefined' ? '' : opt_element;
+  this.name = typeof opt_name == 'undefined' ? '' : opt_name;
+  this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
+  this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockChange, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockChange.prototype.toJson = function() {
+  var json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
+  json['element'] = this.element;
+  if (this.name) {
+    json['name'] = this.name;
+  }
+  json['oldValue'] = this.oldValue;
+  json['newValue'] = this.newValue;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockChange.prototype.fromJson = function(json) {
+  Blockly.Events.BlockChange.superClass_.fromJson.call(this, json);
+  this.element = json['element'];
+  this.name = json['name'];
+  this.oldValue = json['oldValue'];
+  this.newValue = json['newValue'];
+};
+
+/**
+ * Does this event record any change of state?
+ * @return {boolean} False if something changed.
+ */
+Blockly.Events.BlockChange.prototype.isNull = function() {
+  return this.oldValue == this.newValue;
+};
+
+/**
+ * Run a change event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockChange.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  var block = workspace.getBlockById(this.blockId);
+  if (!block) {
+    console.warn("Can't change non-existent block: " + this.blockId);
+    return;
+  }
+  if (block.mutator) {
+    // Close the mutator (if open) since we don't want to update it.
+    block.mutator.setVisible(false);
+  }
+  var value = forward ? this.newValue : this.oldValue;
+  switch (this.element) {
+    case 'field':
+      var field = block.getField(this.name);
+      if (field) {
+        field.setValue(value);
+      } else {
+        console.warn("Can't set non-existent field: " + this.name);
+      }
+      break;
+    case 'comment':
+      block.setCommentText(/** @type {string} */ (value) || null);
+      break;
+    case 'collapsed':
+      block.setCollapsed(!!value);
+      break;
+    case 'disabled':
+      block.setEnabled(!value);
+      break;
+    case 'inline':
+      block.setInputsInline(!!value);
+      break;
+    case 'mutation':
+      var oldMutation = '';
+      if (block.mutationToDom) {
+        var oldMutationDom = block.mutationToDom();
+        oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+      }
+      if (block.domToMutation) {
+        var dom = Blockly.Xml.textToDom(/** @type {string} */ (value) || '<mutation/>');
+        block.domToMutation(dom);
+      }
+      Blockly.Events.fire(new Blockly.Events.BlockChange(
+          block, 'mutation', null, oldMutation, value));
+      break;
+    default:
+      console.warn('Unknown change type: ' + this.element);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
+    Blockly.Events.BlockChange);
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
new file mode 100644
index 000000000..301068afe
--- /dev/null
+++ b/core/events/events_block_create.js
@@ -0,0 +1,107 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockCreate');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.utils.object');
+goog.require('Blockly.utils.xml');
+goog.require('Blockly.Xml');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block creation event.
+ * @param {!Blockly.Block=} opt_block The created block.  Undefined for a blank
+ *     event.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockCreate = function(opt_block) {
+  Blockly.Events.BlockCreate.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  if (opt_block.isShadow()) {
+    // Moving shadow blocks is handled via disconnection.
+    this.recordUndo = false;
+  }
+
+  if (opt_block.workspace.rendered) {
+    this.xml = Blockly.Xml.blockToDomWithXY(opt_block);
+  } else {
+    this.xml = Blockly.Xml.blockToDom(opt_block);
+  }
+  this.ids = Blockly.Events.getDescendantIds(opt_block);
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockCreate, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockCreate.prototype.toJson = function() {
+  var json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
+  json['xml'] = Blockly.Xml.domToText(this.xml);
+  json['ids'] = this.ids;
+  if (!this.recordUndo) {
+    json['recordUndo'] = this.recordUndo;
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
+  Blockly.Events.BlockCreate.superClass_.fromJson.call(this, json);
+  this.xml = Blockly.Xml.textToDom(json['xml']);
+  this.ids = json['ids'];
+  if (json['recordUndo'] !== undefined) {
+    this.recordUndo = json['recordUndo'];
+  }
+};
+
+/**
+ * Run a creation event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockCreate.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    var xml = Blockly.utils.xml.createElement('xml');
+    xml.appendChild(this.xml);
+    Blockly.Xml.domToWorkspace(xml, workspace);
+  } else {
+    for (var i = 0, id; (id = this.ids[i]); i++) {
+      var block = workspace.getBlockById(id);
+      if (block) {
+        block.dispose(false);
+      } else if (id == this.blockId) {
+        // Only complain about root-level block.
+        console.warn("Can't uncreate non-existent block: " + id);
+      }
+    }
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
+    Blockly.Events.BlockCreate);
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
new file mode 100644
index 000000000..38d1d6345
--- /dev/null
+++ b/core/events/events_block_delete.js
@@ -0,0 +1,111 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of block events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockDelete');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+goog.require('Blockly.utils.xml');
+goog.require('Blockly.Xml');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block deletion event.
+ * @param {!Blockly.Block=} opt_block The deleted block.  Undefined for a blank
+ *     event.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockDelete = function(opt_block) {
+  Blockly.Events.BlockDelete.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  if (opt_block.getParent()) {
+    throw Error('Connected blocks cannot be deleted.');
+  }
+  if (opt_block.isShadow()) {
+    // Respawning shadow blocks is handled via disconnection.
+    this.recordUndo = false;
+  }
+
+  if (opt_block.workspace.rendered) {
+    this.oldXml = Blockly.Xml.blockToDomWithXY(opt_block);
+  } else {
+    this.oldXml = Blockly.Xml.blockToDom(opt_block);
+  }
+  this.ids = Blockly.Events.getDescendantIds(opt_block);
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockDelete, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockDelete.prototype.toJson = function() {
+  var json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
+  json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
+  json['ids'] = this.ids;
+  if (!this.recordUndo) {
+    json['recordUndo'] = this.recordUndo;
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
+  Blockly.Events.BlockDelete.superClass_.fromJson.call(this, json);
+  this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
+  this.ids = json['ids'];
+  if (json['recordUndo'] !== undefined) {
+    this.recordUndo = json['recordUndo'];
+  }
+};
+
+/**
+ * Run a deletion event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockDelete.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    for (var i = 0, id; (id = this.ids[i]); i++) {
+      var block = workspace.getBlockById(id);
+      if (block) {
+        block.dispose(false);
+      } else if (id == this.blockId) {
+        // Only complain about root-level block.
+        console.warn("Can't delete non-existent block: " + id);
+      }
+    }
+  } else {
+    var xml = Blockly.utils.xml.createElement('xml');
+    xml.appendChild(this.oldXml);
+    Blockly.Xml.domToWorkspace(xml, workspace);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
+    Blockly.Events.BlockDelete);
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
new file mode 100644
index 000000000..d3121e115
--- /dev/null
+++ b/core/events/events_block_move.js
@@ -0,0 +1,187 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for a block move event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.BlockMove');
+
+goog.require('Blockly.connectionTypes');
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.Coordinate');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Class for a block move event.  Created before the move.
+ * @param {!Blockly.Block=} opt_block The moved block.  Undefined for a blank
+ *     event.
+ * @extends {Blockly.Events.BlockBase}
+ * @constructor
+ */
+Blockly.Events.BlockMove = function(opt_block) {
+  Blockly.Events.BlockMove.superClass_.constructor.call(this, opt_block);
+  if (!opt_block) {
+    return;  // Blank event to be populated by fromJson.
+  }
+  if (opt_block.isShadow()) {
+    // Moving shadow blocks is handled via disconnection.
+    this.recordUndo = false;
+  }
+
+  var location = this.currentLocation_();
+  this.oldParentId = location.parentId;
+  this.oldInputName = location.inputName;
+  this.oldCoordinate = location.coordinate;
+};
+Blockly.utils.object.inherits(Blockly.Events.BlockMove, Blockly.Events.BlockBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.BlockMove.prototype.toJson = function() {
+  var json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
+  if (this.newParentId) {
+    json['newParentId'] = this.newParentId;
+  }
+  if (this.newInputName) {
+    json['newInputName'] = this.newInputName;
+  }
+  if (this.newCoordinate) {
+    json['newCoordinate'] = Math.round(this.newCoordinate.x) + ',' +
+        Math.round(this.newCoordinate.y);
+  }
+  if (!this.recordUndo) {
+    json['recordUndo'] = this.recordUndo;
+  }
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.BlockMove.prototype.fromJson = function(json) {
+  Blockly.Events.BlockMove.superClass_.fromJson.call(this, json);
+  this.newParentId = json['newParentId'];
+  this.newInputName = json['newInputName'];
+  if (json['newCoordinate']) {
+    var xy = json['newCoordinate'].split(',');
+    this.newCoordinate =
+        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
+  }
+  if (json['recordUndo'] !== undefined) {
+    this.recordUndo = json['recordUndo'];
+  }
+};
+
+/**
+ * Record the block's new location.  Called after the move.
+ */
+Blockly.Events.BlockMove.prototype.recordNew = function() {
+  var location = this.currentLocation_();
+  this.newParentId = location.parentId;
+  this.newInputName = location.inputName;
+  this.newCoordinate = location.coordinate;
+};
+
+/**
+ * Returns the parentId and input if the block is connected,
+ *   or the XY location if disconnected.
+ * @return {!Object} Collection of location info.
+ * @private
+ */
+Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
+  var workspace = this.getEventWorkspace_();
+  var block = workspace.getBlockById(this.blockId);
+  var location = {};
+  var parent = block.getParent();
+  if (parent) {
+    location.parentId = parent.id;
+    var input = parent.getInputWithBlock(block);
+    if (input) {
+      location.inputName = input.name;
+    }
+  } else {
+    location.coordinate = block.getRelativeToSurfaceXY();
+  }
+  return location;
+};
+
+/**
+ * Does this event record any change of state?
+ * @return {boolean} False if something changed.
+ */
+Blockly.Events.BlockMove.prototype.isNull = function() {
+  return this.oldParentId == this.newParentId &&
+      this.oldInputName == this.newInputName &&
+      Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
+};
+
+/**
+ * Run a move event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.BlockMove.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  var block = workspace.getBlockById(this.blockId);
+  if (!block) {
+    console.warn("Can't move non-existent block: " + this.blockId);
+    return;
+  }
+  var parentId = forward ? this.newParentId : this.oldParentId;
+  var inputName = forward ? this.newInputName : this.oldInputName;
+  var coordinate = forward ? this.newCoordinate : this.oldCoordinate;
+  var parentBlock = null;
+  if (parentId) {
+    parentBlock = workspace.getBlockById(parentId);
+    if (!parentBlock) {
+      console.warn("Can't connect to non-existent block: " + parentId);
+      return;
+    }
+  }
+  if (block.getParent()) {
+    block.unplug();
+  }
+  if (coordinate) {
+    var xy = block.getRelativeToSurfaceXY();
+    block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
+  } else {
+    var blockConnection = block.outputConnection || block.previousConnection;
+    var parentConnection;
+    var connectionType = blockConnection.type;
+    if (inputName) {
+      var input = parentBlock.getInput(inputName);
+      if (input) {
+        parentConnection = input.connection;
+      }
+    } else if (connectionType == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+      parentConnection = parentBlock.nextConnection;
+    }
+    if (parentConnection) {
+      blockConnection.connect(parentConnection);
+    } else {
+      console.warn("Can't connect to non-existent input: " + inputName);
+    }
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
+    Blockly.Events.BlockMove);
diff --git a/tests/deps.js b/tests/deps.js
index 4ab382ba8..542c8355d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -34,10 +34,14 @@ goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'mo
 goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
-goog.addDependency('../../core/events/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Events.BlockBase', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml']);
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
diff --git a/tests/mocha/event_test.js b/tests/mocha/event_test.js
index 81ab69519..febcaf1c3 100644
--- a/tests/mocha/event_test.js
+++ b/tests/mocha/event_test.js
@@ -109,32 +109,10 @@ suite('Events', function() {
             });
       });
 
-      test('Create', function() {
-        var event = new Blockly.Events.Create(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': true,
-              'group': '',
-            });
-      });
-
       test('Block create', function() {
         var event = new Blockly.Events.BlockCreate(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': true,
-              'group': '',
-            });
-      });
-
-      test('Delete', function() {
-        var event = new Blockly.Events.Delete(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_CREATE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': true,
@@ -145,7 +123,7 @@ suite('Events', function() {
       test('Block delete', function() {
         var event = new Blockly.Events.BlockDelete(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_DELETE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': true,
@@ -181,30 +159,14 @@ suite('Events', function() {
             }, true);
       });
 
-      suite('Move', function() {
-        test('Move by coordinate', function() {
-          var coordinate = new Blockly.utils.Coordinate(3, 4);
-          this.block.xy_ = coordinate;
-
-          var event = new Blockly.Events.Move(this.block);
-          sinon.assert.calledOnce(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
-              this.TEST_BLOCK_ID, {
-                'oldParentId': undefined,
-                'oldInputName': undefined,
-                'oldCoordinate': coordinate,
-                'recordUndo': true,
-                'group': ''
-              });
-        });
-
-        test('Block move by coordinate', function() {
+      suite('Block Move', function() {
+        test('by coordinate', function() {
           var coordinate = new Blockly.utils.Coordinate(3, 4);
           this.block.xy_ = coordinate;
 
           var event = new Blockly.Events.BlockMove(this.block);
           sinon.assert.calledOnce(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
+          assertEventEquals(event, Blockly.Events.BLOCK_MOVE, this.workspace.id,
               this.TEST_BLOCK_ID, {
                 'oldParentId': undefined,
                 'oldInputName': undefined,
@@ -214,22 +176,14 @@ suite('Events', function() {
               });
         });
 
-        suite('Move by parent', function() {
-          setup(function() {
+        test('by parent', function() {
+          try {
             this.parentBlock = createSimpleTestBlock(this.workspace);
-
             this.block.parentBlock_ = this.parentBlock;
             this.block.xy_ = new Blockly.utils.Coordinate(3, 4);
-          });
-          teardown(function() {
-            // This needs to be cleared, otherwise workspace.dispose will fail.
-            this.block.parentBlock_ = null;
-          });
-
-          test('Move by parent', function() {
-            var event = new Blockly.Events.Move(this.block);
+            var event = new Blockly.Events.BlockMove(this.block);
             sinon.assert.calledTwice(this.genUidStub);
-            assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
+            assertEventEquals(event, Blockly.Events.BLOCK_MOVE, this.workspace.id,
                 this.TEST_BLOCK_ID, {
                   'oldParentId': this.TEST_PARENT_ID,
                   'oldInputName': undefined,
@@ -237,21 +191,10 @@ suite('Events', function() {
                   'recordUndo': true,
                   'group': ''
                 });
-          });
-
-          test('Block move by parent', function() {
-            var event = new Blockly.Events.BlockMove(this.block);
-            sinon.assert.calledTwice(this.genUidStub);
-            assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
-                this.TEST_BLOCK_ID,
-                {
-                  'oldParentId': this.TEST_PARENT_ID,
-                  'oldInputName': undefined,
-                  'oldCoordinate': undefined,
-                  'recordUndo': true,
-                  'group': ''
-                });
-          });
+          } finally {
+            // This needs to be cleared, otherwise workspace.dispose will fail.
+            this.block.parentBlock_ = null;
+          }
         });
       });
     });
@@ -279,28 +222,11 @@ suite('Events', function() {
             });
       });
 
-      test('Change', function() {
-        var event = new Blockly.Events.Change(
-            this.block, 'field', 'FIELD_NAME', 'old', 'new');
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CHANGE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'varId': undefined,
-              'element': 'field',
-              'name': 'FIELD_NAME',
-              'oldValue': 'old',
-              'newValue': 'new',
-              'recordUndo': true,
-              'group': '',
-            });
-      });
-
       test('Block change', function() {
         var event = new Blockly.Events.BlockChange(
             this.block, 'field', 'FIELD_NAME', 'old', 'new');
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CHANGE,
+        assertEventEquals(event, Blockly.Events.BLOCK_CHANGE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'varId': undefined,
@@ -313,32 +239,10 @@ suite('Events', function() {
             });
       });
 
-      test('Create', function() {
-        var event = new Blockly.Events.Create(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': false,
-              'group': '',
-            });
-      });
-
       test('Block create', function() {
         var event = new Blockly.Events.BlockCreate(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.CREATE,
-            this.workspace.id, this.TEST_BLOCK_ID,
-            {
-              'recordUndo': false,
-              'group': '',
-            });
-      });
-
-      test('Delete', function() {
-        var event = new Blockly.Events.Delete(this.block);
-        sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_CREATE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': false,
@@ -349,7 +253,7 @@ suite('Events', function() {
       test('Block delete', function() {
         var event = new Blockly.Events.BlockDelete(this.block);
         sinon.assert.calledOnce(this.genUidStub);
-        assertEventEquals(event, Blockly.Events.DELETE,
+        assertEventEquals(event, Blockly.Events.BLOCK_DELETE,
             this.workspace.id, this.TEST_BLOCK_ID,
             {
               'recordUndo': false,
@@ -357,35 +261,14 @@ suite('Events', function() {
             });
       });
 
-      suite('Move', function() {
-        setup(function() {
+      test('Block move', function() {
+        try {
           this.parentBlock = createSimpleTestBlock(this.workspace);
           this.block.parentBlock_ = this.parentBlock;
           this.block.xy_ = new Blockly.utils.Coordinate(3, 4);
-        });
-
-        teardown(function() {
-          // This needs to be cleared, otherwise workspace.dispose will fail.
-          this.block.parentBlock_ = null;
-        });
-
-        test('Move', function() {
-          var event = new Blockly.Events.Move(this.block);
-          sinon.assert.calledTwice(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
-              this.TEST_BLOCK_ID, {
-                'oldParentId': this.TEST_PARENT_ID,
-                'oldInputName': undefined,
-                'oldCoordinate': undefined,
-                'recordUndo': false,
-                'group': ''
-              });
-        });
-
-        test('Block move', function() {
           var event = new Blockly.Events.BlockMove(this.block);
           sinon.assert.calledTwice(this.genUidStub);
-          assertEventEquals(event, Blockly.Events.MOVE, this.workspace.id,
+          assertEventEquals(event, Blockly.Events.BLOCK_MOVE, this.workspace.id,
               this.TEST_BLOCK_ID,
               {
                 'oldParentId': this.TEST_PARENT_ID,
@@ -394,7 +277,10 @@ suite('Events', function() {
                 'recordUndo': false,
                 'group': ''
               });
-        });
+        } finally {
+          // This needs to be cleared, otherwise workspace.dispose will fail.
+          this.block.parentBlock_ = null;
+        }
       });
     });
 
@@ -408,25 +294,10 @@ suite('Events', function() {
             this.workspace, 'field_variable_test_block');
       });
 
-      test('Change', function() {
-        var event = new Blockly.Events.Change(
-            this.block, 'field', 'VAR', 'id1', 'id2');
-        assertEventEquals(event, Blockly.Events.CHANGE, this.workspace.id,
-            this.TEST_BLOCK_ID,
-            {
-              'element': 'field',
-              'name': 'VAR',
-              'oldValue': 'id1',
-              'newValue': 'id2',
-              'recordUndo': true,
-              'group': ''
-            });
-      });
-
       test('Block change', function() {
         var event = new Blockly.Events.BlockChange(
             this.block, 'field', 'VAR', 'id1', 'id2');
-        assertEventEquals(event, Blockly.Events.CHANGE, this.workspace.id,
+        assertEventEquals(event, Blockly.Events.BLOCK_CHANGE, this.workspace.id,
             this.TEST_BLOCK_ID,
             {
               'element': 'field',
@@ -889,7 +760,7 @@ suite('Events', function() {
       chai.assert.equal(filteredEvents[1].newCoordinate.y, 1);
     });
 
-    test('Merge move events', function() {
+    test('Merge block move events', function() {
       var block = this.workspace.newBlock('field_variable_test_block', '1');
       var events = [];
       addMoveEvent(events, block, 0, 0);
@@ -900,11 +771,11 @@ suite('Events', function() {
       chai.assert.equal(filteredEvents[0].newCoordinate.y, 1);
     });
 
-    test('Merge change events', function() {
+    test('Merge block change events', function() {
       var block1 = this.workspace.newBlock('field_variable_test_block', '1');
       var events = [
-        new Blockly.Events.Change(block1, 'field', 'VAR', 'item', 'item1'),
-        new Blockly.Events.Change(block1, 'field', 'VAR', 'item1', 'item2')
+        new Blockly.Events.BlockChange(block1, 'field', 'VAR', 'item', 'item1'),
+        new Blockly.Events.BlockChange(block1, 'field', 'VAR', 'item1', 'item2')
       ];
       var filteredEvents = Blockly.Events.filter(events, true);
       chai.assert.equal(filteredEvents.length, 1);  // second change event merged into first
@@ -1042,11 +913,11 @@ suite('Events', function() {
         sinon.assert.calledTwice(genUidStub);
 
         assertNthCallEventArgEquals(
-            this.eventsFireSpy, 0, Blockly.Events.Delete,
+            this.eventsFireSpy, 0, Blockly.Events.BlockDelete,
             {oldXml: expectedOldXml, group: ''},
             workspaceSvg.id, expectedId);
         assertNthCallEventArgEquals(
-            changeListenerSpy, 0, Blockly.Events.Delete,
+            changeListenerSpy, 0, Blockly.Events.BlockDelete,
             {oldXml: expectedOldXml, group: ''},
             workspaceSvg.id, expectedId);
 
@@ -1086,7 +957,7 @@ suite('Events', function() {
           {group: TEST_GROUP_ID, varId: TEST_VAR_ID, varName: TEST_VAR_NAME},
           this.workspace.id, undefined);
       assertNthCallEventArgEquals(
-          this.changeListenerSpy, 1, Blockly.Events.Create,
+          this.changeListenerSpy, 1, Blockly.Events.BlockCreate,
           {group: TEST_GROUP_ID}, this.workspace.id, TEST_BLOCK_ID);
 
       // Expect the workspace to have a variable with ID 'test_var_id'.
@@ -1131,7 +1002,7 @@ suite('Events', function() {
           {group: TEST_GROUP_ID, varId: TEST_VAR_ID, varName: TEST_VAR_NAME},
           this.workspace.id, undefined);
       assertNthCallEventArgEquals(
-          this.changeListenerSpy, 1, Blockly.Events.Create,
+          this.changeListenerSpy, 1, Blockly.Events.BlockCreate,
           {group: TEST_GROUP_ID}, this.workspace.id, TEST_BLOCK_ID);
 
       // Finished loading event should not be part of event group.
diff --git a/tests/mocha/trashcan_test.js b/tests/mocha/trashcan_test.js
index 9e0122d71..3a8bed245 100644
--- a/tests/mocha/trashcan_test.js
+++ b/tests/mocha/trashcan_test.js
@@ -10,7 +10,7 @@ suite("Trashcan", function() {
         '<xml xmlns="https://developers.google.com/blockly/xml">' +
         xmlString + '</xml>');
     xml = xml.children[0];
-    var event = new Blockly.Events.Delete();
+    var event = new Blockly.Events.BlockDelete();
     event.oldXml = xml;
     event.workspaceId = workspace.id;
     Blockly.Events.fire(event);

From 20dad54d38f3181b3e852ba3f6b9797b06000ca8 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:41:52 -0700
Subject: [PATCH 236/291] Migrate core/events/block_events.js to ES6 const/let

---
 core/events/events_block_base.js   |  2 +-
 core/events/events_block_change.js | 23 +++++++++--------
 core/events/events_block_create.js | 11 ++++----
 core/events/events_block_delete.js | 11 ++++----
 core/events/events_block_move.js   | 40 +++++++++++++++---------------
 5 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index c1c0ebb61..2ba798689 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -51,7 +51,7 @@ Blockly.utils.object.inherits(Blockly.Events.BlockBase,
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockBase.prototype.toJson = function() {
-  var json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
   json['blockId'] = this.blockId;
   return json;
 };
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 82868aac2..6938712b0 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -54,7 +54,7 @@ Blockly.Events.BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockChange.prototype.toJson = function() {
-  var json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.name) {
     json['name'] = this.name;
@@ -89,8 +89,8 @@ Blockly.Events.BlockChange.prototype.isNull = function() {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockChange.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
+  const workspace = this.getEventWorkspace_();
+  const block = workspace.getBlockById(this.blockId);
   if (!block) {
     console.warn("Can't change non-existent block: " + this.blockId);
     return;
@@ -99,16 +99,17 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
     // Close the mutator (if open) since we don't want to update it.
     block.mutator.setVisible(false);
   }
-  var value = forward ? this.newValue : this.oldValue;
+  const value = forward ? this.newValue : this.oldValue;
   switch (this.element) {
-    case 'field':
-      var field = block.getField(this.name);
+    case 'field': {
+      const field = block.getField(this.name);
       if (field) {
         field.setValue(value);
       } else {
         console.warn("Can't set non-existent field: " + this.name);
       }
       break;
+    }
     case 'comment':
       block.setCommentText(/** @type {string} */ (value) || null);
       break;
@@ -121,19 +122,21 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
     case 'inline':
       block.setInputsInline(!!value);
       break;
-    case 'mutation':
-      var oldMutation = '';
+    case 'mutation': {
+      let oldMutation = '';
       if (block.mutationToDom) {
-        var oldMutationDom = block.mutationToDom();
+        const oldMutationDom = block.mutationToDom();
         oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
       }
       if (block.domToMutation) {
-        var dom = Blockly.Xml.textToDom(/** @type {string} */ (value) || '<mutation/>');
+        const dom = Blockly.Xml.textToDom(/** @type {string} */
+            (value) || '<mutation/>');
         block.domToMutation(dom);
       }
       Blockly.Events.fire(new Blockly.Events.BlockChange(
           block, 'mutation', null, oldMutation, value));
       break;
+    }
     default:
       console.warn('Unknown change type: ' + this.element);
   }
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 301068afe..119f9c0a8 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -58,7 +58,7 @@ Blockly.Events.BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockCreate.prototype.toJson = function() {
-  var json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
   json['xml'] = Blockly.Xml.domToText(this.xml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -85,14 +85,15 @@ Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockCreate.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
-    var xml = Blockly.utils.xml.createElement('xml');
+    const xml = Blockly.utils.xml.createElement('xml');
     xml.appendChild(this.xml);
     Blockly.Xml.domToWorkspace(xml, workspace);
   } else {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
+    for (let i = 0; i < this.ids.length; i++) {
+      const id = this.ids[i];
+      const block = workspace.getBlockById(id);
       if (block) {
         block.dispose(false);
       } else if (id == this.blockId) {
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 38d1d6345..120ac7ddc 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -62,7 +62,7 @@ Blockly.Events.BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockDelete.prototype.toJson = function() {
-  var json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
   json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -89,10 +89,11 @@ Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockDelete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
-    for (var i = 0, id; (id = this.ids[i]); i++) {
-      var block = workspace.getBlockById(id);
+    for (let i = 0; i < this.ids.length; i++) {
+      const id = this.ids[i];
+      const block = workspace.getBlockById(id);
       if (block) {
         block.dispose(false);
       } else if (id == this.blockId) {
@@ -101,7 +102,7 @@ Blockly.Events.BlockDelete.prototype.run = function(forward) {
       }
     }
   } else {
-    var xml = Blockly.utils.xml.createElement('xml');
+    const xml = Blockly.utils.xml.createElement('xml');
     xml.appendChild(this.oldXml);
     Blockly.Xml.domToWorkspace(xml, workspace);
   }
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index d3121e115..4318e443e 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -39,7 +39,7 @@ Blockly.Events.BlockMove = function(opt_block) {
     this.recordUndo = false;
   }
 
-  var location = this.currentLocation_();
+  const location = this.currentLocation_();
   this.oldParentId = location.parentId;
   this.oldInputName = location.inputName;
   this.oldCoordinate = location.coordinate;
@@ -57,7 +57,7 @@ Blockly.Events.BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.BlockMove.prototype.toJson = function() {
-  var json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
+  const json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
   if (this.newParentId) {
     json['newParentId'] = this.newParentId;
   }
@@ -83,7 +83,7 @@ Blockly.Events.BlockMove.prototype.fromJson = function(json) {
   this.newParentId = json['newParentId'];
   this.newInputName = json['newInputName'];
   if (json['newCoordinate']) {
-    var xy = json['newCoordinate'].split(',');
+    const xy = json['newCoordinate'].split(',');
     this.newCoordinate =
         new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
   }
@@ -96,7 +96,7 @@ Blockly.Events.BlockMove.prototype.fromJson = function(json) {
  * Record the block's new location.  Called after the move.
  */
 Blockly.Events.BlockMove.prototype.recordNew = function() {
-  var location = this.currentLocation_();
+  const location = this.currentLocation_();
   this.newParentId = location.parentId;
   this.newInputName = location.inputName;
   this.newCoordinate = location.coordinate;
@@ -109,13 +109,13 @@ Blockly.Events.BlockMove.prototype.recordNew = function() {
  * @private
  */
 Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
-  var location = {};
-  var parent = block.getParent();
+  const workspace = this.getEventWorkspace_();
+  const block = workspace.getBlockById(this.blockId);
+  const location = {};
+  const parent = block.getParent();
   if (parent) {
     location.parentId = parent.id;
-    var input = parent.getInputWithBlock(block);
+    const input = parent.getInputWithBlock(block);
     if (input) {
       location.inputName = input.name;
     }
@@ -140,16 +140,16 @@ Blockly.Events.BlockMove.prototype.isNull = function() {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.BlockMove.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  var block = workspace.getBlockById(this.blockId);
+  const workspace = this.getEventWorkspace_();
+  const block = workspace.getBlockById(this.blockId);
   if (!block) {
     console.warn("Can't move non-existent block: " + this.blockId);
     return;
   }
-  var parentId = forward ? this.newParentId : this.oldParentId;
-  var inputName = forward ? this.newInputName : this.oldInputName;
-  var coordinate = forward ? this.newCoordinate : this.oldCoordinate;
-  var parentBlock = null;
+  const parentId = forward ? this.newParentId : this.oldParentId;
+  const inputName = forward ? this.newInputName : this.oldInputName;
+  const coordinate = forward ? this.newCoordinate : this.oldCoordinate;
+  let parentBlock;
   if (parentId) {
     parentBlock = workspace.getBlockById(parentId);
     if (!parentBlock) {
@@ -161,14 +161,14 @@ Blockly.Events.BlockMove.prototype.run = function(forward) {
     block.unplug();
   }
   if (coordinate) {
-    var xy = block.getRelativeToSurfaceXY();
+    const xy = block.getRelativeToSurfaceXY();
     block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
   } else {
-    var blockConnection = block.outputConnection || block.previousConnection;
-    var parentConnection;
-    var connectionType = blockConnection.type;
+    const blockConnection = block.outputConnection || block.previousConnection;
+    let parentConnection;
+    const connectionType = blockConnection.type;
     if (inputName) {
-      var input = parentBlock.getInput(inputName);
+      const input = parentBlock.getInput(inputName);
       if (input) {
         parentConnection = input.connection;
       }

From fd0385dd63b5edee14364d7f224bdd1bd6a1b755 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:42:12 -0700
Subject: [PATCH 237/291] Migrate core/events/block_events.js to goog.module

---
 core/events/events_block_base.js   | 21 ++++++++++----------
 core/events/events_block_change.js | 30 ++++++++++++++++-------------
 core/events/events_block_create.js | 26 ++++++++++++++-----------
 core/events/events_block_delete.js | 25 +++++++++++++-----------
 core/events/events_block_move.js   | 31 ++++++++++++++++--------------
 tests/deps.js                      | 10 +++++-----
 6 files changed, 79 insertions(+), 64 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 2ba798689..6fe90fdca 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -10,11 +10,10 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockBase');
+goog.module('Blockly.Events.BlockBase');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.Events.BlockBase');
 goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.Block');
@@ -27,8 +26,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.Abstract}
  * @constructor
  */
-Blockly.Events.BlockBase = function(opt_block) {
-  Blockly.Events.BlockBase.superClass_.constructor.call(this);
+const BlockBase = function(opt_block) {
+  BlockBase.superClass_.constructor.call(this);
   this.isBlank = typeof opt_block == 'undefined';
 
   /**
@@ -43,15 +42,15 @@ Blockly.Events.BlockBase = function(opt_block) {
    */
   this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockBase,
+Blockly.utils.object.inherits(BlockBase,
     Blockly.Events.Abstract);
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockBase.prototype.toJson = function() {
-  const json = Blockly.Events.BlockBase.superClass_.toJson.call(this);
+BlockBase.prototype.toJson = function() {
+  const json = BlockBase.superClass_.toJson.call(this);
   json['blockId'] = this.blockId;
   return json;
 };
@@ -60,7 +59,9 @@ Blockly.Events.BlockBase.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockBase.prototype.fromJson = function(json) {
-  Blockly.Events.BlockBase.superClass_.fromJson.call(this, json);
+BlockBase.prototype.fromJson = function(json) {
+  BlockBase.superClass_.fromJson.call(this, json);
   this.blockId = json['blockId'];
 };
+
+exports = BlockBase;
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 6938712b0..c9071580a 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -10,9 +10,11 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockChange');
+goog.module('Blockly.Events.BlockChange');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
+goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.Xml');
 
@@ -30,9 +32,9 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
+const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
     opt_newValue) {
-  Blockly.Events.BlockChange.superClass_.constructor.call(this, opt_block);
+  BlockChange.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -41,20 +43,20 @@ Blockly.Events.BlockChange = function(opt_block, opt_element, opt_name, opt_oldV
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockChange, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockChange, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
+BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockChange.prototype.toJson = function() {
-  const json = Blockly.Events.BlockChange.superClass_.toJson.call(this);
+BlockChange.prototype.toJson = function() {
+  const json = BlockChange.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.name) {
     json['name'] = this.name;
@@ -68,8 +70,8 @@ Blockly.Events.BlockChange.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockChange.prototype.fromJson = function(json) {
-  Blockly.Events.BlockChange.superClass_.fromJson.call(this, json);
+BlockChange.prototype.fromJson = function(json) {
+  BlockChange.superClass_.fromJson.call(this, json);
   this.element = json['element'];
   this.name = json['name'];
   this.oldValue = json['oldValue'];
@@ -80,7 +82,7 @@ Blockly.Events.BlockChange.prototype.fromJson = function(json) {
  * Does this event record any change of state?
  * @return {boolean} False if something changed.
  */
-Blockly.Events.BlockChange.prototype.isNull = function() {
+BlockChange.prototype.isNull = function() {
   return this.oldValue == this.newValue;
 };
 
@@ -88,7 +90,7 @@ Blockly.Events.BlockChange.prototype.isNull = function() {
  * Run a change event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockChange.prototype.run = function(forward) {
+BlockChange.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
@@ -133,7 +135,7 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
             (value) || '<mutation/>');
         block.domToMutation(dom);
       }
-      Blockly.Events.fire(new Blockly.Events.BlockChange(
+      Blockly.Events.fire(new BlockChange(
           block, 'mutation', null, oldMutation, value));
       break;
     }
@@ -143,4 +145,6 @@ Blockly.Events.BlockChange.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
-    Blockly.Events.BlockChange);
+    BlockChange);
+
+exports = BlockChange;
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 119f9c0a8..6d3597e68 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -10,10 +10,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockCreate');
+goog.module('Blockly.Events.BlockCreate');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockBase');
+goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.xml');
 goog.require('Blockly.Xml');
@@ -28,8 +30,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockCreate = function(opt_block) {
-  Blockly.Events.BlockCreate.superClass_.constructor.call(this, opt_block);
+const BlockCreate = function(opt_block) {
+  BlockCreate.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -45,20 +47,20 @@ Blockly.Events.BlockCreate = function(opt_block) {
   }
   this.ids = Blockly.Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockCreate, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockCreate, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
+BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockCreate.prototype.toJson = function() {
-  const json = Blockly.Events.BlockCreate.superClass_.toJson.call(this);
+BlockCreate.prototype.toJson = function() {
+  const json = BlockCreate.superClass_.toJson.call(this);
   json['xml'] = Blockly.Xml.domToText(this.xml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -71,8 +73,8 @@ Blockly.Events.BlockCreate.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
-  Blockly.Events.BlockCreate.superClass_.fromJson.call(this, json);
+BlockCreate.prototype.fromJson = function(json) {
+  BlockCreate.superClass_.fromJson.call(this, json);
   this.xml = Blockly.Xml.textToDom(json['xml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
@@ -84,7 +86,7 @@ Blockly.Events.BlockCreate.prototype.fromJson = function(json) {
  * Run a creation event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockCreate.prototype.run = function(forward) {
+BlockCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     const xml = Blockly.utils.xml.createElement('xml');
@@ -105,4 +107,6 @@ Blockly.Events.BlockCreate.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
-    Blockly.Events.BlockCreate);
+    BlockCreate);
+
+exports = BlockCreate;
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 120ac7ddc..7cd483fb8 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockDelete');
+goog.module('Blockly.Events.BlockDelete');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockBase');
@@ -29,8 +30,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockDelete = function(opt_block) {
-  Blockly.Events.BlockDelete.superClass_.constructor.call(this, opt_block);
+const BlockDelete = function(opt_block) {
+  BlockDelete.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -49,20 +50,20 @@ Blockly.Events.BlockDelete = function(opt_block) {
   }
   this.ids = Blockly.Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockDelete, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockDelete, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
+BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockDelete.prototype.toJson = function() {
-  const json = Blockly.Events.BlockDelete.superClass_.toJson.call(this);
+BlockDelete.prototype.toJson = function() {
+  const json = BlockDelete.superClass_.toJson.call(this);
   json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
@@ -75,8 +76,8 @@ Blockly.Events.BlockDelete.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
-  Blockly.Events.BlockDelete.superClass_.fromJson.call(this, json);
+BlockDelete.prototype.fromJson = function(json) {
+  BlockDelete.superClass_.fromJson.call(this, json);
   this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
@@ -88,7 +89,7 @@ Blockly.Events.BlockDelete.prototype.fromJson = function(json) {
  * Run a deletion event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockDelete.prototype.run = function(forward) {
+BlockDelete.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     for (let i = 0; i < this.ids.length; i++) {
@@ -109,4 +110,6 @@ Blockly.Events.BlockDelete.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
-    Blockly.Events.BlockDelete);
+    BlockDelete);
+
+exports = BlockDelete;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index 4318e443e..c2e3b544f 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockMove');
+goog.module('Blockly.Events.BlockMove');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.Events');
@@ -29,8 +30,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.BlockBase}
  * @constructor
  */
-Blockly.Events.BlockMove = function(opt_block) {
-  Blockly.Events.BlockMove.superClass_.constructor.call(this, opt_block);
+const BlockMove = function(opt_block) {
+  BlockMove.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -44,20 +45,20 @@ Blockly.Events.BlockMove = function(opt_block) {
   this.oldInputName = location.inputName;
   this.oldCoordinate = location.coordinate;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockMove, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(BlockMove, Blockly.Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
+BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockMove.prototype.toJson = function() {
-  const json = Blockly.Events.BlockMove.superClass_.toJson.call(this);
+BlockMove.prototype.toJson = function() {
+  const json = BlockMove.superClass_.toJson.call(this);
   if (this.newParentId) {
     json['newParentId'] = this.newParentId;
   }
@@ -78,8 +79,8 @@ Blockly.Events.BlockMove.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockMove.prototype.fromJson = function(json) {
-  Blockly.Events.BlockMove.superClass_.fromJson.call(this, json);
+BlockMove.prototype.fromJson = function(json) {
+  BlockMove.superClass_.fromJson.call(this, json);
   this.newParentId = json['newParentId'];
   this.newInputName = json['newInputName'];
   if (json['newCoordinate']) {
@@ -95,7 +96,7 @@ Blockly.Events.BlockMove.prototype.fromJson = function(json) {
 /**
  * Record the block's new location.  Called after the move.
  */
-Blockly.Events.BlockMove.prototype.recordNew = function() {
+BlockMove.prototype.recordNew = function() {
   const location = this.currentLocation_();
   this.newParentId = location.parentId;
   this.newInputName = location.inputName;
@@ -108,7 +109,7 @@ Blockly.Events.BlockMove.prototype.recordNew = function() {
  * @return {!Object} Collection of location info.
  * @private
  */
-Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
+BlockMove.prototype.currentLocation_ = function() {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   const location = {};
@@ -129,7 +130,7 @@ Blockly.Events.BlockMove.prototype.currentLocation_ = function() {
  * Does this event record any change of state?
  * @return {boolean} False if something changed.
  */
-Blockly.Events.BlockMove.prototype.isNull = function() {
+BlockMove.prototype.isNull = function() {
   return this.oldParentId == this.newParentId &&
       this.oldInputName == this.newInputName &&
       Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
@@ -139,7 +140,7 @@ Blockly.Events.BlockMove.prototype.isNull = function() {
  * Run a move event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.BlockMove.prototype.run = function(forward) {
+BlockMove.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
@@ -184,4 +185,6 @@ Blockly.Events.BlockMove.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
-    Blockly.Events.BlockMove);
+    BlockMove);
+
+exports = BlockMove;
diff --git a/tests/deps.js b/tests/deps.js
index 542c8355d..d75d74f9e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -36,12 +36,12 @@ goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockl
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Events.BlockBase', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.utils.object', 'Blockly.utils.xml']);
-goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml']);
+goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.BlockBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 7889b02d9bd6d555717073ae4614c904a1e16432 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:42:29 -0700
Subject: [PATCH 238/291] Migrate core/events/block_events.js named requires

---
 core/events/events_block_base.js   | 16 ++++++------
 core/events/events_block_change.js | 28 ++++++++++----------
 core/events/events_block_create.js | 42 +++++++++++++++---------------
 core/events/events_block_delete.js | 42 +++++++++++++++---------------
 core/events/events_block_move.js   | 32 +++++++++++------------
 5 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 6fe90fdca..76fa09c97 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -13,17 +13,17 @@
 goog.module('Blockly.Events.BlockBase');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+const Abstract = goog.require('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * Abstract class for a block event.
- * @param {!Blockly.Block=} opt_block The block this event corresponds to.
+ * @param {!Block=} opt_block The block this event corresponds to.
  *     Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {Abstract}
  * @constructor
  */
 const BlockBase = function(opt_block) {
@@ -42,8 +42,8 @@ const BlockBase = function(opt_block) {
    */
   this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
 };
-Blockly.utils.object.inherits(BlockBase,
-    Blockly.Events.Abstract);
+object.inherits(BlockBase,
+    Abstract);
 
 /**
  * Encode the event as JSON.
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index c9071580a..5e12919c0 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -13,23 +13,23 @@
 goog.module('Blockly.Events.BlockChange');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a block change event.
- * @param {!Blockly.Block=} opt_block The changed block.  Undefined for a blank
+ * @param {!Block=} opt_block The changed block.  Undefined for a blank
  *     event.
  * @param {string=} opt_element One of 'field', 'comment', 'disabled', etc.
  * @param {?string=} opt_name Name of input or field affected, or null.
  * @param {*=} opt_oldValue Previous value of element.
  * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {Events.BlockBase}
  * @constructor
  */
 const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
@@ -43,13 +43,13 @@ const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(BlockChange, Blockly.Events.BlockBase);
+object.inherits(BlockChange, Events.BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockChange.prototype.type = Blockly.Events.BLOCK_CHANGE;
+BlockChange.prototype.type = Events.BLOCK_CHANGE;
 
 /**
  * Encode the event as JSON.
@@ -128,14 +128,14 @@ BlockChange.prototype.run = function(forward) {
       let oldMutation = '';
       if (block.mutationToDom) {
         const oldMutationDom = block.mutationToDom();
-        oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+        oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
       }
       if (block.domToMutation) {
-        const dom = Blockly.Xml.textToDom(/** @type {string} */
+        const dom = Xml.textToDom(/** @type {string} */
             (value) || '<mutation/>');
         block.domToMutation(dom);
       }
-      Blockly.Events.fire(new BlockChange(
+      Events.fire(new BlockChange(
           block, 'mutation', null, oldMutation, value));
       break;
     }
@@ -144,7 +144,7 @@ BlockChange.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CHANGE,
+registry.register(registry.Type.EVENT, Events.CHANGE,
     BlockChange);
 
 exports = BlockChange;
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 6d3597e68..460afc2c1 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -13,21 +13,21 @@
 goog.module('Blockly.Events.BlockCreate');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.BlockBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const BlockBase = goog.require('Blockly.Events.BlockBase');
+const Events = goog.require('Blockly.Events');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const xml = goog.require('Blockly.utils.xml');
 
 
 /**
  * Class for a block creation event.
- * @param {!Blockly.Block=} opt_block The created block.  Undefined for a blank
+ * @param {!Block=} opt_block The created block.  Undefined for a blank
  *     event.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockCreate = function(opt_block) {
@@ -41,19 +41,19 @@ const BlockCreate = function(opt_block) {
   }
 
   if (opt_block.workspace.rendered) {
-    this.xml = Blockly.Xml.blockToDomWithXY(opt_block);
+    this.xml = Xml.blockToDomWithXY(opt_block);
   } else {
-    this.xml = Blockly.Xml.blockToDom(opt_block);
+    this.xml = Xml.blockToDom(opt_block);
   }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
+  this.ids = Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(BlockCreate, Blockly.Events.BlockBase);
+object.inherits(BlockCreate, BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
+BlockCreate.prototype.type = Events.BLOCK_CREATE;
 
 /**
  * Encode the event as JSON.
@@ -61,7 +61,7 @@ BlockCreate.prototype.type = Blockly.Events.BLOCK_CREATE;
  */
 BlockCreate.prototype.toJson = function() {
   const json = BlockCreate.superClass_.toJson.call(this);
-  json['xml'] = Blockly.Xml.domToText(this.xml);
+  json['xml'] = Xml.domToText(this.xml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
     json['recordUndo'] = this.recordUndo;
@@ -75,7 +75,7 @@ BlockCreate.prototype.toJson = function() {
  */
 BlockCreate.prototype.fromJson = function(json) {
   BlockCreate.superClass_.fromJson.call(this, json);
-  this.xml = Blockly.Xml.textToDom(json['xml']);
+  this.xml = Xml.textToDom(json['xml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -89,9 +89,9 @@ BlockCreate.prototype.fromJson = function(json) {
 BlockCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
-    const xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.xml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
+    const xmlEl = xml.createElement('xml');
+    xmlEl.appendChild(this.xml);
+    Xml.domToWorkspace(xmlEl, workspace);
   } else {
     for (let i = 0; i < this.ids.length; i++) {
       const id = this.ids[i];
@@ -106,7 +106,7 @@ BlockCreate.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.CREATE,
+registry.register(registry.Type.EVENT, Events.CREATE,
     BlockCreate);
 
 exports = BlockCreate;
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 7cd483fb8..f2bf510e7 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -13,21 +13,21 @@
 goog.module('Blockly.Events.BlockDelete');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.BlockBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const BlockBase = goog.require('Blockly.Events.BlockBase');
+const Events = goog.require('Blockly.Events');
+const Xml = goog.require('Blockly.Xml');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const xml = goog.require('Blockly.utils.xml');
 
 
 /**
  * Class for a block deletion event.
- * @param {!Blockly.Block=} opt_block The deleted block.  Undefined for a blank
+ * @param {!Block=} opt_block The deleted block.  Undefined for a blank
  *     event.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockDelete = function(opt_block) {
@@ -44,19 +44,19 @@ const BlockDelete = function(opt_block) {
   }
 
   if (opt_block.workspace.rendered) {
-    this.oldXml = Blockly.Xml.blockToDomWithXY(opt_block);
+    this.oldXml = Xml.blockToDomWithXY(opt_block);
   } else {
-    this.oldXml = Blockly.Xml.blockToDom(opt_block);
+    this.oldXml = Xml.blockToDom(opt_block);
   }
-  this.ids = Blockly.Events.getDescendantIds(opt_block);
+  this.ids = Events.getDescendantIds(opt_block);
 };
-Blockly.utils.object.inherits(BlockDelete, Blockly.Events.BlockBase);
+object.inherits(BlockDelete, BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
+BlockDelete.prototype.type = Events.BLOCK_DELETE;
 
 /**
  * Encode the event as JSON.
@@ -64,7 +64,7 @@ BlockDelete.prototype.type = Blockly.Events.BLOCK_DELETE;
  */
 BlockDelete.prototype.toJson = function() {
   const json = BlockDelete.superClass_.toJson.call(this);
-  json['oldXml'] = Blockly.Xml.domToText(this.oldXml);
+  json['oldXml'] = Xml.domToText(this.oldXml);
   json['ids'] = this.ids;
   if (!this.recordUndo) {
     json['recordUndo'] = this.recordUndo;
@@ -78,7 +78,7 @@ BlockDelete.prototype.toJson = function() {
  */
 BlockDelete.prototype.fromJson = function(json) {
   BlockDelete.superClass_.fromJson.call(this, json);
-  this.oldXml = Blockly.Xml.textToDom(json['oldXml']);
+  this.oldXml = Xml.textToDom(json['oldXml']);
   this.ids = json['ids'];
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -103,13 +103,13 @@ BlockDelete.prototype.run = function(forward) {
       }
     }
   } else {
-    const xml = Blockly.utils.xml.createElement('xml');
-    xml.appendChild(this.oldXml);
-    Blockly.Xml.domToWorkspace(xml, workspace);
+    const xmlEl = xml.createElement('xml');
+    xmlEl.appendChild(this.oldXml);
+    Xml.domToWorkspace(xmlEl, workspace);
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.DELETE,
+registry.register(registry.Type.EVENT, Events.DELETE,
     BlockDelete);
 
 exports = BlockDelete;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index c2e3b544f..766d72f96 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -13,21 +13,21 @@
 goog.module('Blockly.Events.BlockMove');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.BlockBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const BlockBase = goog.require('Blockly.Events.BlockBase');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a block move event.  Created before the move.
- * @param {!Blockly.Block=} opt_block The moved block.  Undefined for a blank
+ * @param {!Block=} opt_block The moved block.  Undefined for a blank
  *     event.
- * @extends {Blockly.Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockMove = function(opt_block) {
@@ -45,13 +45,13 @@ const BlockMove = function(opt_block) {
   this.oldInputName = location.inputName;
   this.oldCoordinate = location.coordinate;
 };
-Blockly.utils.object.inherits(BlockMove, Blockly.Events.BlockBase);
+object.inherits(BlockMove, BlockBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-BlockMove.prototype.type = Blockly.Events.BLOCK_MOVE;
+BlockMove.prototype.type = Events.BLOCK_MOVE;
 
 /**
  * Encode the event as JSON.
@@ -86,7 +86,7 @@ BlockMove.prototype.fromJson = function(json) {
   if (json['newCoordinate']) {
     const xy = json['newCoordinate'].split(',');
     this.newCoordinate =
-        new Blockly.utils.Coordinate(Number(xy[0]), Number(xy[1]));
+        new Coordinate(Number(xy[0]), Number(xy[1]));
   }
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -133,7 +133,7 @@ BlockMove.prototype.currentLocation_ = function() {
 BlockMove.prototype.isNull = function() {
   return this.oldParentId == this.newParentId &&
       this.oldInputName == this.newInputName &&
-      Blockly.utils.Coordinate.equals(this.oldCoordinate, this.newCoordinate);
+      Coordinate.equals(this.oldCoordinate, this.newCoordinate);
 };
 
 /**
@@ -173,7 +173,7 @@ BlockMove.prototype.run = function(forward) {
       if (input) {
         parentConnection = input.connection;
       }
-    } else if (connectionType == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+    } else if (connectionType == connectionTypes.PREVIOUS_STATEMENT) {
       parentConnection = parentBlock.nextConnection;
     }
     if (parentConnection) {
@@ -184,7 +184,7 @@ BlockMove.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.MOVE,
+registry.register(registry.Type.EVENT, Events.MOVE,
     BlockMove);
 
 exports = BlockMove;

From 5acdd5e4bc5b10d858c2a467743068995594c661 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:43:06 -0700
Subject: [PATCH 239/291] clang-format core/events/block_events.js

---
 core/events/events_block_base.js   |  3 +--
 core/events/events_block_change.js | 16 +++++++---------
 core/events/events_block_create.js |  5 ++---
 core/events/events_block_delete.js |  5 ++---
 core/events/events_block_move.js   | 12 +++++-------
 5 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 76fa09c97..1f22a4ed8 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -42,8 +42,7 @@ const BlockBase = function(opt_block) {
    */
   this.workspaceId = this.isBlank ? '' : opt_block.workspace.id;
 };
-object.inherits(BlockBase,
-    Abstract);
+object.inherits(BlockBase, Abstract);
 
 /**
  * Encode the event as JSON.
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 5e12919c0..38d8b5c67 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -32,8 +32,8 @@ const registry = goog.require('Blockly.registry');
  * @extends {Events.BlockBase}
  * @constructor
  */
-const BlockChange = function(opt_block, opt_element, opt_name, opt_oldValue,
-    opt_newValue) {
+const BlockChange = function(
+    opt_block, opt_element, opt_name, opt_oldValue, opt_newValue) {
   BlockChange.superClass_.constructor.call(this, opt_block);
   if (!opt_block) {
     return;  // Blank event to be populated by fromJson.
@@ -94,7 +94,7 @@ BlockChange.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
-    console.warn("Can't change non-existent block: " + this.blockId);
+    console.warn('Can\'t change non-existent block: ' + this.blockId);
     return;
   }
   if (block.mutator) {
@@ -108,7 +108,7 @@ BlockChange.prototype.run = function(forward) {
       if (field) {
         field.setValue(value);
       } else {
-        console.warn("Can't set non-existent field: " + this.name);
+        console.warn('Can\'t set non-existent field: ' + this.name);
       }
       break;
     }
@@ -132,11 +132,10 @@ BlockChange.prototype.run = function(forward) {
       }
       if (block.domToMutation) {
         const dom = Xml.textToDom(/** @type {string} */
-            (value) || '<mutation/>');
+                                  (value) || '<mutation/>');
         block.domToMutation(dom);
       }
-      Events.fire(new BlockChange(
-          block, 'mutation', null, oldMutation, value));
+      Events.fire(new BlockChange(block, 'mutation', null, oldMutation, value));
       break;
     }
     default:
@@ -144,7 +143,6 @@ BlockChange.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.CHANGE,
-    BlockChange);
+registry.register(registry.Type.EVENT, Events.CHANGE, BlockChange);
 
 exports = BlockChange;
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index 460afc2c1..e3531dabe 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -100,13 +100,12 @@ BlockCreate.prototype.run = function(forward) {
         block.dispose(false);
       } else if (id == this.blockId) {
         // Only complain about root-level block.
-        console.warn("Can't uncreate non-existent block: " + id);
+        console.warn('Can\'t uncreate non-existent block: ' + id);
       }
     }
   }
 };
 
-registry.register(registry.Type.EVENT, Events.CREATE,
-    BlockCreate);
+registry.register(registry.Type.EVENT, Events.CREATE, BlockCreate);
 
 exports = BlockCreate;
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index f2bf510e7..57275b31a 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -99,7 +99,7 @@ BlockDelete.prototype.run = function(forward) {
         block.dispose(false);
       } else if (id == this.blockId) {
         // Only complain about root-level block.
-        console.warn("Can't delete non-existent block: " + id);
+        console.warn('Can\'t delete non-existent block: ' + id);
       }
     }
   } else {
@@ -109,7 +109,6 @@ BlockDelete.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT, Events.DELETE,
-    BlockDelete);
+registry.register(registry.Type.EVENT, Events.DELETE, BlockDelete);
 
 exports = BlockDelete;
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index 766d72f96..8ab5c5367 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -85,8 +85,7 @@ BlockMove.prototype.fromJson = function(json) {
   this.newInputName = json['newInputName'];
   if (json['newCoordinate']) {
     const xy = json['newCoordinate'].split(',');
-    this.newCoordinate =
-        new Coordinate(Number(xy[0]), Number(xy[1]));
+    this.newCoordinate = new Coordinate(Number(xy[0]), Number(xy[1]));
   }
   if (json['recordUndo'] !== undefined) {
     this.recordUndo = json['recordUndo'];
@@ -144,7 +143,7 @@ BlockMove.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   const block = workspace.getBlockById(this.blockId);
   if (!block) {
-    console.warn("Can't move non-existent block: " + this.blockId);
+    console.warn('Can\'t move non-existent block: ' + this.blockId);
     return;
   }
   const parentId = forward ? this.newParentId : this.oldParentId;
@@ -154,7 +153,7 @@ BlockMove.prototype.run = function(forward) {
   if (parentId) {
     parentBlock = workspace.getBlockById(parentId);
     if (!parentBlock) {
-      console.warn("Can't connect to non-existent block: " + parentId);
+      console.warn('Can\'t connect to non-existent block: ' + parentId);
       return;
     }
   }
@@ -179,12 +178,11 @@ BlockMove.prototype.run = function(forward) {
     if (parentConnection) {
       blockConnection.connect(parentConnection);
     } else {
-      console.warn("Can't connect to non-existent input: " + inputName);
+      console.warn('Can\'t connect to non-existent input: ' + inputName);
     }
   }
 };
 
-registry.register(registry.Type.EVENT, Events.MOVE,
-    BlockMove);
+registry.register(registry.Type.EVENT, Events.MOVE, BlockMove);
 
 exports = BlockMove;

From 2f71d18e8afee2ca7c8b589332743dc25c355789 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 15:51:32 -0700
Subject: [PATCH 240/291] Update jsdoc comment for classes

---
 core/events/events_block_change.js | 2 +-
 core/events/events_block_create.js | 2 +-
 core/events/events_block_delete.js | 2 +-
 core/events/events_block_move.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 38d8b5c67..3814a0d27 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for all types of block events.
+ * @fileoverview Class for a block change event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index e3531dabe..2a6afb003 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for all types of block events.
+ * @fileoverview Class for a block creation event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 57275b31a..f44caa7f0 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for all types of block events.
+ * @fileoverview Class for a block delete event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index 8ab5c5367..f026c080b 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -5,7 +5,7 @@
  */
 
 /**
- * @fileoverview Classes for a block move event.
+ * @fileoverview Class for a block move event.
  * @author fenichel@google.com (Rachel Fenichel)
  */
 'use strict';

From d1ab960f0fabdd11419e56b1afdc137434951cb3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 16:21:02 -0700
Subject: [PATCH 241/291] Split classes from core/events/variable_events.js
 into multiple files

---
 core/events/events_var_base.js   |  64 ++++++++
 core/events/events_var_create.js |  82 ++++++++++
 core/events/events_var_delete.js |  82 ++++++++++
 core/events/events_var_rename.js |  83 ++++++++++
 core/events/variable_events.js   | 250 -------------------------------
 tests/deps.js                    |   5 +-
 6 files changed, 315 insertions(+), 251 deletions(-)
 create mode 100644 core/events/events_var_base.js
 create mode 100644 core/events/events_var_create.js
 create mode 100644 core/events/events_var_delete.js
 create mode 100644 core/events/events_var_rename.js
 delete mode 100644 core/events/variable_events.js

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
new file mode 100644
index 000000000..202218269
--- /dev/null
+++ b/core/events/events_var_base.js
@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Abstract class for a variable event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarBase');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Abstract class for a variable event.
+ * @param {!Blockly.VariableModel=} opt_variable The variable this event
+ *     corresponds to.  Undefined for a blank event.
+ * @extends {Blockly.Events.Abstract}
+ * @constructor
+ */
+Blockly.Events.VarBase = function(opt_variable) {
+  Blockly.Events.VarBase.superClass_.constructor.call(this);
+  this.isBlank = typeof opt_variable == 'undefined';
+
+  /**
+   * The variable id for the variable this event pertains to.
+   * @type {string}
+   */
+  this.varId = this.isBlank ? '' : opt_variable.getId();
+
+  /**
+   * The workspace identifier for this event.
+   * @type {string}
+   */
+  this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarBase.prototype.toJson = function() {
+  var json = Blockly.Events.VarBase.superClass_.toJson.call(this);
+  json['varId'] = this.varId;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarBase.prototype.fromJson = function(json) {
+  Blockly.Events.VarBase.superClass_.toJson.call(this);
+  this.varId = json['varId'];
+};
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
new file mode 100644
index 000000000..a228a1b92
--- /dev/null
+++ b/core/events/events_var_create.js
@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for a variable creation event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarCreate');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.VarBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Class for a variable creation event.
+ * @param {!Blockly.VariableModel=} opt_variable The created variable. Undefined
+ *     for a blank event.
+ * @extends {Blockly.Events.VarBase}
+ * @constructor
+ */
+Blockly.Events.VarCreate = function(opt_variable) {
+  Blockly.Events.VarCreate.superClass_.constructor.call(this, opt_variable);
+  if (!opt_variable) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.varType = opt_variable.type;
+  this.varName = opt_variable.name;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarCreate, Blockly.Events.VarBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarCreate.prototype.toJson = function() {
+  var json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
+  json['varType'] = this.varType;
+  json['varName'] = this.varName;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarCreate.prototype.fromJson = function(json) {
+  Blockly.Events.VarCreate.superClass_.fromJson.call(this, json);
+  this.varType = json['varType'];
+  this.varName = json['varName'];
+};
+
+/**
+ * Run a variable creation event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.VarCreate.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    workspace.createVariable(this.varName, this.varType, this.varId);
+  } else {
+    workspace.deleteVariableById(this.varId);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT,
+    Blockly.Events.VAR_CREATE, Blockly.Events.VarCreate);
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
new file mode 100644
index 000000000..87a57b1b9
--- /dev/null
+++ b/core/events/events_var_delete.js
@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Classes for all types of variable events.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarDelete');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.VarBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Class for a variable deletion event.
+ * @param {!Blockly.VariableModel=} opt_variable The deleted variable. Undefined
+ *     for a blank event.
+ * @extends {Blockly.Events.VarBase}
+ * @constructor
+ */
+Blockly.Events.VarDelete = function(opt_variable) {
+  Blockly.Events.VarDelete.superClass_.constructor.call(this, opt_variable);
+  if (!opt_variable) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.varType = opt_variable.type;
+  this.varName = opt_variable.name;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarDelete, Blockly.Events.VarBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarDelete.prototype.toJson = function() {
+  var json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
+  json['varType'] = this.varType;
+  json['varName'] = this.varName;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarDelete.prototype.fromJson = function(json) {
+  Blockly.Events.VarDelete.superClass_.fromJson.call(this, json);
+  this.varType = json['varType'];
+  this.varName = json['varName'];
+};
+
+/**
+ * Run a variable deletion event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.VarDelete.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    workspace.deleteVariableById(this.varId);
+  } else {
+    workspace.createVariable(this.varName, this.varType, this.varId);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT,
+    Blockly.Events.VAR_DELETE, Blockly.Events.VarDelete);
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
new file mode 100644
index 000000000..60368e0af
--- /dev/null
+++ b/core/events/events_var_rename.js
@@ -0,0 +1,83 @@
+/**
+ * @license
+ * Copyright 2018 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class for a variable rename event.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.VarRename');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.VarBase');
+goog.require('Blockly.registry');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.VariableModel');
+
+
+/**
+ * Class for a variable rename event.
+ * @param {!Blockly.VariableModel=} opt_variable The renamed variable. Undefined
+ *     for a blank event.
+ * @param {string=} newName The new name the variable will be changed to.
+ * @extends {Blockly.Events.VarBase}
+ * @constructor
+ */
+Blockly.Events.VarRename = function(opt_variable, newName) {
+  Blockly.Events.VarRename.superClass_.constructor.call(this, opt_variable);
+  if (!opt_variable) {
+    return;  // Blank event to be populated by fromJson.
+  }
+
+  this.oldName = opt_variable.name;
+  this.newName = typeof newName == 'undefined' ? '' : newName;
+};
+Blockly.utils.object.inherits(Blockly.Events.VarRename, Blockly.Events.VarBase);
+
+/**
+ * Type of this event.
+ * @type {string}
+ */
+Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
+
+/**
+ * Encode the event as JSON.
+ * @return {!Object} JSON representation.
+ */
+Blockly.Events.VarRename.prototype.toJson = function() {
+  var json = Blockly.Events.VarRename.superClass_.toJson.call(this);
+  json['oldName'] = this.oldName;
+  json['newName'] = this.newName;
+  return json;
+};
+
+/**
+ * Decode the JSON event.
+ * @param {!Object} json JSON representation.
+ */
+Blockly.Events.VarRename.prototype.fromJson = function(json) {
+  Blockly.Events.VarRename.superClass_.fromJson.call(this, json);
+  this.oldName = json['oldName'];
+  this.newName = json['newName'];
+};
+
+/**
+ * Run a variable rename event.
+ * @param {boolean} forward True if run forward, false if run backward (undo).
+ */
+Blockly.Events.VarRename.prototype.run = function(forward) {
+  var workspace = this.getEventWorkspace_();
+  if (forward) {
+    workspace.renameVariableById(this.varId, this.newName);
+  } else {
+    workspace.renameVariableById(this.varId, this.oldName);
+  }
+};
+
+Blockly.registry.register(Blockly.registry.Type.EVENT,
+    Blockly.Events.VAR_RENAME, Blockly.Events.VarRename);
diff --git a/core/events/variable_events.js b/core/events/variable_events.js
deleted file mode 100644
index 4f7af9258..000000000
--- a/core/events/variable_events.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Classes for all types of variable events.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-'use strict';
-
-goog.provide('Blockly.Events.VarBase');
-goog.provide('Blockly.Events.VarCreate');
-goog.provide('Blockly.Events.VarDelete');
-goog.provide('Blockly.Events.VarRename');
-
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
-
-
-/**
- * Abstract class for a variable event.
- * @param {!Blockly.VariableModel=} opt_variable The variable this event
- *     corresponds to.  Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
- * @constructor
- */
-Blockly.Events.VarBase = function(opt_variable) {
-  Blockly.Events.VarBase.superClass_.constructor.call(this);
-  this.isBlank = typeof opt_variable == 'undefined';
-
-  /**
-   * The variable id for the variable this event pertains to.
-   * @type {string}
-   */
-  this.varId = this.isBlank ? '' : opt_variable.getId();
-
-  /**
-   * The workspace identifier for this event.
-   * @type {string}
-   */
-  this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarBase.prototype.toJson = function() {
-  var json = Blockly.Events.VarBase.superClass_.toJson.call(this);
-  json['varId'] = this.varId;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarBase.prototype.fromJson = function(json) {
-  Blockly.Events.VarBase.superClass_.toJson.call(this);
-  this.varId = json['varId'];
-};
-
-/**
- * Class for a variable creation event.
- * @param {!Blockly.VariableModel=} opt_variable The created variable. Undefined
- *     for a blank event.
- * @extends {Blockly.Events.VarBase}
- * @constructor
- */
-Blockly.Events.VarCreate = function(opt_variable) {
-  Blockly.Events.VarCreate.superClass_.constructor.call(this, opt_variable);
-  if (!opt_variable) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.varType = opt_variable.type;
-  this.varName = opt_variable.name;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarCreate, Blockly.Events.VarBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarCreate.prototype.toJson = function() {
-  var json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
-  json['varType'] = this.varType;
-  json['varName'] = this.varName;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarCreate.prototype.fromJson = function(json) {
-  Blockly.Events.VarCreate.superClass_.fromJson.call(this, json);
-  this.varType = json['varType'];
-  this.varName = json['varName'];
-};
-
-/**
- * Run a variable creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.VarCreate.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    workspace.createVariable(this.varName, this.varType, this.varId);
-  } else {
-    workspace.deleteVariableById(this.varId);
-  }
-};
-
-/**
- * Class for a variable deletion event.
- * @param {!Blockly.VariableModel=} opt_variable The deleted variable. Undefined
- *     for a blank event.
- * @extends {Blockly.Events.VarBase}
- * @constructor
- */
-Blockly.Events.VarDelete = function(opt_variable) {
-  Blockly.Events.VarDelete.superClass_.constructor.call(this, opt_variable);
-  if (!opt_variable) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.varType = opt_variable.type;
-  this.varName = opt_variable.name;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarDelete, Blockly.Events.VarBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarDelete.prototype.toJson = function() {
-  var json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
-  json['varType'] = this.varType;
-  json['varName'] = this.varName;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarDelete.prototype.fromJson = function(json) {
-  Blockly.Events.VarDelete.superClass_.fromJson.call(this, json);
-  this.varType = json['varType'];
-  this.varName = json['varName'];
-};
-
-/**
- * Run a variable deletion event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.VarDelete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    workspace.deleteVariableById(this.varId);
-  } else {
-    workspace.createVariable(this.varName, this.varType, this.varId);
-  }
-};
-
-/**
- * Class for a variable rename event.
- * @param {!Blockly.VariableModel=} opt_variable The renamed variable. Undefined
- *     for a blank event.
- * @param {string=} newName The new name the variable will be changed to.
- * @extends {Blockly.Events.VarBase}
- * @constructor
- */
-Blockly.Events.VarRename = function(opt_variable, newName) {
-  Blockly.Events.VarRename.superClass_.constructor.call(this, opt_variable);
-  if (!opt_variable) {
-    return;  // Blank event to be populated by fromJson.
-  }
-
-  this.oldName = opt_variable.name;
-  this.newName = typeof newName == 'undefined' ? '' : newName;
-};
-Blockly.utils.object.inherits(Blockly.Events.VarRename, Blockly.Events.VarBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Blockly.Events.VarRename.prototype.toJson = function() {
-  var json = Blockly.Events.VarRename.superClass_.toJson.call(this);
-  json['oldName'] = this.oldName;
-  json['newName'] = this.newName;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Blockly.Events.VarRename.prototype.fromJson = function(json) {
-  Blockly.Events.VarRename.superClass_.fromJson.call(this, json);
-  this.oldName = json['oldName'];
-  this.newName = json['newName'];
-};
-
-/**
- * Run a variable rename event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-Blockly.Events.VarRename.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
-  if (forward) {
-    workspace.renameVariableById(this.varId, this.newName);
-  } else {
-    workspace.renameVariableById(this.varId, this.oldName);
-  }
-};
-
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_CREATE, Blockly.Events.VarCreate);
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_DELETE, Blockly.Events.VarDelete);
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_RENAME, Blockly.Events.VarRename);
diff --git a/tests/deps.js b/tests/deps.js
index d75d74f9e..6fe187c7d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,9 +49,12 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});

From 6e821fb9fce95d21f7f194d060f6dfe2890d31af Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 16:33:44 -0700
Subject: [PATCH 242/291] Migrate core/events/block_events.js to ES6 const/let

---
 core/events/events_var_base.js   | 2 +-
 core/events/events_var_create.js | 4 ++--
 core/events/events_var_delete.js | 4 ++--
 core/events/events_var_rename.js | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index 202218269..3effcbce7 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -49,7 +49,7 @@ Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarBase.prototype.toJson = function() {
-  var json = Blockly.Events.VarBase.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarBase.superClass_.toJson.call(this);
   json['varId'] = this.varId;
   return json;
 };
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index a228a1b92..69811feeb 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -49,7 +49,7 @@ Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarCreate.prototype.toJson = function() {
-  var json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -70,7 +70,7 @@ Blockly.Events.VarCreate.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.VarCreate.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.createVariable(this.varName, this.varType, this.varId);
   } else {
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index 87a57b1b9..284e499b3 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -49,7 +49,7 @@ Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarDelete.prototype.toJson = function() {
-  var json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -70,7 +70,7 @@ Blockly.Events.VarDelete.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.VarDelete.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.deleteVariableById(this.varId);
   } else {
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 60368e0af..90329f0be 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -50,7 +50,7 @@ Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.VarRename.prototype.toJson = function() {
-  var json = Blockly.Events.VarRename.superClass_.toJson.call(this);
+  const json = Blockly.Events.VarRename.superClass_.toJson.call(this);
   json['oldName'] = this.oldName;
   json['newName'] = this.newName;
   return json;
@@ -71,7 +71,7 @@ Blockly.Events.VarRename.prototype.fromJson = function(json) {
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
 Blockly.Events.VarRename.prototype.run = function(forward) {
-  var workspace = this.getEventWorkspace_();
+  const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.renameVariableById(this.varId, this.newName);
   } else {

From 9ac531ba5859cbafeab901c7a83914493a665617 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 16:36:01 -0700
Subject: [PATCH 243/291] Migrate core/events/block_events.js to goog.module

---
 core/events/events_var_base.js   | 20 +++++++++++---------
 core/events/events_var_create.js | 25 ++++++++++++++-----------
 core/events/events_var_delete.js | 25 ++++++++++++++-----------
 core/events/events_var_rename.js | 25 ++++++++++++++-----------
 tests/deps.js                    |  8 ++++----
 5 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index 3effcbce7..f4de12429 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -10,9 +10,9 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarBase');
+goog.module('Blockly.Events.VarBase');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.utils.object');
 
@@ -26,8 +26,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.Abstract}
  * @constructor
  */
-Blockly.Events.VarBase = function(opt_variable) {
-  Blockly.Events.VarBase.superClass_.constructor.call(this);
+const VarBase = function(opt_variable) {
+  VarBase.superClass_.constructor.call(this);
   this.isBlank = typeof opt_variable == 'undefined';
 
   /**
@@ -42,14 +42,14 @@ Blockly.Events.VarBase = function(opt_variable) {
    */
   this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarBase, Blockly.Events.Abstract);
+Blockly.utils.object.inherits(VarBase, Blockly.Events.Abstract);
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarBase.prototype.toJson = function() {
-  const json = Blockly.Events.VarBase.superClass_.toJson.call(this);
+VarBase.prototype.toJson = function() {
+  const json = VarBase.superClass_.toJson.call(this);
   json['varId'] = this.varId;
   return json;
 };
@@ -58,7 +58,9 @@ Blockly.Events.VarBase.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarBase.prototype.fromJson = function(json) {
-  Blockly.Events.VarBase.superClass_.toJson.call(this);
+VarBase.prototype.fromJson = function(json) {
+  VarBase.superClass_.toJson.call(this);
   this.varId = json['varId'];
 };
+
+exports = VarBase;
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 69811feeb..3fd79d64c 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarCreate');
+goog.module('Blockly.Events.VarCreate');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarBase');
@@ -27,8 +28,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.VarBase}
  * @constructor
  */
-Blockly.Events.VarCreate = function(opt_variable) {
-  Blockly.Events.VarCreate.superClass_.constructor.call(this, opt_variable);
+const VarCreate = function(opt_variable) {
+  VarCreate.superClass_.constructor.call(this, opt_variable);
   if (!opt_variable) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -36,20 +37,20 @@ Blockly.Events.VarCreate = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarCreate, Blockly.Events.VarBase);
+Blockly.utils.object.inherits(VarCreate, Blockly.Events.VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
+VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarCreate.prototype.toJson = function() {
-  const json = Blockly.Events.VarCreate.superClass_.toJson.call(this);
+VarCreate.prototype.toJson = function() {
+  const json = VarCreate.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -59,8 +60,8 @@ Blockly.Events.VarCreate.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarCreate.prototype.fromJson = function(json) {
-  Blockly.Events.VarCreate.superClass_.fromJson.call(this, json);
+VarCreate.prototype.fromJson = function(json) {
+  VarCreate.superClass_.fromJson.call(this, json);
   this.varType = json['varType'];
   this.varName = json['varName'];
 };
@@ -69,7 +70,7 @@ Blockly.Events.VarCreate.prototype.fromJson = function(json) {
  * Run a variable creation event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.VarCreate.prototype.run = function(forward) {
+VarCreate.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.createVariable(this.varName, this.varType, this.varId);
@@ -79,4 +80,6 @@ Blockly.Events.VarCreate.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_CREATE, Blockly.Events.VarCreate);
+    Blockly.Events.VAR_CREATE, VarCreate);
+
+exports = VarCreate;
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index 284e499b3..fa2af41a6 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarDelete');
+goog.module('Blockly.Events.VarDelete');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarBase');
@@ -27,8 +28,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.VarBase}
  * @constructor
  */
-Blockly.Events.VarDelete = function(opt_variable) {
-  Blockly.Events.VarDelete.superClass_.constructor.call(this, opt_variable);
+const VarDelete = function(opt_variable) {
+  VarDelete.superClass_.constructor.call(this, opt_variable);
   if (!opt_variable) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -36,20 +37,20 @@ Blockly.Events.VarDelete = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarDelete, Blockly.Events.VarBase);
+Blockly.utils.object.inherits(VarDelete, Blockly.Events.VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
+VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarDelete.prototype.toJson = function() {
-  const json = Blockly.Events.VarDelete.superClass_.toJson.call(this);
+VarDelete.prototype.toJson = function() {
+  const json = VarDelete.superClass_.toJson.call(this);
   json['varType'] = this.varType;
   json['varName'] = this.varName;
   return json;
@@ -59,8 +60,8 @@ Blockly.Events.VarDelete.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarDelete.prototype.fromJson = function(json) {
-  Blockly.Events.VarDelete.superClass_.fromJson.call(this, json);
+VarDelete.prototype.fromJson = function(json) {
+  VarDelete.superClass_.fromJson.call(this, json);
   this.varType = json['varType'];
   this.varName = json['varName'];
 };
@@ -69,7 +70,7 @@ Blockly.Events.VarDelete.prototype.fromJson = function(json) {
  * Run a variable deletion event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.VarDelete.prototype.run = function(forward) {
+VarDelete.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.deleteVariableById(this.varId);
@@ -79,4 +80,6 @@ Blockly.Events.VarDelete.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_DELETE, Blockly.Events.VarDelete);
+    Blockly.Events.VAR_DELETE, VarDelete);
+
+exports = VarDelete;
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 90329f0be..418164167 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.VarRename');
+goog.module('Blockly.Events.VarRename');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarBase');
@@ -28,8 +29,8 @@ goog.requireType('Blockly.VariableModel');
  * @extends {Blockly.Events.VarBase}
  * @constructor
  */
-Blockly.Events.VarRename = function(opt_variable, newName) {
-  Blockly.Events.VarRename.superClass_.constructor.call(this, opt_variable);
+const VarRename = function(opt_variable, newName) {
+  VarRename.superClass_.constructor.call(this, opt_variable);
   if (!opt_variable) {
     return;  // Blank event to be populated by fromJson.
   }
@@ -37,20 +38,20 @@ Blockly.Events.VarRename = function(opt_variable, newName) {
   this.oldName = opt_variable.name;
   this.newName = typeof newName == 'undefined' ? '' : newName;
 };
-Blockly.utils.object.inherits(Blockly.Events.VarRename, Blockly.Events.VarBase);
+Blockly.utils.object.inherits(VarRename, Blockly.Events.VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.VarRename.prototype.type = Blockly.Events.VAR_RENAME;
+VarRename.prototype.type = Blockly.Events.VAR_RENAME;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.VarRename.prototype.toJson = function() {
-  const json = Blockly.Events.VarRename.superClass_.toJson.call(this);
+VarRename.prototype.toJson = function() {
+  const json = VarRename.superClass_.toJson.call(this);
   json['oldName'] = this.oldName;
   json['newName'] = this.newName;
   return json;
@@ -60,8 +61,8 @@ Blockly.Events.VarRename.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.VarRename.prototype.fromJson = function(json) {
-  Blockly.Events.VarRename.superClass_.fromJson.call(this, json);
+VarRename.prototype.fromJson = function(json) {
+  VarRename.superClass_.fromJson.call(this, json);
   this.oldName = json['oldName'];
   this.newName = json['newName'];
 };
@@ -70,7 +71,7 @@ Blockly.Events.VarRename.prototype.fromJson = function(json) {
  * Run a variable rename event.
  * @param {boolean} forward True if run forward, false if run backward (undo).
  */
-Blockly.Events.VarRename.prototype.run = function(forward) {
+VarRename.prototype.run = function(forward) {
   const workspace = this.getEventWorkspace_();
   if (forward) {
     workspace.renameVariableById(this.varId, this.newName);
@@ -80,4 +81,6 @@ Blockly.Events.VarRename.prototype.run = function(forward) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_RENAME, Blockly.Events.VarRename);
+    Blockly.Events.VAR_RENAME, VarRename);
+
+exports = VarRename;
diff --git a/tests/deps.js b/tests/deps.js
index 6fe187c7d..7b93512dd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,10 +49,10 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From dc2438eb28bdfc4fa1c4d454842bcfcdfa7d50ac Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 17:02:18 -0700
Subject: [PATCH 244/291] Migrate core/events/block_events.js named requires

---
 core/events/events_var_base.js   | 14 +++++++-------
 core/events/events_var_create.js | 24 ++++++++++++------------
 core/events/events_var_delete.js | 24 ++++++++++++------------
 core/events/events_var_rename.js | 24 ++++++++++++------------
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index f4de12429..cedf349b7 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -13,17 +13,17 @@
 goog.module('Blockly.Events.VarBase');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+const Abstract = goog.require('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * Abstract class for a variable event.
- * @param {!Blockly.VariableModel=} opt_variable The variable this event
+ * @param {!VariableModel=} opt_variable The variable this event
  *     corresponds to.  Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {Abstract}
  * @constructor
  */
 const VarBase = function(opt_variable) {
@@ -42,7 +42,7 @@ const VarBase = function(opt_variable) {
    */
   this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
 };
-Blockly.utils.object.inherits(VarBase, Blockly.Events.Abstract);
+object.inherits(VarBase, Abstract);
 
 /**
  * Encode the event as JSON.
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 3fd79d64c..1d5c3ca75 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -13,19 +13,19 @@
 goog.module('Blockly.Events.VarCreate');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.VarBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+const Events = goog.require('Blockly.Events');
+const VarBase = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a variable creation event.
- * @param {!Blockly.VariableModel=} opt_variable The created variable. Undefined
+ * @param {!VariableModel=} opt_variable The created variable. Undefined
  *     for a blank event.
- * @extends {Blockly.Events.VarBase}
+ * @extends {VarBase}
  * @constructor
  */
 const VarCreate = function(opt_variable) {
@@ -37,13 +37,13 @@ const VarCreate = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(VarCreate, Blockly.Events.VarBase);
+object.inherits(VarCreate, VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-VarCreate.prototype.type = Blockly.Events.VAR_CREATE;
+VarCreate.prototype.type = Events.VAR_CREATE;
 
 /**
  * Encode the event as JSON.
@@ -79,7 +79,7 @@ VarCreate.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_CREATE, VarCreate);
+registry.register(registry.Type.EVENT,
+    Events.VAR_CREATE, VarCreate);
 
 exports = VarCreate;
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index fa2af41a6..cd93ccf39 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -13,19 +13,19 @@
 goog.module('Blockly.Events.VarDelete');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.VarBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+const Events = goog.require('Blockly.Events');
+const VarBase = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a variable deletion event.
- * @param {!Blockly.VariableModel=} opt_variable The deleted variable. Undefined
+ * @param {!VariableModel=} opt_variable The deleted variable. Undefined
  *     for a blank event.
- * @extends {Blockly.Events.VarBase}
+ * @extends {VarBase}
  * @constructor
  */
 const VarDelete = function(opt_variable) {
@@ -37,13 +37,13 @@ const VarDelete = function(opt_variable) {
   this.varType = opt_variable.type;
   this.varName = opt_variable.name;
 };
-Blockly.utils.object.inherits(VarDelete, Blockly.Events.VarBase);
+object.inherits(VarDelete, VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-VarDelete.prototype.type = Blockly.Events.VAR_DELETE;
+VarDelete.prototype.type = Events.VAR_DELETE;
 
 /**
  * Encode the event as JSON.
@@ -79,7 +79,7 @@ VarDelete.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_DELETE, VarDelete);
+registry.register(registry.Type.EVENT,
+    Events.VAR_DELETE, VarDelete);
 
 exports = VarDelete;
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 418164167..1f7d0b982 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -13,20 +13,20 @@
 goog.module('Blockly.Events.VarRename');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.VarBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.VariableModel');
+const Events = goog.require('Blockly.Events');
+const VarBase = goog.require('Blockly.Events.VarBase');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a variable rename event.
- * @param {!Blockly.VariableModel=} opt_variable The renamed variable. Undefined
+ * @param {!VariableModel=} opt_variable The renamed variable. Undefined
  *     for a blank event.
  * @param {string=} newName The new name the variable will be changed to.
- * @extends {Blockly.Events.VarBase}
+ * @extends {VarBase}
  * @constructor
  */
 const VarRename = function(opt_variable, newName) {
@@ -38,13 +38,13 @@ const VarRename = function(opt_variable, newName) {
   this.oldName = opt_variable.name;
   this.newName = typeof newName == 'undefined' ? '' : newName;
 };
-Blockly.utils.object.inherits(VarRename, Blockly.Events.VarBase);
+object.inherits(VarRename, VarBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-VarRename.prototype.type = Blockly.Events.VAR_RENAME;
+VarRename.prototype.type = Events.VAR_RENAME;
 
 /**
  * Encode the event as JSON.
@@ -80,7 +80,7 @@ VarRename.prototype.run = function(forward) {
   }
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.VAR_RENAME, VarRename);
+registry.register(registry.Type.EVENT,
+    Events.VAR_RENAME, VarRename);
 
 exports = VarRename;

From d7840db7361c63cb1db1b7a4dbec19cacbe01857 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Fri, 6 Aug 2021 17:03:01 -0700
Subject: [PATCH 245/291] clang-formant core/events/variable_events.js

---
 core/events/events_var_create.js | 3 +--
 core/events/events_var_delete.js | 3 +--
 core/events/events_var_rename.js | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 1d5c3ca75..8db58be74 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -79,7 +79,6 @@ VarCreate.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VAR_CREATE, VarCreate);
+registry.register(registry.Type.EVENT, Events.VAR_CREATE, VarCreate);
 
 exports = VarCreate;
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index cd93ccf39..48497bdd7 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -79,7 +79,6 @@ VarDelete.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VAR_DELETE, VarDelete);
+registry.register(registry.Type.EVENT, Events.VAR_DELETE, VarDelete);
 
 exports = VarDelete;
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index 1f7d0b982..9fa5f7058 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -80,7 +80,6 @@ VarRename.prototype.run = function(forward) {
   }
 };
 
-registry.register(registry.Type.EVENT,
-    Events.VAR_RENAME, VarRename);
+registry.register(registry.Type.EVENT, Events.VAR_RENAME, VarRename);
 
 exports = VarRename;

From 8875dbd50c35fb8d7263076a35512844a624873a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:21:59 -0700
Subject: [PATCH 246/291] Migrate core/toolbox/toolbox.js to ES6 const/let

---
 core/toolbox/toolbox.js | 117 ++++++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 57 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 826482eaf..535e0065b 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -195,8 +195,8 @@ Blockly.Toolbox.prototype.onShortcut = function(_shortcut) {
  * @public
  */
 Blockly.Toolbox.prototype.init = function() {
-  var workspace = this.workspace_;
-  var svg = workspace.getParentSvg();
+  const workspace = this.workspace_;
+  const svg = workspace.getParentSvg();
 
   this.flyout_ = this.createFlyout_();
 
@@ -206,7 +206,7 @@ Blockly.Toolbox.prototype.init = function() {
   this.flyout_.init(workspace);
 
   this.render(this.toolboxDef_);
-  var themeManager = workspace.getThemeManager();
+  const themeManager = workspace.getThemeManager();
   themeManager.subscribe(this.HtmlDiv, 'toolboxBackgroundColour',
       'background-color');
   themeManager.subscribe(this.HtmlDiv, 'toolboxForegroundColour', 'color');
@@ -228,9 +228,9 @@ Blockly.Toolbox.prototype.init = function() {
  * @protected
  */
 Blockly.Toolbox.prototype.createDom_ = function(workspace) {
-  var svg = workspace.getParentSvg();
+  const svg = workspace.getParentSvg();
 
-  var container = this.createContainer_();
+  const container = this.createContainer_();
 
   this.contentsDiv_ = this.createContentsContainer_();
   this.contentsDiv_.tabIndex = 0;
@@ -249,7 +249,7 @@ Blockly.Toolbox.prototype.createDom_ = function(workspace) {
  * @protected
  */
 Blockly.Toolbox.prototype.createContainer_ = function() {
-  var toolboxContainer = document.createElement('div');
+  const toolboxContainer = document.createElement('div');
   toolboxContainer.setAttribute('layout', this.isHorizontal() ? 'h' : 'v');
   Blockly.utils.dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
   Blockly.utils.dom.addClass(toolboxContainer, 'blocklyNonSelectable');
@@ -263,7 +263,7 @@ Blockly.Toolbox.prototype.createContainer_ = function() {
  * @protected
  */
 Blockly.Toolbox.prototype.createContentsContainer_ = function() {
-  var contentsContainer = document.createElement('div');
+  const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, 'blocklyToolboxContents');
   if (this.isHorizontal()) {
     contentsContainer.style.flexDirection = 'row';
@@ -281,13 +281,13 @@ Blockly.Toolbox.prototype.createContentsContainer_ = function() {
 Blockly.Toolbox.prototype.attachEvents_ = function(container,
     contentsContainer) {
   // Clicking on toolbox closes popups.
-  var clickEvent = Blockly.browserEvents.conditionalBind(
+  const clickEvent = Blockly.browserEvents.conditionalBind(
       container, 'click', this, this.onClick_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
   this.boundEvents_.push(clickEvent);
 
-  var keyDownEvent = Blockly.browserEvents.conditionalBind(
+  const keyDownEvent = Blockly.browserEvents.conditionalBind(
       contentsContainer, 'keydown', this, this.onKeyDown_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
@@ -304,10 +304,10 @@ Blockly.Toolbox.prototype.onClick_ = function(e) {
     // Close flyout.
     Blockly.hideChaff(false);
   } else {
-    var targetElement = e.target;
-    var itemId = targetElement.getAttribute('id');
+    const targetElement = e.target;
+    const itemId = targetElement.getAttribute('id');
     if (itemId) {
-      var item = this.getToolboxItemById(itemId);
+      const item = this.getToolboxItemById(itemId);
       if (item.isSelectable()) {
         this.setSelectedItem(item);
         item.onClick(e);
@@ -325,7 +325,7 @@ Blockly.Toolbox.prototype.onClick_ = function(e) {
  * @protected
  */
 Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
-  var handled = false;
+  let handled = false;
   switch (e.keyCode) {
     case Blockly.utils.KeyCodes.DOWN:
       handled = this.selectNext_();
@@ -342,7 +342,7 @@ Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
     case Blockly.utils.KeyCodes.ENTER:
     case Blockly.utils.KeyCodes.SPACE:
       if (this.selectedItem_ && this.selectedItem_.isCollapsible()) {
-        var collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+        const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
         collapsibleItem.toggleExpanded();
         handled = true;
       }
@@ -368,9 +368,9 @@ Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
  * @protected
  */
 Blockly.Toolbox.prototype.createFlyout_ = function() {
-  var workspace = this.workspace_;
+  const workspace = this.workspace_;
   // TODO (#4247): Look into adding a makeFlyout method to Blockly Options.
-  var workspaceOptions = new Blockly.Options(
+  const workspaceOptions = new Blockly.Options(
       /** @type {!Blockly.BlocklyOptions} */
       ({
         'parentWorkspace': workspace,
@@ -386,7 +386,7 @@ Blockly.Toolbox.prototype.createFlyout_ = function() {
   // Options takes in either 'end' or 'start'. This has already been parsed to
   // be either 0 or 1, so set it after.
   workspaceOptions.toolboxPosition = workspace.options.toolboxPosition;
-  var FlyoutClass = null;
+  let FlyoutClass = null;
   if (workspace.horizontalLayout) {
     FlyoutClass = Blockly.registry.getClassFromOptions(
         Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
@@ -407,8 +407,8 @@ Blockly.Toolbox.prototype.createFlyout_ = function() {
  */
 Blockly.Toolbox.prototype.render = function(toolboxDef) {
   this.toolboxDef_ = toolboxDef;
-  for (var i = 0; i < this.contents_.length; i++) {
-    var toolboxItem = this.contents_[i];
+  for (let i = 0; i < this.contents_.length; i++) {
+    const toolboxItem = this.contents_[i];
     if (toolboxItem) {
       toolboxItem.dispose();
     }
@@ -429,8 +429,9 @@ Blockly.Toolbox.prototype.render = function(toolboxDef) {
 Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
   // This is for performance reasons. By using document fragment we only have to
   // add to the DOM once.
-  var fragment = document.createDocumentFragment();
-  for (var i = 0, toolboxItemDef; (toolboxItemDef = toolboxDef[i]); i++) {
+  const fragment = document.createDocumentFragment();
+  for (let i = 0; i < toolboxDef.length; i++) {
+    const toolboxItemDef = toolboxDef[i];
     this.createToolboxItem_(toolboxItemDef, fragment);
   }
   this.contentsDiv_.appendChild(fragment);
@@ -445,7 +446,7 @@ Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
  * @private
  */
 Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
-  var registryName = toolboxItemDef['kind'];
+  let registryName = toolboxItemDef['kind'];
 
   // Categories that are collapsible are created using a class registered under
   // a different name.
@@ -455,13 +456,13 @@ Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment
     registryName = Blockly.CollapsibleToolboxCategory.registrationName;
   }
 
-  var ToolboxItemClass = Blockly.registry.getClass(
+  const ToolboxItemClass = Blockly.registry.getClass(
       Blockly.registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
   if (ToolboxItemClass) {
-    var toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
+    const toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
     this.addToolboxItem_(toolboxItem);
     toolboxItem.init();
-    var toolboxItemDom = toolboxItem.getDiv();
+    const toolboxItemDom = toolboxItem.getDiv();
     if (toolboxItemDom) {
       fragment.appendChild(toolboxItemDom);
     }
@@ -482,9 +483,11 @@ Blockly.Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
   this.contents_.push(toolboxItem);
   this.contentMap_[toolboxItem.getId()] = toolboxItem;
   if (toolboxItem.isCollapsible()) {
-    var collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+    const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
         (toolboxItem);
-    for (var i = 0, child; (child = collapsibleItem.getChildToolboxItems()[i]); i++) {
+    const childToolboxItems = collapsibleItem.getChildToolboxItems();
+    for (let i = 0; i < childToolboxItems.length; i++) {
+      const child = childToolboxItems[i];
       this.addToolboxItem_(child);
     }
   }
@@ -531,13 +534,13 @@ Blockly.Toolbox.prototype.getClientRect = function() {
   // BIG_NUM is offscreen padding so that blocks dragged beyond the toolbox
   // area are still deleted.  Must be smaller than Infinity, but larger than
   // the largest screen size.
-  var BIG_NUM = 10000000;
-  var toolboxRect = this.HtmlDiv.getBoundingClientRect();
+  const BIG_NUM = 10000000;
+  const toolboxRect = this.HtmlDiv.getBoundingClientRect();
 
-  var top = toolboxRect.top;
-  var bottom = top + toolboxRect.height;
-  var left = toolboxRect.left;
-  var right = left + toolboxRect.width;
+  const top = toolboxRect.top;
+  const bottom = top + toolboxRect.height;
+  const left = toolboxRect.left;
+  const right = left + toolboxRect.width;
 
   // Assumes that the toolbox is on the SVG edge.  If this changes
   // (e.g. toolboxes in mutators) then this code will need to be more complex.
@@ -567,7 +570,7 @@ Blockly.Toolbox.prototype.getClientRect = function() {
  */
 Blockly.Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
   if (element instanceof Blockly.BlockSvg) {
-    var block = /** @type {Blockly.BlockSvg} */ (element);
+    const block = /** @type {Blockly.BlockSvg} */ (element);
     // Prefer dragging to the toolbox over connecting to other blocks.
     this.updateWouldDelete_(!block.getParent() && block.isDeletable());
   } else {
@@ -636,7 +639,7 @@ Blockly.Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
  * @protected
  */
 Blockly.Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
-  var style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
+  const style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
       'blocklyToolboxGrab';
   if (addStyle) {
     this.addStyle(style);
@@ -728,8 +731,8 @@ Blockly.Toolbox.prototype.isHorizontal = function() {
  * @public
  */
 Blockly.Toolbox.prototype.position = function() {
-  var workspaceMetrics = this.workspace_.getMetrics();
-  var toolboxDiv = this.HtmlDiv;
+  const workspaceMetrics = this.workspace_.getMetrics();
+  const toolboxDiv = this.HtmlDiv;
   if (!toolboxDiv) {
     // Not initialized yet.
     return;
@@ -765,12 +768,12 @@ Blockly.Toolbox.prototype.position = function() {
 Blockly.Toolbox.prototype.handleToolboxItemResize = function() {
   // Reposition the workspace so that (0,0) is in the correct position relative
   // to the new absolute edge (ie toolbox edge).
-  var workspace = this.workspace_;
-  var rect = this.HtmlDiv.getBoundingClientRect();
-  var newX = this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT ?
+  const workspace = this.workspace_;
+  const rect = this.HtmlDiv.getBoundingClientRect();
+  const newX = this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT ?
       workspace.scrollX + rect.width :
       workspace.scrollX;
-  var newY = this.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
+  const newY = this.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
       workspace.scrollY + rect.height :
       workspace.scrollY;
   workspace.translate(newX, newY);
@@ -793,8 +796,8 @@ Blockly.Toolbox.prototype.clearSelection = function() {
  * @package
  */
 Blockly.Toolbox.prototype.refreshTheme = function() {
-  for (var i = 0; i < this.contents_.length; i++) {
-    var child = this.contents_[i];
+  for (let i = 0; i < this.contents_.length; i++) {
+    const child = this.contents_[i];
     if (child.refreshTheme) {
       child.refreshTheme();
     }
@@ -849,7 +852,7 @@ Blockly.Toolbox.prototype.autoHide = function(onlyClosePopups) {
  * @public
  */
 Blockly.Toolbox.prototype.setSelectedItem = function(newItem) {
-  var oldItem = this.selectedItem_;
+  const oldItem = this.selectedItem_;
 
   if ((!newItem && !oldItem) || (newItem && !newItem.isSelectable())) {
     return;
@@ -934,7 +937,7 @@ Blockly.Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
  */
 Blockly.Toolbox.prototype.selectItemByPosition = function(position) {
   if (position > -1 && position < this.contents_.length) {
-    var item = this.contents_[position];
+    const item = this.contents_[position];
     if (item.isSelectable()) {
       this.setSelectedItem(item);
     }
@@ -966,13 +969,13 @@ Blockly.Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
  * @private
  */
 Blockly.Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
-  var oldElement = oldItem && oldItem.getName();
-  var newElement = newItem && newItem.getName();
+  const oldElement = oldItem && oldItem.getName();
+  let newElement = newItem && newItem.getName();
   // In this case the toolbox closes, so the newElement should be null.
   if (oldItem == newItem) {
     newElement = null;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.TOOLBOX_ITEM_SELECT))(
+  const event = new (Blockly.Events.get(Blockly.Events.TOOLBOX_ITEM_SELECT))(
       oldElement, newElement, this.workspace_.id);
   Blockly.Events.fire(event);
 };
@@ -988,7 +991,7 @@ Blockly.Toolbox.prototype.selectParent_ = function() {
   }
 
   if (this.selectedItem_.isCollapsible() && this.selectedItem_.isExpanded()) {
-    var collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+    const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
     collapsibleItem.setExpanded(false);
     return true;
   } else if (this.selectedItem_.getParent() &&
@@ -1009,7 +1012,7 @@ Blockly.Toolbox.prototype.selectChild_ = function() {
   if (!this.selectedItem_ || !this.selectedItem_.isCollapsible()) {
     return false;
   }
-  var collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+  const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
       (this.selectedItem_);
   if (!collapsibleItem.isExpanded()) {
     collapsibleItem.setExpanded(true);
@@ -1030,9 +1033,9 @@ Blockly.Toolbox.prototype.selectNext_ = function() {
     return false;
   }
 
-  var nextItemIdx = this.contents_.indexOf(this.selectedItem_) + 1;
+  let nextItemIdx = this.contents_.indexOf(this.selectedItem_) + 1;
   if (nextItemIdx > -1 && nextItemIdx < this.contents_.length) {
-    var nextItem = this.contents_[nextItemIdx];
+    let nextItem = this.contents_[nextItemIdx];
     while (nextItem && !nextItem.isSelectable()) {
       nextItem = this.contents_[++nextItemIdx];
     }
@@ -1054,9 +1057,9 @@ Blockly.Toolbox.prototype.selectPrevious_ = function() {
     return false;
   }
 
-  var prevItemIdx = this.contents_.indexOf(this.selectedItem_) - 1;
+  let prevItemIdx = this.contents_.indexOf(this.selectedItem_) - 1;
   if (prevItemIdx > -1 && prevItemIdx < this.contents_.length) {
-    var prevItem = this.contents_[prevItemIdx];
+    let prevItem = this.contents_[prevItemIdx];
     while (prevItem && !prevItem.isSelectable()) {
       prevItem = this.contents_[--prevItemIdx];
     }
@@ -1075,12 +1078,12 @@ Blockly.Toolbox.prototype.selectPrevious_ = function() {
 Blockly.Toolbox.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('toolbox');
   this.flyout_.dispose();
-  for (var i = 0; i < this.contents_.length; i++) {
-    var toolboxItem = this.contents_[i];
+  for (let i = 0; i < this.contents_.length; i++) {
+    const toolboxItem = this.contents_[i];
     toolboxItem.dispose();
   }
 
-  for (var j = 0; j < this.boundEvents_.length; j++) {
+  for (let j = 0; j < this.boundEvents_.length; j++) {
     Blockly.browserEvents.unbind(this.boundEvents_[j]);
   }
   this.boundEvents_ = [];

From ec1567020b21d943cd62fa831aee0e6d18d18363 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:22:10 -0700
Subject: [PATCH 247/291] Migrate core/toolbox/toolbox.js to goog.module

---
 core/toolbox/toolbox.js | 118 ++++++++++++++++++++--------------------
 tests/deps.js           |   2 +-
 2 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 535e0065b..c57588eec 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -10,14 +10,14 @@
  */
 'use strict';
 
-goog.provide('Blockly.Toolbox');
+goog.module('Blockly.Toolbox');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly');
 goog.require('Blockly.BlockSvg');
 goog.require('Blockly.browserEvents');
 goog.require('Blockly.CollapsibleToolboxCategory');
 goog.require('Blockly.ComponentManager');
-/** @suppress {extraRequire} */
-goog.require('Blockly.constants');
 goog.require('Blockly.Css');
 goog.require('Blockly.DeleteArea');
 goog.require('Blockly.Events');
@@ -58,8 +58,8 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @implements {Blockly.IToolbox}
  * @extends {Blockly.DeleteArea}
  */
-Blockly.Toolbox = function(workspace) {
-  Blockly.Toolbox.superClass_.constructor.call(this);
+const Toolbox = function(workspace) {
+  Toolbox.superClass_.constructor.call(this);
   /**
    * The workspace this toolbox is on.
    * @type {!Blockly.WorkspaceSvg}
@@ -178,7 +178,7 @@ Blockly.Toolbox = function(workspace) {
    */
   this.boundEvents_ = [];
 };
-Blockly.utils.object.inherits(Blockly.Toolbox, Blockly.DeleteArea);
+Blockly.utils.object.inherits(Toolbox, Blockly.DeleteArea);
 
 /**
  * Handles the given keyboard shortcut.
@@ -186,7 +186,7 @@ Blockly.utils.object.inherits(Blockly.Toolbox, Blockly.DeleteArea);
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
-Blockly.Toolbox.prototype.onShortcut = function(_shortcut) {
+Toolbox.prototype.onShortcut = function(_shortcut) {
   return false;
 };
 
@@ -194,7 +194,7 @@ Blockly.Toolbox.prototype.onShortcut = function(_shortcut) {
  * Initializes the toolbox
  * @public
  */
-Blockly.Toolbox.prototype.init = function() {
+Toolbox.prototype.init = function() {
   const workspace = this.workspace_;
   const svg = workspace.getParentSvg();
 
@@ -227,7 +227,7 @@ Blockly.Toolbox.prototype.init = function() {
  * @return {!Element} The HTML container for the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.createDom_ = function(workspace) {
+Toolbox.prototype.createDom_ = function(workspace) {
   const svg = workspace.getParentSvg();
 
   const container = this.createContainer_();
@@ -248,7 +248,7 @@ Blockly.Toolbox.prototype.createDom_ = function(workspace) {
  * @return {!Element} The HTML container for the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.createContainer_ = function() {
+Toolbox.prototype.createContainer_ = function() {
   const toolboxContainer = document.createElement('div');
   toolboxContainer.setAttribute('layout', this.isHorizontal() ? 'h' : 'v');
   Blockly.utils.dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
@@ -262,7 +262,7 @@ Blockly.Toolbox.prototype.createContainer_ = function() {
  * @return {!Element} The HTML container for the toolbox contents.
  * @protected
  */
-Blockly.Toolbox.prototype.createContentsContainer_ = function() {
+Toolbox.prototype.createContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
   Blockly.utils.dom.addClass(contentsContainer, 'blocklyToolboxContents');
   if (this.isHorizontal()) {
@@ -278,7 +278,7 @@ Blockly.Toolbox.prototype.createContentsContainer_ = function() {
  *     of the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.attachEvents_ = function(container,
+Toolbox.prototype.attachEvents_ = function(container,
     contentsContainer) {
   // Clicking on toolbox closes popups.
   const clickEvent = Blockly.browserEvents.conditionalBind(
@@ -299,7 +299,7 @@ Blockly.Toolbox.prototype.attachEvents_ = function(container,
  * @param {!Event} e Click event to handle.
  * @protected
  */
-Blockly.Toolbox.prototype.onClick_ = function(e) {
+Toolbox.prototype.onClick_ = function(e) {
   if (Blockly.utils.isRightButton(e) || e.target == this.HtmlDiv) {
     // Close flyout.
     Blockly.hideChaff(false);
@@ -324,7 +324,7 @@ Blockly.Toolbox.prototype.onClick_ = function(e) {
  * @param {!KeyboardEvent} e The key down event.
  * @protected
  */
-Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
+Toolbox.prototype.onKeyDown_ = function(e) {
   let handled = false;
   switch (e.keyCode) {
     case Blockly.utils.KeyCodes.DOWN:
@@ -367,7 +367,7 @@ Blockly.Toolbox.prototype.onKeyDown_ = function(e) {
  *     `Blockly.VerticalFlyout`, and no flyout plugin is specified.
  * @protected
  */
-Blockly.Toolbox.prototype.createFlyout_ = function() {
+Toolbox.prototype.createFlyout_ = function() {
   const workspace = this.workspace_;
   // TODO (#4247): Look into adding a makeFlyout method to Blockly Options.
   const workspaceOptions = new Blockly.Options(
@@ -405,7 +405,7 @@ Blockly.Toolbox.prototype.createFlyout_ = function() {
  *     for creating a toolbox.
  * @package
  */
-Blockly.Toolbox.prototype.render = function(toolboxDef) {
+Toolbox.prototype.render = function(toolboxDef) {
   this.toolboxDef_ = toolboxDef;
   for (let i = 0; i < this.contents_.length; i++) {
     const toolboxItem = this.contents_[i];
@@ -426,7 +426,7 @@ Blockly.Toolbox.prototype.render = function(toolboxDef) {
  *     holding objects containing information on the contents of the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
+Toolbox.prototype.renderContents_ = function(toolboxDef) {
   // This is for performance reasons. By using document fragment we only have to
   // add to the DOM once.
   const fragment = document.createDocumentFragment();
@@ -445,7 +445,7 @@ Blockly.Toolbox.prototype.renderContents_ = function(toolboxDef) {
  *     toolbox elements to.
  * @private
  */
-Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
+Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
   let registryName = toolboxItemDef['kind'];
 
   // Categories that are collapsible are created using a class registered under
@@ -479,7 +479,7 @@ Blockly.Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment
  * @param {!Blockly.IToolboxItem} toolboxItem The item in the toolbox.
  * @protected
  */
-Blockly.Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
+Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
   this.contents_.push(toolboxItem);
   this.contentMap_[toolboxItem.getId()] = toolboxItem;
   if (toolboxItem.isCollapsible()) {
@@ -498,7 +498,7 @@ Blockly.Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
  * @return {!Array<!Blockly.IToolboxItem>} The list of items in the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getToolboxItems = function() {
+Toolbox.prototype.getToolboxItems = function() {
   return this.contents_;
 };
 
@@ -507,7 +507,7 @@ Blockly.Toolbox.prototype.getToolboxItems = function() {
  * @param {string} style The name of the class to add.
  * @package
  */
-Blockly.Toolbox.prototype.addStyle = function(style) {
+Toolbox.prototype.addStyle = function(style) {
   Blockly.utils.dom.addClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
@@ -516,7 +516,7 @@ Blockly.Toolbox.prototype.addStyle = function(style) {
  * @param {string} style The name of the class to remove.
  * @package
  */
-Blockly.Toolbox.prototype.removeStyle = function(style) {
+Toolbox.prototype.removeStyle = function(style) {
   Blockly.utils.dom.removeClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
@@ -526,7 +526,7 @@ Blockly.Toolbox.prototype.removeStyle = function(style) {
  * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
-Blockly.Toolbox.prototype.getClientRect = function() {
+Toolbox.prototype.getClientRect = function() {
   if (!this.HtmlDiv || !this.isVisible_) {
     return null;
   }
@@ -568,7 +568,7 @@ Blockly.Toolbox.prototype.getClientRect = function() {
  *     this area.
  * @override
  */
-Blockly.Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
+Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
   if (element instanceof Blockly.BlockSvg) {
     const block = /** @type {Blockly.BlockSvg} */ (element);
     // Prefer dragging to the toolbox over connecting to other blocks.
@@ -585,7 +585,7 @@ Blockly.Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
  *   dragged.
  * @override
  */
-Blockly.Toolbox.prototype.onDragEnter = function(_dragElement) {
+Toolbox.prototype.onDragEnter = function(_dragElement) {
   this.updateCursorDeleteStyle_(true);
 };
 
@@ -595,7 +595,7 @@ Blockly.Toolbox.prototype.onDragEnter = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Toolbox.prototype.onDragExit = function(_dragElement) {
+Toolbox.prototype.onDragExit = function(_dragElement) {
   this.updateCursorDeleteStyle_(false);
 };
 
@@ -607,7 +607,7 @@ Blockly.Toolbox.prototype.onDragExit = function(_dragElement) {
  *   dragged.
  * @override
  */
-Blockly.Toolbox.prototype.onDrop = function(_dragElement) {
+Toolbox.prototype.onDrop = function(_dragElement) {
   this.updateCursorDeleteStyle_(false);
 };
 
@@ -617,7 +617,7 @@ Blockly.Toolbox.prototype.onDrop = function(_dragElement) {
  * @protected
  * @override
  */
-Blockly.Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
+Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
   if (wouldDelete === this.wouldDelete_) {
     return;
   }
@@ -638,7 +638,7 @@ Blockly.Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
  * @param {boolean} addStyle Whether the style should be added or removed.
  * @protected
  */
-Blockly.Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
+Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
   const style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
       'blocklyToolboxGrab';
   if (addStyle) {
@@ -655,7 +655,7 @@ Blockly.Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
  *     if no item exists.
  * @public
  */
-Blockly.Toolbox.prototype.getToolboxItemById = function(id) {
+Toolbox.prototype.getToolboxItemById = function(id) {
   return this.contentMap_[id] || null;
 };
 
@@ -664,7 +664,7 @@ Blockly.Toolbox.prototype.getToolboxItemById = function(id) {
  * @return {number} The width of the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getWidth = function() {
+Toolbox.prototype.getWidth = function() {
   return this.width_;
 };
 
@@ -673,7 +673,7 @@ Blockly.Toolbox.prototype.getWidth = function() {
  * @return {number} The width of the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getHeight = function() {
+Toolbox.prototype.getHeight = function() {
   return this.height_;
 };
 
@@ -682,7 +682,7 @@ Blockly.Toolbox.prototype.getHeight = function() {
  * @return {?Blockly.IFlyout} The toolbox flyout.
  * @public
  */
-Blockly.Toolbox.prototype.getFlyout = function() {
+Toolbox.prototype.getFlyout = function() {
   return this.flyout_;
 };
 
@@ -691,7 +691,7 @@ Blockly.Toolbox.prototype.getFlyout = function() {
  * @return {!Blockly.WorkspaceSvg} The parent workspace for the toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.getWorkspace = function() {
+Toolbox.prototype.getWorkspace = function() {
   return this.workspace_;
 };
 
@@ -701,7 +701,7 @@ Blockly.Toolbox.prototype.getWorkspace = function() {
  *     currently selected.
  * @public
  */
-Blockly.Toolbox.prototype.getSelectedItem = function() {
+Toolbox.prototype.getSelectedItem = function() {
   return this.selectedItem_;
 };
 
@@ -711,7 +711,7 @@ Blockly.Toolbox.prototype.getSelectedItem = function() {
  *     item was previously selected.
  * @public
  */
-Blockly.Toolbox.prototype.getPreviouslySelectedItem = function() {
+Toolbox.prototype.getPreviouslySelectedItem = function() {
   return this.previouslySelectedItem_;
 };
 
@@ -721,7 +721,7 @@ Blockly.Toolbox.prototype.getPreviouslySelectedItem = function() {
  *     vertical.
  * @public
  */
-Blockly.Toolbox.prototype.isHorizontal = function() {
+Toolbox.prototype.isHorizontal = function() {
   return this.horizontalLayout_;
 };
 
@@ -730,7 +730,7 @@ Blockly.Toolbox.prototype.isHorizontal = function() {
  * the workspace is in rtl.
  * @public
  */
-Blockly.Toolbox.prototype.position = function() {
+Toolbox.prototype.position = function() {
   const workspaceMetrics = this.workspace_.getMetrics();
   const toolboxDiv = this.HtmlDiv;
   if (!toolboxDiv) {
@@ -765,7 +765,7 @@ Blockly.Toolbox.prototype.position = function() {
  * Handles resizing the toolbox when a toolbox item resizes.
  * @package
  */
-Blockly.Toolbox.prototype.handleToolboxItemResize = function() {
+Toolbox.prototype.handleToolboxItemResize = function() {
   // Reposition the workspace so that (0,0) is in the correct position relative
   // to the new absolute edge (ie toolbox edge).
   const workspace = this.workspace_;
@@ -787,7 +787,7 @@ Blockly.Toolbox.prototype.handleToolboxItemResize = function() {
  * Unhighlights any previously selected item.
  * @public
  */
-Blockly.Toolbox.prototype.clearSelection = function() {
+Toolbox.prototype.clearSelection = function() {
   this.setSelectedItem(null);
 };
 
@@ -795,7 +795,7 @@ Blockly.Toolbox.prototype.clearSelection = function() {
  * Updates the category colours and background colour of selected categories.
  * @package
  */
-Blockly.Toolbox.prototype.refreshTheme = function() {
+Toolbox.prototype.refreshTheme = function() {
   for (let i = 0; i < this.contents_.length; i++) {
     const child = this.contents_[i];
     if (child.refreshTheme) {
@@ -810,7 +810,7 @@ Blockly.Toolbox.prototype.refreshTheme = function() {
  * procedures.
  * @public
  */
-Blockly.Toolbox.prototype.refreshSelection = function() {
+Toolbox.prototype.refreshSelection = function() {
   if (this.selectedItem_ && this.selectedItem_.isSelectable() &&
       this.selectedItem_.getContents().length) {
     this.flyout_.show(this.selectedItem_.getContents());
@@ -822,7 +822,7 @@ Blockly.Toolbox.prototype.refreshSelection = function() {
  * @param {boolean} isVisible True if toolbox should be visible.
  * @public
  */
-Blockly.Toolbox.prototype.setVisible = function(isVisible) {
+Toolbox.prototype.setVisible = function(isVisible) {
   if (this.isVisible_ === isVisible) {
     return;
   }
@@ -839,7 +839,7 @@ Blockly.Toolbox.prototype.setVisible = function(isVisible) {
  * @param {boolean} onlyClosePopups Whether only popups should be closed.
  *     Flyouts should not be closed if this is true.
  */
-Blockly.Toolbox.prototype.autoHide = function(onlyClosePopups) {
+Toolbox.prototype.autoHide = function(onlyClosePopups) {
   if (!onlyClosePopups && this.flyout_ && this.flyout_.autoClose) {
     this.clearSelection();
   }
@@ -851,7 +851,7 @@ Blockly.Toolbox.prototype.autoHide = function(onlyClosePopups) {
  * @param {?Blockly.IToolboxItem} newItem The toolbox item to select.
  * @public
  */
-Blockly.Toolbox.prototype.setSelectedItem = function(newItem) {
+Toolbox.prototype.setSelectedItem = function(newItem) {
   const oldItem = this.selectedItem_;
 
   if ((!newItem && !oldItem) || (newItem && !newItem.isSelectable())) {
@@ -880,7 +880,7 @@ Blockly.Toolbox.prototype.setSelectedItem = function(newItem) {
  * @return {boolean} True if the old item should be deselected, false otherwise.
  * @protected
  */
-Blockly.Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
+Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
   // Deselect the old item unless the old item is collapsible and has been
   // previously clicked on.
   return oldItem != null && (!oldItem.isCollapsible() || oldItem != newItem);
@@ -895,7 +895,7 @@ Blockly.Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
  * @return {boolean} True if the new item should be selected, false otherwise.
  * @protected
  */
-Blockly.Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
+Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
   // Select the new item unless the old item equals the new item.
   return newItem != null && newItem != oldItem;
 };
@@ -906,7 +906,7 @@ Blockly.Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
  *     toolbox item which should be deselected.
  * @protected
  */
-Blockly.Toolbox.prototype.deselectItem_ = function(item) {
+Toolbox.prototype.deselectItem_ = function(item) {
   this.selectedItem_ = null;
   this.previouslySelectedItem_ = item;
   item.setSelected(false);
@@ -922,7 +922,7 @@ Blockly.Toolbox.prototype.deselectItem_ = function(item) {
  *     item.
  * @protected
  */
-Blockly.Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
+Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
   this.selectedItem_ = newItem;
   this.previouslySelectedItem_ = oldItem;
   newItem.setSelected(true);
@@ -935,7 +935,7 @@ Blockly.Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
  * @param {number} position The position of the item to select.
  * @public
  */
-Blockly.Toolbox.prototype.selectItemByPosition = function(position) {
+Toolbox.prototype.selectItemByPosition = function(position) {
   if (position > -1 && position < this.contents_.length) {
     const item = this.contents_[position];
     if (item.isSelectable()) {
@@ -950,7 +950,7 @@ Blockly.Toolbox.prototype.selectItemByPosition = function(position) {
  * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox item.
  * @protected
  */
-Blockly.Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
+Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
   if ((oldItem == newItem && !newItem.isCollapsible()) || !newItem ||
       !newItem.getContents().length) {
     this.flyout_.hide();
@@ -968,7 +968,7 @@ Blockly.Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
  *     item.
  * @private
  */
-Blockly.Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
+Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
   const oldElement = oldItem && oldItem.getName();
   let newElement = newItem && newItem.getName();
   // In this case the toolbox closes, so the newElement should be null.
@@ -985,7 +985,7 @@ Blockly.Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
  * @return {boolean} True if a parent category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectParent_ = function() {
+Toolbox.prototype.selectParent_ = function() {
   if (!this.selectedItem_) {
     return false;
   }
@@ -1008,7 +1008,7 @@ Blockly.Toolbox.prototype.selectParent_ = function() {
  * @return {boolean} True if a child category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectChild_ = function() {
+Toolbox.prototype.selectChild_ = function() {
   if (!this.selectedItem_ || !this.selectedItem_.isCollapsible()) {
     return false;
   }
@@ -1028,7 +1028,7 @@ Blockly.Toolbox.prototype.selectChild_ = function() {
  * @return {boolean} True if a next category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectNext_ = function() {
+Toolbox.prototype.selectNext_ = function() {
   if (!this.selectedItem_) {
     return false;
   }
@@ -1052,7 +1052,7 @@ Blockly.Toolbox.prototype.selectNext_ = function() {
  * @return {boolean} True if a previous category was selected, false otherwise.
  * @private
  */
-Blockly.Toolbox.prototype.selectPrevious_ = function() {
+Toolbox.prototype.selectPrevious_ = function() {
   if (!this.selectedItem_) {
     return false;
   }
@@ -1075,7 +1075,7 @@ Blockly.Toolbox.prototype.selectPrevious_ = function() {
  * Disposes of this toolbox.
  * @public
  */
-Blockly.Toolbox.prototype.dispose = function() {
+Toolbox.prototype.dispose = function() {
   this.workspace_.getComponentManager().removeComponent('toolbox');
   this.flyout_.dispose();
   for (let i = 0; i < this.contents_.length; i++) {
@@ -1132,4 +1132,6 @@ Blockly.Css.register([
 ]);
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX,
-    Blockly.registry.DEFAULT, Blockly.Toolbox);
+    Blockly.registry.DEFAULT, Toolbox);
+
+exports = Toolbox;
diff --git a/tests/deps.js b/tests/deps.js
index 7b93512dd..8cdafbc4c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -179,7 +179,7 @@ goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Bl
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);

From a2e9509542f39e33600c6c61d31cc75bb311c662 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 29 Jul 2021 09:22:44 -0700
Subject: [PATCH 248/291] Migrate core/toolbox/toolbox.js named requires

---
 core/toolbox/toolbox.js | 268 ++++++++++++++++++++--------------------
 1 file changed, 133 insertions(+), 135 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index c57588eec..fa9e80f57 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -13,56 +13,54 @@
 goog.module('Blockly.Toolbox');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly');
-goog.require('Blockly.BlockSvg');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.CollapsibleToolboxCategory');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.Css');
-goog.require('Blockly.DeleteArea');
-goog.require('Blockly.Events');
+const Blockly = goog.require('Blockly');
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+const BlockSvg = goog.require('Blockly.BlockSvg');
+const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const Css = goog.require('Blockly.Css');const DeleteArea = goog.require('Blockly.DeleteArea');
+const Events = goog.require('Blockly.Events');
+const IAutoHideable = goog.require('Blockly.IAutoHideable');
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+const IDraggable = goog.requireType('Blockly.IDraggable');
+const IFlyout = goog.requireType('Blockly.IFlyout');
+const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
+const IStyleable = goog.require('Blockly.IStyleable');
+const IToolbox = goog.require('Blockly.IToolbox');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
+const Options = goog.require('Blockly.Options');
+const Rect = goog.require('Blockly.utils.Rect');
+const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
+const Touch = goog.require('Blockly.Touch');
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const aria = goog.require('Blockly.utils.aria');
+const browserEvents = goog.require('Blockly.browserEvents');
+const dom = goog.require('Blockly.utils.dom');
+const registry = goog.require('Blockly.registry');
+const utils = goog.require('Blockly.utils');
+const toolbox = goog.require('Blockly.utils.toolbox');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ToolboxItemSelect');
-goog.require('Blockly.IAutoHideable');
-goog.require('Blockly.IKeyboardAccessible');
-goog.require('Blockly.IStyleable');
-goog.require('Blockly.IToolbox');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.Touch');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.aria');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.toolbox');
-
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.ICollapsibleToolboxItem');
-goog.requireType('Blockly.IDraggable');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.ISelectableToolboxItem');
-goog.requireType('Blockly.IToolboxItem');
-goog.requireType('Blockly.ShortcutRegistry');
-goog.requireType('Blockly.WorkspaceSvg');
 
 
 /**
  * Class for a Toolbox.
  * Creates the toolbox's DOM.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace in which to create new
+ * @param {!WorkspaceSvg} workspace The workspace in which to create new
  *     blocks.
  * @constructor
- * @implements {Blockly.IAutoHideable}
- * @implements {Blockly.IKeyboardAccessible}
- * @implements {Blockly.IStyleable}
- * @implements {Blockly.IToolbox}
- * @extends {Blockly.DeleteArea}
+ * @implements {IAutoHideable}
+ * @implements {IKeyboardAccessible}
+ * @implements {IStyleable}
+ * @implements {IToolbox}
+ * @extends {DeleteArea}
  */
 const Toolbox = function(workspace) {
   Toolbox.superClass_.constructor.call(this);
   /**
    * The workspace this toolbox is on.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @protected
    */
   this.workspace_ = workspace;
@@ -76,7 +74,7 @@ const Toolbox = function(workspace) {
 
   /**
    * The JSON describing the contents of this toolbox.
-   * @type {!Blockly.utils.toolbox.ToolboxInfo}
+   * @type {!toolbox.ToolboxInfo}
    * @protected
    */
   this.toolboxDef_ = workspace.options.languageTree || {'contents': []};
@@ -110,7 +108,7 @@ const Toolbox = function(workspace) {
 
   /**
    * The list of items in the toolbox.
-   * @type {!Array<!Blockly.IToolboxItem>}
+   * @type {!Array<!IToolboxItem>}
    * @protected
    */
   this.contents_ = [];
@@ -137,34 +135,34 @@ const Toolbox = function(workspace) {
 
   /**
    * The flyout for the toolbox.
-   * @type {?Blockly.IFlyout}
+   * @type {?IFlyout}
    * @private
    */
   this.flyout_ = null;
 
   /**
    * A map from toolbox item IDs to toolbox items.
-   * @type {!Object<string, !Blockly.IToolboxItem>}
+   * @type {!Object<string, !IToolboxItem>}
    * @protected
    */
   this.contentMap_ = Object.create(null);
 
   /**
    * Position of the toolbox and flyout relative to the workspace.
-   * @type {!Blockly.utils.toolbox.Position}
+   * @type {!toolbox.Position}
    */
   this.toolboxPosition = workspace.options.toolboxPosition;
 
   /**
    * The currently selected item.
-   * @type {?Blockly.ISelectableToolboxItem}
+   * @type {?ISelectableToolboxItem}
    * @protected
    */
   this.selectedItem_ = null;
 
   /**
    * The previously selected item.
-   * @type {?Blockly.ISelectableToolboxItem}
+   * @type {?ISelectableToolboxItem}
    * @protected
    */
   this.previouslySelectedItem_ = null;
@@ -173,16 +171,16 @@ const Toolbox = function(workspace) {
    * Array holding info needed to unbind event handlers.
    * Used for disposing.
    * Ex: [[node, name, func], [node, name, func]].
-   * @type {!Array<!Blockly.browserEvents.Data>}
+   * @type {!Array<!browserEvents.Data>}
    * @protected
    */
   this.boundEvents_ = [];
 };
-Blockly.utils.object.inherits(Toolbox, Blockly.DeleteArea);
+utils.object.inherits(Toolbox, DeleteArea);
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!Blockly.ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
+ * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
@@ -201,7 +199,7 @@ Toolbox.prototype.init = function() {
   this.flyout_ = this.createFlyout_();
 
   this.HtmlDiv = this.createDom_(this.workspace_);
-  Blockly.utils.dom.insertAfter(this.flyout_.createDom('svg'), svg);
+  dom.insertAfter(this.flyout_.createDom('svg'), svg);
   this.setVisible(true);
   this.flyout_.init(workspace);
 
@@ -214,16 +212,16 @@ Toolbox.prototype.init = function() {
     component: this,
     weight: 1,
     capabilities: [
-      Blockly.ComponentManager.Capability.AUTOHIDEABLE,
-      Blockly.ComponentManager.Capability.DELETE_AREA,
-      Blockly.ComponentManager.Capability.DRAG_TARGET
+      ComponentManager.Capability.AUTOHIDEABLE,
+      ComponentManager.Capability.DELETE_AREA,
+      ComponentManager.Capability.DRAG_TARGET
     ]
   });
 };
 
 /**
  * Creates the DOM for the toolbox.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace this toolbox is on.
+ * @param {!WorkspaceSvg} workspace The workspace this toolbox is on.
  * @return {!Element} The HTML container for the toolbox.
  * @protected
  */
@@ -234,7 +232,7 @@ Toolbox.prototype.createDom_ = function(workspace) {
 
   this.contentsDiv_ = this.createContentsContainer_();
   this.contentsDiv_.tabIndex = 0;
-  Blockly.utils.aria.setRole(this.contentsDiv_, Blockly.utils.aria.Role.TREE);
+  aria.setRole(this.contentsDiv_, aria.Role.TREE);
   container.appendChild(this.contentsDiv_);
 
   svg.parentNode.insertBefore(container, svg);
@@ -251,8 +249,8 @@ Toolbox.prototype.createDom_ = function(workspace) {
 Toolbox.prototype.createContainer_ = function() {
   const toolboxContainer = document.createElement('div');
   toolboxContainer.setAttribute('layout', this.isHorizontal() ? 'h' : 'v');
-  Blockly.utils.dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
-  Blockly.utils.dom.addClass(toolboxContainer, 'blocklyNonSelectable');
+  dom.addClass(toolboxContainer, 'blocklyToolboxDiv');
+  dom.addClass(toolboxContainer, 'blocklyNonSelectable');
   toolboxContainer.setAttribute('dir', this.RTL ? 'RTL' : 'LTR');
   return toolboxContainer;
 };
@@ -264,7 +262,7 @@ Toolbox.prototype.createContainer_ = function() {
  */
 Toolbox.prototype.createContentsContainer_ = function() {
   const contentsContainer = document.createElement('div');
-  Blockly.utils.dom.addClass(contentsContainer, 'blocklyToolboxContents');
+  dom.addClass(contentsContainer, 'blocklyToolboxContents');
   if (this.isHorizontal()) {
     contentsContainer.style.flexDirection = 'row';
   }
@@ -281,13 +279,13 @@ Toolbox.prototype.createContentsContainer_ = function() {
 Toolbox.prototype.attachEvents_ = function(container,
     contentsContainer) {
   // Clicking on toolbox closes popups.
-  const clickEvent = Blockly.browserEvents.conditionalBind(
+  const clickEvent = browserEvents.conditionalBind(
       container, 'click', this, this.onClick_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
   this.boundEvents_.push(clickEvent);
 
-  const keyDownEvent = Blockly.browserEvents.conditionalBind(
+  const keyDownEvent = browserEvents.conditionalBind(
       contentsContainer, 'keydown', this, this.onKeyDown_,
       /* opt_noCaptureIdentifier */ false,
       /* opt_noPreventDefault */ true);
@@ -300,7 +298,7 @@ Toolbox.prototype.attachEvents_ = function(container,
  * @protected
  */
 Toolbox.prototype.onClick_ = function(e) {
-  if (Blockly.utils.isRightButton(e) || e.target == this.HtmlDiv) {
+  if (utils.isRightButton(e) || e.target == this.HtmlDiv) {
     // Close flyout.
     Blockly.hideChaff(false);
   } else {
@@ -316,7 +314,7 @@ Toolbox.prototype.onClick_ = function(e) {
     // Just close popups.
     Blockly.hideChaff(true);
   }
-  Blockly.Touch.clearTouchIdentifier();  // Don't block future drags.
+  Touch.clearTouchIdentifier();  // Don't block future drags.
 };
 
 /**
@@ -327,22 +325,22 @@ Toolbox.prototype.onClick_ = function(e) {
 Toolbox.prototype.onKeyDown_ = function(e) {
   let handled = false;
   switch (e.keyCode) {
-    case Blockly.utils.KeyCodes.DOWN:
+    case utils.KeyCodes.DOWN:
       handled = this.selectNext_();
       break;
-    case Blockly.utils.KeyCodes.UP:
+    case utils.KeyCodes.UP:
       handled = this.selectPrevious_();
       break;
-    case Blockly.utils.KeyCodes.LEFT:
+    case utils.KeyCodes.LEFT:
       handled = this.selectParent_();
       break;
-    case Blockly.utils.KeyCodes.RIGHT:
+    case utils.KeyCodes.RIGHT:
       handled = this.selectChild_();
       break;
-    case Blockly.utils.KeyCodes.ENTER:
-    case Blockly.utils.KeyCodes.SPACE:
+    case utils.KeyCodes.ENTER:
+    case utils.KeyCodes.SPACE:
       if (this.selectedItem_ && this.selectedItem_.isCollapsible()) {
-        const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+        const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
         collapsibleItem.toggleExpanded();
         handled = true;
       }
@@ -362,7 +360,7 @@ Toolbox.prototype.onKeyDown_ = function(e) {
 
 /**
  * Creates the flyout based on the toolbox layout.
- * @return {!Blockly.IFlyout} The flyout for the toolbox.
+ * @return {!IFlyout} The flyout for the toolbox.
  * @throws {Error} If missing a require for `Blockly.HorizontalFlyout`,
  *     `Blockly.VerticalFlyout`, and no flyout plugin is specified.
  * @protected
@@ -370,8 +368,8 @@ Toolbox.prototype.onKeyDown_ = function(e) {
 Toolbox.prototype.createFlyout_ = function() {
   const workspace = this.workspace_;
   // TODO (#4247): Look into adding a makeFlyout method to Blockly Options.
-  const workspaceOptions = new Blockly.Options(
-      /** @type {!Blockly.BlocklyOptions} */
+  const workspaceOptions = new Options(
+      /** @type {!BlocklyOptions} */
       ({
         'parentWorkspace': workspace,
         'rtl': workspace.RTL,
@@ -388,12 +386,12 @@ Toolbox.prototype.createFlyout_ = function() {
   workspaceOptions.toolboxPosition = workspace.options.toolboxPosition;
   let FlyoutClass = null;
   if (workspace.horizontalLayout) {
-    FlyoutClass = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
+    FlyoutClass = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
         true);
   } else {
-    FlyoutClass = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options,
+    FlyoutClass = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options,
         true);
   }
   return new FlyoutClass(workspaceOptions);
@@ -401,7 +399,7 @@ Toolbox.prototype.createFlyout_ = function() {
 
 /**
  * Fills the toolbox with new toolbox items and removes any old contents.
- * @param {!Blockly.utils.toolbox.ToolboxInfo} toolboxDef Object holding information
+ * @param {!toolbox.ToolboxInfo} toolboxDef Object holding information
  *     for creating a toolbox.
  * @package
  */
@@ -422,7 +420,7 @@ Toolbox.prototype.render = function(toolboxDef) {
 
 /**
  * Adds all the toolbox items to the toolbox.
- * @param {!Array<!Blockly.utils.toolbox.ToolboxItemInfo>} toolboxDef Array
+ * @param {!Array<!toolbox.ToolboxItemInfo>} toolboxDef Array
  *     holding objects containing information on the contents of the toolbox.
  * @protected
  */
@@ -439,7 +437,7 @@ Toolbox.prototype.renderContents_ = function(toolboxDef) {
 
 /**
  * Creates and renders the toolbox item.
- * @param {!Blockly.utils.toolbox.ToolboxItemInfo} toolboxItemDef Any information
+ * @param {!toolbox.ToolboxItemInfo} toolboxItemDef Any information
  *    that can be used to create an item in the toolbox.
  * @param {!DocumentFragment} fragment The document fragment to add the child
  *     toolbox elements to.
@@ -451,13 +449,13 @@ Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
   // Categories that are collapsible are created using a class registered under
   // a different name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
-      Blockly.utils.toolbox.isCategoryCollapsible(
-      /** @type {!Blockly.utils.toolbox.CategoryInfo} */(toolboxItemDef))) {
-    registryName = Blockly.CollapsibleToolboxCategory.registrationName;
+      toolbox.isCategoryCollapsible(
+      /** @type {!toolbox.CategoryInfo} */(toolboxItemDef))) {
+    registryName = CollapsibleToolboxCategory.registrationName;
   }
 
-  const ToolboxItemClass = Blockly.registry.getClass(
-      Blockly.registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
+  const ToolboxItemClass = registry.getClass(
+      registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
   if (ToolboxItemClass) {
     const toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
     this.addToolboxItem_(toolboxItem);
@@ -476,14 +474,14 @@ Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
 
 /**
  * Adds an item to the toolbox.
- * @param {!Blockly.IToolboxItem} toolboxItem The item in the toolbox.
+ * @param {!IToolboxItem} toolboxItem The item in the toolbox.
  * @protected
  */
 Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
   this.contents_.push(toolboxItem);
   this.contentMap_[toolboxItem.getId()] = toolboxItem;
   if (toolboxItem.isCollapsible()) {
-    const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+    const collapsibleItem = /** @type {ICollapsibleToolboxItem} */
         (toolboxItem);
     const childToolboxItems = collapsibleItem.getChildToolboxItems();
     for (let i = 0; i < childToolboxItems.length; i++) {
@@ -495,7 +493,7 @@ Toolbox.prototype.addToolboxItem_ = function(toolboxItem) {
 
 /**
  * Gets the items in the toolbox.
- * @return {!Array<!Blockly.IToolboxItem>} The list of items in the toolbox.
+ * @return {!Array<!IToolboxItem>} The list of items in the toolbox.
  * @public
  */
 Toolbox.prototype.getToolboxItems = function() {
@@ -508,7 +506,7 @@ Toolbox.prototype.getToolboxItems = function() {
  * @package
  */
 Toolbox.prototype.addStyle = function(style) {
-  Blockly.utils.dom.addClass(/** @type {!Element} */ (this.HtmlDiv), style);
+  dom.addClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
 /**
@@ -517,13 +515,13 @@ Toolbox.prototype.addStyle = function(style) {
  * @package
  */
 Toolbox.prototype.removeStyle = function(style) {
-  Blockly.utils.dom.removeClass(/** @type {!Element} */ (this.HtmlDiv), style);
+  dom.removeClass(/** @type {!Element} */ (this.HtmlDiv), style);
 };
 
 /**
  * Returns the bounding rectangle of the drag target area in pixel units
  * relative to viewport.
- * @return {?Blockly.utils.Rect} The component's bounding box. Null if drag
+ * @return {?Rect} The component's bounding box. Null if drag
  *   target area should be ignored.
  */
 Toolbox.prototype.getClientRect = function() {
@@ -544,14 +542,14 @@ Toolbox.prototype.getClientRect = function() {
 
   // Assumes that the toolbox is on the SVG edge.  If this changes
   // (e.g. toolboxes in mutators) then this code will need to be more complex.
-  if (this.toolboxPosition == Blockly.utils.toolbox.Position.TOP) {
-    return new Blockly.utils.Rect(-BIG_NUM, bottom, -BIG_NUM, BIG_NUM);
-  } else if (this.toolboxPosition == Blockly.utils.toolbox.Position.BOTTOM) {
-    return new Blockly.utils.Rect(top, BIG_NUM, -BIG_NUM, BIG_NUM);
-  } else if (this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT) {
-    return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, right);
+  if (this.toolboxPosition == toolbox.Position.TOP) {
+    return new Rect(-BIG_NUM, bottom, -BIG_NUM, BIG_NUM);
+  } else if (this.toolboxPosition == toolbox.Position.BOTTOM) {
+    return new Rect(top, BIG_NUM, -BIG_NUM, BIG_NUM);
+  } else if (this.toolboxPosition == toolbox.Position.LEFT) {
+    return new Rect(-BIG_NUM, BIG_NUM, -BIG_NUM, right);
   } else {  // Right
-    return new Blockly.utils.Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
+    return new Rect(-BIG_NUM, BIG_NUM, left, BIG_NUM);
   }
 };
 
@@ -560,7 +558,7 @@ Toolbox.prototype.getClientRect = function() {
  * this area.
  * This method should check if the element is deletable and is always called
  * before onDragEnter/onDragOver/onDragExit.
- * @param {!Blockly.IDraggable} element The block or bubble currently being
+ * @param {!IDraggable} element The block or bubble currently being
  *   dragged.
  * @param {boolean} _couldConnect Whether the element could could connect to
  *     another.
@@ -569,8 +567,8 @@ Toolbox.prototype.getClientRect = function() {
  * @override
  */
 Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
-  if (element instanceof Blockly.BlockSvg) {
-    const block = /** @type {Blockly.BlockSvg} */ (element);
+  if (element instanceof BlockSvg) {
+    const block = /** @type {BlockSvg} */ (element);
     // Prefer dragging to the toolbox over connecting to other blocks.
     this.updateWouldDelete_(!block.getParent() && block.isDeletable());
   } else {
@@ -581,7 +579,7 @@ Toolbox.prototype.wouldDelete = function(element, _couldConnect) {
 
 /**
  * Handles when a cursor with a block or bubble enters this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -591,7 +589,7 @@ Toolbox.prototype.onDragEnter = function(_dragElement) {
 
 /**
  * Handles when a cursor with a block or bubble exits this drag target.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -603,7 +601,7 @@ Toolbox.prototype.onDragExit = function(_dragElement) {
 /**
  * Handles when a block or bubble is dropped on this component.
  * Should not handle delete here.
- * @param {!Blockly.IDraggable} _dragElement The block or bubble currently being
+ * @param {!IDraggable} _dragElement The block or bubble currently being
  *   dragged.
  * @override
  */
@@ -651,7 +649,7 @@ Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
 /**
  * Gets the toolbox item with the given ID.
  * @param {string} id The ID of the toolbox item.
- * @return {?Blockly.IToolboxItem} The toolbox item with the given ID, or null
+ * @return {?IToolboxItem} The toolbox item with the given ID, or null
  *     if no item exists.
  * @public
  */
@@ -679,7 +677,7 @@ Toolbox.prototype.getHeight = function() {
 
 /**
  * Gets the toolbox flyout.
- * @return {?Blockly.IFlyout} The toolbox flyout.
+ * @return {?IFlyout} The toolbox flyout.
  * @public
  */
 Toolbox.prototype.getFlyout = function() {
@@ -688,7 +686,7 @@ Toolbox.prototype.getFlyout = function() {
 
 /**
  * Gets the workspace for the toolbox.
- * @return {!Blockly.WorkspaceSvg} The parent workspace for the toolbox.
+ * @return {!WorkspaceSvg} The parent workspace for the toolbox.
  * @public
  */
 Toolbox.prototype.getWorkspace = function() {
@@ -697,7 +695,7 @@ Toolbox.prototype.getWorkspace = function() {
 
 /**
  * Gets the selected item.
- * @return {?Blockly.ISelectableToolboxItem} The selected item, or null if no item is
+ * @return {?ISelectableToolboxItem} The selected item, or null if no item is
  *     currently selected.
  * @public
  */
@@ -707,7 +705,7 @@ Toolbox.prototype.getSelectedItem = function() {
 
 /**
  * Gets the previously selected item.
- * @return {?Blockly.ISelectableToolboxItem} The previously selected item, or null if no
+ * @return {?ISelectableToolboxItem} The previously selected item, or null if no
  *     item was previously selected.
  * @public
  */
@@ -744,13 +742,13 @@ Toolbox.prototype.position = function() {
     toolboxDiv.style.width = '100%';
     this.height_ = toolboxDiv.offsetHeight;
     this.width_ = workspaceMetrics.viewWidth;
-    if (this.toolboxPosition == Blockly.utils.toolbox.Position.TOP) {
+    if (this.toolboxPosition == toolbox.Position.TOP) {
       toolboxDiv.style.top = '0';
     } else {  // Bottom
       toolboxDiv.style.bottom = '0';
     }
   } else {
-    if (this.toolboxPosition == Blockly.utils.toolbox.Position.RIGHT) {
+    if (this.toolboxPosition == toolbox.Position.RIGHT) {
       toolboxDiv.style.right = '0';
     } else {  // Left
       toolboxDiv.style.left = '0';
@@ -770,10 +768,10 @@ Toolbox.prototype.handleToolboxItemResize = function() {
   // to the new absolute edge (ie toolbox edge).
   const workspace = this.workspace_;
   const rect = this.HtmlDiv.getBoundingClientRect();
-  const newX = this.toolboxPosition == Blockly.utils.toolbox.Position.LEFT ?
+  const newX = this.toolboxPosition == toolbox.Position.LEFT ?
       workspace.scrollX + rect.width :
       workspace.scrollX;
-  const newY = this.toolboxPosition == Blockly.utils.toolbox.Position.TOP ?
+  const newY = this.toolboxPosition == toolbox.Position.TOP ?
       workspace.scrollY + rect.height :
       workspace.scrollY;
   workspace.translate(newX, newY);
@@ -848,7 +846,7 @@ Toolbox.prototype.autoHide = function(onlyClosePopups) {
 /**
  * Sets the given item as selected.
  * No-op if the item is not selectable.
- * @param {?Blockly.IToolboxItem} newItem The toolbox item to select.
+ * @param {?IToolboxItem} newItem The toolbox item to select.
  * @public
  */
 Toolbox.prototype.setSelectedItem = function(newItem) {
@@ -857,7 +855,7 @@ Toolbox.prototype.setSelectedItem = function(newItem) {
   if ((!newItem && !oldItem) || (newItem && !newItem.isSelectable())) {
     return;
   }
-  newItem = /** @type {Blockly.ISelectableToolboxItem} */ (newItem);
+  newItem = /** @type {ISelectableToolboxItem} */ (newItem);
 
   if (this.shouldDeselectItem_(oldItem, newItem) && oldItem != null) {
     this.deselectItem_(oldItem);
@@ -873,9 +871,9 @@ Toolbox.prototype.setSelectedItem = function(newItem) {
 
 /**
  * Decides whether the old item should be deselected.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @return {boolean} True if the old item should be deselected, false otherwise.
  * @protected
@@ -888,9 +886,9 @@ Toolbox.prototype.shouldDeselectItem_ = function(oldItem, newItem) {
 
 /**
  * Decides whether the new item should be selected.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @return {boolean} True if the new item should be selected, false otherwise.
  * @protected
@@ -902,7 +900,7 @@ Toolbox.prototype.shouldSelectItem_ = function(oldItem, newItem) {
 
 /**
  * Deselects the given item, marks it as unselected, and updates aria state.
- * @param {!Blockly.ISelectableToolboxItem} item The previously selected
+ * @param {!ISelectableToolboxItem} item The previously selected
  *     toolbox item which should be deselected.
  * @protected
  */
@@ -910,15 +908,15 @@ Toolbox.prototype.deselectItem_ = function(item) {
   this.selectedItem_ = null;
   this.previouslySelectedItem_ = item;
   item.setSelected(false);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      Blockly.utils.aria.State.ACTIVEDESCENDANT, '');
+  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
+      aria.State.ACTIVEDESCENDANT, '');
 };
 
 /**
  * Selects the given item, marks it selected, and updates aria state.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {!Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {!ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @protected
  */
@@ -926,8 +924,8 @@ Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
   this.selectedItem_ = newItem;
   this.previouslySelectedItem_ = oldItem;
   newItem.setSelected(true);
-  Blockly.utils.aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      Blockly.utils.aria.State.ACTIVEDESCENDANT, newItem.getId());
+  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
+      aria.State.ACTIVEDESCENDANT, newItem.getId());
 };
 
 /**
@@ -946,8 +944,8 @@ Toolbox.prototype.selectItemByPosition = function(position) {
 
 /**
  * Decides whether to hide or show the flyout depending on the selected item.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox item.
+ * @param {?ISelectableToolboxItem} oldItem The previously selected toolbox item.
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox item.
  * @protected
  */
 Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
@@ -962,9 +960,9 @@ Toolbox.prototype.updateFlyout_ = function(oldItem, newItem) {
 
 /**
  * Emits an event when a new toolbox item is selected.
- * @param {?Blockly.ISelectableToolboxItem} oldItem The previously selected
+ * @param {?ISelectableToolboxItem} oldItem The previously selected
  *     toolbox item.
- * @param {?Blockly.ISelectableToolboxItem} newItem The newly selected toolbox
+ * @param {?ISelectableToolboxItem} newItem The newly selected toolbox
  *     item.
  * @private
  */
@@ -975,9 +973,9 @@ Toolbox.prototype.fireSelectEvent_ = function(oldItem, newItem) {
   if (oldItem == newItem) {
     newElement = null;
   }
-  const event = new (Blockly.Events.get(Blockly.Events.TOOLBOX_ITEM_SELECT))(
+  const event = new (Events.get(Events.TOOLBOX_ITEM_SELECT))(
       oldElement, newElement, this.workspace_.id);
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -991,7 +989,7 @@ Toolbox.prototype.selectParent_ = function() {
   }
 
   if (this.selectedItem_.isCollapsible() && this.selectedItem_.isExpanded()) {
-    const collapsibleItem = /** @type {!Blockly.ICollapsibleToolboxItem} */ (this.selectedItem_);
+    const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
     collapsibleItem.setExpanded(false);
     return true;
   } else if (this.selectedItem_.getParent() &&
@@ -1012,7 +1010,7 @@ Toolbox.prototype.selectChild_ = function() {
   if (!this.selectedItem_ || !this.selectedItem_.isCollapsible()) {
     return false;
   }
-  const collapsibleItem = /** @type {Blockly.ICollapsibleToolboxItem} */
+  const collapsibleItem = /** @type {ICollapsibleToolboxItem} */
       (this.selectedItem_);
   if (!collapsibleItem.isExpanded()) {
     collapsibleItem.setExpanded(true);
@@ -1084,19 +1082,19 @@ Toolbox.prototype.dispose = function() {
   }
 
   for (let j = 0; j < this.boundEvents_.length; j++) {
-    Blockly.browserEvents.unbind(this.boundEvents_[j]);
+    browserEvents.unbind(this.boundEvents_[j]);
   }
   this.boundEvents_ = [];
   this.contents_ = [];
 
   this.workspace_.getThemeManager().unsubscribe(this.HtmlDiv);
-  Blockly.utils.dom.removeNode(this.HtmlDiv);
+  dom.removeNode(this.HtmlDiv);
 };
 
 /**
  * CSS for Toolbox.  See css.js for use.
  */
-Blockly.Css.register([
+Css.register([
   /* eslint-disable indent */
   '.blocklyToolboxDelete {',
     'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
@@ -1131,7 +1129,7 @@ Blockly.Css.register([
   /* eslint-enable indent */
 ]);
 
-Blockly.registry.register(Blockly.registry.Type.TOOLBOX,
-    Blockly.registry.DEFAULT, Toolbox);
+registry.register(registry.Type.TOOLBOX,
+    registry.DEFAULT, Toolbox);
 
 exports = Toolbox;

From 6863d7fa0825eb0fb4655081a4fbd789d2427276 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 11:22:29 -0700
Subject: [PATCH 249/291] clang-format core/toolbox/toolbox.js

---
 core/toolbox/toolbox.js | 87 ++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index fa9e80f57..1edb72fc2 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -18,7 +18,8 @@ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const BlockSvg = goog.require('Blockly.BlockSvg');
 const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
 const ComponentManager = goog.require('Blockly.ComponentManager');
-const Css = goog.require('Blockly.Css');const DeleteArea = goog.require('Blockly.DeleteArea');
+const Css = goog.require('Blockly.Css');
+const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
 const IAutoHideable = goog.require('Blockly.IAutoHideable');
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
@@ -180,7 +181,8 @@ utils.object.inherits(Toolbox, DeleteArea);
 
 /**
  * Handles the given keyboard shortcut.
- * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be handled.
+ * @param {!ShortcutRegistry.KeyboardShortcut} _shortcut The shortcut to be
+ *     handled.
  * @return {boolean} True if the shortcut has been handled, false otherwise.
  * @public
  */
@@ -205,8 +207,8 @@ Toolbox.prototype.init = function() {
 
   this.render(this.toolboxDef_);
   const themeManager = workspace.getThemeManager();
-  themeManager.subscribe(this.HtmlDiv, 'toolboxBackgroundColour',
-      'background-color');
+  themeManager.subscribe(
+      this.HtmlDiv, 'toolboxBackgroundColour', 'background-color');
   themeManager.subscribe(this.HtmlDiv, 'toolboxForegroundColour', 'color');
   this.workspace_.getComponentManager().addComponent({
     component: this,
@@ -276,8 +278,7 @@ Toolbox.prototype.createContentsContainer_ = function() {
  *     of the toolbox.
  * @protected
  */
-Toolbox.prototype.attachEvents_ = function(container,
-    contentsContainer) {
+Toolbox.prototype.attachEvents_ = function(container, contentsContainer) {
   // Clicking on toolbox closes popups.
   const clickEvent = browserEvents.conditionalBind(
       container, 'click', this, this.onClick_,
@@ -340,7 +341,8 @@ Toolbox.prototype.onKeyDown_ = function(e) {
     case utils.KeyCodes.ENTER:
     case utils.KeyCodes.SPACE:
       if (this.selectedItem_ && this.selectedItem_.isCollapsible()) {
-        const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
+        const collapsibleItem =
+            /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
         collapsibleItem.toggleExpanded();
         handled = true;
       }
@@ -387,12 +389,10 @@ Toolbox.prototype.createFlyout_ = function() {
   let FlyoutClass = null;
   if (workspace.horizontalLayout) {
     FlyoutClass = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options,
-        true);
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, workspace.options, true);
   } else {
     FlyoutClass = registry.getClassFromOptions(
-        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options,
-        true);
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, workspace.options, true);
   }
   return new FlyoutClass(workspaceOptions);
 };
@@ -450,12 +450,12 @@ Toolbox.prototype.createToolboxItem_ = function(toolboxItemDef, fragment) {
   // a different name.
   if (registryName.toUpperCase() == 'CATEGORY' &&
       toolbox.isCategoryCollapsible(
-      /** @type {!toolbox.CategoryInfo} */(toolboxItemDef))) {
+          /** @type {!toolbox.CategoryInfo} */ (toolboxItemDef))) {
     registryName = CollapsibleToolboxCategory.registrationName;
   }
 
-  const ToolboxItemClass = registry.getClass(
-      registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
+  const ToolboxItemClass =
+      registry.getClass(registry.Type.TOOLBOX_ITEM, registryName.toLowerCase());
   if (ToolboxItemClass) {
     const toolboxItem = new ToolboxItemClass(toolboxItemDef, this);
     this.addToolboxItem_(toolboxItem);
@@ -637,8 +637,8 @@ Toolbox.prototype.updateWouldDelete_ = function(wouldDelete) {
  * @protected
  */
 Toolbox.prototype.updateCursorDeleteStyle_ = function(addStyle) {
-  const style = this.wouldDelete_ ? 'blocklyToolboxDelete' :
-      'blocklyToolboxGrab';
+  const style =
+      this.wouldDelete_ ? 'blocklyToolboxDelete' : 'blocklyToolboxGrab';
   if (addStyle) {
     this.addStyle(style);
   } else {
@@ -908,8 +908,9 @@ Toolbox.prototype.deselectItem_ = function(item) {
   this.selectedItem_ = null;
   this.previouslySelectedItem_ = item;
   item.setSelected(false);
-  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      aria.State.ACTIVEDESCENDANT, '');
+  aria.setState(
+      /** @type {!Element} */ (this.contentsDiv_), aria.State.ACTIVEDESCENDANT,
+      '');
 };
 
 /**
@@ -924,8 +925,9 @@ Toolbox.prototype.selectItem_ = function(oldItem, newItem) {
   this.selectedItem_ = newItem;
   this.previouslySelectedItem_ = oldItem;
   newItem.setSelected(true);
-  aria.setState(/** @type {!Element} */ (this.contentsDiv_),
-      aria.State.ACTIVEDESCENDANT, newItem.getId());
+  aria.setState(
+      /** @type {!Element} */ (this.contentsDiv_), aria.State.ACTIVEDESCENDANT,
+      newItem.getId());
 };
 
 /**
@@ -944,7 +946,8 @@ Toolbox.prototype.selectItemByPosition = function(position) {
 
 /**
  * Decides whether to hide or show the flyout depending on the selected item.
- * @param {?ISelectableToolboxItem} oldItem The previously selected toolbox item.
+ * @param {?ISelectableToolboxItem} oldItem The previously selected toolbox
+ *     item.
  * @param {?ISelectableToolboxItem} newItem The newly selected toolbox item.
  * @protected
  */
@@ -989,10 +992,12 @@ Toolbox.prototype.selectParent_ = function() {
   }
 
   if (this.selectedItem_.isCollapsible() && this.selectedItem_.isExpanded()) {
-    const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
+    const collapsibleItem =
+        /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_);
     collapsibleItem.setExpanded(false);
     return true;
-  } else if (this.selectedItem_.getParent() &&
+  } else if (
+      this.selectedItem_.getParent() &&
       this.selectedItem_.getParent().isSelectable()) {
     this.setSelectedItem(this.selectedItem_.getParent());
     return true;
@@ -1096,40 +1101,26 @@ Toolbox.prototype.dispose = function() {
  */
 Css.register([
   /* eslint-disable indent */
-  '.blocklyToolboxDelete {',
-    'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
+  '.blocklyToolboxDelete {', 'cursor: url("<<<PATH>>>/handdelete.cur"), auto;',
   '}',
 
-  '.blocklyToolboxGrab {',
-    'cursor: url("<<<PATH>>>/handclosed.cur"), auto;',
-    'cursor: grabbing;',
-    'cursor: -webkit-grabbing;',
-  '}',
+  '.blocklyToolboxGrab {', 'cursor: url("<<<PATH>>>/handclosed.cur"), auto;',
+  'cursor: grabbing;', 'cursor: -webkit-grabbing;', '}',
 
   /* Category tree in Toolbox. */
-  '.blocklyToolboxDiv {',
-    'background-color: #ddd;',
-    'overflow-x: visible;',
-    'overflow-y: auto;',
-    'padding: 4px 0 4px 0;',
-    'position: absolute;',
-    'z-index: 70;', /* so blocks go under toolbox when dragging */
-    '-webkit-tap-highlight-color: transparent;', /* issue #1345 */
+  '.blocklyToolboxDiv {', 'background-color: #ddd;', 'overflow-x: visible;',
+  'overflow-y: auto;', 'padding: 4px 0 4px 0;', 'position: absolute;',
+  'z-index: 70;', /* so blocks go under toolbox when dragging */
+  '-webkit-tap-highlight-color: transparent;', /* issue #1345 */
   '}',
 
-  '.blocklyToolboxContents {',
-    'display: flex;',
-    'flex-wrap: wrap;',
-    'flex-direction: column;',
-  '}',
+  '.blocklyToolboxContents {', 'display: flex;', 'flex-wrap: wrap;',
+  'flex-direction: column;', '}',
 
-  '.blocklyToolboxContents:focus {',
-    'outline: none;',
-  '}',
+  '.blocklyToolboxContents:focus {', 'outline: none;', '}',
   /* eslint-enable indent */
 ]);
 
-registry.register(registry.Type.TOOLBOX,
-    registry.DEFAULT, Toolbox);
+registry.register(registry.Type.TOOLBOX, registry.DEFAULT, Toolbox);
 
 exports = Toolbox;

From 6ad723afbc23aa0cedeaa41911b311c72d21276f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 18:29:34 -0700
Subject: [PATCH 250/291] Add eslint disable

---
 core/toolbox/toolbox.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 1edb72fc2..abab56d26 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -14,6 +14,7 @@ goog.module('Blockly.Toolbox');
 goog.module.declareLegacyNamespace();
 
 const Blockly = goog.require('Blockly');
+/* eslint-disable-next-line no-unused-vars */
 const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const BlockSvg = goog.require('Blockly.BlockSvg');
 const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory');
@@ -22,18 +23,25 @@ const Css = goog.require('Blockly.Css');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
 const IAutoHideable = goog.require('Blockly.IAutoHideable');
+/* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
+/* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
+/* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
 const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+/* eslint-disable-next-line no-unused-vars */
 const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
 const IStyleable = goog.require('Blockly.IStyleable');
 const IToolbox = goog.require('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const Options = goog.require('Blockly.Options');
 const Rect = goog.require('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
 const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry');
 const Touch = goog.require('Blockly.Touch');
+/* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 const aria = goog.require('Blockly.utils.aria');
 const browserEvents = goog.require('Blockly.browserEvents');

From 6bae1ce9f982c965181bcaa3accb9e55542dc825 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 10 Aug 2021 08:09:46 -0700
Subject: [PATCH 251/291] Migrate core/workspace_svg.js to goog.module syntax
 (#5334)

* Migrate core/workspace_svg.js to ES6 const/let

* Migrate core/workspace_svg.js to goog.module

* Migrate core/workspace_svg.js to named requires

* clang-format core/workspace_svg.js
---
 core/workspace_svg.js | 1219 +++++++++++++++++++++--------------------
 tests/deps.js         |    2 +-
 2 files changed, 631 insertions(+), 590 deletions(-)

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 6def3fc5c..5010aff79 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -10,100 +10,128 @@
  */
 'use strict';
 
-goog.provide('Blockly.WorkspaceSvg');
+goog.module('Blockly.WorkspaceSvg');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.BlockSvg');
-goog.require('Blockly.browserEvents');
-goog.require('Blockly.common');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.ConnectionDB');
-goog.require('Blockly.ContextMenu');
-goog.require('Blockly.ContextMenuRegistry');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
+const BlockSvg = goog.require('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
+const Classic = goog.require('Blockly.Themes.Classic');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+const ConnectionDB = goog.require('Blockly.ConnectionDB');
+const ContextMenu = goog.require('Blockly.ContextMenu');
+const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry');
+const Coordinate = goog.require('Blockly.utils.Coordinate');
+/* eslint-disable-next-line no-unused-vars */
+const Cursor = goog.requireType('Blockly.Cursor');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
+const Gesture = goog.require('Blockly.Gesture');
+const Grid = goog.require('Blockly.Grid');
+/* eslint-disable-next-line no-unused-vars */
+const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+/* eslint-disable-next-line no-unused-vars */
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
+/* eslint-disable-next-line no-unused-vars */
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const IFlyout = goog.requireType('Blockly.IFlyout');
+/* eslint-disable-next-line no-unused-vars */
+const IMetricsManager = goog.requireType('Blockly.IMetricsManager');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
+const Marker = goog.requireType('Blockly.Marker');
+const MarkerManager = goog.require('Blockly.MarkerManager');
+/* eslint-disable-next-line no-unused-vars */
+const Metrics = goog.requireType('Blockly.utils.Metrics');
+const Options = goog.require('Blockly.Options');
+/* eslint-disable-next-line no-unused-vars */
+const Procedures = goog.requireType('Blockly.Procedures');
+const Rect = goog.require('Blockly.utils.Rect');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const ScrollbarPair = goog.requireType('Blockly.ScrollbarPair');
+const Size = goog.require('Blockly.utils.Size');
+const Svg = goog.require('Blockly.utils.Svg');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const ThemeManager = goog.require('Blockly.ThemeManager');
+const TouchGesture = goog.require('Blockly.TouchGesture');
+/* eslint-disable-next-line no-unused-vars */
+const Trashcan = goog.requireType('Blockly.Trashcan');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const Variables = goog.requireType('Blockly.Variables');
+/* eslint-disable-next-line no-unused-vars */
+const VariablesDynamic = goog.requireType('Blockly.VariablesDynamic');
+const Workspace = goog.require('Blockly.Workspace');
+const WorkspaceAudio = goog.require('Blockly.WorkspaceAudio');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceDragSurfaceSvg = goog.requireType('Blockly.WorkspaceDragSurfaceSvg');
+const Xml = goog.require('Blockly.Xml');
+/* eslint-disable-next-line no-unused-vars */
+const ZoomControls = goog.requireType('Blockly.ZoomControls');
+const blockRendering = goog.require('Blockly.blockRendering');
+const browserEvents = goog.require('Blockly.browserEvents');
+const common = goog.require('Blockly.common');
+const dom = goog.require('Blockly.utils.dom');
+const internalConstants = goog.require('Blockly.internalConstants');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
+const toolbox = goog.require('Blockly.utils.toolbox');
+const utils = goog.require('Blockly.utils');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockCreate');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ThemeChange');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.ViewportChange');
-goog.require('Blockly.Gesture');
-goog.require('Blockly.Grid');
-goog.require('Blockly.IASTNodeLocationSvg');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.MarkerManager');
 /** @suppress {extraRequire} */
 goog.require('Blockly.MetricsManager');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Msg');
-goog.require('Blockly.Options');
-goog.require('Blockly.registry');
-goog.require('Blockly.ThemeManager');
-goog.require('Blockly.Themes.Classic');
-goog.require('Blockly.TouchGesture');
-goog.require('Blockly.utils');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Metrics');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.Rect');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.Svg');
-goog.require('Blockly.utils.toolbox');
-goog.require('Blockly.Workspace');
-goog.require('Blockly.WorkspaceAudio');
-goog.require('Blockly.WorkspaceDragSurfaceSvg');
-goog.require('Blockly.Xml');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockDragSurfaceSvg');
-goog.requireType('Blockly.BlocklyOptions');
-goog.requireType('Blockly.blockRendering.Renderer');
-goog.requireType('Blockly.Cursor');
-goog.requireType('Blockly.FlyoutButton');
-goog.requireType('Blockly.IBoundedElement');
-goog.requireType('Blockly.IDragTarget');
-goog.requireType('Blockly.IFlyout');
-goog.requireType('Blockly.IMetricsManager');
-goog.requireType('Blockly.IToolbox');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.ScrollbarPair');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.Trashcan');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.WorkspaceComment');
-goog.requireType('Blockly.WorkspaceCommentSvg');
-goog.requireType('Blockly.ZoomControls');
 
 
 /**
  * Class for a workspace.  This is an onscreen area with optional trashcan,
  * scrollbars, bubbles, and dragging.
- * @param {!Blockly.Options} options Dictionary of options.
- * @param {Blockly.BlockDragSurfaceSvg=} opt_blockDragSurface Drag surface for
+ * @param {!Options} options Dictionary of options.
+ * @param {BlockDragSurfaceSvg=} opt_blockDragSurface Drag surface for
  *     blocks.
- * @param {Blockly.WorkspaceDragSurfaceSvg=} opt_wsDragSurface Drag surface for
+ * @param {WorkspaceDragSurfaceSvg=} opt_wsDragSurface Drag surface for
  *     the workspace.
- * @extends {Blockly.Workspace}
- * @implements {Blockly.IASTNodeLocationSvg}
+ * @extends {Workspace}
+ * @implements {IASTNodeLocationSvg}
  * @constructor
  */
-Blockly.WorkspaceSvg = function(
+const WorkspaceSvg = function(
     options, opt_blockDragSurface, opt_wsDragSurface) {
-  Blockly.WorkspaceSvg.superClass_.constructor.call(this, options);
+  WorkspaceSvg.superClass_.constructor.call(this, options);
 
-  var MetricsManagerClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.METRICS_MANAGER, options, true);
+  const MetricsManagerClass = registry.getClassFromOptions(
+      registry.Type.METRICS_MANAGER, options, true);
   /**
    * Object in charge of calculating metrics for the workspace.
-   * @type {!Blockly.IMetricsManager}
+   * @type {!IMetricsManager}
    * @private
    */
   this.metricsManager_ = new MetricsManagerClass(this);
 
   /**
    * Method to get all the metrics that have to do with a workspace.
-   * @type {function():!Blockly.utils.Metrics}
+   * @type {function():!Metrics}
    * @package
    */
   this.getMetrics = options.getMetrics ||
@@ -115,15 +143,15 @@ Blockly.WorkspaceSvg = function(
    * @package
    */
   this.setMetrics =
-      options.setMetrics || Blockly.WorkspaceSvg.setTopLevelWorkspaceMetrics_;
+      options.setMetrics || WorkspaceSvg.setTopLevelWorkspaceMetrics_;
 
   /**
-   * @type {!Blockly.ComponentManager}
+   * @type {!ComponentManager}
    * @private
    */
-  this.componentManager_ = new Blockly.ComponentManager();
+  this.componentManager_ = new ComponentManager();
 
-  this.connectionDBList = Blockly.ConnectionDB.init(this.connectionChecker);
+  this.connectionDBList = ConnectionDB.init(this.connectionChecker);
 
   if (opt_blockDragSurface) {
     this.blockDragSurface_ = opt_blockDragSurface;
@@ -134,90 +162,94 @@ Blockly.WorkspaceSvg = function(
   }
 
   this.useWorkspaceDragSurface_ =
-      !!this.workspaceDragSurface_ && Blockly.utils.is3dSupported();
+      !!this.workspaceDragSurface_ && utils.is3dSupported();
 
   /**
    * List of currently highlighted blocks.  Block highlighting is often used to
    * visually mark blocks currently being executed.
-   * @type {!Array<!Blockly.BlockSvg>}
+   * @type {!Array<!BlockSvg>}
    * @private
    */
   this.highlightedBlocks_ = [];
 
   /**
    * Object in charge of loading, storing, and playing audio for a workspace.
-   * @type {!Blockly.WorkspaceAudio}
+   * @type {!WorkspaceAudio}
    * @private
    */
-  this.audioManager_ = new Blockly.WorkspaceAudio(
-      /** @type {Blockly.WorkspaceSvg} */ (options.parentWorkspace));
+  this.audioManager_ = new WorkspaceAudio(
+      /** @type {WorkspaceSvg} */ (options.parentWorkspace));
 
   /**
    * This workspace's grid object or null.
-   * @type {Blockly.Grid}
+   * @type {Grid}
    * @private
    */
   this.grid_ = this.options.gridPattern ?
-      new Blockly.Grid(this.options.gridPattern, options.gridOptions) : null;
+      new Grid(this.options.gridPattern, options.gridOptions) :
+      null;
 
   /**
    * Manager in charge of markers and cursors.
-   * @type {!Blockly.MarkerManager}
+   * @type {!MarkerManager}
    * @private
    */
-  this.markerManager_ = new Blockly.MarkerManager(this);
+  this.markerManager_ = new MarkerManager(this);
 
   /**
-  * Map from function names to callbacks, for deciding what to do when a custom
-  * toolbox category is opened.
-  * @type {!Object<string, ?function(!Blockly.Workspace):!Array<!Element>>}
-  * @private
-  */
+   * Map from function names to callbacks, for deciding what to do when a custom
+   * toolbox category is opened.
+   * @type {!Object<string, ?function(!Workspace):!Array<!Element>>}
+   * @private
+   */
   this.toolboxCategoryCallbacks_ = Object.create(null);
 
   /**
-  * Map from function names to callbacks, for deciding what to do when a button
-  * is clicked.
-  * @type {!Object<string, ?function(!Blockly.FlyoutButton)>}
-  * @private
-  */
+   * Map from function names to callbacks, for deciding what to do when a button
+   * is clicked.
+   * @type {!Object<string, ?function(!FlyoutButton)>}
+   * @private
+   */
   this.flyoutButtonCallbacks_ = Object.create(null);
 
-  if (Blockly.Variables && Blockly.Variables.flyoutCategory) {
+  const Variables = goog.module.get('Blockly.Variables');
+  if (Variables && Variables.flyoutCategory) {
     this.registerToolboxCategoryCallback(
-        Blockly.internalConstants.VARIABLE_CATEGORY_NAME,
-        Blockly.Variables.flyoutCategory);
+        internalConstants.VARIABLE_CATEGORY_NAME, Variables.flyoutCategory);
   }
-  if (Blockly.VariablesDynamic && Blockly.VariablesDynamic.flyoutCategory) {
+
+  const VariablesDynamic = goog.module.get('Blockly.VariablesDynamic');
+  if (VariablesDynamic && VariablesDynamic.flyoutCategory) {
     this.registerToolboxCategoryCallback(
-        Blockly.internalConstants.VARIABLE_DYNAMIC_CATEGORY_NAME,
-        Blockly.VariablesDynamic.flyoutCategory);
+        internalConstants.VARIABLE_DYNAMIC_CATEGORY_NAME,
+        VariablesDynamic.flyoutCategory);
   }
-  if (Blockly.Procedures && Blockly.Procedures.flyoutCategory) {
+
+  const Procedures = goog.module.get('Blockly.Procedures');
+  if (Procedures && Procedures.flyoutCategory) {
     this.registerToolboxCategoryCallback(
-        Blockly.internalConstants.PROCEDURE_CATEGORY_NAME,
-        Blockly.Procedures.flyoutCategory);
-    this.addChangeListener(Blockly.Procedures.mutatorOpenListener);
+        internalConstants.PROCEDURE_CATEGORY_NAME, Procedures.flyoutCategory);
+    this.addChangeListener(Procedures.mutatorOpenListener);
   }
 
   /**
    * Object in charge of storing and updating the workspace theme.
-   * @type {!Blockly.ThemeManager}
+   * @type {!ThemeManager}
    * @protected
    */
   this.themeManager_ = this.options.parentWorkspace ?
       this.options.parentWorkspace.getThemeManager() :
-      new Blockly.ThemeManager(this,
-          this.options.theme || Blockly.Themes.Classic);
+      new ThemeManager(this, this.options.theme || Classic);
   this.themeManager_.subscribeWorkspace(this);
 
   /**
    * The block renderer used for rendering blocks on this workspace.
-   * @type {!Blockly.blockRendering.Renderer}
+   * @type {!Renderer}
    * @private
    */
-  this.renderer_ = Blockly.blockRendering.init(this.options.renderer || 'geras',
-      this.getTheme(), this.options.rendererOverrides);
+  this.renderer_ = blockRendering.init(
+      this.options.renderer || 'geras', this.getTheme(),
+      this.options.rendererOverrides);
 
   /**
    * Cached parent SVG.
@@ -234,7 +266,7 @@ Blockly.WorkspaceSvg = function(
 
   /**
    * The list of top-level bounded elements on the workspace.
-   * @type {!Array<!Blockly.IBoundedElement>}
+   * @type {!Array<!IBoundedElement>}
    * @private
    */
   this.topBoundedElements_ = [];
@@ -243,8 +275,8 @@ Blockly.WorkspaceSvg = function(
    * The recorded drag targets.
    * @type {!Array<
    * {
-   *   component: !Blockly.IDragTarget,
-   *   clientRect: !Blockly.utils.Rect
+   *   component: !IDragTarget,
+   *   clientRect: !Rect
    * }>}
    * @private
    */
@@ -253,28 +285,28 @@ Blockly.WorkspaceSvg = function(
   /**
    * The cached size of the parent svg element.
    * Used to compute svg metrics.
-   * @type {!Blockly.utils.Size}
+   * @type {!Size}
    * @private
    */
-  this.cachedParentSvgSize_ = new Blockly.utils.Size(0, 0);
+  this.cachedParentSvgSize_ = new Size(0, 0);
 };
-Blockly.utils.object.inherits(Blockly.WorkspaceSvg, Blockly.Workspace);
+object.inherits(WorkspaceSvg, Workspace);
 
 /**
  * A wrapper function called when a resize event occurs.
  * You can pass the result to `eventHandling.unbind`.
- * @type {?Blockly.browserEvents.Data}
+ * @type {?browserEvents.Data}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.resizeHandlerWrapper_ = null;
+WorkspaceSvg.prototype.resizeHandlerWrapper_ = null;
 
 /**
  * The render status of an SVG workspace.
  * Returns `false` for headless workspaces and true for instances of
- * `Blockly.WorkspaceSvg`.
+ * `WorkspaceSvg`.
  * @type {boolean}
  */
-Blockly.WorkspaceSvg.prototype.rendered = true;
+WorkspaceSvg.prototype.rendered = true;
 
 /**
  * Whether the workspace is visible.  False if the workspace has been hidden
@@ -282,20 +314,20 @@ Blockly.WorkspaceSvg.prototype.rendered = true;
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.isVisible_ = true;
+WorkspaceSvg.prototype.isVisible_ = true;
 
 /**
  * Is this workspace the surface for a flyout?
  * @type {boolean}
  */
-Blockly.WorkspaceSvg.prototype.isFlyout = false;
+WorkspaceSvg.prototype.isFlyout = false;
 
 /**
  * Is this workspace the surface for a mutator?
  * @type {boolean}
  * @package
  */
-Blockly.WorkspaceSvg.prototype.isMutator = false;
+WorkspaceSvg.prototype.isMutator = false;
 
 /**
  * Whether this workspace has resizes enabled.
@@ -303,7 +335,7 @@ Blockly.WorkspaceSvg.prototype.isMutator = false;
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.resizesEnabled_ = true;
+WorkspaceSvg.prototype.resizesEnabled_ = true;
 
 /**
  * Current horizontal scrolling offset in pixel units, relative to the
@@ -337,7 +369,7 @@ Blockly.WorkspaceSvg.prototype.resizesEnabled_ = true;
  *
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.scrollX = 0;
+WorkspaceSvg.prototype.scrollX = 0;
 
 /**
  * Current vertical scrolling offset in pixel units, relative to the
@@ -371,109 +403,109 @@ Blockly.WorkspaceSvg.prototype.scrollX = 0;
  *
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.scrollY = 0;
+WorkspaceSvg.prototype.scrollY = 0;
 
 /**
  * Horizontal scroll value when scrolling started in pixel units.
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.startScrollX = 0;
+WorkspaceSvg.prototype.startScrollX = 0;
 
 /**
  * Vertical scroll value when scrolling started in pixel units.
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.startScrollY = 0;
+WorkspaceSvg.prototype.startScrollY = 0;
 
 /**
  * Distance from mouse to object being dragged.
- * @type {Blockly.utils.Coordinate}
+ * @type {Coordinate}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.dragDeltaXY_ = null;
+WorkspaceSvg.prototype.dragDeltaXY_ = null;
 
 /**
  * Current scale.
  * @type {number}
  */
-Blockly.WorkspaceSvg.prototype.scale = 1;
+WorkspaceSvg.prototype.scale = 1;
 
 /**
  * Cached scale value. Used to detect changes in viewport.
  * @type {number}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.oldScale_ = 1;
+WorkspaceSvg.prototype.oldScale_ = 1;
 
 /**
  * Cached viewport top value. Used to detect changes in viewport.
  * @type {number}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.oldTop_ = 0;
+WorkspaceSvg.prototype.oldTop_ = 0;
 
 /**
  * Cached viewport left value. Used to detect changes in viewport.
  * @type {number}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.oldLeft_ = 0;
+WorkspaceSvg.prototype.oldLeft_ = 0;
 
 /**
  * The workspace's trashcan (if any).
- * @type {Blockly.Trashcan}
+ * @type {Trashcan}
  */
-Blockly.WorkspaceSvg.prototype.trashcan = null;
+WorkspaceSvg.prototype.trashcan = null;
 
 /**
  * This workspace's scrollbars, if they exist.
- * @type {Blockly.ScrollbarPair}
+ * @type {ScrollbarPair}
  */
-Blockly.WorkspaceSvg.prototype.scrollbar = null;
+WorkspaceSvg.prototype.scrollbar = null;
 
 /**
  * Fixed flyout providing blocks which may be dragged into this workspace.
- * @type {Blockly.IFlyout}
+ * @type {IFlyout}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.flyout_ = null;
+WorkspaceSvg.prototype.flyout_ = null;
 
 /**
  * Category-based toolbox providing blocks which may be dragged into this
  * workspace.
- * @type {Blockly.IToolbox}
+ * @type {IToolbox}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.toolbox_ = null;
+WorkspaceSvg.prototype.toolbox_ = null;
 
 /**
  * The current gesture in progress on this workspace, if any.
- * @type {Blockly.TouchGesture}
+ * @type {TouchGesture}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.currentGesture_ = null;
+WorkspaceSvg.prototype.currentGesture_ = null;
 
 /**
  * This workspace's surface for dragging blocks, if it exists.
- * @type {Blockly.BlockDragSurfaceSvg}
+ * @type {BlockDragSurfaceSvg}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.blockDragSurface_ = null;
+WorkspaceSvg.prototype.blockDragSurface_ = null;
 
 /**
  * This workspace's drag surface, if it exists.
- * @type {Blockly.WorkspaceDragSurfaceSvg}
+ * @type {WorkspaceDragSurfaceSvg}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.workspaceDragSurface_ = null;
+WorkspaceSvg.prototype.workspaceDragSurface_ = null;
 
 /**
-  * Whether to move workspace to the drag surface when it is dragged.
-  * True if it should move, false if it should be translated directly.
-  * @type {boolean}
-  * @private
-  */
-Blockly.WorkspaceSvg.prototype.useWorkspaceDragSurface_ = false;
+ * Whether to move workspace to the drag surface when it is dragged.
+ * True if it should move, false if it should be translated directly.
+ * @type {boolean}
+ * @private
+ */
+WorkspaceSvg.prototype.useWorkspaceDragSurface_ = false;
 
 /**
  * Whether the drag surface is actively in use. When true, calls to
@@ -483,7 +515,7 @@ Blockly.WorkspaceSvg.prototype.useWorkspaceDragSurface_ = false;
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.isDragSurfaceActive_ = false;
+WorkspaceSvg.prototype.isDragSurfaceActive_ = false;
 
 /**
  * The first parent div with 'injectionDiv' in the name, or null if not set.
@@ -491,16 +523,16 @@ Blockly.WorkspaceSvg.prototype.isDragSurfaceActive_ = false;
  * @type {Element}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.injectionDiv_ = null;
+WorkspaceSvg.prototype.injectionDiv_ = null;
 
 /**
  * Last known position of the page scroll.
  * This is used to determine whether we have recalculated screen coordinate
  * stuff since the page scrolled.
- * @type {Blockly.utils.Coordinate}
+ * @type {Coordinate}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.lastRecordedPageScroll_ = null;
+WorkspaceSvg.prototype.lastRecordedPageScroll_ = null;
 
 /**
  * Developers may define this function to add custom menu options to the
@@ -508,63 +540,63 @@ Blockly.WorkspaceSvg.prototype.lastRecordedPageScroll_ = null;
  * @param {!Array<!Object>} options List of menu options to add to.
  * @param {!Event} e The right-click event that triggered the context menu.
  */
-Blockly.WorkspaceSvg.prototype.configureContextMenu;
+WorkspaceSvg.prototype.configureContextMenu;
 
 /**
  * In a flyout, the target workspace where blocks should be placed after a drag.
  * Otherwise null.
- * @type {Blockly.WorkspaceSvg}
+ * @type {WorkspaceSvg}
  * @package
  */
-Blockly.WorkspaceSvg.prototype.targetWorkspace = null;
+WorkspaceSvg.prototype.targetWorkspace = null;
 
 /**
  * Inverted screen CTM, for use in mouseToSvg.
  * @type {?SVGMatrix}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.inverseScreenCTM_ = null;
+WorkspaceSvg.prototype.inverseScreenCTM_ = null;
 
 /**
  * Inverted screen CTM is dirty, recalculate it.
  * @type {boolean}
  * @private
  */
-Blockly.WorkspaceSvg.prototype.inverseScreenCTMDirty_ = true;
+WorkspaceSvg.prototype.inverseScreenCTMDirty_ = true;
 
 /**
  * Get the marker manager for this workspace.
- * @return {!Blockly.MarkerManager} The marker manager.
+ * @return {!MarkerManager} The marker manager.
  */
-Blockly.WorkspaceSvg.prototype.getMarkerManager = function() {
+WorkspaceSvg.prototype.getMarkerManager = function() {
   return this.markerManager_;
 };
 
 /**
  * Gets the metrics manager for this workspace.
- * @return {!Blockly.IMetricsManager} The metrics manager.
+ * @return {!IMetricsManager} The metrics manager.
  * @public
  */
-Blockly.WorkspaceSvg.prototype.getMetricsManager = function() {
+WorkspaceSvg.prototype.getMetricsManager = function() {
   return this.metricsManager_;
 };
 
 /**
  * Sets the metrics manager for the workspace.
- * @param {!Blockly.IMetricsManager} metricsManager The metrics manager.
+ * @param {!IMetricsManager} metricsManager The metrics manager.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setMetricsManager = function(metricsManager) {
+WorkspaceSvg.prototype.setMetricsManager = function(metricsManager) {
   this.metricsManager_ = metricsManager;
   this.getMetrics = this.metricsManager_.getMetrics.bind(this.metricsManager_);
 };
 
 /**
  * Gets the component manager for this workspace.
- * @return {!Blockly.ComponentManager} The component manager.
+ * @return {!ComponentManager} The component manager.
  * @public
  */
-Blockly.WorkspaceSvg.prototype.getComponentManager = function() {
+WorkspaceSvg.prototype.getComponentManager = function() {
   return this.componentManager_;
 };
 
@@ -574,7 +606,7 @@ Blockly.WorkspaceSvg.prototype.getComponentManager = function() {
  *     workspace SVG group.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setCursorSvg = function(cursorSvg) {
+WorkspaceSvg.prototype.setCursorSvg = function(cursorSvg) {
   this.markerManager_.setCursorSvg(cursorSvg);
 };
 
@@ -584,18 +616,18 @@ Blockly.WorkspaceSvg.prototype.setCursorSvg = function(cursorSvg) {
  *     workspace SVG group.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setMarkerSvg = function(markerSvg) {
+WorkspaceSvg.prototype.setMarkerSvg = function(markerSvg) {
   this.markerManager_.setMarkerSvg(markerSvg);
 };
 
 /**
  * Get the marker with the given ID.
  * @param {string} id The ID of the marker.
- * @return {?Blockly.Marker} The marker with the given ID or null if no marker
+ * @return {?Marker} The marker with the given ID or null if no marker
  *     with the given ID exists.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getMarker = function(id) {
+WorkspaceSvg.prototype.getMarker = function(id) {
   if (this.markerManager_) {
     return this.markerManager_.getMarker(id);
   }
@@ -604,9 +636,9 @@ Blockly.WorkspaceSvg.prototype.getMarker = function(id) {
 
 /**
  * The cursor for this workspace.
- * @return {?Blockly.Cursor} The cursor for the workspace.
+ * @return {?Cursor} The cursor for the workspace.
  */
-Blockly.WorkspaceSvg.prototype.getCursor = function() {
+WorkspaceSvg.prototype.getCursor = function() {
   if (this.markerManager_) {
     return this.markerManager_.getCursor();
   }
@@ -615,38 +647,38 @@ Blockly.WorkspaceSvg.prototype.getCursor = function() {
 
 /**
  * Get the block renderer attached to this workspace.
- * @return {!Blockly.blockRendering.Renderer} The renderer attached to this
+ * @return {!Renderer} The renderer attached to this
  *     workspace.
  */
-Blockly.WorkspaceSvg.prototype.getRenderer = function() {
+WorkspaceSvg.prototype.getRenderer = function() {
   return this.renderer_;
 };
 
 /**
  * Get the theme manager for this workspace.
- * @return {!Blockly.ThemeManager} The theme manager for this workspace.
+ * @return {!ThemeManager} The theme manager for this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getThemeManager = function() {
+WorkspaceSvg.prototype.getThemeManager = function() {
   return this.themeManager_;
 };
 
 /**
  * Get the workspace theme object.
- * @return {!Blockly.Theme} The workspace theme object.
+ * @return {!Theme} The workspace theme object.
  */
-Blockly.WorkspaceSvg.prototype.getTheme = function() {
+WorkspaceSvg.prototype.getTheme = function() {
   return this.themeManager_.getTheme();
 };
 
 /**
  * Set the workspace theme object.
- * If no theme is passed, default to the `Blockly.Themes.Classic` theme.
- * @param {Blockly.Theme} theme The workspace theme object.
+ * If no theme is passed, default to the `Classic` theme.
+ * @param {Theme} theme The workspace theme object.
  */
-Blockly.WorkspaceSvg.prototype.setTheme = function(theme) {
+WorkspaceSvg.prototype.setTheme = function(theme) {
   if (!theme) {
-    theme = /** @type {!Blockly.Theme} */ (Blockly.Themes.Classic);
+    theme = /** @type {!Theme} */ (Classic);
   }
   this.themeManager_.setTheme(theme);
 };
@@ -655,17 +687,15 @@ Blockly.WorkspaceSvg.prototype.setTheme = function(theme) {
  * Refresh all blocks on the workspace after a theme update.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.refreshTheme = function() {
+WorkspaceSvg.prototype.refreshTheme = function() {
   if (this.svgGroup_) {
     this.renderer_.refreshDom(this.svgGroup_, this.getTheme());
   }
 
   // Update all blocks in workspace that have a style name.
-  this.updateBlockStyles_(this.getAllBlocks(false).filter(
-      function(block) {
-        return !!block.getStyleName();
-      }
-  ));
+  this.updateBlockStyles_(this.getAllBlocks(false).filter(function(block) {
+    return !!block.getStyleName();
+  }));
 
   // Update current toolbox selection.
   this.refreshToolboxSelection();
@@ -678,20 +708,20 @@ Blockly.WorkspaceSvg.prototype.refreshTheme = function() {
     this.setVisible(true);
   }
 
-  var event = new (Blockly.Events.get(Blockly.Events.THEME_CHANGE))(
-      this.getTheme().name, this.id);
-  Blockly.Events.fire(event);
+  const event =
+      new (Events.get(Events.THEME_CHANGE))(this.getTheme().name, this.id);
+  Events.fire(event);
 };
 
 /**
  * Updates all the blocks with new style.
- * @param {!Array<!Blockly.Block>} blocks List of blocks to update the style
+ * @param {!Array<!Block>} blocks List of blocks to update the style
  *     on.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.updateBlockStyles_ = function(blocks) {
-  for (var i = 0, block; (block = blocks[i]); i++) {
-    var blockStyleName = block.getStyleName();
+WorkspaceSvg.prototype.updateBlockStyles_ = function(blocks) {
+  for (let i = 0, block; (block = blocks[i]); i++) {
+    const blockStyleName = block.getStyleName();
     if (blockStyleName) {
       block.setStyle(blockStyleName);
       if (block.mutator) {
@@ -705,11 +735,11 @@ Blockly.WorkspaceSvg.prototype.updateBlockStyles_ = function(blocks) {
  * Getter for the inverted screen CTM.
  * @return {?SVGMatrix} The matrix to use in mouseToSvg
  */
-Blockly.WorkspaceSvg.prototype.getInverseScreenCTM = function() {
+WorkspaceSvg.prototype.getInverseScreenCTM = function() {
   // Defer getting the screen CTM until we actually need it, this should
   // avoid forced reflows from any calls to updateInverseScreenCTM.
   if (this.inverseScreenCTMDirty_) {
-    var ctm = this.getParentSvg().getScreenCTM();
+    const ctm = this.getParentSvg().getScreenCTM();
     if (ctm) {
       this.inverseScreenCTM_ = ctm.inverse();
       this.inverseScreenCTMDirty_ = false;
@@ -722,7 +752,7 @@ Blockly.WorkspaceSvg.prototype.getInverseScreenCTM = function() {
 /**
  * Mark the inverse screen CTM as dirty.
  */
-Blockly.WorkspaceSvg.prototype.updateInverseScreenCTM = function() {
+WorkspaceSvg.prototype.updateInverseScreenCTM = function() {
   this.inverseScreenCTMDirty_ = true;
 };
 
@@ -731,7 +761,7 @@ Blockly.WorkspaceSvg.prototype.updateInverseScreenCTM = function() {
  * @return {boolean} Whether the workspace is visible.
  *     False if the workspace has been hidden by calling `setVisible(false)`.
  */
-Blockly.WorkspaceSvg.prototype.isVisible = function() {
+WorkspaceSvg.prototype.isVisible = function() {
   return this.isVisible_;
 };
 
@@ -740,23 +770,22 @@ Blockly.WorkspaceSvg.prototype.isVisible = function() {
  * scales that after canvas SVG element, if it's a descendant.
  * The origin (0,0) is the top-left corner of the Blockly SVG.
  * @param {!SVGElement} element SVG element to find the coordinates of.
- * @return {!Blockly.utils.Coordinate} Object with .x and .y properties.
+ * @return {!Coordinate} Object with .x and .y properties.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getSvgXY = function(element) {
-  var x = 0;
-  var y = 0;
-  var scale = 1;
-  if (Blockly.utils.dom.containsNode(this.getCanvas(), element) ||
-      Blockly.utils.dom.containsNode(this.getBubbleCanvas(), element)) {
+WorkspaceSvg.prototype.getSvgXY = function(element) {
+  let x = 0;
+  let y = 0;
+  let scale = 1;
+  if (dom.containsNode(this.getCanvas(), element) ||
+      dom.containsNode(this.getBubbleCanvas(), element)) {
     // Before the SVG canvas, scale the coordinates.
     scale = this.scale;
   }
   do {
     // Loop through this block and every parent.
-    var xy = Blockly.utils.getRelativeXY(element);
-    if (element == this.getCanvas() ||
-        element == this.getBubbleCanvas()) {
+    const xy = utils.getRelativeXY(element);
+    if (element == this.getCanvas() || element == this.getBubbleCanvas()) {
       // After the SVG canvas, don't scale the coordinates.
       scale = 1;
     }
@@ -764,18 +793,18 @@ Blockly.WorkspaceSvg.prototype.getSvgXY = function(element) {
     y += xy.y * scale;
     element = /** @type {!SVGElement} */ (element.parentNode);
   } while (element && element != this.getParentSvg());
-  return new Blockly.utils.Coordinate(x, y);
+  return new Coordinate(x, y);
 };
 
 /**
  * Gets the size of the workspace's parent SVG element.
- * @return {!Blockly.utils.Size} The cached width and height of the workspace's
+ * @return {!Size} The cached width and height of the workspace's
  *     parent SVG element.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getCachedParentSvgSize = function() {
-  var size = this.cachedParentSvgSize_;
-  return new Blockly.utils.Size(size.width, size.height);
+WorkspaceSvg.prototype.getCachedParentSvgSize = function() {
+  const size = this.cachedParentSvgSize_;
+  return new Size(size.width, size.height);
 };
 
 /**
@@ -783,11 +812,11 @@ Blockly.WorkspaceSvg.prototype.getCachedParentSvgSize = function() {
  * origin in pixels.
  * The workspace origin is where a block would render at position (0, 0).
  * It is not the upper left corner of the workspace SVG.
- * @return {!Blockly.utils.Coordinate} Offset in pixels.
+ * @return {!Coordinate} Offset in pixels.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getOriginOffsetInPixels = function() {
-  return Blockly.utils.getInjectionDivXY_(this.getCanvas());
+WorkspaceSvg.prototype.getOriginOffsetInPixels = function() {
+  return utils.getInjectionDivXY_(this.getCanvas());
 };
 
 /**
@@ -798,13 +827,13 @@ Blockly.WorkspaceSvg.prototype.getOriginOffsetInPixels = function() {
  * @return {!Element} The first parent div with 'injectionDiv' in the name.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getInjectionDiv = function() {
+WorkspaceSvg.prototype.getInjectionDiv = function() {
   // NB: it would be better to pass this in at createDom, but is more likely to
   // break existing uses of Blockly.
   if (!this.injectionDiv_) {
-    var element = this.svgGroup_;
+    let element = this.svgGroup_;
     while (element) {
-      var classes = element.getAttribute('class') || '';
+      const classes = element.getAttribute('class') || '';
       if ((' ' + classes + ' ').indexOf(' injectionDiv ') != -1) {
         this.injectionDiv_ = element;
         break;
@@ -820,16 +849,16 @@ Blockly.WorkspaceSvg.prototype.getInjectionDiv = function() {
  * @return {?SVGElement} The SVG group for the workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getBlockCanvas = function() {
+WorkspaceSvg.prototype.getBlockCanvas = function() {
   return this.svgBlockCanvas_;
 };
 
 /**
  * Save resize handler data so we can delete it later in dispose.
- * @param {!Blockly.browserEvents.Data} handler Data that can be passed to
+ * @param {!browserEvents.Data} handler Data that can be passed to
  *     eventHandling.unbind.
  */
-Blockly.WorkspaceSvg.prototype.setResizeHandlerWrapper = function(handler) {
+WorkspaceSvg.prototype.setResizeHandlerWrapper = function(handler) {
   this.resizeHandlerWrapper_ = handler;
 };
 
@@ -839,7 +868,7 @@ Blockly.WorkspaceSvg.prototype.setResizeHandlerWrapper = function(handler) {
  *     'blocklyMutatorBackground'.
  * @return {!Element} The workspace's SVG group.
  */
-Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
+WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
   /**
    * <g class="blocklyWorkspace">
    *   <rect class="blocklyMainBackground" height="100%" width="100%"></rect>
@@ -849,17 +878,16 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
    * </g>
    * @type {SVGElement}
    */
-  this.svgGroup_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {'class': 'blocklyWorkspace'}, null);
+  this.svgGroup_ =
+      dom.createSvgElement(Svg.G, {'class': 'blocklyWorkspace'}, null);
 
   // Note that a <g> alone does not receive mouse events--it must have a
   // valid target inside it.  If no background class is specified, as in the
   // flyout, the workspace will not receive mouse events.
   if (opt_backgroundClass) {
     /** @type {SVGElement} */
-    this.svgBackground_ = Blockly.utils.dom.createSvgElement(
-        Blockly.utils.Svg.RECT,
+    this.svgBackground_ = dom.createSvgElement(
+        Svg.RECT,
         {'height': '100%', 'width': '100%', 'class': opt_backgroundClass},
         this.svgGroup_);
 
@@ -867,43 +895,41 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
       this.svgBackground_.style.fill =
           'url(#' + this.grid_.getPatternId() + ')';
     } else {
-      this.themeManager_.subscribe(this.svgBackground_,
-          'workspaceBackgroundColour', 'fill');
+      this.themeManager_.subscribe(
+          this.svgBackground_, 'workspaceBackgroundColour', 'fill');
     }
   }
   /** @type {SVGElement} */
-  this.svgBlockCanvas_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {'class': 'blocklyBlockCanvas'}, this.svgGroup_);
+  this.svgBlockCanvas_ = dom.createSvgElement(
+      Svg.G, {'class': 'blocklyBlockCanvas'}, this.svgGroup_);
   /** @type {SVGElement} */
-  this.svgBubbleCanvas_ = Blockly.utils.dom.createSvgElement(
-      Blockly.utils.Svg.G,
-      {'class': 'blocklyBubbleCanvas'}, this.svgGroup_);
+  this.svgBubbleCanvas_ = dom.createSvgElement(
+      Svg.G, {'class': 'blocklyBubbleCanvas'}, this.svgGroup_);
 
   if (!this.isFlyout) {
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgGroup_, 'mousedown', this, this.onMouseDown_, false, true);
     // This no-op works around https://bugs.webkit.org/show_bug.cgi?id=226683,
     // which otherwise prevents zoom/scroll events from being observed in
     // Safari. Once that bug is fixed it should be removed.
     document.body.addEventListener('wheel', function() {});
-    Blockly.browserEvents.conditionalBind(
+    browserEvents.conditionalBind(
         this.svgGroup_, 'wheel', this, this.onMouseWheel_);
   }
 
   // Determine if there needs to be a category tree, or a simple list of
   // blocks.  This cannot be changed later, since the UI is very different.
   if (this.options.hasCategories) {
-    var ToolboxClass = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.TOOLBOX, this.options, true);
+    const ToolboxClass =
+        registry.getClassFromOptions(registry.Type.TOOLBOX, this.options, true);
     this.toolbox_ = new ToolboxClass(this);
   }
   if (this.grid_) {
     this.grid_.update(this.scale);
   }
   this.recordDragTargets();
-  var CursorClass = Blockly.registry.getClassFromOptions(
-      Blockly.registry.Type.CURSOR, this.options);
+  const CursorClass =
+      registry.getClassFromOptions(registry.Type.CURSOR, this.options);
 
   CursorClass && this.markerManager_.setCursor(new CursorClass());
 
@@ -916,14 +942,14 @@ Blockly.WorkspaceSvg.prototype.createDom = function(opt_backgroundClass) {
  * Unlink from all DOM elements to prevent memory leaks.
  * @suppress {checkTypes}
  */
-Blockly.WorkspaceSvg.prototype.dispose = function() {
+WorkspaceSvg.prototype.dispose = function() {
   // Stop rerendering.
   this.rendered = false;
   if (this.currentGesture_) {
     this.currentGesture_.cancel();
   }
   if (this.svgGroup_) {
-    Blockly.utils.dom.removeNode(this.svgGroup_);
+    dom.removeNode(this.svgGroup_);
     this.svgGroup_ = null;
   }
   this.svgBlockCanvas_ = null;
@@ -966,7 +992,7 @@ Blockly.WorkspaceSvg.prototype.dispose = function() {
     this.markerManager_ = null;
   }
 
-  Blockly.WorkspaceSvg.superClass_.dispose.call(this);
+  WorkspaceSvg.superClass_.dispose.call(this);
 
   // Dispose of theme manager after all blocks and mutators are disposed of.
   if (this.themeManager_) {
@@ -986,13 +1012,13 @@ Blockly.WorkspaceSvg.prototype.dispose = function() {
   if (!this.options.parentWorkspace) {
     // Top-most workspace.  Dispose of the div that the
     // SVG is injected into (i.e. injectionDiv).
-    var parentSvg = this.getParentSvg();
+    const parentSvg = this.getParentSvg();
     if (parentSvg && parentSvg.parentNode) {
-      Blockly.utils.dom.removeNode(parentSvg.parentNode);
+      dom.removeNode(parentSvg.parentNode);
     }
   }
   if (this.resizeHandlerWrapper_) {
-    Blockly.browserEvents.unbind(this.resizeHandlerWrapper_);
+    browserEvents.unbind(this.resizeHandlerWrapper_);
     this.resizeHandlerWrapper_ = null;
   }
 };
@@ -1001,30 +1027,31 @@ Blockly.WorkspaceSvg.prototype.dispose = function() {
  * Obtain a newly created block.
  *
  * This block's SVG must still be initialized
- * ([initSvg]{@link Blockly.BlockSvg#initSvg}) and it must be rendered
- * ([render]{@link Blockly.BlockSvg#render}) before the block will be visible.
+ * ([initSvg]{@link BlockSvg#initSvg}) and it must be rendered
+ * ([render]{@link BlockSvg#render}) before the block will be visible.
  * @param {!string} prototypeName Name of the language object containing
  *     type-specific functions for this block.
  * @param {string=} opt_id Optional ID.  Use this ID if provided, otherwise
  *     create a new ID.
- * @return {!Blockly.BlockSvg} The created block.
+ * @return {!BlockSvg} The created block.
  * @override
  */
-Blockly.WorkspaceSvg.prototype.newBlock = function(prototypeName, opt_id) {
-  return new Blockly.BlockSvg(this, prototypeName, opt_id);
+WorkspaceSvg.prototype.newBlock = function(prototypeName, opt_id) {
+  return new BlockSvg(this, prototypeName, opt_id);
 };
 
 /**
  * Add a trashcan.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.addTrashcan = function() {
-  if (!Blockly.Trashcan) {
+WorkspaceSvg.prototype.addTrashcan = function() {
+  const Trashcan = goog.module.get('Blockly.Trashcan');
+  if (!Trashcan) {
     throw Error('Missing require for Blockly.Trashcan');
   }
-  /** @type {Blockly.Trashcan} */
-  this.trashcan = new Blockly.Trashcan(this);
-  var svgTrashcan = this.trashcan.createDom();
+  /** @type {Trashcan} */
+  this.trashcan = new Trashcan(this);
+  const svgTrashcan = this.trashcan.createDom();
   this.svgGroup_.insertBefore(svgTrashcan, this.svgBlockCanvas_);
 };
 
@@ -1032,28 +1059,29 @@ Blockly.WorkspaceSvg.prototype.addTrashcan = function() {
  * Add zoom controls.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.addZoomControls = function() {
-  if (!Blockly.ZoomControls) {
+WorkspaceSvg.prototype.addZoomControls = function() {
+  const ZoomControls = goog.module.get('Blockly.ZoomControls');
+  if (!ZoomControls) {
     throw Error('Missing require for Blockly.ZoomControls');
   }
-  /** @type {Blockly.ZoomControls} */
-  this.zoomControls_ = new Blockly.ZoomControls(this);
-  var svgZoomControls = this.zoomControls_.createDom();
+  /** @type {ZoomControls} */
+  this.zoomControls_ = new ZoomControls(this);
+  const svgZoomControls = this.zoomControls_.createDom();
   this.svgGroup_.appendChild(svgZoomControls);
 };
 
 /**
  * Add a flyout element in an element with the given tag name.
  * @param {string|
- * !Blockly.utils.Svg<!SVGSVGElement>|
- * !Blockly.utils.Svg<!SVGGElement>} tagName What type of tag the
+ * !Svg<!SVGSVGElement>|
+ * !Svg<!SVGGElement>} tagName What type of tag the
  *     flyout belongs in.
  * @return {!Element} The element containing the flyout DOM.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.addFlyout = function(tagName) {
-  var workspaceOptions = new Blockly.Options(
-      /** @type {!Blockly.BlocklyOptions} */
+WorkspaceSvg.prototype.addFlyout = function(tagName) {
+  const workspaceOptions = new Options(
+      /** @type {!BlocklyOptions} */
       ({
         'parentWorkspace': this,
         'rtl': this.RTL,
@@ -1067,12 +1095,12 @@ Blockly.WorkspaceSvg.prototype.addFlyout = function(tagName) {
       }));
   workspaceOptions.toolboxPosition = this.options.toolboxPosition;
   if (this.horizontalLayout) {
-    var HorizontalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, this.options, true);
+    const HorizontalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, this.options, true);
     this.flyout_ = new HorizontalFlyout(workspaceOptions);
   } else {
-    var VerticalFlyout = Blockly.registry.getClassFromOptions(
-        Blockly.registry.Type.FLYOUTS_VERTICAL_TOOLBOX, this.options, true);
+    const VerticalFlyout = registry.getClassFromOptions(
+        registry.Type.FLYOUTS_VERTICAL_TOOLBOX, this.options, true);
     this.flyout_ = new VerticalFlyout(workspaceOptions);
   }
   this.flyout_.autoClose = false;
@@ -1089,10 +1117,10 @@ Blockly.WorkspaceSvg.prototype.addFlyout = function(tagName) {
  * owned by either the toolbox or the workspace, depending on toolbox
  * configuration.  It will be null if there is no flyout.
  * @param {boolean=} opt_own Whether to only return the workspace's own flyout.
- * @return {?Blockly.IFlyout} The flyout on this workspace.
+ * @return {?IFlyout} The flyout on this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getFlyout = function(opt_own) {
+WorkspaceSvg.prototype.getFlyout = function(opt_own) {
   if (this.flyout_ || opt_own) {
     return this.flyout_;
   }
@@ -1104,10 +1132,10 @@ Blockly.WorkspaceSvg.prototype.getFlyout = function(opt_own) {
 
 /**
  * Getter for the toolbox associated with this workspace, if one exists.
- * @return {?Blockly.IToolbox} The toolbox on this workspace.
+ * @return {?IToolbox} The toolbox on this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getToolbox = function() {
+WorkspaceSvg.prototype.getToolbox = function() {
   return this.toolbox_;
 };
 
@@ -1116,7 +1144,7 @@ Blockly.WorkspaceSvg.prototype.getToolbox = function() {
  * because something has changed (e.g. scroll position, window size).
  * @private
  */
-Blockly.WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
+WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
   this.updateInverseScreenCTM();
   this.recordDragTargets();
 };
@@ -1127,7 +1155,7 @@ Blockly.WorkspaceSvg.prototype.updateScreenCalculations_ = function() {
  * workspace contents if needed.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.resizeContents = function() {
+WorkspaceSvg.prototype.resizeContents = function() {
   if (!this.resizesEnabled_ || !this.rendered) {
     return;
   }
@@ -1144,7 +1172,7 @@ Blockly.WorkspaceSvg.prototype.resizeContents = function() {
  * requires recalculating dimensions and positions of the
  * trash, zoom, toolbox, etc. (e.g. window resize).
  */
-Blockly.WorkspaceSvg.prototype.resize = function() {
+WorkspaceSvg.prototype.resize = function() {
   if (this.toolbox_) {
     this.toolbox_.position();
   }
@@ -1152,13 +1180,13 @@ Blockly.WorkspaceSvg.prototype.resize = function() {
     this.flyout_.position();
   }
 
-  var positionables = this.componentManager_.getComponents(
-      Blockly.ComponentManager.Capability.POSITIONABLE, true);
-  var metrics = this.getMetricsManager().getUiMetrics();
-  var savedPositions = [];
-  for (var i = 0, positionable; (positionable = positionables[i]); i++) {
+  const positionables = this.componentManager_.getComponents(
+      ComponentManager.Capability.POSITIONABLE, true);
+  const metrics = this.getMetricsManager().getUiMetrics();
+  const savedPositions = [];
+  for (let i = 0, positionable; (positionable = positionables[i]); i++) {
     positionable.position(metrics, savedPositions);
-    var boundingRect = positionable.getBoundingRectangle();
+    const boundingRect = positionable.getBoundingRectangle();
     if (boundingRect) {
       savedPositions.push(boundingRect);
     }
@@ -1175,12 +1203,10 @@ Blockly.WorkspaceSvg.prototype.resize = function() {
  * scroll position.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.updateScreenCalculationsIfScrolled =
-    function() {
-    /* eslint-disable indent */
-  var currScroll = Blockly.utils.getDocumentScroll();
-  if (!Blockly.utils.Coordinate.equals(
-      this.lastRecordedPageScroll_, currScroll)) {
+WorkspaceSvg.prototype.updateScreenCalculationsIfScrolled = function() {
+  /* eslint-disable indent */
+  const currScroll = utils.getDocumentScroll();
+  if (!Coordinate.equals(this.lastRecordedPageScroll_, currScroll)) {
     this.lastRecordedPageScroll_ = currScroll;
     this.updateScreenCalculations_();
   }
@@ -1190,7 +1216,7 @@ Blockly.WorkspaceSvg.prototype.updateScreenCalculationsIfScrolled =
  * Get the SVG element that forms the drawing surface.
  * @return {!SVGGElement} SVG group element.
  */
-Blockly.WorkspaceSvg.prototype.getCanvas = function() {
+WorkspaceSvg.prototype.getCanvas = function() {
   return /** @type {!SVGGElement} */ (this.svgBlockCanvas_);
 };
 
@@ -1201,16 +1227,18 @@ Blockly.WorkspaceSvg.prototype.getCanvas = function() {
  * @param {?number} height The height of the parent SVG element
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setCachedParentSvgSize = function(width, height) {
-  var svg = this.getParentSvg();
+WorkspaceSvg.prototype.setCachedParentSvgSize = function(width, height) {
+  const svg = this.getParentSvg();
   if (width) {
     this.cachedParentSvgSize_.width = width;
-    // This is set to support the public (but deprecated) Blockly.svgSize method.
+    // This is set to support the public (but deprecated) Blockly.svgSize
+    // method.
     svg.cachedWidth_ = width;
   }
   if (height) {
     this.cachedParentSvgSize_.height = height;
-    // This is set to support the public (but deprecated) Blockly.svgSize method.
+    // This is set to support the public (but deprecated) Blockly.svgSize
+    // method.
     svg.cachedHeight_ = height;
   }
 };
@@ -1219,7 +1247,7 @@ Blockly.WorkspaceSvg.prototype.setCachedParentSvgSize = function(width, height)
  * Get the SVG element that forms the bubble surface.
  * @return {!SVGGElement} SVG group element.
  */
-Blockly.WorkspaceSvg.prototype.getBubbleCanvas = function() {
+WorkspaceSvg.prototype.getBubbleCanvas = function() {
   return /** @type {!SVGGElement} */ (this.svgBubbleCanvas_);
 };
 
@@ -1229,9 +1257,9 @@ Blockly.WorkspaceSvg.prototype.getBubbleCanvas = function() {
  * into the DOM.
  * @return {!SVGElement} SVG element.
  */
-Blockly.WorkspaceSvg.prototype.getParentSvg = function() {
+WorkspaceSvg.prototype.getParentSvg = function() {
   if (!this.cachedParentSvg_) {
-    var element = this.svgGroup_;
+    let element = this.svgGroup_;
     while (element) {
       if (element.tagName == 'svg') {
         this.cachedParentSvg_ = element;
@@ -1248,26 +1276,25 @@ Blockly.WorkspaceSvg.prototype.getParentSvg = function() {
  * viewport values.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
-  if (!Blockly.Events.isEnabled()) {
+WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
+  if (!Events.isEnabled()) {
     return;
   }
-  var scale = this.scale;
-  var top = -this.scrollY;
-  var left = -this.scrollX;
-  if (scale == this.oldScale_ &&
-      Math.abs(top - this.oldTop_) < 1 &&
+  const scale = this.scale;
+  const top = -this.scrollY;
+  const left = -this.scrollX;
+  if (scale == this.oldScale_ && Math.abs(top - this.oldTop_) < 1 &&
       Math.abs(left - this.oldLeft_) < 1) {
     // Ignore sub-pixel changes in top and left. Due to #4192 there are a lot of
     // negligible changes in viewport top/left.
     return;
   }
-  var event = new (Blockly.Events.get(Blockly.Events.VIEWPORT_CHANGE))(top,
-      left, scale, this.id, this.oldScale_);
+  const event = new (Events.get(Events.VIEWPORT_CHANGE))(
+      top, left, scale, this.id, this.oldScale_);
   this.oldScale_ = scale;
   this.oldTop_ = top;
   this.oldLeft_ = left;
-  Blockly.Events.fire(event);
+  Events.fire(event);
 };
 
 /**
@@ -1277,11 +1304,11 @@ Blockly.WorkspaceSvg.prototype.maybeFireViewportChangeEvent = function() {
  * @param {number} y Vertical translation, in pixel units relative to the
  *    top left of the Blockly div.
  */
-Blockly.WorkspaceSvg.prototype.translate = function(x, y) {
+WorkspaceSvg.prototype.translate = function(x, y) {
   if (this.useWorkspaceDragSurface_ && this.isDragSurfaceActive_) {
-    this.workspaceDragSurface_.translateSurface(x,y);
+    this.workspaceDragSurface_.translateSurface(x, y);
   } else {
-    var translation = 'translate(' + x + ',' + y + ') ' +
+    const translation = 'translate(' + x + ',' + y + ') ' +
         'scale(' + this.scale + ')';
     this.svgBlockCanvas_.setAttribute('transform', translation);
     this.svgBubbleCanvas_.setAttribute('transform', translation);
@@ -1304,7 +1331,7 @@ Blockly.WorkspaceSvg.prototype.translate = function(x, y) {
  * Does nothing if the workspace drag surface is not enabled.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
+WorkspaceSvg.prototype.resetDragSurface = function() {
   // Don't do anything if we aren't using a drag surface.
   if (!this.useWorkspaceDragSurface_) {
     return;
@@ -1312,9 +1339,9 @@ Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
 
   this.isDragSurfaceActive_ = false;
 
-  var trans = this.workspaceDragSurface_.getSurfaceTranslation();
+  const trans = this.workspaceDragSurface_.getSurfaceTranslation();
   this.workspaceDragSurface_.clearAndHide(this.svgGroup_);
-  var translation = 'translate(' + trans.x + ',' + trans.y + ') ' +
+  const translation = 'translate(' + trans.x + ',' + trans.y + ') ' +
       'scale(' + this.scale + ')';
   this.svgBlockCanvas_.setAttribute('transform', translation);
   this.svgBubbleCanvas_.setAttribute('transform', translation);
@@ -1326,7 +1353,7 @@ Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
  * Does nothing if the drag surface is not enabled.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.setupDragSurface = function() {
+WorkspaceSvg.prototype.setupDragSurface = function() {
   // Don't do anything if we aren't using a drag surface.
   if (!this.useWorkspaceDragSurface_) {
     return;
@@ -1345,23 +1372,24 @@ Blockly.WorkspaceSvg.prototype.setupDragSurface = function() {
 
   // Figure out where we want to put the canvas back.  The order
   // in the is important because things are layered.
-  var previousElement =
-    /** @type {Element} */ (this.svgBlockCanvas_.previousSibling);
-  var width = parseInt(this.getParentSvg().getAttribute('width'), 10);
-  var height = parseInt(this.getParentSvg().getAttribute('height'), 10);
-  var coord = Blockly.utils.getRelativeXY(this.getCanvas());
-  this.workspaceDragSurface_.setContentsAndShow(this.getCanvas(),
-      this.getBubbleCanvas(), previousElement, width, height, this.scale);
+  const previousElement =
+      /** @type {Element} */ (this.svgBlockCanvas_.previousSibling);
+  const width = parseInt(this.getParentSvg().getAttribute('width'), 10);
+  const height = parseInt(this.getParentSvg().getAttribute('height'), 10);
+  const coord = utils.getRelativeXY(this.getCanvas());
+  this.workspaceDragSurface_.setContentsAndShow(
+      this.getCanvas(), this.getBubbleCanvas(), previousElement, width, height,
+      this.scale);
   this.workspaceDragSurface_.translateSurface(coord.x, coord.y);
 };
 
 /**
  * Gets the drag surface blocks are moved to when a drag is started.
- * @return {?Blockly.BlockDragSurfaceSvg} This workspace's block drag surface,
+ * @return {?BlockDragSurfaceSvg} This workspace's block drag surface,
  *     if one is in use.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getBlockDragSurface = function() {
+WorkspaceSvg.prototype.getBlockDragSurface = function() {
   return this.blockDragSurface_;
 };
 
@@ -1370,8 +1398,8 @@ Blockly.WorkspaceSvg.prototype.getBlockDragSurface = function() {
  * Intended for LTR/RTL compatibility in XML.
  * @return {number} Width.
  */
-Blockly.WorkspaceSvg.prototype.getWidth = function() {
-  var metrics = this.getMetrics();
+WorkspaceSvg.prototype.getWidth = function() {
+  const metrics = this.getMetrics();
   return metrics ? metrics.viewWidth / this.scale : 0;
 };
 
@@ -1380,7 +1408,7 @@ Blockly.WorkspaceSvg.prototype.getWidth = function() {
  * Currently only intended for main workspace.
  * @param {boolean} isVisible True if workspace should be visible.
  */
-Blockly.WorkspaceSvg.prototype.setVisible = function(isVisible) {
+WorkspaceSvg.prototype.setVisible = function(isVisible) {
   this.isVisible_ = isVisible;
   if (!this.svgGroup_) {
     return;
@@ -1404,9 +1432,9 @@ Blockly.WorkspaceSvg.prototype.setVisible = function(isVisible) {
     this.toolbox_.setVisible(isVisible);
   }
   if (isVisible) {
-    var blocks = this.getAllBlocks(false);
+    const blocks = this.getAllBlocks(false);
     // Tell each block on the workspace to mark its fields as dirty.
-    for (var i = blocks.length - 1; i >= 0; i--) {
+    for (let i = blocks.length - 1; i >= 0; i--) {
       blocks[i].markDirty();
     }
 
@@ -1422,17 +1450,17 @@ Blockly.WorkspaceSvg.prototype.setVisible = function(isVisible) {
 /**
  * Render all blocks in workspace.
  */
-Blockly.WorkspaceSvg.prototype.render = function() {
+WorkspaceSvg.prototype.render = function() {
   // Generate list of all blocks.
-  var blocks = this.getAllBlocks(false);
+  const blocks = this.getAllBlocks(false);
   // Render each block.
-  for (var i = blocks.length - 1; i >= 0; i--) {
+  for (let i = blocks.length - 1; i >= 0; i--) {
     blocks[i].render(false);
   }
 
   if (this.currentGesture_) {
-    var imList = this.currentGesture_.getInsertionMarkers();
-    for (var i = 0; i < imList.length; i++) {
+    const imList = this.currentGesture_.getInsertionMarkers();
+    for (let i = 0; i < imList.length; i++) {
       imList[i].render(false);
     }
   }
@@ -1449,21 +1477,21 @@ Blockly.WorkspaceSvg.prototype.render = function() {
  * automatically unhighlight all others.  If true or false, manually
  * highlight/unhighlight the specified block.
  */
-Blockly.WorkspaceSvg.prototype.highlightBlock = function(id, opt_state) {
+WorkspaceSvg.prototype.highlightBlock = function(id, opt_state) {
   if (opt_state === undefined) {
     // Unhighlight all blocks.
-    for (var i = 0, block; (block = this.highlightedBlocks_[i]); i++) {
+    for (let i = 0, block; (block = this.highlightedBlocks_[i]); i++) {
       block.setHighlighted(false);
     }
     this.highlightedBlocks_.length = 0;
   }
   // Highlight/unhighlight the specified block.
-  var block = id ? this.getBlockById(id) : null;
+  const block = id ? this.getBlockById(id) : null;
   if (block) {
-    var state = (opt_state === undefined) || opt_state;
+    const state = (opt_state === undefined) || opt_state;
     // Using Set here would be great, but at the cost of IE10 support.
     if (!state) {
-      Blockly.utils.arrayRemove(this.highlightedBlocks_, block);
+      utils.arrayRemove(this.highlightedBlocks_, block);
     } else if (this.highlightedBlocks_.indexOf(block) == -1) {
       this.highlightedBlocks_.push(block);
     }
@@ -1476,12 +1504,14 @@ Blockly.WorkspaceSvg.prototype.highlightBlock = function(id, opt_state) {
  * @param {!Element|!DocumentFragment} xmlBlock XML block element or an empty
  *     DocumentFragment if the block was an insertion marker.
  */
-Blockly.WorkspaceSvg.prototype.paste = function(xmlBlock) {
-  if (!this.rendered || !xmlBlock.tagName || xmlBlock.getElementsByTagName('block').length >=
-      this.remainingCapacity()) {
+WorkspaceSvg.prototype.paste = function(xmlBlock) {
+  if (!this.rendered || !xmlBlock.tagName ||
+      xmlBlock.getElementsByTagName('block').length >=
+          this.remainingCapacity()) {
     return;
   }
-  // The check above for tagName rules out the possibility of this being a DocumentFragment.
+  // The check above for tagName rules out the possibility of this being a
+  // DocumentFragment.
   xmlBlock = /** @type {!Element} */ (xmlBlock);
   if (this.currentGesture_) {
     this.currentGesture_.cancel();  // Dragging while pasting?  No.
@@ -1498,25 +1528,27 @@ Blockly.WorkspaceSvg.prototype.paste = function(xmlBlock) {
  * @param {!Element} xmlBlock XML block element.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
-  Blockly.Events.disable();
+WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
+  Events.disable();
+  let block;
   try {
-    var block = Blockly.Xml.domToBlock(xmlBlock, this);
+    block = Xml.domToBlock(xmlBlock, this);
 
     // Move the duplicate to original position.
-    var blockX = parseInt(xmlBlock.getAttribute('x'), 10);
-    var blockY = parseInt(xmlBlock.getAttribute('y'), 10);
+    let blockX = parseInt(xmlBlock.getAttribute('x'), 10);
+    let blockY = parseInt(xmlBlock.getAttribute('y'), 10);
     if (!isNaN(blockX) && !isNaN(blockY)) {
       if (this.RTL) {
         blockX = -blockX;
       }
       // Offset block until not clobbering another block and not in connection
       // distance with neighbouring blocks.
+      let collide;
       do {
-        var collide = false;
-        var allBlocks = this.getAllBlocks(false);
-        for (var i = 0, otherBlock; (otherBlock = allBlocks[i]); i++) {
-          var otherXY = otherBlock.getRelativeToSurfaceXY();
+        collide = false;
+        const allBlocks = this.getAllBlocks(false);
+        for (let i = 0, otherBlock; (otherBlock = allBlocks[i]); i++) {
+          const otherXY = otherBlock.getRelativeToSurfaceXY();
           if (Math.abs(blockX - otherXY.x) <= 1 &&
               Math.abs(blockY - otherXY.y) <= 1) {
             collide = true;
@@ -1525,11 +1557,10 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
         }
         if (!collide) {
           // Check for blocks in snap range to any of its connections.
-          var connections = block.getConnections_(false);
-          for (var i = 0, connection; (connection = connections[i]); i++) {
-            var neighbour = connection.closest(
-                Blockly.internalConstants.SNAP_RADIUS,
-                new Blockly.utils.Coordinate(blockX, blockY));
+          const connections = block.getConnections_(false);
+          for (let i = 0, connection; (connection = connections[i]); i++) {
+            const neighbour = connection.closest(
+                internalConstants.SNAP_RADIUS, new Coordinate(blockX, blockY));
             if (neighbour.connection) {
               collide = true;
               break;
@@ -1538,21 +1569,20 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
         }
         if (collide) {
           if (this.RTL) {
-            blockX -= Blockly.internalConstants.SNAP_RADIUS;
+            blockX -= internalConstants.SNAP_RADIUS;
           } else {
-            blockX += Blockly.internalConstants.SNAP_RADIUS;
+            blockX += internalConstants.SNAP_RADIUS;
           }
-          blockY += Blockly.internalConstants.SNAP_RADIUS * 2;
+          blockY += internalConstants.SNAP_RADIUS * 2;
         }
       } while (collide);
       block.moveBy(blockX, blockY);
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  if (Blockly.Events.isEnabled() && !block.isShadow()) {
-    Blockly.Events.fire(
-        new (Blockly.Events.get(Blockly.Events.BLOCK_CREATE))(block));
+  if (Events.isEnabled() && !block.isShadow()) {
+    Events.fire(new (Events.get(Events.BLOCK_CREATE))(block));
   }
   block.select();
 };
@@ -1564,13 +1594,15 @@ Blockly.WorkspaceSvg.prototype.pasteBlock_ = function(xmlBlock) {
  * @suppress {checkTypes} Suppress checks while workspace comments are not
  *     bundled in.
  */
-Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
-  Blockly.Events.disable();
+WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
+  Events.disable();
+  let comment;
   try {
-    var comment = goog.module.get('Blockly.WorkspaceCommentSvg').fromXml(xmlComment, this);
+    comment = goog.module.get('Blockly.WorkspaceCommentSvg')
+                  .fromXml(xmlComment, this);
     // Move the duplicate to original position.
-    var commentX = parseInt(xmlComment.getAttribute('x'), 10);
-    var commentY = parseInt(xmlComment.getAttribute('y'), 10);
+    let commentX = parseInt(xmlComment.getAttribute('x'), 10);
+    let commentY = parseInt(xmlComment.getAttribute('y'), 10);
     if (!isNaN(commentX) && !isNaN(commentY)) {
       if (this.RTL) {
         commentX = -commentX;
@@ -1583,9 +1615,9 @@ Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
       comment.moveBy(commentX, commentY);
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  if (Blockly.Events.isEnabled()) {
+  if (Events.isEnabled()) {
     goog.module.get('Blockly.WorkspaceComment').fireCreateEvent(comment);
   }
   comment.select();
@@ -1595,8 +1627,8 @@ Blockly.WorkspaceSvg.prototype.pasteWorkspaceComment_ = function(xmlComment) {
  * Refresh the toolbox unless there's a drag in progress.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.refreshToolboxSelection = function() {
-  var ws = this.isFlyout ? this.targetWorkspace : this;
+WorkspaceSvg.prototype.refreshToolboxSelection = function() {
+  const ws = this.isFlyout ? this.targetWorkspace : this;
   if (ws && !ws.currentGesture_ && ws.toolbox_ && ws.toolbox_.getFlyout()) {
     ws.toolbox_.refreshSelection();
   }
@@ -1608,8 +1640,8 @@ Blockly.WorkspaceSvg.prototype.refreshToolboxSelection = function() {
  * @param {string} id ID of the variable to rename.
  * @param {string} newName New variable name.
  */
-Blockly.WorkspaceSvg.prototype.renameVariableById = function(id, newName) {
-  Blockly.WorkspaceSvg.superClass_.renameVariableById.call(this, id, newName);
+WorkspaceSvg.prototype.renameVariableById = function(id, newName) {
+  WorkspaceSvg.superClass_.renameVariableById.call(this, id, newName);
   this.refreshToolboxSelection();
 };
 
@@ -1618,8 +1650,8 @@ Blockly.WorkspaceSvg.prototype.renameVariableById = function(id, newName) {
  *     immediately that the variable is deleted.
  * @param {string} id ID of variable to delete.
  */
-Blockly.WorkspaceSvg.prototype.deleteVariableById = function(id) {
-  Blockly.WorkspaceSvg.superClass_.deleteVariableById.call(this, id);
+WorkspaceSvg.prototype.deleteVariableById = function(id) {
+  WorkspaceSvg.superClass_.deleteVariableById.call(this, id);
   this.refreshToolboxSelection();
 };
 
@@ -1632,11 +1664,10 @@ Blockly.WorkspaceSvg.prototype.deleteVariableById = function(id) {
  *     their type. This will default to '' which is a specific type.
  * @param {?string=} opt_id The unique ID of the variable. This will default to
  *     a UUID.
- * @return {!Blockly.VariableModel} The newly created variable.
+ * @return {!VariableModel} The newly created variable.
  */
-Blockly.WorkspaceSvg.prototype.createVariable = function(name,
-    opt_type, opt_id) {
-  var newVar = Blockly.WorkspaceSvg.superClass_.createVariable.call(
+WorkspaceSvg.prototype.createVariable = function(name, opt_type, opt_id) {
+  const newVar = WorkspaceSvg.superClass_.createVariable.call(
       this, name, opt_type, opt_id);
   this.refreshToolboxSelection();
   return newVar;
@@ -1646,11 +1677,9 @@ Blockly.WorkspaceSvg.prototype.createVariable = function(name,
  * Make a list of all the delete areas for this workspace.
  * @deprecated Use workspace.recordDragTargets. (2021 June)
  */
-Blockly.WorkspaceSvg.prototype.recordDeleteAreas = function() {
-  Blockly.utils.deprecation.warn(
-      'WorkspaceSvg.prototype.recordDeleteAreas',
-      'June 2021',
-      'June 2022',
+WorkspaceSvg.prototype.recordDeleteAreas = function() {
+  utils.deprecation.warn(
+      'WorkspaceSvg.prototype.recordDeleteAreas', 'June 2021', 'June 2022',
       'WorkspaceSvg.prototype.recordDragTargets');
   this.recordDragTargets();
 };
@@ -1658,13 +1687,13 @@ Blockly.WorkspaceSvg.prototype.recordDeleteAreas = function() {
 /**
  * Make a list of all the delete areas for this workspace.
  */
-Blockly.WorkspaceSvg.prototype.recordDragTargets = function() {
-  var dragTargets = this.componentManager_.getComponents(
-      Blockly.ComponentManager.Capability.DRAG_TARGET, true);
+WorkspaceSvg.prototype.recordDragTargets = function() {
+  const dragTargets = this.componentManager_.getComponents(
+      ComponentManager.Capability.DRAG_TARGET, true);
 
   this.dragTargetAreas_ = [];
-  for (var i = 0, targetArea; (targetArea = dragTargets[i]); i++) {
-    var rect = targetArea.getClientRect();
+  for (let i = 0, targetArea; (targetArea = dragTargets[i]); i++) {
+    const rect = targetArea.getClientRect();
     if (rect) {
       this.dragTargetAreas_.push({
         component: targetArea,
@@ -1678,11 +1707,11 @@ Blockly.WorkspaceSvg.prototype.recordDragTargets = function() {
 /**
  * Returns the drag target the mouse event is over.
  * @param {!Event} e Mouse move event.
- * @return {?Blockly.IDragTarget} Null if not over a drag target, or the drag
+ * @return {?IDragTarget} Null if not over a drag target, or the drag
  *     target the event is over.
  */
-Blockly.WorkspaceSvg.prototype.getDragTarget = function(e) {
-  for (var i = 0, targetArea; (targetArea = this.dragTargetAreas_[i]); i++) {
+WorkspaceSvg.prototype.getDragTarget = function(e) {
+  for (let i = 0, targetArea; (targetArea = this.dragTargetAreas_[i]); i++) {
     if (targetArea.clientRect.contains(e.clientX, e.clientY)) {
       return targetArea.component;
     }
@@ -1695,8 +1724,8 @@ Blockly.WorkspaceSvg.prototype.getDragTarget = function(e) {
  * @param {!Event} e Mouse down event.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.onMouseDown_ = function(e) {
-  var gesture = this.getGesture(e);
+WorkspaceSvg.prototype.onMouseDown_ = function(e) {
+  const gesture = this.getGesture(e);
   if (gesture) {
     gesture.handleWsStart(e, this);
   }
@@ -1705,38 +1734,38 @@ Blockly.WorkspaceSvg.prototype.onMouseDown_ = function(e) {
 /**
  * Start tracking a drag of an object on this workspace.
  * @param {!Event} e Mouse down event.
- * @param {!Blockly.utils.Coordinate} xy Starting location of object.
+ * @param {!Coordinate} xy Starting location of object.
  */
-Blockly.WorkspaceSvg.prototype.startDrag = function(e, xy) {
+WorkspaceSvg.prototype.startDrag = function(e, xy) {
   // Record the starting offset between the bubble's location and the mouse.
-  var point = Blockly.utils.mouseToSvg(e, this.getParentSvg(),
-      this.getInverseScreenCTM());
+  const point =
+      utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
   // Fix scale of mouse event.
   point.x /= this.scale;
   point.y /= this.scale;
-  this.dragDeltaXY_ = Blockly.utils.Coordinate.difference(xy, point);
+  this.dragDeltaXY_ = Coordinate.difference(xy, point);
 };
 
 /**
  * Track a drag of an object on this workspace.
  * @param {!Event} e Mouse move event.
- * @return {!Blockly.utils.Coordinate} New location of object.
+ * @return {!Coordinate} New location of object.
  */
-Blockly.WorkspaceSvg.prototype.moveDrag = function(e) {
-  var point = Blockly.utils.mouseToSvg(e, this.getParentSvg(),
-      this.getInverseScreenCTM());
+WorkspaceSvg.prototype.moveDrag = function(e) {
+  const point =
+      utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
   // Fix scale of mouse event.
   point.x /= this.scale;
   point.y /= this.scale;
-  return Blockly.utils.Coordinate.sum(
-      /** @type {!Blockly.utils.Coordinate} */ (this.dragDeltaXY_), point);
+  return Coordinate.sum(
+      /** @type {!Coordinate} */ (this.dragDeltaXY_), point);
 };
 
 /**
  * Is the user currently dragging a block or scrolling the flyout/workspace?
  * @return {boolean} True if currently dragging or scrolling.
  */
-Blockly.WorkspaceSvg.prototype.isDragging = function() {
+WorkspaceSvg.prototype.isDragging = function() {
   return this.currentGesture_ != null && this.currentGesture_.isDragging();
 };
 
@@ -1744,7 +1773,7 @@ Blockly.WorkspaceSvg.prototype.isDragging = function() {
  * Is this workspace draggable?
  * @return {boolean} True if this workspace may be dragged.
  */
-Blockly.WorkspaceSvg.prototype.isDraggable = function() {
+WorkspaceSvg.prototype.isDraggable = function() {
   return this.options.moveOptions && this.options.moveOptions.drag;
 };
 
@@ -1758,7 +1787,7 @@ Blockly.WorkspaceSvg.prototype.isDraggable = function() {
  * since the X Y coordinates are decided programmatically.
  * @return {boolean} True if the workspace is movable, false otherwise.
  */
-Blockly.WorkspaceSvg.prototype.isMovable = function() {
+WorkspaceSvg.prototype.isMovable = function() {
   return (this.options.moveOptions && !!this.options.moveOptions.scrollbars) ||
       (this.options.moveOptions && this.options.moveOptions.wheel) ||
       (this.options.moveOptions && this.options.moveOptions.drag) ||
@@ -1771,10 +1800,11 @@ Blockly.WorkspaceSvg.prototype.isMovable = function() {
  * @return {boolean} True if the workspace is movable horizontally, false
  *    otherwise.
  */
-Blockly.WorkspaceSvg.prototype.isMovableHorizontally = function() {
-  var hasScrollbars = !!this.scrollbar;
-  return this.isMovable() && (!hasScrollbars ||
-      (hasScrollbars && this.scrollbar.canScrollHorizontally()));
+WorkspaceSvg.prototype.isMovableHorizontally = function() {
+  const hasScrollbars = !!this.scrollbar;
+  return this.isMovable() &&
+      (!hasScrollbars ||
+       (hasScrollbars && this.scrollbar.canScrollHorizontally()));
 };
 
 /**
@@ -1782,10 +1812,11 @@ Blockly.WorkspaceSvg.prototype.isMovableHorizontally = function() {
  * @return {boolean} True if the workspace is movable vertically, false
  *    otherwise.
  */
-Blockly.WorkspaceSvg.prototype.isMovableVertically = function() {
-  var hasScrollbars = !!this.scrollbar;
-  return this.isMovable() && (!hasScrollbars ||
-      (hasScrollbars && this.scrollbar.canScrollVertically()));
+WorkspaceSvg.prototype.isMovableVertically = function() {
+  const hasScrollbars = !!this.scrollbar;
+  return this.isMovable() &&
+      (!hasScrollbars ||
+       (hasScrollbars && this.scrollbar.canScrollVertically()));
 };
 
 /**
@@ -1793,33 +1824,35 @@ Blockly.WorkspaceSvg.prototype.isMovableVertically = function() {
  * @param {!Event} e Mouse wheel event.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
+WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
   // Don't scroll or zoom anything if drag is in progress.
-  if (Blockly.Gesture.inProgress()) {
+  if (Gesture.inProgress()) {
     e.preventDefault();
     e.stopPropagation();
     return;
   }
-  var canWheelZoom = this.options.zoomOptions && this.options.zoomOptions.wheel;
-  var canWheelMove = this.options.moveOptions && this.options.moveOptions.wheel;
+  const canWheelZoom =
+      this.options.zoomOptions && this.options.zoomOptions.wheel;
+  const canWheelMove =
+      this.options.moveOptions && this.options.moveOptions.wheel;
   if (!canWheelZoom && !canWheelMove) {
     return;
   }
 
-  var scrollDelta = Blockly.utils.getScrollDeltaPixels(e);
+  const scrollDelta = utils.getScrollDeltaPixels(e);
   if (canWheelZoom && (e.ctrlKey || !canWheelMove)) {
     // Zoom.
     // The vertical scroll distance that corresponds to a click of a zoom
     // button.
-    var PIXELS_PER_ZOOM_STEP = 50;
-    var delta = -scrollDelta.y / PIXELS_PER_ZOOM_STEP;
-    var position = Blockly.utils.mouseToSvg(e, this.getParentSvg(),
-        this.getInverseScreenCTM());
+    const PIXELS_PER_ZOOM_STEP = 50;
+    const delta = -scrollDelta.y / PIXELS_PER_ZOOM_STEP;
+    const position =
+        utils.mouseToSvg(e, this.getParentSvg(), this.getInverseScreenCTM());
     this.zoom(position.x, position.y, delta);
   } else {
     // Scroll.
-    var x = this.scrollX - scrollDelta.x;
-    var y = this.scrollY - scrollDelta.y;
+    let x = this.scrollX - scrollDelta.x;
+    let y = this.scrollY - scrollDelta.y;
 
     if (e.shiftKey && !scrollDelta.x) {
       // Scroll horizontally (based on vertical scroll delta).
@@ -1837,26 +1870,26 @@ Blockly.WorkspaceSvg.prototype.onMouseWheel_ = function(e) {
  * Calculate the bounding box for the blocks on the workspace.
  * Coordinate system: workspace coordinates.
  *
- * @return {!Blockly.utils.Rect} Contains the position and size of the
+ * @return {!Rect} Contains the position and size of the
  *   bounding box containing the blocks on the workspace.
  */
-Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
-  var topElements = this.getTopBoundedElements();
+WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
+  const topElements = this.getTopBoundedElements();
   // There are no blocks, return empty rectangle.
   if (!topElements.length) {
-    return new Blockly.utils.Rect(0, 0, 0, 0);
+    return new Rect(0, 0, 0, 0);
   }
 
   // Initialize boundary using the first block.
-  var boundary = topElements[0].getBoundingRectangle();
+  const boundary = topElements[0].getBoundingRectangle();
 
   // Start at 1 since the 0th block was used for initialization.
-  for (var i = 1; i < topElements.length; i++) {
-    var topElement = topElements[i];
+  for (let i = 1; i < topElements.length; i++) {
+    const topElement = topElements[i];
     if (topElement.isInsertionMarker && topElement.isInsertionMarker()) {
       continue;
     }
-    var blockBoundary = topElement.getBoundingRectangle();
+    const blockBoundary = topElement.getBoundingRectangle();
     if (blockBoundary.top < boundary.top) {
       boundary.top = blockBoundary.top;
     }
@@ -1876,23 +1909,22 @@ Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
 /**
  * Clean up the workspace by ordering all the blocks in a column.
  */
-Blockly.WorkspaceSvg.prototype.cleanUp = function() {
+WorkspaceSvg.prototype.cleanUp = function() {
   this.setResizesEnabled(false);
-  Blockly.Events.setGroup(true);
-  var topBlocks = this.getTopBlocks(true);
-  var cursorY = 0;
-  for (var i = 0, block; (block = topBlocks[i]); i++) {
+  Events.setGroup(true);
+  const topBlocks = this.getTopBlocks(true);
+  let cursorY = 0;
+  for (let i = 0, block; (block = topBlocks[i]); i++) {
     if (!block.isMovable()) {
       continue;
     }
-    var xy = block.getRelativeToSurfaceXY();
+    const xy = block.getRelativeToSurfaceXY();
     block.moveBy(-xy.x, cursorY - xy.y);
     block.snapToGrid();
-    cursorY = block.getRelativeToSurfaceXY().y +
-        block.getHeightWidth().height +
+    cursorY = block.getRelativeToSurfaceXY().y + block.getHeightWidth().height +
         this.renderer_.getConstants().MIN_BLOCK_HEIGHT;
   }
-  Blockly.Events.setGroup(false);
+  Events.setGroup(false);
   this.setResizesEnabled(true);
 };
 
@@ -1901,29 +1933,29 @@ Blockly.WorkspaceSvg.prototype.cleanUp = function() {
  * @param {!Event} e Mouse event.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.showContextMenu = function(e) {
+WorkspaceSvg.prototype.showContextMenu = function(e) {
   if (this.options.readOnly || this.isFlyout) {
     return;
   }
-  var menuOptions = Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
-      Blockly.ContextMenuRegistry.ScopeType.WORKSPACE, {workspace: this});
+  const menuOptions = ContextMenuRegistry.registry.getContextMenuOptions(
+      ContextMenuRegistry.ScopeType.WORKSPACE, {workspace: this});
 
   // Allow the developer to add or modify menuOptions.
   if (this.configureContextMenu) {
     this.configureContextMenu(menuOptions, e);
   }
 
-  Blockly.ContextMenu.show(e, menuOptions, this.RTL);
+  ContextMenu.show(e, menuOptions, this.RTL);
 };
 
 /**
  * Modify the block tree on the existing toolbox.
- * @param {?Blockly.utils.toolbox.ToolboxDefinition} toolboxDef
+ * @param {?toolbox.ToolboxDefinition} toolboxDef
  *    DOM tree of toolbox contents, string of toolbox contents, or JSON
  *    representing toolbox definition.
  */
-Blockly.WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
-  var parsedToolboxDef = Blockly.utils.toolbox.convertToolboxDefToJson(toolboxDef);
+WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
+  const parsedToolboxDef = toolbox.convertToolboxDefToJson(toolboxDef);
 
   if (!parsedToolboxDef) {
     if (this.options.languageTree) {
@@ -1935,7 +1967,7 @@ Blockly.WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
     throw Error('Existing toolbox is null.  Can\'t create new toolbox.');
   }
 
-  if (Blockly.utils.toolbox.hasCategories(parsedToolboxDef)) {
+  if (toolbox.hasCategories(parsedToolboxDef)) {
     if (!this.toolbox_) {
       throw Error('Existing toolbox has no categories.  Can\'t change mode.');
     }
@@ -1953,11 +1985,11 @@ Blockly.WorkspaceSvg.prototype.updateToolbox = function(toolboxDef) {
 /**
  * Mark this workspace as the currently focused main workspace.
  */
-Blockly.WorkspaceSvg.prototype.markFocused = function() {
+WorkspaceSvg.prototype.markFocused = function() {
   if (this.options.parentWorkspace) {
     this.options.parentWorkspace.markFocused();
   } else {
-    Blockly.common.setMainWorkspace(this);
+    common.setMainWorkspace(this);
     // We call e.preventDefault in many event handlers which means we
     // need to explicitly grab focus (e.g from a textarea) because
     // the browser will not do it for us.  How to do this is browser dependent.
@@ -1969,7 +2001,7 @@ Blockly.WorkspaceSvg.prototype.markFocused = function() {
  * Set the workspace to have focus in the browser.
  * @private
  */
-Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
+WorkspaceSvg.prototype.setBrowserFocus = function() {
   // Blur whatever was focused since explicitly grabbing focus below does not
   // work in Edge.
   // In IE, SVGs can't be blurred or focused. Check to make sure the current
@@ -1980,7 +2012,7 @@ Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
   }
   try {
     // Focus the workspace SVG - this is for Chrome and Firefox.
-    this.getParentSvg().focus({preventScroll:true});
+    this.getParentSvg().focus({preventScroll: true});
   } catch (e) {
     // IE and Edge do not support focus on SVG elements. When that fails
     // above, get the injectionDiv (the workspace's parent) and focus that
@@ -1992,7 +2024,7 @@ Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
     } catch (e) {
       // setActive support was discontinued in Edge so when that fails, call
       // focus instead.
-      this.getParentSvg().parentNode.focus({preventScroll:true});
+      this.getParentSvg().parentNode.focus({preventScroll: true});
     }
   }
 };
@@ -2009,11 +2041,11 @@ Blockly.WorkspaceSvg.prototype.setBrowserFocus = function() {
  *     the workspace options. Negative amount values zoom out, and positive
  *     amount values zoom in.
  */
-Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
+WorkspaceSvg.prototype.zoom = function(x, y, amount) {
   // Scale factor.
-  var speed = this.options.zoomOptions.scaleSpeed;
-  var scaleChange = Math.pow(speed, amount);
-  var newScale = this.scale * scaleChange;
+  const speed = this.options.zoomOptions.scaleSpeed;
+  let scaleChange = Math.pow(speed, amount);
+  const newScale = this.scale * scaleChange;
   if (this.scale == newScale) {
     return;  // No change in zoom.
   }
@@ -2028,8 +2060,8 @@ Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
   // Transform the x/y coordinates from the parentSVG's space into the
   // canvas' space, so that they are in workspace units relative to the top
   // left of the visible portion of the workspace.
-  var matrix = this.getCanvas().getCTM();
-  var center = this.getParentSvg().createSVGPoint();
+  let matrix = this.getCanvas().getCTM();
+  let center = this.getParentSvg().createSVGPoint();
   center.x = x;
   center.y = y;
   center = center.matrixTransform(matrix.inverse());
@@ -2040,7 +2072,7 @@ Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
   // position (relative to the center) after we zoom.
   // newScale and matrix.a should be identical (within a rounding error).
   matrix = matrix.translate(x * (1 - scaleChange), y * (1 - scaleChange))
-      .scale(scaleChange);
+               .scale(scaleChange);
   // scrollX and scrollY are in pixels.
   // The scrollX and scrollY still need to have absoluteLeft and absoluteTop
   // subtracted from them, but we'll leave that for setScale so that they're
@@ -2054,19 +2086,21 @@ Blockly.WorkspaceSvg.prototype.zoom = function(x, y, amount) {
  * Zooming the blocks centered in the center of view with zooming in or out.
  * @param {number} type Type of zooming (-1 zooming out and 1 zooming in).
  */
-Blockly.WorkspaceSvg.prototype.zoomCenter = function(type) {
-  var metrics = this.getMetrics();
+WorkspaceSvg.prototype.zoomCenter = function(type) {
+  const metrics = this.getMetrics();
+  let x;
+  let y;
   if (this.flyout_) {
     // If you want blocks in the center of the view (visible portion of the
     // workspace) to stay centered when the size of the view decreases (i.e.
     // when the size of the flyout increases) you need the center of the
     // *blockly div* to stay in the same pixel-position.
     // Note: This only works because of how scrollCenter positions blocks.
-    var x = metrics.svgWidth ? metrics.svgWidth / 2 : 0;
-    var y = metrics.svgHeight ? metrics.svgHeight / 2 : 0;
+    x = metrics.svgWidth ? metrics.svgWidth / 2 : 0;
+    y = metrics.svgHeight ? metrics.svgHeight / 2 : 0;
   } else {
-    var x = (metrics.viewWidth / 2) + metrics.absoluteLeft;
-    var y = (metrics.viewHeight / 2) + metrics.absoluteTop;
+    x = (metrics.viewWidth / 2) + metrics.absoluteLeft;
+    y = (metrics.viewHeight / 2) + metrics.absoluteTop;
   }
   this.zoom(x, y, type);
 };
@@ -2074,19 +2108,20 @@ Blockly.WorkspaceSvg.prototype.zoomCenter = function(type) {
 /**
  * Zoom the blocks to fit in the workspace if possible.
  */
-Blockly.WorkspaceSvg.prototype.zoomToFit = function() {
+WorkspaceSvg.prototype.zoomToFit = function() {
   if (!this.isMovable()) {
-    console.warn('Tried to move a non-movable workspace. This could result' +
+    console.warn(
+        'Tried to move a non-movable workspace. This could result' +
         ' in blocks becoming inaccessible.');
     return;
   }
 
-  var metrics = this.getMetrics();
-  var workspaceWidth = metrics.viewWidth;
-  var workspaceHeight = metrics.viewHeight;
-  var blocksBox = this.getBlocksBoundingBox();
-  var blocksWidth = blocksBox.right - blocksBox.left;
-  var blocksHeight = blocksBox.bottom - blocksBox.top;
+  const metrics = this.getMetrics();
+  let workspaceWidth = metrics.viewWidth;
+  let workspaceHeight = metrics.viewHeight;
+  const blocksBox = this.getBlocksBoundingBox();
+  let blocksWidth = blocksBox.right - blocksBox.left;
+  let blocksHeight = blocksBox.bottom - blocksBox.top;
   if (!blocksWidth) {
     return;  // Prevents zooming to infinity.
   }
@@ -2107,14 +2142,14 @@ Blockly.WorkspaceSvg.prototype.zoomToFit = function() {
   }
 
   // Scale Units: (pixels / workspaceUnit)
-  var ratioX = workspaceWidth / blocksWidth;
-  var ratioY = workspaceHeight / blocksHeight;
-  Blockly.Events.disable();
+  const ratioX = workspaceWidth / blocksWidth;
+  const ratioY = workspaceHeight / blocksHeight;
+  Events.disable();
   try {
     this.setScale(Math.min(ratioX, ratioY));
     this.scrollCenter();
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
   this.maybeFireViewportChangeEvent();
 };
@@ -2124,11 +2159,11 @@ Blockly.WorkspaceSvg.prototype.zoomToFit = function() {
  * transform changes.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.beginCanvasTransition = function() {
-  Blockly.utils.dom.addClass(
+WorkspaceSvg.prototype.beginCanvasTransition = function() {
+  dom.addClass(
       /** @type {!SVGElement} */ (this.svgBlockCanvas_),
       'blocklyCanvasTransitioning');
-  Blockly.utils.dom.addClass(
+  dom.addClass(
       /** @type {!SVGElement} */ (this.svgBubbleCanvas_),
       'blocklyCanvasTransitioning');
 };
@@ -2137,11 +2172,11 @@ Blockly.WorkspaceSvg.prototype.beginCanvasTransition = function() {
  * Remove transition class from the block and bubble canvas.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.endCanvasTransition = function() {
-  Blockly.utils.dom.removeClass(
+WorkspaceSvg.prototype.endCanvasTransition = function() {
+  dom.removeClass(
       /** @type {!SVGElement} */ (this.svgBlockCanvas_),
       'blocklyCanvasTransitioning');
-  Blockly.utils.dom.removeClass(
+  dom.removeClass(
       /** @type {!SVGElement} */ (this.svgBubbleCanvas_),
       'blocklyCanvasTransitioning');
 };
@@ -2149,16 +2184,17 @@ Blockly.WorkspaceSvg.prototype.endCanvasTransition = function() {
 /**
  * Center the workspace.
  */
-Blockly.WorkspaceSvg.prototype.scrollCenter = function() {
+WorkspaceSvg.prototype.scrollCenter = function() {
   if (!this.isMovable()) {
-    console.warn('Tried to move a non-movable workspace. This could result' +
+    console.warn(
+        'Tried to move a non-movable workspace. This could result' +
         ' in blocks becoming inaccessible.');
     return;
   }
 
-  var metrics = this.getMetrics();
-  var x = (metrics.scrollWidth - metrics.viewWidth) / 2;
-  var y = (metrics.scrollHeight - metrics.viewHeight) / 2;
+  const metrics = this.getMetrics();
+  let x = (metrics.scrollWidth - metrics.viewWidth) / 2;
+  let y = (metrics.scrollHeight - metrics.viewHeight) / 2;
 
   // Convert from workspace directions to canvas directions.
   x = -x - metrics.scrollLeft;
@@ -2171,52 +2207,53 @@ Blockly.WorkspaceSvg.prototype.scrollCenter = function() {
  * @param {?string} id ID of block center on.
  * @public
  */
-Blockly.WorkspaceSvg.prototype.centerOnBlock = function(id) {
+WorkspaceSvg.prototype.centerOnBlock = function(id) {
   if (!this.isMovable()) {
-    console.warn('Tried to move a non-movable workspace. This could result' +
+    console.warn(
+        'Tried to move a non-movable workspace. This could result' +
         ' in blocks becoming inaccessible.');
     return;
   }
 
-  var block = id ? this.getBlockById(id) : null;
+  const block = id ? this.getBlockById(id) : null;
   if (!block) {
     return;
   }
 
   // XY is in workspace coordinates.
-  var xy = block.getRelativeToSurfaceXY();
+  const xy = block.getRelativeToSurfaceXY();
   // Height/width is in workspace units.
-  var heightWidth = block.getHeightWidth();
+  const heightWidth = block.getHeightWidth();
 
   // Find the enter of the block in workspace units.
-  var blockCenterY = xy.y + heightWidth.height / 2;
+  const blockCenterY = xy.y + heightWidth.height / 2;
 
   // In RTL the block's position is the top right of the block, not top left.
-  var multiplier = this.RTL ? -1 : 1;
-  var blockCenterX = xy.x + (multiplier * heightWidth.width / 2);
+  const multiplier = this.RTL ? -1 : 1;
+  const blockCenterX = xy.x + (multiplier * heightWidth.width / 2);
 
   // Workspace scale, used to convert from workspace coordinates to pixels.
-  var scale = this.scale;
+  const scale = this.scale;
 
   // Center of block in pixels, relative to workspace origin (center 0,0).
   // Scrolling to here would put the block in the top-left corner of the
   // visible workspace.
-  var pixelX = blockCenterX * scale;
-  var pixelY = blockCenterY * scale;
+  const pixelX = blockCenterX * scale;
+  const pixelY = blockCenterY * scale;
 
-  var metrics = this.getMetrics();
+  const metrics = this.getMetrics();
 
   // viewHeight and viewWidth are in pixels.
-  var halfViewWidth = metrics.viewWidth / 2;
-  var halfViewHeight = metrics.viewHeight / 2;
+  const halfViewWidth = metrics.viewWidth / 2;
+  const halfViewHeight = metrics.viewHeight / 2;
 
   // Put the block in the center of the visible workspace instead.
-  var scrollToCenterX = pixelX - halfViewWidth;
-  var scrollToCenterY = pixelY - halfViewHeight;
+  const scrollToCenterX = pixelX - halfViewWidth;
+  const scrollToCenterY = pixelY - halfViewHeight;
 
   // Convert from workspace directions to canvas directions.
-  var x = -scrollToCenterX;
-  var y = -scrollToCenterY;
+  const x = -scrollToCenterX;
+  const y = -scrollToCenterY;
 
   this.scroll(x, y);
 };
@@ -2225,11 +2262,12 @@ Blockly.WorkspaceSvg.prototype.centerOnBlock = function(id) {
  * Set the workspace's zoom factor.
  * @param {number} newScale Zoom factor. Units: (pixels / workspaceUnit).
  */
-Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
+WorkspaceSvg.prototype.setScale = function(newScale) {
   if (this.options.zoomOptions.maxScale &&
       newScale > this.options.zoomOptions.maxScale) {
     newScale = this.options.zoomOptions.maxScale;
-  } else if (this.options.zoomOptions.minScale &&
+  } else if (
+      this.options.zoomOptions.minScale &&
       newScale < this.options.zoomOptions.minScale) {
     newScale = this.options.zoomOptions.minScale;
   }
@@ -2237,7 +2275,7 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
 
   Blockly.hideChaff(false);
   // Get the flyout, if any, whether our own or owned by the toolbox.
-  var flyout = this.getFlyout(false);
+  const flyout = this.getFlyout(false);
   if (flyout && flyout.isVisible()) {
     flyout.reflow();
     this.recordDragTargets();
@@ -2249,7 +2287,7 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
   // We call scroll instead of scrollbar.resize() so that we can center the
   // zoom correctly without scrollbars, but scroll does not resize the
   // scrollbars so we have to call resizeView/resizeContent as well.
-  var metrics = this.getMetrics();
+  const metrics = this.getMetrics();
 
   this.scrollX -= metrics.absoluteLeft;
   this.scrollY -= metrics.absoluteTop;
@@ -2274,7 +2312,7 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
  * the parent to get the workspace scale.
  * @return {number} The workspace zoom factor. Units: (pixels / workspaceUnit).
  */
-Blockly.WorkspaceSvg.prototype.getScale = function() {
+WorkspaceSvg.prototype.getScale = function() {
   if (this.options.parentWorkspace) {
     return this.options.parentWorkspace.getScale();
   }
@@ -2289,19 +2327,20 @@ Blockly.WorkspaceSvg.prototype.getScale = function() {
  * @param {number} y Target Y to scroll to.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.scroll = function(x, y) {
+WorkspaceSvg.prototype.scroll = function(x, y) {
   Blockly.hideChaff(/* opt_onlyClosePopups */ true);
 
   // Keep scrolling within the bounds of the content.
-  var metrics = this.getMetrics();
+  const metrics = this.getMetrics();
   // Canvas coordinates (aka scroll coordinates) have inverse directionality
   // to workspace coordinates so we have to inverse them.
   x = Math.min(x, -metrics.scrollLeft);
   y = Math.min(y, -metrics.scrollTop);
-  var maxXDisplacement = Math.max(0, metrics.scrollWidth - metrics.viewWidth);
-  var maxXScroll = metrics.scrollLeft + maxXDisplacement;
-  var maxYDisplacement = Math.max(0, metrics.scrollHeight - metrics.viewHeight);
-  var maxYScroll = metrics.scrollTop + maxYDisplacement;
+  const maxXDisplacement = Math.max(0, metrics.scrollWidth - metrics.viewWidth);
+  const maxXScroll = metrics.scrollLeft + maxXDisplacement;
+  const maxYDisplacement =
+      Math.max(0, metrics.scrollHeight - metrics.viewHeight);
+  const maxYScroll = metrics.scrollTop + maxYDisplacement;
   x = Math.max(x, -maxXScroll);
   y = Math.max(y, -maxYScroll);
   this.scrollX = x;
@@ -2329,25 +2368,25 @@ Blockly.WorkspaceSvg.prototype.scroll = function(x, y) {
  * @param {!Object} xyRatio Contains an x and/or y property which is a float
  *     between 0 and 1 specifying the degree of scrolling.
  * @private
- * @this {Blockly.WorkspaceSvg}
+ * @this {WorkspaceSvg}
  */
-Blockly.WorkspaceSvg.setTopLevelWorkspaceMetrics_ = function(xyRatio) {
-  var metrics = this.getMetrics();
+WorkspaceSvg.setTopLevelWorkspaceMetrics_ = function(xyRatio) {
+  const metrics = this.getMetrics();
 
   if (typeof xyRatio.x == 'number') {
     this.scrollX =
         -(metrics.scrollLeft +
-            (metrics.scrollWidth - metrics.viewWidth) * xyRatio.x);
+          (metrics.scrollWidth - metrics.viewWidth) * xyRatio.x);
   }
   if (typeof xyRatio.y == 'number') {
     this.scrollY =
         -(metrics.scrollTop +
-            (metrics.scrollHeight - metrics.viewHeight) * xyRatio.y);
+          (metrics.scrollHeight - metrics.viewHeight) * xyRatio.y);
   }
   // We have to shift the translation so that when the canvas is at 0, 0 the
   // workspace origin is not underneath the toolbox.
-  var x = this.scrollX + metrics.absoluteLeft;
-  var y = this.scrollY + metrics.absoluteTop;
+  const x = this.scrollX + metrics.absoluteLeft;
+  const y = this.scrollY + metrics.absoluteTop;
   // We could call scroll here, but that has extra checks we don't need to do.
   this.translate(x, y);
 };
@@ -2355,84 +2394,84 @@ Blockly.WorkspaceSvg.setTopLevelWorkspaceMetrics_ = function(xyRatio) {
 /**
  * Find the block on this workspace with the specified ID.
  * @param {string} id ID of block to find.
- * @return {?Blockly.BlockSvg} The sought after block, or null if not found.
+ * @return {?BlockSvg} The sought after block, or null if not found.
  * @override
  */
-Blockly.WorkspaceSvg.prototype.getBlockById = function(id) {
-  return /** @type {Blockly.BlockSvg} */ (
-    Blockly.WorkspaceSvg.superClass_.getBlockById.call(this, id));
+WorkspaceSvg.prototype.getBlockById = function(id) {
+  return /** @type {BlockSvg} */ (
+      WorkspaceSvg.superClass_.getBlockById.call(this, id));
 };
 
 /**
  * Finds the top-level blocks and returns them.  Blocks are optionally sorted
  * by position; top to bottom (with slight LTR or RTL bias).
  * @param {boolean} ordered Sort the list if true.
- * @return {!Array<!Blockly.BlockSvg>} The top-level block objects.
+ * @return {!Array<!BlockSvg>} The top-level block objects.
  * @override
  */
-Blockly.WorkspaceSvg.prototype.getTopBlocks = function(ordered) {
-  return Blockly.WorkspaceSvg.superClass_.getTopBlocks.call(this, ordered);
+WorkspaceSvg.prototype.getTopBlocks = function(ordered) {
+  return WorkspaceSvg.superClass_.getTopBlocks.call(this, ordered);
 };
 
 /**
  * Adds a block to the list of top blocks.
- * @param {!Blockly.Block} block Block to add.
+ * @param {!Block} block Block to add.
  */
-Blockly.WorkspaceSvg.prototype.addTopBlock = function(block) {
-  this.addTopBoundedElement(/** @type {!Blockly.BlockSvg} */ (block));
-  Blockly.WorkspaceSvg.superClass_.addTopBlock.call(this, block);
+WorkspaceSvg.prototype.addTopBlock = function(block) {
+  this.addTopBoundedElement(/** @type {!BlockSvg} */ (block));
+  WorkspaceSvg.superClass_.addTopBlock.call(this, block);
 };
 
 /**
  * Removes a block from the list of top blocks.
- * @param {!Blockly.Block} block Block to remove.
+ * @param {!Block} block Block to remove.
  */
-Blockly.WorkspaceSvg.prototype.removeTopBlock = function(block) {
-  this.removeTopBoundedElement(/** @type {!Blockly.BlockSvg} */ (block));
-  Blockly.WorkspaceSvg.superClass_.removeTopBlock.call(this, block);
+WorkspaceSvg.prototype.removeTopBlock = function(block) {
+  this.removeTopBoundedElement(/** @type {!BlockSvg} */ (block));
+  WorkspaceSvg.superClass_.removeTopBlock.call(this, block);
 };
 
 /**
  * Adds a comment to the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to add.
+ * @param {!WorkspaceComment} comment comment to add.
  */
-Blockly.WorkspaceSvg.prototype.addTopComment = function(comment) {
+WorkspaceSvg.prototype.addTopComment = function(comment) {
   this.addTopBoundedElement(
-      /** @type {!Blockly.WorkspaceCommentSvg} */ (comment));
-  Blockly.WorkspaceSvg.superClass_.addTopComment.call(this, comment);
+      /** @type {!WorkspaceCommentSvg} */ (comment));
+  WorkspaceSvg.superClass_.addTopComment.call(this, comment);
 };
 
 /**
  * Removes a comment from the list of top comments.
- * @param {!Blockly.WorkspaceComment} comment comment to remove.
+ * @param {!WorkspaceComment} comment comment to remove.
  */
-Blockly.WorkspaceSvg.prototype.removeTopComment = function(comment) {
+WorkspaceSvg.prototype.removeTopComment = function(comment) {
   this.removeTopBoundedElement(
-      /** @type {!Blockly.WorkspaceCommentSvg} */ (comment));
-  Blockly.WorkspaceSvg.superClass_.removeTopComment.call(this, comment);
+      /** @type {!WorkspaceCommentSvg} */ (comment));
+  WorkspaceSvg.superClass_.removeTopComment.call(this, comment);
 };
 
 /**
  * Adds a bounded element to the list of top bounded elements.
- * @param {!Blockly.IBoundedElement} element Bounded element to add.
+ * @param {!IBoundedElement} element Bounded element to add.
  */
-Blockly.WorkspaceSvg.prototype.addTopBoundedElement = function(element) {
+WorkspaceSvg.prototype.addTopBoundedElement = function(element) {
   this.topBoundedElements_.push(element);
 };
 
 /**
  * Removes a bounded element from the list of top bounded elements.
- * @param {!Blockly.IBoundedElement} element Bounded element to remove.
+ * @param {!IBoundedElement} element Bounded element to remove.
  */
-Blockly.WorkspaceSvg.prototype.removeTopBoundedElement = function(element) {
-  Blockly.utils.arrayRemove(this.topBoundedElements_, element);
+WorkspaceSvg.prototype.removeTopBoundedElement = function(element) {
+  utils.arrayRemove(this.topBoundedElements_, element);
 };
 
 /**
  * Finds the top-level bounded elements and returns them.
- * @return {!Array<!Blockly.IBoundedElement>} The top-level bounded elements.
+ * @return {!Array<!IBoundedElement>} The top-level bounded elements.
  */
-Blockly.WorkspaceSvg.prototype.getTopBoundedElements = function() {
+WorkspaceSvg.prototype.getTopBoundedElements = function() {
   return [].concat(this.topBoundedElements_);
 };
 
@@ -2443,8 +2482,8 @@ Blockly.WorkspaceSvg.prototype.getTopBoundedElements = function() {
  * Use to avoid resizing during a batch operation, for performance.
  * @param {boolean} enabled Whether resizes should be enabled.
  */
-Blockly.WorkspaceSvg.prototype.setResizesEnabled = function(enabled) {
-  var reenabled = (!this.resizesEnabled_ && enabled);
+WorkspaceSvg.prototype.setResizesEnabled = function(enabled) {
+  const reenabled = (!this.resizesEnabled_ && enabled);
   this.resizesEnabled_ = enabled;
   if (reenabled) {
     // Newly enabled.  Trigger a resize.
@@ -2455,9 +2494,9 @@ Blockly.WorkspaceSvg.prototype.setResizesEnabled = function(enabled) {
 /**
  * Dispose of all blocks in workspace, with an optimization to prevent resizes.
  */
-Blockly.WorkspaceSvg.prototype.clear = function() {
+WorkspaceSvg.prototype.clear = function() {
   this.setResizesEnabled(false);
-  Blockly.WorkspaceSvg.superClass_.clear.call(this);
+  WorkspaceSvg.superClass_.clear.call(this);
   this.topBoundedElements_ = [];
   this.setResizesEnabled(true);
 };
@@ -2470,10 +2509,10 @@ Blockly.WorkspaceSvg.prototype.clear = function() {
  * should be matched by a call to
  * registerButtonCallback("CREATE_VARIABLE", yourCallbackFunction).
  * @param {string} key The name to use to look up this function.
- * @param {function(!Blockly.FlyoutButton)} func The function to call when the
+ * @param {function(!FlyoutButton)} func The function to call when the
  *     given button is clicked.
  */
-Blockly.WorkspaceSvg.prototype.registerButtonCallback = function(key, func) {
+WorkspaceSvg.prototype.registerButtonCallback = function(key, func) {
   if (typeof func != 'function') {
     throw TypeError('Button callbacks must be functions.');
   }
@@ -2484,11 +2523,11 @@ Blockly.WorkspaceSvg.prototype.registerButtonCallback = function(key, func) {
  * Get the callback function associated with a given key, for clicks on buttons
  * and labels in the flyout.
  * @param {string} key The name to use to look up the function.
- * @return {?function(!Blockly.FlyoutButton)} The function corresponding to the
+ * @return {?function(!FlyoutButton)} The function corresponding to the
  *     given key for this workspace; null if no callback is registered.
  */
-Blockly.WorkspaceSvg.prototype.getButtonCallback = function(key) {
-  var result = this.flyoutButtonCallbacks_[key];
+WorkspaceSvg.prototype.getButtonCallback = function(key) {
+  const result = this.flyoutButtonCallbacks_[key];
   return result ? result : null;
 };
 
@@ -2496,7 +2535,7 @@ Blockly.WorkspaceSvg.prototype.getButtonCallback = function(key) {
  * Remove a callback for a click on a button in the flyout.
  * @param {string} key The name associated with the callback function.
  */
-Blockly.WorkspaceSvg.prototype.removeButtonCallback = function(key) {
+WorkspaceSvg.prototype.removeButtonCallback = function(key) {
   this.flyoutButtonCallbacks_[key] = null;
 };
 
@@ -2505,11 +2544,10 @@ Blockly.WorkspaceSvg.prototype.removeButtonCallback = function(key) {
  * custom toolbox categories in this workspace.  See the variable and procedure
  * categories as an example.
  * @param {string} key The name to use to look up this function.
- * @param {function(!Blockly.Workspace):!Array<!Element>} func The function to
+ * @param {function(!Workspace):!Array<!Element>} func The function to
  *     call when the given toolbox category is opened.
  */
-Blockly.WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key,
-    func) {
+WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key, func) {
   if (typeof func != 'function') {
     throw TypeError('Toolbox category callbacks must be functions.');
   }
@@ -2520,11 +2558,11 @@ Blockly.WorkspaceSvg.prototype.registerToolboxCategoryCallback = function(key,
  * Get the callback function associated with a given key, for populating
  * custom toolbox categories in this workspace.
  * @param {string} key The name to use to look up the function.
- * @return {?function(!Blockly.Workspace):!Array<!Element>} The function
+ * @return {?function(!Workspace):!Array<!Element>} The function
  *     corresponding to the given key for this workspace, or null if no function
  *     is registered.
  */
-Blockly.WorkspaceSvg.prototype.getToolboxCategoryCallback = function(key) {
+WorkspaceSvg.prototype.getToolboxCategoryCallback = function(key) {
   return this.toolboxCategoryCallbacks_[key] || null;
 };
 
@@ -2532,7 +2570,7 @@ Blockly.WorkspaceSvg.prototype.getToolboxCategoryCallback = function(key) {
  * Remove a callback for a click on a custom category's name in the toolbox.
  * @param {string} key The name associated with the callback function.
  */
-Blockly.WorkspaceSvg.prototype.removeToolboxCategoryCallback = function(key) {
+WorkspaceSvg.prototype.removeToolboxCategoryCallback = function(key) {
   this.toolboxCategoryCallbacks_[key] = null;
 };
 
@@ -2540,15 +2578,16 @@ Blockly.WorkspaceSvg.prototype.removeToolboxCategoryCallback = function(key) {
  * Look up the gesture that is tracking this touch stream on this workspace.
  * May create a new gesture.
  * @param {!Event} e Mouse event or touch event.
- * @return {?Blockly.TouchGesture} The gesture that is tracking this touch
+ * @return {?TouchGesture} The gesture that is tracking this touch
  *     stream, or null if no valid gesture exists.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getGesture = function(e) {
-  var isStart = (e.type == 'mousedown' || e.type == 'touchstart' ||
-      e.type == 'pointerdown');
+WorkspaceSvg.prototype.getGesture = function(e) {
+  const isStart =
+      (e.type == 'mousedown' || e.type == 'touchstart' ||
+       e.type == 'pointerdown');
 
-  var gesture = this.currentGesture_;
+  const gesture = this.currentGesture_;
   if (gesture) {
     if (isStart && gesture.hasStarted()) {
       console.warn('Tried to start the same gesture twice.');
@@ -2563,7 +2602,7 @@ Blockly.WorkspaceSvg.prototype.getGesture = function(e) {
   // No gesture existed on this workspace, but this looks like the start of a
   // new gesture.
   if (isStart) {
-    this.currentGesture_ = new Blockly.TouchGesture(e, this);
+    this.currentGesture_ = new TouchGesture(e, this);
     return this.currentGesture_;
   }
   // No gesture existed and this event couldn't be the start of a new gesture.
@@ -2574,7 +2613,7 @@ Blockly.WorkspaceSvg.prototype.getGesture = function(e) {
  * Clear the reference to the current gesture.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.clearGesture = function() {
+WorkspaceSvg.prototype.clearGesture = function() {
   this.currentGesture_ = null;
 };
 
@@ -2582,7 +2621,7 @@ Blockly.WorkspaceSvg.prototype.clearGesture = function() {
  * Cancel the current gesture, if one exists.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.cancelCurrentGesture = function() {
+WorkspaceSvg.prototype.cancelCurrentGesture = function() {
   if (this.currentGesture_) {
     this.currentGesture_.cancel();
   }
@@ -2590,17 +2629,19 @@ Blockly.WorkspaceSvg.prototype.cancelCurrentGesture = function() {
 
 /**
  * Get the audio manager for this workspace.
- * @return {!Blockly.WorkspaceAudio} The audio manager for this workspace.
+ * @return {!WorkspaceAudio} The audio manager for this workspace.
  */
-Blockly.WorkspaceSvg.prototype.getAudioManager = function() {
+WorkspaceSvg.prototype.getAudioManager = function() {
   return this.audioManager_;
 };
 
 /**
  * Get the grid object for this workspace, or null if there is none.
- * @return {?Blockly.Grid} The grid object for this workspace.
+ * @return {?Grid} The grid object for this workspace.
  * @package
  */
-Blockly.WorkspaceSvg.prototype.getGrid = function() {
+WorkspaceSvg.prototype.getGrid = function() {
   return this.grid_;
 };
+
+exports = WorkspaceSvg;
diff --git a/tests/deps.js b/tests/deps.js
index 8cdafbc4c..780484321 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -218,7 +218,7 @@ goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment
 goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Metrics', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);

From ee53e8e8121ec02b46b3a86693be8007b9778d57 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:17:48 -0700
Subject: [PATCH 252/291] Update optional requires

---
 core/extensions.js  | 6 ++++--
 core/flyout_base.js | 4 +++-
 tests/deps.js       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/extensions.js b/core/extensions.js
index bb9ef6731..42dc9d9f6 100644
--- a/core/extensions.js
+++ b/core/extensions.js
@@ -23,6 +23,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
 const utils = goog.require('Blockly.utils');
+goog.requireType('Blockly.Mutator');
 
 
 /**
@@ -102,10 +103,11 @@ const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) {
   // Sanity checks passed.
   register(name, function() {
     if (hasMutatorDialog) {
-      if (!Blockly.Mutator) {
+      const Mutator = goog.module.get('Blockly.Mutator');
+      if (!Mutator) {
         throw Error(errorPrefix + 'Missing require for Blockly.Mutator');
       }
-      this.setMutator(new Blockly.Mutator(opt_blockList || []));
+      this.setMutator(new Mutator(opt_blockList || []));
     }
     // Mixin the object.
     this.mixin(mixinObj);
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 2e6908174..8ce566544 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -22,7 +22,8 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
-const FlyoutButton = goog.require('Blockly.FlyoutButton');
+/* eslint-disable-next-line no-unused-vars */
+const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
 const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager');
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.require('Blockly.IFlyout');
@@ -659,6 +660,7 @@ Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) {
  * @private
  */
 Flyout.prototype.createButton_ = function(btnInfo, isLabel) {
+  const FlyoutButton = goog.module.get('Blockly.FlyoutButton');
   if (!FlyoutButton) {
     throw Error('Missing require for Blockly.FlyoutButton');
   }
diff --git a/tests/deps.js b/tests/deps.js
index 780484321..b36473969 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -71,7 +71,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});

From a7fcf881faa74223006a9cd264962ea8d13e175f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:14:38 -0700
Subject: [PATCH 253/291] Add missing eslint disable line for required
 interface

---
 core/workspace.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/workspace.js b/core/workspace.js
index c1115e011..32125974e 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -22,6 +22,7 @@ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 /* eslint-disable-next-line no-unused-vars */
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
 const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
 const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');

From a04debf2751c37f6c06807a0edd20672cd442186 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Tue, 10 Aug 2021 15:11:56 -0700
Subject: [PATCH 254/291] Fix issue that prevented Mocha and generator tests
 from running on certain configurations (#5344)

* Fix issue that prevented Mocha and generator tests from running on certain configurations

* Link to Blockly issue re: --disable-gpu flag
---
 tests/generators/run_generators_in_browser.js | 5 ++++-
 tests/mocha/run_mocha_tests_in_browser.js     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/generators/run_generators_in_browser.js b/tests/generators/run_generators_in_browser.js
index 2ab48ee2e..97dcf9727 100644
--- a/tests/generators/run_generators_in_browser.js
+++ b/tests/generators/run_generators_in_browser.js
@@ -51,8 +51,11 @@ async function runGeneratorsInBrowser() {
       args: ['--headless', '--no-sandbox', '--disable-dev-shm-usage', '--allow-file-access-from-files']
     };
   } else {
+    // --disable-gpu is needed to prevent Chrome from hanging on Linux with
+    // NVIDIA drivers older than v295.20. See 
+    // https://github.com/google/blockly/issues/5345 for details.   
     options.capabilities['goog:chromeOptions'] = {
-      args: ['--allow-file-access-from-files']
+      args: ['--allow-file-access-from-files', '--disable-gpu']
     };
   }
 
diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js
index 253b79f01..3034f38cc 100644
--- a/tests/mocha/run_mocha_tests_in_browser.js
+++ b/tests/mocha/run_mocha_tests_in_browser.js
@@ -36,8 +36,11 @@ async function runMochaTestsInBrowser() {
       ]
     };
   } else {
+    // --disable-gpu is needed to prevent Chrome from hanging on Linux with
+    // NVIDIA drivers older than v295.20. See 
+    // https://github.com/google/blockly/issues/5345 for details.
     options.capabilities['goog:chromeOptions'] = {
-      args: ['--allow-file-access-from-files']
+      args: ['--allow-file-access-from-files', '--disable-gpu']
     };
   }
 

From 18283e816faba04b9a3695a5270e959aebd3f79e Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:11:44 -0700
Subject: [PATCH 255/291] Migrate core/renderers/measurables/base.js to
 goog.module syntax (#5308)

* Migrate core/renderers/measurables/base.js to goog.module

* Migrate core/renderers/measurables/base.js to named requires
---
 core/renderers/measurables/base.js | 19 +++++++++++--------
 tests/deps.js                      |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js
index 22247d9ff..b3a16d061 100644
--- a/core/renderers/measurables/base.js
+++ b/core/renderers/measurables/base.js
@@ -11,36 +11,39 @@
 
 'use strict';
 
-goog.provide('Blockly.blockRendering.Measurable');
+goog.module('Blockly.blockRendering.Measurable');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Types');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+const Types = goog.require('Blockly.blockRendering.Types');
 
 
 /**
  * The base class to represent a part of a block that takes up space during
  * rendering.  The constructor for each non-spacer Measurable records the size
  * of the block element (e.g. field, statement input).
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
  * @package
  * @constructor
  */
-Blockly.blockRendering.Measurable = function(constants) {
+const Measurable = function(constants) {
   this.width = 0;
   this.height = 0;
-  this.type = Blockly.blockRendering.Types.NONE;
+  this.type = Types.NONE;
 
   this.xPos = 0;
   this.centerline = 0;
 
   /**
    * The renderer's constant provider.
-   * @type {!Blockly.blockRendering.ConstantProvider}
+   * @type {!ConstantProvider}
    * @protected
    */
   this.constants_ = constants;
 
   this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT;
 };
+
+exports = Measurable;
diff --git a/tests/deps.js b/tests/deps.js
index b36473969..f9423f309 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -146,7 +146,7 @@ goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderI
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types']);
+goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From 0f7f597758890c6bcf927fbf5abda604214daad2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:26:04 -0700
Subject: [PATCH 256/291] Migrate core/renderers/geras/drawer.js to goog.module
 syntax (#5300)

* Migrate core/renderers/geras/drawer.js to ES6 const/let

* Migrate core/renderers/geras/drawer.js to goog.module

* Migrate core/renderers/geras/drawer.js to named requires

* clang-format core/renderers/geras/drawer.js

* Remove Blockly prefix on call to blockRendering in core/renderers/geras/drawer.js
---
 core/renderers/geras/drawer.js | 123 +++++++++++++++++----------------
 tests/deps.js                  |   2 +-
 2 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index b1ebc59a6..8c4781890 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -10,51 +10,54 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.Drawer');
+goog.module('Blockly.geras.Drawer');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.geras.Highlighter');
-goog.require('Blockly.geras.RenderInfo');
-goog.require('Blockly.utils.object');
-goog.require('Blockly.utils.svgPaths');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.geras.PathObject');
+const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Highlighter = goog.require('Blockly.geras.Highlighter');
+/* eslint-disable-next-line no-unused-vars */
+const PathObject = goog.requireType('Blockly.geras.PathObject');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.geras.RenderInfo');
+const blockRendering = goog.require('Blockly.blockRendering');
+const object = goog.require('Blockly.utils.object');
+const svgPaths = goog.require('Blockly.utils.svgPaths');
 
 
 /**
  * An object that draws a block based on the given rendering information.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.geras.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Drawer}
+ * @extends {BaseDrawer}
  */
-Blockly.geras.Drawer = function(block, info) {
-  Blockly.geras.Drawer.superClass_.constructor.call(this, block, info);
+const Drawer = function(block, info) {
+  Drawer.superClass_.constructor.call(this, block, info);
   // Unlike Thrasos, Geras has highlights and drop shadows.
-  this.highlighter_ = new Blockly.geras.Highlighter(info);
+  this.highlighter_ = new Highlighter(info);
 };
-Blockly.utils.object.inherits(Blockly.geras.Drawer,
-    Blockly.blockRendering.Drawer);
+object.inherits(Drawer, BaseDrawer);
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.draw = function() {
+Drawer.prototype.draw = function() {
   this.hideHiddenIcons_();
   this.drawOutline_();
   this.drawInternals_();
 
-  var pathObject =
-    /** @type {!Blockly.geras.PathObject} */ (this.block_.pathObject);
+  const pathObject =
+      /** @type {!PathObject} */ (this.block_.pathObject);
   pathObject.setPath(this.outlinePath_ + '\n' + this.inlinePath_);
   pathObject.setHighlightPath(this.highlighter_.getPath());
   if (this.info_.RTL) {
     pathObject.flipRTL();
   }
-  if (Blockly.blockRendering.isDebuggerEnabled()) {
+  if (blockRendering.isDebuggerEnabled()) {
     this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
   }
   this.recordSizeOnBlock_();
@@ -63,58 +66,57 @@ Blockly.geras.Drawer.prototype.draw = function() {
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawTop_ = function() {
+Drawer.prototype.drawTop_ = function() {
   this.highlighter_.drawTopCorner(this.info_.topRow);
   this.highlighter_.drawRightSideRow(this.info_.topRow);
 
-  Blockly.geras.Drawer.superClass_.drawTop_.call(this);
+  Drawer.superClass_.drawTop_.call(this);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawJaggedEdge_ = function(row) {
+Drawer.prototype.drawJaggedEdge_ = function(row) {
   this.highlighter_.drawJaggedEdge_(row);
 
-  Blockly.geras.Drawer.superClass_.drawJaggedEdge_.call(this, row);
+  Drawer.superClass_.drawJaggedEdge_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawValueInput_ = function(row) {
+Drawer.prototype.drawValueInput_ = function(row) {
   this.highlighter_.drawValueInput(row);
 
-  Blockly.geras.Drawer.superClass_.drawValueInput_.call(this, row);
+  Drawer.superClass_.drawValueInput_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawStatementInput_ = function(row) {
+Drawer.prototype.drawStatementInput_ = function(row) {
   this.highlighter_.drawStatementInput(row);
 
-  Blockly.geras.Drawer.superClass_.drawStatementInput_.call(this, row);
+  Drawer.superClass_.drawStatementInput_.call(this, row);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawRightSideRow_ = function(row) {
+Drawer.prototype.drawRightSideRow_ = function(row) {
   this.highlighter_.drawRightSideRow(row);
 
-  this.outlinePath_ +=
-      Blockly.utils.svgPaths.lineOnAxis('H', row.xPos + row.width) +
-      Blockly.utils.svgPaths.lineOnAxis('V', row.yPos + row.height);
+  this.outlinePath_ += svgPaths.lineOnAxis('H', row.xPos + row.width) +
+      svgPaths.lineOnAxis('V', row.yPos + row.height);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawBottom_ = function() {
+Drawer.prototype.drawBottom_ = function() {
   this.highlighter_.drawBottomRow(this.info_.bottomRow);
 
-  Blockly.geras.Drawer.superClass_.drawBottom_.call(this);
+  Drawer.superClass_.drawBottom_.call(this);
 };
 
 /**
@@ -123,65 +125,64 @@ Blockly.geras.Drawer.prototype.drawBottom_ = function() {
  * @protected
  * @override
  */
-Blockly.geras.Drawer.prototype.drawLeft_ = function() {
+Drawer.prototype.drawLeft_ = function() {
   this.highlighter_.drawLeft();
 
-  Blockly.geras.Drawer.superClass_.drawLeft_.call(this);
+  Drawer.superClass_.drawLeft_.call(this);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.drawInlineInput_ = function(input) {
+Drawer.prototype.drawInlineInput_ = function(input) {
   this.highlighter_.drawInlineInput(input);
 
-  Blockly.geras.Drawer.superClass_.drawInlineInput_.call(this, input);
+  Drawer.superClass_.drawInlineInput_.call(this, input);
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionInlineInputConnection_ = function(input) {
-  var yPos = input.centerline - input.height / 2;
+Drawer.prototype.positionInlineInputConnection_ = function(input) {
+  const yPos = input.centerline - input.height / 2;
   // Move the connection.
   if (input.connectionModel) {
     // xPos already contains info about startX
-    var connX = input.xPos + input.connectionWidth +
-        this.constants_.DARK_PATH_OFFSET;
+    let connX =
+        input.xPos + input.connectionWidth + this.constants_.DARK_PATH_OFFSET;
     if (this.info_.RTL) {
       connX *= -1;
     }
     input.connectionModel.setOffsetInBlock(
-        connX, yPos + input.connectionOffsetY +
-        this.constants_.DARK_PATH_OFFSET);
+        connX,
+        yPos + input.connectionOffsetY + this.constants_.DARK_PATH_OFFSET);
   }
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionStatementInputConnection_ = function(row) {
-  var input = row.getLastInput();
+Drawer.prototype.positionStatementInputConnection_ = function(row) {
+  const input = row.getLastInput();
   if (input.connectionModel) {
-    var connX = row.xPos + row.statementEdge + input.notchOffset;
+    let connX = row.xPos + row.statementEdge + input.notchOffset;
     if (this.info_.RTL) {
       connX *= -1;
     } else {
       connX += this.constants_.DARK_PATH_OFFSET;
     }
-    input.connectionModel.setOffsetInBlock(connX,
-        row.yPos + this.constants_.DARK_PATH_OFFSET);
+    input.connectionModel.setOffsetInBlock(
+        connX, row.yPos + this.constants_.DARK_PATH_OFFSET);
   }
 };
 
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionExternalValueConnection_ = function(row) {
-  var input = row.getLastInput();
+Drawer.prototype.positionExternalValueConnection_ = function(row) {
+  const input = row.getLastInput();
   if (input.connectionModel) {
-    var connX = row.xPos + row.width +
-        this.constants_.DARK_PATH_OFFSET;
+    let connX = row.xPos + row.width + this.constants_.DARK_PATH_OFFSET;
     if (this.info_.RTL) {
       connX *= -1;
     }
@@ -192,15 +193,17 @@ Blockly.geras.Drawer.prototype.positionExternalValueConnection_ = function(row)
 /**
  * @override
  */
-Blockly.geras.Drawer.prototype.positionNextConnection_ = function() {
-  var bottomRow = this.info_.bottomRow;
+Drawer.prototype.positionNextConnection_ = function() {
+  const bottomRow = this.info_.bottomRow;
 
   if (bottomRow.connection) {
-    var connInfo = bottomRow.connection;
-    var x = connInfo.xPos;  // Already contains info about startX.
-    var connX = (this.info_.RTL ? -x : x) +
-        (this.constants_.DARK_PATH_OFFSET / 2);
+    const connInfo = bottomRow.connection;
+    const x = connInfo.xPos;  // Already contains info about startX.
+    const connX =
+        (this.info_.RTL ? -x : x) + (this.constants_.DARK_PATH_OFFSET / 2);
     connInfo.connectionModel.setOffsetInBlock(
         connX, bottomRow.baseline + this.constants_.DARK_PATH_OFFSET);
   }
 };
+
+exports = Drawer;
diff --git a/tests/deps.js b/tests/deps.js
index f9423f309..fe3dc6e7b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -139,7 +139,7 @@ goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockR
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.geras.RenderInfo', 'Blockly.utils.object', 'Blockly.utils.svgPaths']);
+goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 228ecb0f2d20b783030dc608cf8392986f78e470 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:30:05 -0700
Subject: [PATCH 257/291] Migrate core/renderers/geras/renderer.js to
 goog.module syntax (#5307)

* Migrate core/renderers/geras/renderer.js to goog.module

* Migrate core/renderers/geras/renderer.js to named requires

* clang-format core/renderers/geras/renderer.js
---
 core/renderers/geras/renderer.js | 109 ++++++++++++++++---------------
 tests/deps.js                    |   2 +-
 2 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js
index 659cb42b6..7c505e8c8 100644
--- a/core/renderers/geras/renderer.js
+++ b/core/renderers/geras/renderer.js
@@ -10,21 +10,25 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.Renderer');
+goog.module('Blockly.geras.Renderer');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.Renderer');
-goog.require('Blockly.geras.ConstantProvider');
-goog.require('Blockly.geras.Drawer');
-goog.require('Blockly.geras.HighlightConstantProvider');
-goog.require('Blockly.geras.PathObject');
-goog.require('Blockly.geras.RenderInfo');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.blockRendering.RenderInfo');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Theme');
+const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
+/* eslint-disable-next-line no-unused-vars */
+const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BaseConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ConstantProvider = goog.require('Blockly.geras.ConstantProvider');
+const Drawer = goog.require('Blockly.geras.Drawer');
+const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider');
+const PathObject = goog.require('Blockly.geras.PathObject');
+const RenderInfo = goog.require('Blockly.geras.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+const blockRendering = goog.require('Blockly.blockRendering');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -32,20 +36,19 @@ goog.requireType('Blockly.Theme');
  * @param {string} name The renderer name.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Renderer}
+ * @extends {BaseRenderer}
  */
-Blockly.geras.Renderer = function(name) {
-  Blockly.geras.Renderer.superClass_.constructor.call(this, name);
+const Renderer = function(name) {
+  Renderer.superClass_.constructor.call(this, name);
 
   /**
    * The renderer's highlight constant provider.
-   * @type {Blockly.geras.HighlightConstantProvider}
+   * @type {HighlightConstantProvider}
    * @private
    */
   this.highlightConstants_ = null;
 };
-Blockly.utils.object.inherits(Blockly.geras.Renderer,
-    Blockly.blockRendering.Renderer);
+object.inherits(Renderer, BaseRenderer);
 
 /**
  * Initialize the renderer.  Geras has a highlight provider in addition to
@@ -53,10 +56,8 @@ Blockly.utils.object.inherits(Blockly.geras.Renderer,
  * @package
  * @override
  */
-Blockly.geras.Renderer.prototype.init = function(theme,
-    opt_rendererOverrides) {
-  Blockly.geras.Renderer.superClass_.init.call(this, theme,
-      opt_rendererOverrides);
+Renderer.prototype.init = function(theme, opt_rendererOverrides) {
+  Renderer.superClass_.init.call(this, theme, opt_rendererOverrides);
   this.highlightConstants_ = this.makeHighlightConstants_();
   this.highlightConstants_.init();
 };
@@ -64,80 +65,84 @@ Blockly.geras.Renderer.prototype.init = function(theme,
 /**
  * @override
  */
-Blockly.geras.Renderer.prototype.refreshDom = function(svg, theme) {
-  Blockly.geras.Renderer.superClass_.refreshDom.call(this, svg, theme);
+Renderer.prototype.refreshDom = function(svg, theme) {
+  Renderer.superClass_.refreshDom.call(this, svg, theme);
   this.getHighlightConstants().init();
 };
 
 /**
  * @override
  */
-Blockly.geras.Renderer.prototype.makeConstants_ = function() {
-  return new Blockly.geras.ConstantProvider();
+Renderer.prototype.makeConstants_ = function() {
+  return new ConstantProvider();
 };
 
 /**
  * Create a new instance of the renderer's render info object.
- * @param {!Blockly.BlockSvg} block The block to measure.
- * @return {!Blockly.geras.RenderInfo} The render info object.
+ * @param {!BlockSvg} block The block to measure.
+ * @return {!RenderInfo} The render info object.
  * @protected
  * @override
  */
-Blockly.geras.Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new Blockly.geras.RenderInfo(this, block);
+Renderer.prototype.makeRenderInfo_ = function(block) {
+  return new RenderInfo(this, block);
 };
 
 /**
  * Create a new instance of the renderer's drawer.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.blockRendering.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!BaseRenderInfo} info An object containing all
  *   information needed to render this block.
- * @return {!Blockly.geras.Drawer} The drawer.
+ * @return {!Drawer} The drawer.
  * @protected
  * @override
  */
-Blockly.geras.Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Blockly.geras.Drawer(block,
-      /** @type {!Blockly.geras.RenderInfo} */ (info));
+Renderer.prototype.makeDrawer_ = function(block, info) {
+  return new Drawer(
+      block,
+      /** @type {!RenderInfo} */ (info));
 };
 
 /**
  * Create a new instance of a renderer path object.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @return {!Blockly.geras.PathObject} The renderer path object.
+ * @return {!PathObject} The renderer path object.
  * @package
  * @override
  */
-Blockly.geras.Renderer.prototype.makePathObject = function(root, style) {
-  return new Blockly.geras.PathObject(root, style,
-      /** @type {!Blockly.geras.ConstantProvider} */ (this.getConstants()));
+Renderer.prototype.makePathObject = function(root, style) {
+  return new PathObject(
+      root, style,
+      /** @type {!ConstantProvider} */ (this.getConstants()));
 };
 
 /**
  * Create a new instance of the renderer's highlight constant provider.
- * @return {!Blockly.geras.HighlightConstantProvider} The highlight constant
+ * @return {!HighlightConstantProvider} The highlight constant
  *     provider.
  * @protected
  */
-Blockly.geras.Renderer.prototype.makeHighlightConstants_ = function() {
-  return new Blockly.geras.HighlightConstantProvider(
-      /** @type {!Blockly.blockRendering.ConstantProvider} */
+Renderer.prototype.makeHighlightConstants_ = function() {
+  return new HighlightConstantProvider(
+      /** @type {!BaseConstantProvider} */
       (this.getConstants()));
 };
 
 /**
  * Get the renderer's highlight constant provider.  We assume that when this is
  * called, the renderer has already been initialized.
- * @return {!Blockly.geras.HighlightConstantProvider} The highlight constant
+ * @return {!HighlightConstantProvider} The highlight constant
  *     provider.
  * @package
  */
-Blockly.geras.Renderer.prototype.getHighlightConstants = function() {
+Renderer.prototype.getHighlightConstants = function() {
   return (
-    /** @type {!Blockly.geras.HighlightConstantProvider} */
-    (this.highlightConstants_));
+      /** @type {!HighlightConstantProvider} */
+      (this.highlightConstants_));
 };
 
-Blockly.blockRendering.register('geras', Blockly.geras.Renderer);
+blockRendering.register('geras', Renderer);
+
+exports = Renderer;
diff --git a/tests/deps.js b/tests/deps.js
index fe3dc6e7b..0f257cd6f 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -145,7 +145,7 @@ goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From 4b6ccf868c6f992a68a6bfbc900f38a40cdc6d6a Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:35:01 -0700
Subject: [PATCH 258/291] Migrate core/events/events_theme_change.js to
 goog.module syntax (#5279)

* Migrate core/events/events_theme_change.js to ES6 const/let

* Migrate core/events/events_theme_change.js to goog.module

* Migrate core/events/events_theme_change.js to named requires

* clang-format core/events/events_theme_change.js
---
 core/events/events_theme_change.js | 34 ++++++++++++++++--------------
 tests/deps.js                      |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/core/events/events_theme_change.js b/core/events/events_theme_change.js
index c0ecd889f..c58d11158 100644
--- a/core/events/events_theme_change.js
+++ b/core/events/events_theme_change.js
@@ -10,12 +10,13 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.ThemeChange');
+goog.module('Blockly.Events.ThemeChange');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
@@ -23,11 +24,11 @@ goog.require('Blockly.utils.object');
  * @param {string=} opt_themeName The theme name. Undefined for a blank event.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    event. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.ThemeChange = function(opt_themeName, opt_workspaceId) {
-  Blockly.Events.ThemeChange.superClass_.constructor.call(this, opt_workspaceId);
+const ThemeChange = function(opt_themeName, opt_workspaceId) {
+  ThemeChange.superClass_.constructor.call(this, opt_workspaceId);
 
   /**
    * The theme name.
@@ -35,20 +36,20 @@ Blockly.Events.ThemeChange = function(opt_themeName, opt_workspaceId) {
    */
   this.themeName = opt_themeName;
 };
-Blockly.utils.object.inherits(Blockly.Events.ThemeChange, Blockly.Events.UiBase);
+object.inherits(ThemeChange, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.ThemeChange.prototype.type = Blockly.Events.THEME_CHANGE;
+ThemeChange.prototype.type = Events.THEME_CHANGE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.ThemeChange.prototype.toJson = function() {
-  var json = Blockly.Events.ThemeChange.superClass_.toJson.call(this);
+ThemeChange.prototype.toJson = function() {
+  const json = ThemeChange.superClass_.toJson.call(this);
   json['themeName'] = this.themeName;
   return json;
 };
@@ -57,10 +58,11 @@ Blockly.Events.ThemeChange.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.ThemeChange.prototype.fromJson = function(json) {
-  Blockly.Events.ThemeChange.superClass_.fromJson.call(this, json);
+ThemeChange.prototype.fromJson = function(json) {
+  ThemeChange.superClass_.fromJson.call(this, json);
   this.themeName = json['themeName'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.THEME_CHANGE, Blockly.Events.ThemeChange);
+registry.register(registry.Type.EVENT, Events.THEME_CHANGE, ThemeChange);
+
+exports = ThemeChange;
diff --git a/tests/deps.js b/tests/deps.js
index 0f257cd6f..cdbc2a718 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -46,7 +46,7 @@ goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.B
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From a5729043c1ee922f89a3ea68556e3c5887798436 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 08:40:01 -0700
Subject: [PATCH 259/291] Migrate core/events/events_block_drag.js to
 goog.module syntax (#5286)

* Migrate core/events/events_block_drag.js to ES6 const/let

* Migrate core/events/events_block_drag.js to goog.module

* Migrate core/events/events_block_drag.js to named requires

* clang-format core/events/events_block_drag.js
---
 core/events/events_block_drag.js | 46 +++++++++++++++++---------------
 tests/deps.js                    |  2 +-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js
index 9d256822a..6fd3f0a9f 100644
--- a/core/events/events_block_drag.js
+++ b/core/events/events_block_drag.js
@@ -10,30 +10,31 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.BlockDrag');
+goog.module('Blockly.Events.BlockDrag');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a block drag event.
- * @param {!Blockly.Block=} opt_block The top block in the stack that is being
+ * @param {!Block=} opt_block The top block in the stack that is being
  *    dragged. Undefined for a blank event.
  * @param {boolean=} opt_isStart Whether this is the start of a block drag.
  *    Undefined for a blank event.
- * @param {!Array<!Blockly.Block>=} opt_blocks The blocks affected by this
+ * @param {!Array<!Block>=} opt_blocks The blocks affected by this
  *    drag. Undefined for a blank event.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @constructor
  */
-Blockly.Events.BlockDrag = function(opt_block, opt_isStart, opt_blocks) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  Blockly.Events.BlockDrag.superClass_.constructor.call(this, workspaceId);
+const BlockDrag = function(opt_block, opt_isStart, opt_blocks) {
+  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  BlockDrag.superClass_.constructor.call(this, workspaceId);
   this.blockId = opt_block ? opt_block.id : null;
 
   /**
@@ -44,24 +45,24 @@ Blockly.Events.BlockDrag = function(opt_block, opt_isStart, opt_blocks) {
 
   /**
    * The blocks affected by this drag event.
-   * @type {!Array<!Blockly.Block>|undefined}
+   * @type {!Array<!Block>|undefined}
    */
   this.blocks = opt_blocks;
 };
-Blockly.utils.object.inherits(Blockly.Events.BlockDrag, Blockly.Events.UiBase);
+object.inherits(BlockDrag, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.BlockDrag.prototype.type = Blockly.Events.BLOCK_DRAG;
+BlockDrag.prototype.type = Events.BLOCK_DRAG;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.BlockDrag.prototype.toJson = function() {
-  var json = Blockly.Events.BlockDrag.superClass_.toJson.call(this);
+BlockDrag.prototype.toJson = function() {
+  const json = BlockDrag.superClass_.toJson.call(this);
   json['isStart'] = this.isStart;
   json['blockId'] = this.blockId;
   json['blocks'] = this.blocks;
@@ -72,12 +73,13 @@ Blockly.Events.BlockDrag.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.BlockDrag.prototype.fromJson = function(json) {
-  Blockly.Events.BlockDrag.superClass_.fromJson.call(this, json);
+BlockDrag.prototype.fromJson = function(json) {
+  BlockDrag.superClass_.fromJson.call(this, json);
   this.isStart = json['isStart'];
   this.blockId = json['blockId'];
   this.blocks = json['blocks'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.BLOCK_DRAG, Blockly.Events.BlockDrag);
+registry.register(registry.Type.EVENT, Events.BLOCK_DRAG, BlockDrag);
+
+exports = BlockDrag;
diff --git a/tests/deps.js b/tests/deps.js
index cdbc2a718..26cac9d15 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -40,7 +40,7 @@ goog.addDependency('../../core/events/events_block_base.js', ['Blockly.Events.Bl
 goog.addDependency('../../core/events/events_block_change.js', ['Blockly.Events.BlockChange'], ['Blockly.Events', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_create.js', ['Blockly.Events.BlockCreate'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_delete.js', ['Blockly.Events.BlockDelete'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.object', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_block_move.js', ['Blockly.Events.BlockMove'], ['Blockly.Events', 'Blockly.Events.BlockBase', 'Blockly.connectionTypes', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 4c40378b9ad33444c3680944e49332282fc8646c Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Wed, 11 Aug 2021 18:50:45 +0100
Subject: [PATCH 260/291] Use `goog.requireType` when importing interfaces
 (etc.) (#5343)

* Use goog.requireType when importing I* interfaces

Interfaces have no code, so should never be referred to outside of
(JSDoc) comments, and so the modules that define only interfaces never
need to be goog.require'd - goog.requireType is always sufficient.

This commit fixes imports of all modules whose name matches
/(.*\.)?I[A-Z]*/ - i.e., the hungarian-notation named ones in
core/interfaces/.

* Use goog.requireType when only using import for type specifications

Where a module is imported only to used in JSDoc comments it can
(and should) be goog.requireType'd instead of goog.require'd.

* Remove spurious eslint-disable no-unused-vars

There were a few cases where modules were being imported with
goog.require (because they are referred to in code, not just JSDoc
comments) but were prefaced by a spurious eslint suppress.

Remove these, restoring the invariant that an import gets an eslint
if and only if it is a requireType.

* Remove obsolete Closure Compiler error group

stricterMissingRequire has been superceded by missingRequire, and now
causes a Java null pointer exception if supplied.
---
 core/block.js                                 |  4 +-
 core/block_dragger.js                         |  2 +-
 core/block_svg.js                             | 10 +--
 core/bubble.js                                |  2 +-
 core/connection.js                            |  2 +-
 core/connection_checker.js                    |  2 +-
 core/connection_db.js                         |  2 +-
 core/delete_area.js                           |  2 +-
 core/drag_target.js                           |  2 +-
 core/field.js                                 |  8 +-
 core/flyout_base.js                           |  4 +-
 core/gesture.js                               |  1 -
 core/input.js                                 |  2 +-
 core/interfaces/i_ast_node_location_svg.js    |  2 +-
 .../i_ast_node_location_with_block.js         |  2 +-
 core/interfaces/i_autohideable.js             |  2 +-
 core/interfaces/i_bubble.js                   |  4 +-
 core/interfaces/i_collapsible_toolbox_item.js |  2 +-
 core/interfaces/i_delete_area.js              |  2 +-
 core/interfaces/i_drag_target.js              |  2 +-
 core/interfaces/i_draggable.js                |  2 +-
 core/interfaces/i_flyout.js                   |  2 +-
 core/interfaces/i_positionable.js             |  2 +-
 core/interfaces/i_selectable_toolbox_item.js  |  2 +-
 core/interfaces/i_toolbox.js                  |  2 +-
 core/metrics_manager.js                       |  2 +-
 core/renderers/common/drawer.js               |  2 +-
 core/renderers/common/info.js                 |  5 +-
 core/renderers/common/path_object.js          |  2 +-
 core/renderers/common/renderer.js             |  4 +-
 core/toolbox/category.js                      |  2 +-
 core/toolbox/collapsible_category.js          |  2 +-
 core/toolbox/toolbox.js                       | 12 ++-
 core/toolbox/toolbox_item.js                  |  2 +-
 core/trashcan.js                              |  4 +-
 core/workspace.js                             |  2 +-
 core/workspace_comment_svg.js                 |  6 +-
 core/workspace_svg.js                         |  2 +-
 core/zoom_controls.js                         |  2 +-
 scripts/gulpfiles/build_tasks.js              |  1 -
 tests/deps.js                                 | 76 +++++++++----------
 41 files changed, 98 insertions(+), 97 deletions(-)

diff --git a/core/block.js b/core/block.js
index adddfe5ec..0f610c2e7 100644
--- a/core/block.js
+++ b/core/block.js
@@ -26,9 +26,9 @@ const Extensions = goog.require('Blockly.Extensions');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
-const IDeletable = goog.require('Blockly.IDeletable');
+const IDeletable = goog.requireType('Blockly.IDeletable');
 const Input = goog.require('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
 const Mutator = goog.requireType('Blockly.Mutator');
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 6e5ac10c1..32a6f4922 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
-const IBlockDragger = goog.require('Blockly.IBlockDragger');
+const IBlockDragger = goog.requireType('Blockly.IBlockDragger');
 /* eslint-disable-next-line no-unused-vars */
 const IDragTarget = goog.requireType('Blockly.IDragTarget');
 const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
diff --git a/core/block_svg.js b/core/block_svg.js
index 027b0c71b..4c2545eb1 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -29,15 +29,15 @@ const Events = goog.require('Blockly.Events');
 const Field = goog.requireType('Blockly.Field');
 const FieldLabel = goog.require('Blockly.FieldLabel');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
-const IBoundedElement = goog.require('Blockly.IBoundedElement');
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
 /* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.require('Blockly.ICopyable');
+const ICopyable = goog.requireType('Blockly.ICopyable');
 /* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.require('Blockly.IDraggable');
+const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
-const IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject');
 /* eslint-disable-next-line no-unused-vars */
 const Icon = goog.requireType('Blockly.Icon');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/bubble.js b/core/bubble.js
index 161b2fb29..40e516639 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -13,7 +13,7 @@
 goog.provide('Blockly.Bubble');
 
 goog.require('Blockly.browserEvents');
-goog.require('Blockly.IBubble');
+goog.requireType('Blockly.IBubble');
 goog.require('Blockly.Scrollbar');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
diff --git a/core/connection.js b/core/connection.js
index f272b59e0..ae7ad8051 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 const Block = goog.requireType('Blockly.Block');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
+const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
 /* eslint-disable-next-line no-unused-vars */
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 76162b017..e3fbc1929 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace();
 
 const Connection = goog.require('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
-const IConnectionChecker = goog.require('Blockly.IConnectionChecker');
+const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const common = goog.require('Blockly.common');
diff --git a/core/connection_db.js b/core/connection_db.js
index d3bc0507d..c0ee7f500 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -20,7 +20,7 @@ const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 /* eslint-disable-next-line no-unused-vars */
-const RenderedConnection = goog.require('Blockly.RenderedConnection');
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 const connectionTypes = goog.require('Blockly.connectionTypes');
 /** @suppress {extraRequire} */
 goog.require('Blockly.constants');
diff --git a/core/delete_area.js b/core/delete_area.js
index 248ef2fd2..6dbe50db6 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -18,7 +18,7 @@ goog.module.declareLegacyNamespace();
 const BlockSvg = goog.require('Blockly.BlockSvg');
 const DragTarget = goog.require('Blockly.DragTarget');
 /* eslint-disable-next-line no-unused-vars */
-const IDeleteArea = goog.require('Blockly.IDeleteArea');
+const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 const object = goog.require('Blockly.utils.object');
diff --git a/core/drag_target.js b/core/drag_target.js
index 18e29b40a..e5a0f578b 100644
--- a/core/drag_target.js
+++ b/core/drag_target.js
@@ -16,7 +16,7 @@ goog.module('Blockly.DragTarget');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.require('Blockly.IDragTarget');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/field.js b/core/field.js
index 77e0ab88c..79496526e 100644
--- a/core/field.js
+++ b/core/field.js
@@ -26,15 +26,15 @@ const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock');
+const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock');
 /* eslint-disable-next-line no-unused-vars */
-const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+const IKeyboardAccessible = goog.requireType('Blockly.IKeyboardAccessible');
 /* eslint-disable-next-line no-unused-vars */
 const Input = goog.requireType('Blockly.Input');
 /* eslint-disable-next-line no-unused-vars */
-const IRegistrable = goog.require('Blockly.IRegistrable');
+const IRegistrable = goog.requireType('Blockly.IRegistrable');
 const MarkerManager = goog.require('Blockly.MarkerManager');
 const Rect = goog.require('Blockly.utils.Rect');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 8ce566544..c37d2a1ef 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -14,7 +14,7 @@ goog.module('Blockly.Flyout');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const Block = goog.require('Blockly.Block');
+const Block = goog.requireType('Blockly.Block');
 const Blockly = goog.require('Blockly');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
@@ -26,7 +26,7 @@ const Events = goog.require('Blockly.Events');
 const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
 const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager');
 /* eslint-disable-next-line no-unused-vars */
-const IFlyout = goog.require('Blockly.IFlyout');
+const IFlyout = goog.requireType('Blockly.IFlyout');
 /* eslint-disable-next-line no-unused-vars */
 const Options = goog.requireType('Blockly.Options');
 const ScrollbarPair = goog.require('Blockly.ScrollbarPair');
diff --git a/core/gesture.js b/core/gesture.js
index ae01b62cc..855dc76de 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -31,7 +31,6 @@ const IBubble = goog.requireType('Blockly.IBubble');
 const IFlyout = goog.requireType('Blockly.IFlyout');
 const Tooltip = goog.require('Blockly.Tooltip');
 const Touch = goog.require('Blockly.Touch');
-/* eslint-disable-next-line no-unused-vars */
 const Workspace = goog.require('Blockly.Workspace');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
diff --git a/core/input.js b/core/input.js
index afa7a3358..9eb3892f8 100644
--- a/core/input.js
+++ b/core/input.js
@@ -18,7 +18,7 @@ const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
 const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
-const Connection = goog.require('Blockly.Connection');
+const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js
index 526fbffa3..53d65a529 100644
--- a/core/interfaces/i_ast_node_location_svg.js
+++ b/core/interfaces/i_ast_node_location_svg.js
@@ -15,7 +15,7 @@ goog.module('Blockly.IASTNodeLocationSvg');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 
 
 /**
diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js
index 002db0ad8..0bef06154 100644
--- a/core/interfaces/i_ast_node_location_with_block.js
+++ b/core/interfaces/i_ast_node_location_with_block.js
@@ -18,7 +18,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const Block = goog.requireType('Blockly.Block');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 
 
 /**
diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js
index 0ccbf310a..c3c7a8125 100644
--- a/core/interfaces/i_autohideable.js
+++ b/core/interfaces/i_autohideable.js
@@ -16,7 +16,7 @@ goog.module('Blockly.IAutoHideable');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const IComponent = goog.requireType('Blockly.IComponent');
 
 
 /**
diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js
index b6e9736d7..a7578fc09 100644
--- a/core/interfaces/i_bubble.js
+++ b/core/interfaces/i_bubble.js
@@ -19,9 +19,9 @@ const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
-const IContextMenu = goog.require('Blockly.IContextMenu');
+const IContextMenu = goog.requireType('Blockly.IContextMenu');
 /* eslint-disable-next-line no-unused-vars */
-const IDraggable = goog.require('Blockly.IDraggable');
+const IDraggable = goog.requireType('Blockly.IDraggable');
 
 
 /**
diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js
index 45bd3ae3e..5915a05b4 100644
--- a/core/interfaces/i_collapsible_toolbox_item.js
+++ b/core/interfaces/i_collapsible_toolbox_item.js
@@ -15,7 +15,7 @@ goog.module('Blockly.ICollapsibleToolboxItem');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 
diff --git a/core/interfaces/i_delete_area.js b/core/interfaces/i_delete_area.js
index 845d7dddb..fbe54559a 100644
--- a/core/interfaces/i_delete_area.js
+++ b/core/interfaces/i_delete_area.js
@@ -18,7 +18,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
-const IDragTarget = goog.require('Blockly.IDragTarget');
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
 
 
 /**
diff --git a/core/interfaces/i_drag_target.js b/core/interfaces/i_drag_target.js
index 6b777781d..a47798841 100644
--- a/core/interfaces/i_drag_target.js
+++ b/core/interfaces/i_drag_target.js
@@ -16,7 +16,7 @@ goog.module('Blockly.IDragTarget');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const IComponent = goog.requireType('Blockly.IComponent');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_draggable.js b/core/interfaces/i_draggable.js
index 5d7e17d53..5e6702a1c 100644
--- a/core/interfaces/i_draggable.js
+++ b/core/interfaces/i_draggable.js
@@ -15,7 +15,7 @@ goog.module('Blockly.IDraggable');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IDeletable = goog.require('Blockly.IDeletable');
+const IDeletable = goog.requireType('Blockly.IDeletable');
 
 
 /**
diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js
index 7c0c47421..405f0e482 100644
--- a/core/interfaces/i_flyout.js
+++ b/core/interfaces/i_flyout.js
@@ -19,7 +19,7 @@ const BlockSvg = goog.requireType('Blockly.BlockSvg');
 /* eslint-disable-next-line no-unused-vars */
 const Coordinate = goog.requireType('Blockly.utils.Coordinate');
 /* eslint-disable-next-line no-unused-vars */
-const IRegistrable = goog.require('Blockly.IRegistrable');
+const IRegistrable = goog.requireType('Blockly.IRegistrable');
 /* eslint-disable-next-line no-unused-vars */
 const Svg = goog.requireType('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js
index 56b9515c3..ba1a4d2b5 100644
--- a/core/interfaces/i_positionable.js
+++ b/core/interfaces/i_positionable.js
@@ -15,7 +15,7 @@ goog.module('Blockly.IPositionable');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IComponent = goog.require('Blockly.IComponent');
+const IComponent = goog.requireType('Blockly.IComponent');
 /* eslint-disable-next-line no-unused-vars */
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js
index 837aad148..2e286889f 100644
--- a/core/interfaces/i_selectable_toolbox_item.js
+++ b/core/interfaces/i_selectable_toolbox_item.js
@@ -15,7 +15,7 @@ goog.module('Blockly.ISelectableToolboxItem');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const toolbox = goog.requireType('Blockly.utils.toolbox');
 
diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js
index d6d6ec626..ee645ba34 100644
--- a/core/interfaces/i_toolbox.js
+++ b/core/interfaces/i_toolbox.js
@@ -17,7 +17,7 @@ goog.module.declareLegacyNamespace();
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
 /* eslint-disable-next-line no-unused-vars */
-const IRegistrable = goog.require('Blockly.IRegistrable');
+const IRegistrable = goog.requireType('Blockly.IRegistrable');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index 841114d14..1288588df 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -13,7 +13,7 @@
 goog.provide('Blockly.FlyoutMetricsManager');
 goog.provide('Blockly.MetricsManager');
 
-goog.require('Blockly.IMetricsManager');
+goog.requireType('Blockly.IMetricsManager');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.toolbox');
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index 92e659ab7..af03eaf2e 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -26,7 +26,7 @@ const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput');
 /* eslint-disable-next-line no-unused-vars */
 const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
 /* eslint-disable-next-line no-unused-vars */
-const Row = goog.require('Blockly.blockRendering.Row');
+const Row = goog.requireType('Blockly.blockRendering.Row');
 const Types = goog.require('Blockly.blockRendering.Types');
 const svgPaths = goog.require('Blockly.utils.svgPaths');
 
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 06f9d7009..b5da1701d 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -29,7 +29,7 @@ const InputRow = goog.require('Blockly.blockRendering.InputRow');
 const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer');
 const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge');
 /* eslint-disable-next-line no-unused-vars */
-const Measurable = goog.require('Blockly.blockRendering.Measurable');
+const Measurable = goog.requireType('Blockly.blockRendering.Measurable');
 const NextConnection = goog.require('Blockly.blockRendering.NextConnection');
 const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection');
 const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection');
@@ -37,10 +37,9 @@ const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnecti
 const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
 /* eslint-disable-next-line no-unused-vars */
 const Renderer = goog.requireType('Blockly.blockRendering.Renderer');
-/* eslint-disable-next-line no-unused-vars */
 const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner');
 /* eslint-disable-next-line no-unused-vars */
-const Row = goog.require('Blockly.blockRendering.Row');
+const Row = goog.requireType('Blockly.blockRendering.Row');
 const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow');
 const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner');
 const StatementInput = goog.require('Blockly.blockRendering.StatementInput');
diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index 7b1f6af9d..d8d36c9dc 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -21,7 +21,7 @@ const Connection = goog.requireType('Blockly.Connection');
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
 /* eslint-disable-next-line no-unused-vars */
-const IPathObject = goog.require('Blockly.blockRendering.IPathObject');
+const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject');
 const Svg = goog.require('Blockly.utils.Svg');
 /* eslint-disable-next-line no-unused-vars */
 const Theme = goog.requireType('Blockly.Theme');
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index b4be1af87..f72a88437 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -15,13 +15,13 @@ goog.provide('Blockly.blockRendering.Renderer');
 goog.require('Blockly.blockRendering.ConstantProvider');
 goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.blockRendering.IPathObject');
+goog.requireType('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.blockRendering.MarkerSvg');
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.blockRendering.RenderInfo');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.InsertionMarkerManager');
-goog.require('Blockly.IRegistrable');
+goog.requireType('Blockly.IRegistrable');
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.BlockSvg');
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index 5c8076383..962a5cb85 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -18,7 +18,7 @@ const Css = goog.require('Blockly.Css');
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
-const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem');
+const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 const ToolboxItem = goog.require('Blockly.ToolboxItem');
diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index ae243f1e6..923d681b2 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -14,7 +14,7 @@ goog.module('Blockly.CollapsibleToolboxCategory');
 goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
-const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem');
+const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index abab56d26..37808a80d 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -22,18 +22,22 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
-const IAutoHideable = goog.require('Blockly.IAutoHideable');
+/* eslint-disable-next-line no-unused-vars */
+const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
 /* eslint-disable-next-line no-unused-vars */
 const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
-const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible');
+/* eslint-disable-next-line no-unused-vars */
+const IKeyboardAccessible = goog.requireType('Blockly.IKeyboardAccessible');
 /* eslint-disable-next-line no-unused-vars */
 const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem');
-const IStyleable = goog.require('Blockly.IStyleable');
-const IToolbox = goog.require('Blockly.IToolbox');
+/* eslint-disable-next-line no-unused-vars */
+const IStyleable = goog.requireType('Blockly.IStyleable');
+/* eslint-disable-next-line no-unused-vars */
+const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
 const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 const Options = goog.require('Blockly.Options');
diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index 0fdbfd424..7cffe6540 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -19,7 +19,7 @@ const IdGenerator = goog.require('Blockly.utils.IdGenerator');
 /* eslint-disable-next-line no-unused-vars */
 const IToolbox = goog.requireType('Blockly.IToolbox');
 /* eslint-disable-next-line no-unused-vars */
-const IToolboxItem = goog.require('Blockly.IToolboxItem');
+const IToolboxItem = goog.requireType('Blockly.IToolboxItem');
 /* eslint-disable-next-line no-unused-vars */
 const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/trashcan.js b/core/trashcan.js
index 7e60d841d..49596ae83 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -21,13 +21,13 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const DeleteArea = goog.require('Blockly.DeleteArea');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IAutoHideable = goog.require('Blockly.IAutoHideable');
+const IAutoHideable = goog.requireType('Blockly.IAutoHideable');
 /* eslint-disable-next-line no-unused-vars */
 const IDraggable = goog.requireType('Blockly.IDraggable');
 /* eslint-disable-next-line no-unused-vars */
 const IFlyout = goog.requireType('Blockly.IFlyout');
 /* eslint-disable-next-line no-unused-vars */
-const IPositionable = goog.require('Blockly.IPositionable');
+const IPositionable = goog.requireType('Blockly.IPositionable');
 /* eslint-disable-next-line no-unused-vars */
 const MetricsManager = goog.requireType('Blockly.MetricsManager');
 const Options = goog.require('Blockly.Options');
diff --git a/core/workspace.js b/core/workspace.js
index 32125974e..77b50967e 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -23,7 +23,7 @@ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions');
 const ConnectionDB = goog.requireType('Blockly.ConnectionDB');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation');
+const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation');
 /* eslint-disable-next-line no-unused-vars */
 const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker');
 const Options = goog.require('Blockly.Options');
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 5702cc14c..0b68db82e 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -21,11 +21,11 @@ const Coordinate = goog.require('Blockly.utils.Coordinate');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IBoundedElement = goog.require('Blockly.IBoundedElement');
+const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
 /* eslint-disable-next-line no-unused-vars */
-const IBubble = goog.require('Blockly.IBubble');
+const IBubble = goog.requireType('Blockly.IBubble');
 /* eslint-disable-next-line no-unused-vars */
-const ICopyable = goog.require('Blockly.ICopyable');
+const ICopyable = goog.requireType('Blockly.ICopyable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 5010aff79..419879bad 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -34,7 +34,7 @@ const FlyoutButton = goog.requireType('Blockly.FlyoutButton');
 const Gesture = goog.require('Blockly.Gesture');
 const Grid = goog.require('Blockly.Grid');
 /* eslint-disable-next-line no-unused-vars */
-const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg');
+const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg');
 /* eslint-disable-next-line no-unused-vars */
 const IBoundedElement = goog.requireType('Blockly.IBoundedElement');
 /* eslint-disable-next-line no-unused-vars */
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 1b7a568cc..eb27b17e3 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -17,7 +17,7 @@ const ComponentManager = goog.require('Blockly.ComponentManager');
 const Css = goog.require('Blockly.Css');
 const Events = goog.require('Blockly.Events');
 /* eslint-disable-next-line no-unused-vars */
-const IPositionable = goog.require('Blockly.IPositionable');
+const IPositionable = goog.requireType('Blockly.IPositionable');
 const Rect = goog.require('Blockly.utils.Rect');
 const Svg = goog.require('Blockly.utils.Svg');
 const Touch = goog.require('Blockly.Touch');
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index e6f496544..318304189 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -90,7 +90,6 @@ var JSCOMP_ERROR = [
   // 'strictMissingProperties',
   'strictModuleDepCheck',
   // 'strictPrimitiveOperators',
-  // 'stricterMissingRequire',
   'suspiciousCode',
   'typeInvalidation',
   'undefinedNames',
diff --git a/tests/deps.js b/tests/deps.js
index 26cac9d15..874dcb83d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -7,32 +7,32 @@ goog.addDependency('../../blocks/procedures.js', ['Blockly.Blocks.procedures'],
 goog.addDependency('../../blocks/text.js', ['Blockly.Blocks.texts', 'Blockly.Constants.Text'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldMultilineInput', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Mutator']);
 goog.addDependency('../../blocks/variables.js', ['Blockly.Blocks.variables', 'Blockly.Constants.Variables'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
 goog.addDependency('../../blocks/variables_dynamic.js', ['Blockly.Constants.VariablesDynamic'], ['Blockly', 'Blockly.Blocks', 'Blockly.FieldLabel', 'Blockly.FieldVariable']);
-goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.IASTNodeLocation', 'Blockly.IDeletable', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block.js', ['Blockly.Block'], ['Blockly.ASTNode', 'Blockly.Blocks', 'Blockly.Connection', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Extensions', 'Blockly.Input', 'Blockly.Tooltip', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.FieldLabel', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']);
 goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
+goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/bubble_dragger.js', ['Blockly.BubbleDragger'], ['Blockly.Bubble', 'Blockly.ComponentManager', 'Blockly.Events', 'Blockly.Events.CommentMove', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/clipboard.js', ['Blockly.clipboard'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/comment.js', ['Blockly.Comment'], ['Blockly.Bubble', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Warning', 'Blockly.browserEvents', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/common.js', ['Blockly.common'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/component_manager.js', ['Blockly.ComponentManager'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.IConnectionChecker', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection', 'Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.deprecation'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.Connection', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.connectionTypes', 'Blockly.constants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/connection_types.js', ['Blockly.connectionTypes'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_items.js', ['Blockly.ContextMenuItems'], ['Blockly', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Msg', 'Blockly.clipboard', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/contextmenu_registry.js', ['Blockly.ContextMenuRegistry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/css.js', ['Blockly.Css'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.IDeleteArea', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/delete_area.js', ['Blockly.DeleteArea'], ['Blockly.BlockSvg', 'Blockly.DragTarget', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/drag_target.js', ['Blockly.DragTarget'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/dropdowndiv.js', ['Blockly.DropDownDiv'], ['Blockly.common', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.style']);
 goog.addDependency('../../core/events/events.js', ['Blockly.Events'], ['Blockly.registry', 'Blockly.utils']);
 goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abstract'], ['Blockly.Events'], {'lang': 'es6', 'module': 'goog'});
@@ -58,7 +58,7 @@ goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Bloc
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IKeyboardAccessible', 'Blockly.IRegistrable', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/field.js', ['Blockly.Field'], ['Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Gesture', 'Blockly.MarkerManager', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_angle.js', ['Blockly.FieldAngle'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.FieldTextInput', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.KeyCodes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.object', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/field_checkbox.js', ['Blockly.FieldCheckbox'], ['Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.fieldRegistry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_colour.js', ['Blockly.FieldColour'], ['Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils.IdGenerator', 'Blockly.utils.KeyCodes', 'Blockly.utils.Size', 'Blockly.utils.aria', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
@@ -71,7 +71,7 @@ goog.addDependency('../../core/field_number.js', ['Blockly.FieldNumber'], ['Bloc
 goog.addDependency('../../core/field_registry.js', ['Blockly.fieldRegistry'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_textinput.js', ['Blockly.FieldTextInput'], ['Blockly', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.WidgetDiv', 'Blockly.browserEvents', 'Blockly.fieldRegistry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/field_variable.js', ['Blockly.FieldVariable'], ['Blockly.Events.BlockChange', 'Blockly.FieldDropdown', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Xml', 'Blockly.fieldRegistry', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.Block', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.IFlyout', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/flyout_base.js', ['Blockly.Flyout'], ['Blockly', 'Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.VarCreate', 'Blockly.FlyoutMetricsManager', 'Blockly.Gesture', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_button.js', ['Blockly.FlyoutButton'], ['Blockly.Css', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_horizontal.js', ['Blockly.HorizontalFlyout'], ['Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/flyout_vertical.js', ['Blockly.VerticalFlyout'], ['Blockly.Block', 'Blockly.DropDownDiv', 'Blockly.Flyout', 'Blockly.Scrollbar', 'Blockly.WidgetDiv', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
@@ -80,36 +80,36 @@ goog.addDependency('../../core/gesture.js', ['Blockly.Gesture'], ['Blockly.Block
 goog.addDependency('../../core/grid.js', ['Blockly.Grid'], ['Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
-goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.Connection', 'Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], ['Blockly.IASTNodeLocation'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_autohideable.js', ['Blockly.IAutoHideable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_block_dragger.js', ['Blockly.IBlockDragger'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_bounded_element.js', ['Blockly.IBoundedElement'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], ['Blockly.IContextMenu', 'Blockly.IDraggable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], ['Blockly.ISelectableToolboxItem'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_bubble.js', ['Blockly.IBubble'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_collapsible_toolbox_item.js', ['Blockly.ICollapsibleToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_component.js', ['Blockly.IComponent'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_connection_checker.js', ['Blockly.IConnectionChecker'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_contextmenu.js', ['Blockly.IContextMenu'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_copyable.js', ['Blockly.ICopyable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_deletable.js', ['Blockly.IDeletable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], ['Blockly.IDragTarget'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], ['Blockly.IDeletable'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_delete_area.js', ['Blockly.IDeleteArea'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_drag_target.js', ['Blockly.IDragTarget'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_draggable.js', ['Blockly.IDraggable'], [], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_flyout.js', ['Blockly.IFlyout'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_keyboard_accessible.js', ['Blockly.IKeyboardAccessible'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_metrics_manager.js', ['Blockly.IMetricsManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_movable.js', ['Blockly.IMovable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], ['Blockly.IComponent'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_positionable.js', ['Blockly.IPositionable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable.js', ['Blockly.IRegistrable'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_registrable_field.js', ['Blockly.IRegistrableField'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_selectable.js', ['Blockly.ISelectable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], ['Blockly.IToolboxItem'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_selectable_toolbox_item.js', ['Blockly.ISelectableToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_styleable.js', ['Blockly.IStyleable'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], ['Blockly.IRegistrable'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/interfaces/i_toolbox.js', ['Blockly.IToolbox'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_toolbox_item.js', ['Blockly.IToolboxItem'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/internal_constants.js', ['Blockly.internalConstants'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/keyboard_nav/ast_node.js', ['Blockly.ASTNode'], ['Blockly.connectionTypes', 'Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
@@ -120,7 +120,7 @@ goog.addDependency('../../core/keyboard_nav/tab_navigate_cursor.js', ['Blockly.T
 goog.addDependency('../../core/marker_manager.js', ['Blockly.MarkerManager'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/menu.js', ['Blockly.Menu'], ['Blockly.browserEvents', 'Blockly.utils.Coordinate', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.style'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/menuitem.js', ['Blockly.MenuItem'], ['Blockly.utils.IdGenerator', 'Blockly.utils.aria', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.IMetricsManager', 'Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
+goog.addDependency('../../core/metrics_manager.js', ['Blockly.FlyoutMetricsManager', 'Blockly.MetricsManager'], ['Blockly.registry', 'Blockly.utils.Size', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global']);
 goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.Variables', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
@@ -132,12 +132,12 @@ goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnec
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
-goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], [], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.blockRendering.IPathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.IRegistrable', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.IPathObject', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
+goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
@@ -176,15 +176,15 @@ goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry'
 goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Blockly.Theme']);
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly', 'Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly', 'Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.common', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch.js', ['Blockly.Touch'], ['Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.global', 'Blockly.utils.string']);
 goog.addDependency('../../core/touch_gesture.js', ['Blockly.TouchGesture'], ['Blockly.Gesture', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.object']);
-goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.IAutoHideable', 'Blockly.IPositionable', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/trashcan.js', ['Blockly.Trashcan'], ['Blockly.ComponentManager', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.TrashcanOpen', 'Blockly.Options', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/utils.js', ['Blockly.utils'], ['Blockly.Msg', 'Blockly.internalConstants', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.colour', 'Blockly.utils.global', 'Blockly.utils.string', 'Blockly.utils.style', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/utils/aria.js', ['Blockly.utils.aria'], []);
 goog.addDependency('../../core/utils/colour.js', ['Blockly.utils.colour'], [], {'lang': 'es6', 'module': 'goog'});
@@ -212,14 +212,14 @@ goog.addDependency('../../core/variables.js', ['Blockly.Variables'], ['Blockly.B
 goog.addDependency('../../core/variables_dynamic.js', ['Blockly.VariablesDynamic'], ['Blockly.Blocks', 'Blockly.Msg', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/warning.js', ['Blockly.Warning'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/widgetdiv.js', ['Blockly.WidgetDiv'], ['Blockly.common', 'Blockly.utils.dom']);
-goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.IASTNodeLocation', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace.js', ['Blockly.Workspace'], ['Blockly.ConnectionChecker', 'Blockly.Events', 'Blockly.Options', 'Blockly.VariableMap', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.math'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_audio.js', ['Blockly.WorkspaceAudio'], ['Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_comment.js', ['Blockly.WorkspaceComment'], ['Blockly.Events', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICopyable', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCommentSvg'], ['Blockly', 'Blockly.ContextMenu', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove', 'Blockly.Events.Selected', 'Blockly.Touch', 'Blockly.WorkspaceComment', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.IASTNodeLocationSvg', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
-goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.IPositionable', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 7c45b039f3482f07f3229bb5aac5b301b671e32f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:07:12 -0700
Subject: [PATCH 261/291] Migrate core/renderers/minimalist/drawer.js to
 goog.module

---
 core/renderers/minimalist/drawer.js | 15 ++++++++++-----
 tests/deps.js                       |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js
index 592710d6d..033f90741 100644
--- a/core/renderers/minimalist/drawer.js
+++ b/core/renderers/minimalist/drawer.js
@@ -9,12 +9,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.minimalist.Drawer');
+goog.module('Blockly.minimalist.Drawer');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.minimalist.RenderInfo');
 goog.require('Blockly.utils.object');
 
+goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.minimalist.RenderInfo');
+
 
 /**
  * An object that draws a block based on the given rendering information.
@@ -25,8 +28,10 @@ goog.require('Blockly.utils.object');
  * @constructor
  * @extends {Blockly.blockRendering.Drawer}
  */
-Blockly.minimalist.Drawer = function(block, info) {
-  Blockly.minimalist.Drawer.superClass_.constructor.call(this, block, info);
+const Drawer = function(block, info) {
+  Drawer.superClass_.constructor.call(this, block, info);
 };
-Blockly.utils.object.inherits(Blockly.minimalist.Drawer,
+Blockly.utils.object.inherits(Drawer,
     Blockly.blockRendering.Drawer);
+
+exports = Drawer;
diff --git a/tests/deps.js b/tests/deps.js
index 874dcb83d..8c0415c0e 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -153,7 +153,7 @@ goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);

From 8aa437b44a0cca0c01c3495f31791623d9585c38 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 16:27:06 -0700
Subject: [PATCH 262/291] Migrate core/renderers/minimalist/drawer.js named
 requires

---
 core/renderers/minimalist/drawer.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js
index 033f90741..d0cd3a417 100644
--- a/core/renderers/minimalist/drawer.js
+++ b/core/renderers/minimalist/drawer.js
@@ -12,26 +12,26 @@
 goog.module('Blockly.minimalist.Drawer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.minimalist.RenderInfo');
+const BaseDrawer = goog.require('Blockly.blockRendering.Drawer');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const RenderInfo = goog.requireType('Blockly.minimalist.RenderInfo');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object that draws a block based on the given rendering information.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.minimalist.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Drawer}
+ * @extends {BaseDrawer}
  */
 const Drawer = function(block, info) {
   Drawer.superClass_.constructor.call(this, block, info);
 };
-Blockly.utils.object.inherits(Drawer,
-    Blockly.blockRendering.Drawer);
+object.inherits(Drawer, BaseDrawer);
 
 exports = Drawer;

From 684047d22f97388f8197b4d84c7a33ca5bc09874 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:35:44 -0700
Subject: [PATCH 263/291] Migrate core/renderers/common/renderer.js to ES6
 const/let

---
 core/renderers/common/renderer.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index f72a88437..f136238df 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -108,7 +108,7 @@ Blockly.blockRendering.Renderer.prototype.createDom = function(svg, theme) {
  * @package
  */
 Blockly.blockRendering.Renderer.prototype.refreshDom = function(svg, theme) {
-  var previousConstants = this.getConstants();
+  const previousConstants = this.getConstants();
   previousConstants.dispose();
   this.constants_ = this.makeConstants_();
   if (this.overrides) {
@@ -244,8 +244,9 @@ Blockly.blockRendering.Renderer.prototype.shouldHighlightConnection =
  */
 Blockly.blockRendering.Renderer.prototype.orphanCanConnectAtEnd =
     function(topBlock, orphanBlock, localType) {
-      var orphanConnection = localType === Blockly.connectionTypes.OUTPUT_VALUE ?
-          orphanBlock.outputConnection : orphanBlock.previousConnection;
+      const orphanConnection = (
+          localType === Blockly.connectionTypes.OUTPUT_VALUE ?
+              orphanBlock.outputConnection : orphanBlock.previousConnection);
       return !!Blockly.Connection.getConnectionForOrphanedConnection(
           /** @type {!Blockly.Block} **/ (topBlock),
           /** @type {!Blockly.Connection} **/ (orphanConnection));
@@ -288,7 +289,7 @@ Blockly.blockRendering.Renderer.prototype.render = function(block) {
   if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
-  var info = this.makeRenderInfo_(block);
+  const info = this.makeRenderInfo_(block);
   info.measure();
   this.makeDrawer_(block, info).draw();
 };

From c1bf49ae5c4248fccdb3f7d41a5b5fe1dbc9deed Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 15:36:22 -0700
Subject: [PATCH 264/291] Migrate core/renderers/common/renderer.js to
 goog.module

---
 core/renderers/common/renderer.js | 55 +++++++++++++++++--------------
 tests/deps.js                     |  2 +-
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index f136238df..eb64e0e50 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -10,26 +10,28 @@
  */
 'use strict';
 
-goog.provide('Blockly.blockRendering.Renderer');
+goog.module('Blockly.blockRendering.Renderer');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly.blockRendering');
 goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.Debug');
 goog.require('Blockly.blockRendering.Drawer');
-goog.requireType('Blockly.blockRendering.IPathObject');
 goog.require('Blockly.blockRendering.MarkerSvg');
 goog.require('Blockly.blockRendering.PathObject');
 goog.require('Blockly.blockRendering.RenderInfo');
+goog.require('Blockly.Connection');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.InsertionMarkerManager');
-goog.requireType('Blockly.IRegistrable');
+goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.Block');
 goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.Connection');
+goog.requireType('Blockly.blockRendering.Debug');
+goog.requireType('Blockly.blockRendering.IPathObject');
+goog.requireType('Blockly.IRegistrable');
 goog.requireType('Blockly.Marker');
 goog.requireType('Blockly.RenderedConnection');
 goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.utils.object');
 goog.requireType('Blockly.WorkspaceSvg');
 
 
@@ -40,7 +42,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @constructor
  * @implements {Blockly.IRegistrable}
  */
-Blockly.blockRendering.Renderer = function(name) {
+const Renderer = function(name) {
 
   /**
    * The renderer name.
@@ -69,7 +71,7 @@ Blockly.blockRendering.Renderer = function(name) {
  * @return {string} The CSS class name.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.getClassName = function() {
+Renderer.prototype.getClassName = function() {
   return this.name + '-renderer';
 };
 
@@ -79,7 +81,7 @@ Blockly.blockRendering.Renderer.prototype.getClassName = function() {
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.init = function(theme,
+Renderer.prototype.init = function(theme,
     opt_rendererOverrides) {
   this.constants_ = this.makeConstants_();
   if (opt_rendererOverrides) {
@@ -96,7 +98,7 @@ Blockly.blockRendering.Renderer.prototype.init = function(theme,
  * @param {!Blockly.Theme} theme The workspace theme object.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.createDom = function(svg, theme) {
+Renderer.prototype.createDom = function(svg, theme) {
   this.constants_.createDom(svg, this.name + '-' + theme.name,
       '.' + this.getClassName() + '.' + theme.getClassName());
 };
@@ -107,7 +109,7 @@ Blockly.blockRendering.Renderer.prototype.createDom = function(svg, theme) {
  * @param {!Blockly.Theme} theme The workspace theme object.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.refreshDom = function(svg, theme) {
+Renderer.prototype.refreshDom = function(svg, theme) {
   const previousConstants = this.getConstants();
   previousConstants.dispose();
   this.constants_ = this.makeConstants_();
@@ -126,7 +128,7 @@ Blockly.blockRendering.Renderer.prototype.refreshDom = function(svg, theme) {
  * Delete all DOM elements that this renderer and its constants created.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.dispose = function() {
+Renderer.prototype.dispose = function() {
   if (this.constants_) {
     this.constants_.dispose();
   }
@@ -137,7 +139,7 @@ Blockly.blockRendering.Renderer.prototype.dispose = function() {
  * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeConstants_ = function() {
+Renderer.prototype.makeConstants_ = function() {
   return new Blockly.blockRendering.ConstantProvider();
 };
 
@@ -147,7 +149,7 @@ Blockly.blockRendering.Renderer.prototype.makeConstants_ = function() {
  * @return {!Blockly.blockRendering.RenderInfo} The render info object.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeRenderInfo_ = function(block) {
+Renderer.prototype.makeRenderInfo_ = function(block) {
   return new Blockly.blockRendering.RenderInfo(this, block);
 };
 
@@ -159,7 +161,7 @@ Blockly.blockRendering.Renderer.prototype.makeRenderInfo_ = function(block) {
  * @return {!Blockly.blockRendering.Drawer} The drawer.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeDrawer_ = function(block, info) {
+Renderer.prototype.makeDrawer_ = function(block, info) {
   return new Blockly.blockRendering.Drawer(block, info);
 };
 
@@ -169,11 +171,12 @@ Blockly.blockRendering.Renderer.prototype.makeDrawer_ = function(block, info) {
  * @suppress {strictModuleDepCheck} Debug renderer only included in playground.
  * @protected
  */
-Blockly.blockRendering.Renderer.prototype.makeDebugger_ = function() {
-  if (!Blockly.blockRendering.Debug) {
+Renderer.prototype.makeDebugger_ = function() {
+  const Debug = goog.module.get('Blockly.blockRendering.Debug');
+  if (!Debug) {
     throw Error('Missing require for Blockly.blockRendering.Debug');
   }
-  return new Blockly.blockRendering.Debug(this.getConstants());
+  return new Debug(this.getConstants());
 };
 
 /**
@@ -184,7 +187,7 @@ Blockly.blockRendering.Renderer.prototype.makeDebugger_ = function() {
  *     the marker.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.makeMarkerDrawer = function(
+Renderer.prototype.makeMarkerDrawer = function(
     workspace, marker) {
   return new Blockly.blockRendering.MarkerSvg(workspace, this.getConstants(), marker);
 };
@@ -197,7 +200,7 @@ Blockly.blockRendering.Renderer.prototype.makeMarkerDrawer = function(
  * @return {!Blockly.blockRendering.IPathObject} The renderer path object.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.makePathObject = function(root,
+Renderer.prototype.makePathObject = function(root,
     style) {
   return new Blockly.blockRendering.PathObject(root, style,
       /** @type {!Blockly.blockRendering.ConstantProvider} */ (this.constants_));
@@ -210,7 +213,7 @@ Blockly.blockRendering.Renderer.prototype.makePathObject = function(root,
  * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.getConstants = function() {
+Renderer.prototype.getConstants = function() {
   return (
     /** @type {!Blockly.blockRendering.ConstantProvider} */
     (this.constants_));
@@ -223,7 +226,7 @@ Blockly.blockRendering.Renderer.prototype.getConstants = function() {
  * @return {boolean} True if we should highlight the connection.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.shouldHighlightConnection =
+Renderer.prototype.shouldHighlightConnection =
     function(_conn) {
     /* eslint-disable indent */
   return true;
@@ -242,7 +245,7 @@ Blockly.blockRendering.Renderer.prototype.shouldHighlightConnection =
  * @return {boolean} Whether there is a home for the orphan or not.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.orphanCanConnectAtEnd =
+Renderer.prototype.orphanCanConnectAtEnd =
     function(topBlock, orphanBlock, localType) {
       const orphanConnection = (
           localType === Blockly.connectionTypes.OUTPUT_VALUE ?
@@ -263,7 +266,7 @@ Blockly.blockRendering.Renderer.prototype.orphanCanConnectAtEnd =
  *     to display.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.getConnectionPreviewMethod = function(
+Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
   if (local.type == Blockly.connectionTypes.OUTPUT_VALUE ||
       local.type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
@@ -285,7 +288,7 @@ Blockly.blockRendering.Renderer.prototype.getConnectionPreviewMethod = function(
  * @param {!Blockly.BlockSvg} block The block to render.
  * @package
  */
-Blockly.blockRendering.Renderer.prototype.render = function(block) {
+Renderer.prototype.render = function(block) {
   if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
@@ -293,3 +296,5 @@ Blockly.blockRendering.Renderer.prototype.render = function(block) {
   info.measure();
   this.makeDrawer_(block, info).draw();
 };
+
+exports = Renderer;
diff --git a/tests/deps.js b/tests/deps.js
index 8c0415c0e..8db3435f9 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -137,7 +137,7 @@ goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blo
 goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/path_object.js', ['Blockly.blockRendering.PathObject'], ['Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Debug', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes']);
+goog.addDependency('../../core/renderers/common/renderer.js', ['Blockly.blockRendering.Renderer'], ['Blockly.Connection', 'Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.ConstantProvider', 'Blockly.blockRendering.Drawer', 'Blockly.blockRendering.MarkerSvg', 'Blockly.blockRendering.PathObject', 'Blockly.blockRendering.RenderInfo', 'Blockly.connectionTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/constants.js', ['Blockly.geras.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.geras.Highlighter', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});

From 15c512f6ea0e7deac9f8c8a41336762cd3717a22 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:04:15 -0700
Subject: [PATCH 265/291] Migrate core/renderers/common/renderer.js named
 requires

---
 core/renderers/common/renderer.js | 140 ++++++++++++++++--------------
 1 file changed, 74 insertions(+), 66 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index eb64e0e50..57ef23f11 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -13,26 +13,34 @@
 goog.module('Blockly.blockRendering.Renderer');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering');
-goog.require('Blockly.blockRendering.ConstantProvider');
-goog.require('Blockly.blockRendering.Drawer');
-goog.require('Blockly.blockRendering.MarkerSvg');
-goog.require('Blockly.blockRendering.PathObject');
-goog.require('Blockly.blockRendering.RenderInfo');
-goog.require('Blockly.Connection');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.InsertionMarkerManager');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.blockRendering.Debug');
-goog.requireType('Blockly.blockRendering.IPathObject');
-goog.requireType('Blockly.IRegistrable');
-goog.requireType('Blockly.Marker');
-goog.requireType('Blockly.RenderedConnection');
-goog.requireType('Blockly.Theme');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const Connection = goog.require('Blockly.Connection');
+const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Debug = goog.requireType('Blockly.blockRendering.Debug');
+const Drawer = goog.require('Blockly.blockRendering.Drawer');
+const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager');
+/* eslint-disable-next-line no-unused-vars */
+const IRegistrable = goog.requireType('Blockly.IRegistrable');
+/* eslint-disable-next-line no-unused-vars */
+const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject');
+/* eslint-disable-next-line no-unused-vars */
+const Marker = goog.requireType('Blockly.Marker');
+const MarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg');
+const PathObject = goog.require('Blockly.blockRendering.PathObject');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const Theme = goog.requireType('Blockly.Theme');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const blockRendering = goog.require('Blockly.blockRendering');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -40,7 +48,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {string} name The renderer name.
  * @package
  * @constructor
- * @implements {Blockly.IRegistrable}
+ * @implements {IRegistrable}
  */
 const Renderer = function(name) {
 
@@ -53,7 +61,7 @@ const Renderer = function(name) {
 
   /**
    * The renderer's constant provider.
-   * @type {Blockly.blockRendering.ConstantProvider}
+   * @type {ConstantProvider}
    * @private
    */
   this.constants_ = null;
@@ -77,7 +85,7 @@ Renderer.prototype.getClassName = function() {
 
 /**
  * Initialize the renderer.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
  * @package
  */
@@ -86,7 +94,7 @@ Renderer.prototype.init = function(theme,
   this.constants_ = this.makeConstants_();
   if (opt_rendererOverrides) {
     this.overrides = opt_rendererOverrides;
-    Blockly.utils.object.mixin(this.constants_, opt_rendererOverrides);
+    object.mixin(this.constants_, opt_rendererOverrides);
   }
   this.constants_.setTheme(theme);
   this.constants_.init();
@@ -95,7 +103,7 @@ Renderer.prototype.init = function(theme,
 /**
  * Create any DOM elements that this renderer needs.
  * @param {!SVGElement} svg The root of the workspace's SVG.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @package
  */
 Renderer.prototype.createDom = function(svg, theme) {
@@ -106,7 +114,7 @@ Renderer.prototype.createDom = function(svg, theme) {
 /**
  * Refresh the renderer after a theme change.
  * @param {!SVGElement} svg The root of the workspace's SVG.
- * @param {!Blockly.Theme} theme The workspace theme object.
+ * @param {!Theme} theme The workspace theme object.
  * @package
  */
 Renderer.prototype.refreshDom = function(svg, theme) {
@@ -114,7 +122,7 @@ Renderer.prototype.refreshDom = function(svg, theme) {
   previousConstants.dispose();
   this.constants_ = this.makeConstants_();
   if (this.overrides) {
-    Blockly.utils.object.mixin(this.constants_, this.overrides);
+    object.mixin(this.constants_, this.overrides);
   }
   // Ensure the constant provider's random identifier does not change.
   this.constants_.randomIdentifier = previousConstants.randomIdentifier;
@@ -136,38 +144,38 @@ Renderer.prototype.dispose = function() {
 
 /**
  * Create a new instance of the renderer's constant provider.
- * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
+ * @return {!ConstantProvider} The constant provider.
  * @protected
  */
 Renderer.prototype.makeConstants_ = function() {
-  return new Blockly.blockRendering.ConstantProvider();
+  return new ConstantProvider();
 };
 
 /**
  * Create a new instance of the renderer's render info object.
- * @param {!Blockly.BlockSvg} block The block to measure.
- * @return {!Blockly.blockRendering.RenderInfo} The render info object.
+ * @param {!BlockSvg} block The block to measure.
+ * @return {!RenderInfo} The render info object.
  * @protected
  */
 Renderer.prototype.makeRenderInfo_ = function(block) {
-  return new Blockly.blockRendering.RenderInfo(this, block);
+  return new RenderInfo(this, block);
 };
 
 /**
  * Create a new instance of the renderer's drawer.
- * @param {!Blockly.BlockSvg} block The block to render.
- * @param {!Blockly.blockRendering.RenderInfo} info An object containing all
+ * @param {!BlockSvg} block The block to render.
+ * @param {!RenderInfo} info An object containing all
  *   information needed to render this block.
- * @return {!Blockly.blockRendering.Drawer} The drawer.
+ * @return {!Drawer} The drawer.
  * @protected
  */
 Renderer.prototype.makeDrawer_ = function(block, info) {
-  return new Blockly.blockRendering.Drawer(block, info);
+  return new Drawer(block, info);
 };
 
 /**
  * Create a new instance of the renderer's debugger.
- * @return {!Blockly.blockRendering.Debug} The renderer debugger.
+ * @return {!Debug} The renderer debugger.
  * @suppress {strictModuleDepCheck} Debug renderer only included in playground.
  * @protected
  */
@@ -181,47 +189,47 @@ Renderer.prototype.makeDebugger_ = function() {
 
 /**
  * Create a new instance of the renderer's marker drawer.
- * @param {!Blockly.WorkspaceSvg} workspace The workspace the marker belongs to.
- * @param {!Blockly.Marker} marker The marker.
- * @return {!Blockly.blockRendering.MarkerSvg} The object in charge of drawing
+ * @param {!WorkspaceSvg} workspace The workspace the marker belongs to.
+ * @param {!Marker} marker The marker.
+ * @return {!MarkerSvg} The object in charge of drawing
  *     the marker.
  * @package
  */
 Renderer.prototype.makeMarkerDrawer = function(
     workspace, marker) {
-  return new Blockly.blockRendering.MarkerSvg(workspace, this.getConstants(), marker);
+  return new MarkerSvg(workspace, this.getConstants(), marker);
 };
 
 /**
  * Create a new instance of a renderer path object.
  * @param {!SVGElement} root The root SVG element.
- * @param {!Blockly.Theme.BlockStyle} style The style object to use for
+ * @param {!Theme.BlockStyle} style The style object to use for
  *     colouring.
- * @return {!Blockly.blockRendering.IPathObject} The renderer path object.
+ * @return {!IPathObject} The renderer path object.
  * @package
  */
 Renderer.prototype.makePathObject = function(root,
     style) {
-  return new Blockly.blockRendering.PathObject(root, style,
-      /** @type {!Blockly.blockRendering.ConstantProvider} */ (this.constants_));
+  return new PathObject(root, style,
+      /** @type {!ConstantProvider} */ (this.constants_));
 
 };
 
 /**
  * Get the current renderer's constant provider.  We assume that when this is
  * called, the renderer has already been initialized.
- * @return {!Blockly.blockRendering.ConstantProvider} The constant provider.
+ * @return {!ConstantProvider} The constant provider.
  * @package
  */
 Renderer.prototype.getConstants = function() {
   return (
-    /** @type {!Blockly.blockRendering.ConstantProvider} */
+    /** @type {!ConstantProvider} */
     (this.constants_));
 };
 
 /**
  * Determine whether or not to highlight a connection.
- * @param {Blockly.Connection} _conn The connection to determine whether or not
+ * @param {Connection} _conn The connection to determine whether or not
  *     to highlight.
  * @return {boolean} True if we should highlight the connection.
  * @package
@@ -237,9 +245,9 @@ Renderer.prototype.shouldHighlightConnection =
  * block-clump. If the clump is a row the end is the last input. If the clump
  * is a stack, the end is the last next connection. If the clump is neither,
  * then this returns false.
- * @param {!Blockly.BlockSvg} topBlock The top block of the block clump we want to try and
+ * @param {!BlockSvg} topBlock The top block of the block clump we want to try and
  *     connect to.
- * @param {!Blockly.BlockSvg} orphanBlock The orphan block that wants to find
+ * @param {!BlockSvg} orphanBlock The orphan block that wants to find
  *     a home.
  * @param {number} localType The type of the connection being dragged.
  * @return {boolean} Whether there is a home for the orphan or not.
@@ -248,48 +256,48 @@ Renderer.prototype.shouldHighlightConnection =
 Renderer.prototype.orphanCanConnectAtEnd =
     function(topBlock, orphanBlock, localType) {
       const orphanConnection = (
-          localType === Blockly.connectionTypes.OUTPUT_VALUE ?
+          localType === connectionTypes.OUTPUT_VALUE ?
               orphanBlock.outputConnection : orphanBlock.previousConnection);
-      return !!Blockly.Connection.getConnectionForOrphanedConnection(
-          /** @type {!Blockly.Block} **/ (topBlock),
-          /** @type {!Blockly.Connection} **/ (orphanConnection));
+      return !!Connection.getConnectionForOrphanedConnection(
+          /** @type {!Block} **/ (topBlock),
+          /** @type {!Connection} **/ (orphanConnection));
     };
 
 /**
  * Chooses a connection preview method based on the available connection, the
  * current dragged connection, and the block being dragged.
- * @param {!Blockly.RenderedConnection} closest The available connection.
- * @param {!Blockly.RenderedConnection} local The connection currently being
+ * @param {!RenderedConnection} closest The available connection.
+ * @param {!RenderedConnection} local The connection currently being
  *     dragged.
- * @param {!Blockly.BlockSvg} topBlock The block currently being dragged.
- * @return {!Blockly.InsertionMarkerManager.PREVIEW_TYPE} The preview type
+ * @param {!BlockSvg} topBlock The block currently being dragged.
+ * @return {!InsertionMarkerManager.PREVIEW_TYPE} The preview type
  *     to display.
  * @package
  */
 Renderer.prototype.getConnectionPreviewMethod = function(
     closest, local, topBlock) {
-  if (local.type == Blockly.connectionTypes.OUTPUT_VALUE ||
-      local.type == Blockly.connectionTypes.PREVIOUS_STATEMENT) {
+  if (local.type == connectionTypes.OUTPUT_VALUE ||
+      local.type == connectionTypes.PREVIOUS_STATEMENT) {
     if (!closest.isConnected() ||
         this.orphanCanConnectAtEnd(
             topBlock,
-            /** @type {!Blockly.BlockSvg} */ (closest.targetBlock()),
+            /** @type {!BlockSvg} */ (closest.targetBlock()),
             local.type)) {
-      return Blockly.InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
+      return InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
     }
-    return Blockly.InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
+    return InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
   }
 
-  return Blockly.InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
+  return InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
 };
 
 /**
  * Render the block.
- * @param {!Blockly.BlockSvg} block The block to render.
+ * @param {!BlockSvg} block The block to render.
  * @package
  */
 Renderer.prototype.render = function(block) {
-  if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
+  if (blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
     block.renderingDebugger = this.makeDebugger_();
   }
   const info = this.makeRenderInfo_(block);

From 62fff867d8f08436b4ac57c4001d19a3d2bcc07b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 9 Aug 2021 16:05:01 -0700
Subject: [PATCH 266/291] clang-format core/renderers/common/renderer.js

---
 core/renderers/common/renderer.js | 54 +++++++++++++------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 57ef23f11..0fdd2d00f 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -51,7 +51,6 @@ const object = goog.require('Blockly.utils.object');
  * @implements {IRegistrable}
  */
 const Renderer = function(name) {
-
   /**
    * The renderer name.
    * @type {string}
@@ -89,8 +88,7 @@ Renderer.prototype.getClassName = function() {
  * @param {Object=} opt_rendererOverrides Rendering constant overrides.
  * @package
  */
-Renderer.prototype.init = function(theme,
-    opt_rendererOverrides) {
+Renderer.prototype.init = function(theme, opt_rendererOverrides) {
   this.constants_ = this.makeConstants_();
   if (opt_rendererOverrides) {
     this.overrides = opt_rendererOverrides;
@@ -107,7 +105,8 @@ Renderer.prototype.init = function(theme,
  * @package
  */
 Renderer.prototype.createDom = function(svg, theme) {
-  this.constants_.createDom(svg, this.name + '-' + theme.name,
+  this.constants_.createDom(
+      svg, this.name + '-' + theme.name,
       '.' + this.getClassName() + '.' + theme.getClassName());
 };
 
@@ -195,8 +194,7 @@ Renderer.prototype.makeDebugger_ = function() {
  *     the marker.
  * @package
  */
-Renderer.prototype.makeMarkerDrawer = function(
-    workspace, marker) {
+Renderer.prototype.makeMarkerDrawer = function(workspace, marker) {
   return new MarkerSvg(workspace, this.getConstants(), marker);
 };
 
@@ -208,11 +206,9 @@ Renderer.prototype.makeMarkerDrawer = function(
  * @return {!IPathObject} The renderer path object.
  * @package
  */
-Renderer.prototype.makePathObject = function(root,
-    style) {
-  return new PathObject(root, style,
-      /** @type {!ConstantProvider} */ (this.constants_));
-
+Renderer.prototype.makePathObject = function(root, style) {
+  return new PathObject(
+      root, style, /** @type {!ConstantProvider} */ (this.constants_));
 };
 
 /**
@@ -222,9 +218,7 @@ Renderer.prototype.makePathObject = function(root,
  * @package
  */
 Renderer.prototype.getConstants = function() {
-  return (
-    /** @type {!ConstantProvider} */
-    (this.constants_));
+  return /** @type {!ConstantProvider} */ (this.constants_);
 };
 
 /**
@@ -234,34 +228,33 @@ Renderer.prototype.getConstants = function() {
  * @return {boolean} True if we should highlight the connection.
  * @package
  */
-Renderer.prototype.shouldHighlightConnection =
-    function(_conn) {
-    /* eslint-disable indent */
+Renderer.prototype.shouldHighlightConnection = function(_conn) {
   return true;
-}; /* eslint-enable indent */
+};
 
 /**
  * Checks if an orphaned block can connect to the "end" of the topBlock's
  * block-clump. If the clump is a row the end is the last input. If the clump
  * is a stack, the end is the last next connection. If the clump is neither,
  * then this returns false.
- * @param {!BlockSvg} topBlock The top block of the block clump we want to try and
- *     connect to.
+ * @param {!BlockSvg} topBlock The top block of the block clump we want to try
+ *     and connect to.
  * @param {!BlockSvg} orphanBlock The orphan block that wants to find
  *     a home.
  * @param {number} localType The type of the connection being dragged.
  * @return {boolean} Whether there is a home for the orphan or not.
  * @package
  */
-Renderer.prototype.orphanCanConnectAtEnd =
-    function(topBlock, orphanBlock, localType) {
-      const orphanConnection = (
-          localType === connectionTypes.OUTPUT_VALUE ?
-              orphanBlock.outputConnection : orphanBlock.previousConnection);
-      return !!Connection.getConnectionForOrphanedConnection(
-          /** @type {!Block} **/ (topBlock),
-          /** @type {!Connection} **/ (orphanConnection));
-    };
+Renderer.prototype.orphanCanConnectAtEnd = function(
+    topBlock, orphanBlock, localType) {
+  const orphanConnection =
+      (localType === connectionTypes.OUTPUT_VALUE ?
+           orphanBlock.outputConnection :
+           orphanBlock.previousConnection);
+  return !!Connection.getConnectionForOrphanedConnection(
+      /** @type {!Block} **/ (topBlock),
+      /** @type {!Connection} **/ (orphanConnection));
+};
 
 /**
  * Chooses a connection preview method based on the available connection, the
@@ -281,8 +274,7 @@ Renderer.prototype.getConnectionPreviewMethod = function(
     if (!closest.isConnected() ||
         this.orphanCanConnectAtEnd(
             topBlock,
-            /** @type {!BlockSvg} */ (closest.targetBlock()),
-            local.type)) {
+            /** @type {!BlockSvg} */ (closest.targetBlock()), local.type)) {
       return InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER;
     }
     return InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;

From 09573bcf160de31dc4fc0164b4d21013fe733fe9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:43:41 -0700
Subject: [PATCH 267/291] Split classes from
 core/renderers/measurables/inputs.js

---
 .../measurables/external_value_input.js       |  53 ++++++
 core/renderers/measurables/inline_input.js    |  63 +++++++
 .../renderers/measurables/input_connection.js |  55 ++++++
 core/renderers/measurables/inputs.js          | 162 ------------------
 core/renderers/measurables/statement_input.js |  50 ++++++
 tests/deps.js                                 |   5 +-
 6 files changed, 225 insertions(+), 163 deletions(-)
 create mode 100644 core/renderers/measurables/external_value_input.js
 create mode 100644 core/renderers/measurables/inline_input.js
 create mode 100644 core/renderers/measurables/input_connection.js
 delete mode 100644 core/renderers/measurables/inputs.js
 create mode 100644 core/renderers/measurables/statement_input.js

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
new file mode 100644
index 000000000..52fb78a0a
--- /dev/null
+++ b/core/renderers/measurables/external_value_input.js
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing external value inputs with connections on a
+ * rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.ExternalValueInput');
+
+goog.require('Blockly.blockRendering.InputConnection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space an external value input
+ * takes up during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The external value input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.InputConnection}
+ */
+Blockly.blockRendering.ExternalValueInput = function(constants, input) {
+  Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
+      constants, input);
+  this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
+  if (!this.connectedBlock) {
+    this.height = this.shape.height;
+  } else {
+    this.height =
+        this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
+        this.constants_.MEDIUM_PADDING;
+  }
+  this.width = this.shape.width +
+      this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
+
+  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
+  this.connectionHeight = this.shape.height;
+  this.connectionWidth = this.shape.width;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
+    Blockly.blockRendering.InputConnection);
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
new file mode 100644
index 000000000..59a4bf670
--- /dev/null
+++ b/core/renderers/measurables/inline_input.js
@@ -0,0 +1,63 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing inline inputs with connections on a rendered
+ * block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.InlineInput');
+
+goog.require('Blockly.blockRendering.InputConnection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space an inline input takes up
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The inline input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.InputConnection}
+ */
+Blockly.blockRendering.InlineInput = function(constants, input) {
+  Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
+      constants, input);
+  this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
+
+  if (!this.connectedBlock) {
+    this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
+    this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
+  } else {
+    // We allow the dark path to show on the parent block so that the child
+    // block looks embossed.  This takes up an extra pixel in both x and y.
+    this.width = this.connectedBlockWidth;
+    this.height = this.connectedBlockHeight;
+  }
+
+  this.connectionHeight = !this.isDynamicShape ? this.shape.height :
+      this.shape.height(this.height);
+  this.connectionWidth = !this.isDynamicShape ? this.shape.width :
+      this.shape.width(this.height);
+  if (!this.connectedBlock) {
+    this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
+  }
+  this.connectionOffsetY = this.isDynamicShape ?
+      this.shape.connectionOffsetY(this.connectionHeight) :
+      this.constants_.TAB_OFFSET_FROM_TOP;
+  this.connectionOffsetX = this.isDynamicShape ?
+      this.shape.connectionOffsetX(this.connectionWidth) : 0;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
+    Blockly.blockRendering.InputConnection);
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
new file mode 100644
index 000000000..9a9edc887
--- /dev/null
+++ b/core/renderers/measurables/input_connection.js
@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing inputs with connections on a rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.InputConnection');
+
+goog.require('Blockly.blockRendering.Connection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * The base class to represent an input that takes up space on a block
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The input to measure and store information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.Connection}
+ */
+Blockly.blockRendering.InputConnection = function(constants, input) {
+  Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
+      constants, input.connection);
+
+  this.type |= Blockly.blockRendering.Types.INPUT;
+  this.input = input;
+  this.align = input.align;
+  this.connectedBlock = input.connection && input.connection.targetBlock() ?
+      input.connection.targetBlock() : null;
+
+  if (this.connectedBlock) {
+    var bBox = this.connectedBlock.getHeightWidth();
+    this.connectedBlockWidth = bBox.width;
+    this.connectedBlockHeight = bBox.height;
+  } else {
+    this.connectedBlockWidth = 0;
+    this.connectedBlockHeight = 0;
+  }
+
+  this.connectionOffsetX = 0;
+  this.connectionOffsetY = 0;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
+    Blockly.blockRendering.Connection);
diff --git a/core/renderers/measurables/inputs.js b/core/renderers/measurables/inputs.js
deleted file mode 100644
index 5f845d65b..000000000
--- a/core/renderers/measurables/inputs.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Objects representing inputs with connections on a rendered
- * block.
- * @author fenichel@google.com (Rachel Fenichel)
- */
-
-goog.provide('Blockly.blockRendering.ExternalValueInput');
-goog.provide('Blockly.blockRendering.InlineInput');
-goog.provide('Blockly.blockRendering.InputConnection');
-goog.provide('Blockly.blockRendering.StatementInput');
-
-goog.require('Blockly.blockRendering.Connection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
-
-
-/**
- * The base class to represent an input that takes up space on a block
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The input to measure and store information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.Connection}
- */
-Blockly.blockRendering.InputConnection = function(constants, input) {
-  Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
-      constants, input.connection);
-
-  this.type |= Blockly.blockRendering.Types.INPUT;
-  this.input = input;
-  this.align = input.align;
-  this.connectedBlock = input.connection && input.connection.targetBlock() ?
-      input.connection.targetBlock() : null;
-
-  if (this.connectedBlock) {
-    var bBox = this.connectedBlock.getHeightWidth();
-    this.connectedBlockWidth = bBox.width;
-    this.connectedBlockHeight = bBox.height;
-  } else {
-    this.connectedBlockWidth = 0;
-    this.connectedBlockHeight = 0;
-  }
-
-  this.connectionOffsetX = 0;
-  this.connectionOffsetY = 0;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
-    Blockly.blockRendering.Connection);
-
-/**
- * An object containing information about the space an inline input takes up
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The inline input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
- */
-Blockly.blockRendering.InlineInput = function(constants, input) {
-  Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
-      constants, input);
-  this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
-
-  if (!this.connectedBlock) {
-    this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
-    this.width = this.constants_.EMPTY_INLINE_INPUT_PADDING;
-  } else {
-    // We allow the dark path to show on the parent block so that the child
-    // block looks embossed.  This takes up an extra pixel in both x and y.
-    this.width = this.connectedBlockWidth;
-    this.height = this.connectedBlockHeight;
-  }
-
-  this.connectionHeight = !this.isDynamicShape ? this.shape.height :
-      this.shape.height(this.height);
-  this.connectionWidth = !this.isDynamicShape ? this.shape.width :
-      this.shape.width(this.height);
-  if (!this.connectedBlock) {
-    this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
-  }
-  this.connectionOffsetY = this.isDynamicShape ?
-      this.shape.connectionOffsetY(this.connectionHeight) :
-      this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionOffsetX = this.isDynamicShape ?
-      this.shape.connectionOffsetX(this.connectionWidth) : 0;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
-    Blockly.blockRendering.InputConnection);
-
-/**
- * An object containing information about the space a statement input takes up
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
- */
-Blockly.blockRendering.StatementInput = function(constants, input) {
-  Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
-      constants, input);
-  this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
-
-  if (!this.connectedBlock) {
-    this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
-  } else {
-    // We allow the dark path to show on the parent block so that the child
-    // block looks embossed.  This takes up an extra pixel in both x and y.
-    this.height =
-        this.connectedBlockHeight + this.constants_.STATEMENT_BOTTOM_SPACER;
-  }
-  this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
-    Blockly.blockRendering.InputConnection);
-
-/**
- * An object containing information about the space an external value input
- * takes up during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The external value input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
- */
-Blockly.blockRendering.ExternalValueInput = function(constants, input) {
-  Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
-      constants, input);
-  this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
-  if (!this.connectedBlock) {
-    this.height = this.shape.height;
-  } else {
-    this.height =
-        this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
-        this.constants_.MEDIUM_PADDING;
-  }
-  this.width = this.shape.width +
-      this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
-
-  this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
-  this.connectionHeight = this.shape.height;
-  this.connectionWidth = this.shape.width;
-};
-Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
-    Blockly.blockRendering.InputConnection);
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
new file mode 100644
index 000000000..6bd1c23fa
--- /dev/null
+++ b/core/renderers/measurables/statement_input.js
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Class representing statement inputs with connections on a
+ * rendered block.
+ * @author fenichel@google.com (Rachel Fenichel)
+ */
+
+goog.provide('Blockly.blockRendering.StatementInput');
+
+goog.require('Blockly.blockRendering.InputConnection');
+goog.require('Blockly.blockRendering.Types');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space a statement input takes up
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The statement input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.InputConnection}
+ */
+Blockly.blockRendering.StatementInput = function(constants, input) {
+  Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
+      constants, input);
+  this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
+
+  if (!this.connectedBlock) {
+    this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
+  } else {
+    // We allow the dark path to show on the parent block so that the child
+    // block looks embossed.  This takes up an extra pixel in both x and y.
+    this.height =
+        this.connectedBlockHeight + this.constants_.STATEMENT_BOTTOM_SPACER;
+  }
+  this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
+};
+Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
+    Blockly.blockRendering.InputConnection);
diff --git a/tests/deps.js b/tests/deps.js
index 8db3435f9..590b1a3d5 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -148,9 +148,12 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/inputs.js', ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 3081c40a029aff68291c2e2b559163ae9fa8d8e5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:45:38 -0700
Subject: [PATCH 268/291] Migrate
 core/renderers/measurables/input_connection.js to ES6 const/let

---
 core/renderers/measurables/input_connection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 9a9edc887..420c508ca 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -40,7 +40,7 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
       input.connection.targetBlock() : null;
 
   if (this.connectedBlock) {
-    var bBox = this.connectedBlock.getHeightWidth();
+    const bBox = this.connectedBlock.getHeightWidth();
     this.connectedBlockWidth = bBox.width;
     this.connectedBlockHeight = bBox.height;
   } else {

From 59dee77fa8faa29cb975027f00182ae52bf426a0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:47:42 -0700
Subject: [PATCH 269/291] Migrate core/renderers/measurables/inputs.js to
 goog.module

---
 core/renderers/measurables/external_value_input.js | 11 +++++++----
 core/renderers/measurables/inline_input.js         | 11 +++++++----
 core/renderers/measurables/input_connection.js     | 11 +++++++----
 core/renderers/measurables/statement_input.js      | 11 +++++++----
 tests/deps.js                                      |  8 ++++----
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index 52fb78a0a..9832d0659 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.ExternalValueInput');
+goog.module('Blockly.blockRendering.ExternalValueInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.ExternalValueInput = function(constants, input) {
-  Blockly.blockRendering.ExternalValueInput.superClass_.constructor.call(this,
+const ExternalValueInput = function(constants, input) {
+  ExternalValueInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
   if (!this.connectedBlock) {
@@ -49,5 +50,7 @@ Blockly.blockRendering.ExternalValueInput = function(constants, input) {
   this.connectionHeight = this.shape.height;
   this.connectionWidth = this.shape.width;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.ExternalValueInput,
+Blockly.utils.object.inherits(ExternalValueInput,
     Blockly.blockRendering.InputConnection);
+
+exports = ExternalValueInput;
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 59a4bf670..3b3974d79 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.InlineInput');
+goog.module('Blockly.blockRendering.InlineInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.InlineInput = function(constants, input) {
-  Blockly.blockRendering.InlineInput.superClass_.constructor.call(this,
+const InlineInput = function(constants, input) {
+  InlineInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
 
@@ -59,5 +60,7 @@ Blockly.blockRendering.InlineInput = function(constants, input) {
   this.connectionOffsetX = this.isDynamicShape ?
       this.shape.connectionOffsetX(this.connectionWidth) : 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.InlineInput,
+Blockly.utils.object.inherits(InlineInput,
     Blockly.blockRendering.InputConnection);
+
+exports = InlineInput;
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 420c508ca..67ed3c361 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -9,7 +9,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.InputConnection');
+goog.module('Blockly.blockRendering.InputConnection');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.Connection');
 goog.require('Blockly.blockRendering.Types');
@@ -29,8 +30,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.Connection}
  */
-Blockly.blockRendering.InputConnection = function(constants, input) {
-  Blockly.blockRendering.InputConnection.superClass_.constructor.call(this,
+const InputConnection = function(constants, input) {
+  InputConnection.superClass_.constructor.call(this,
       constants, input.connection);
 
   this.type |= Blockly.blockRendering.Types.INPUT;
@@ -51,5 +52,7 @@ Blockly.blockRendering.InputConnection = function(constants, input) {
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.InputConnection,
+Blockly.utils.object.inherits(InputConnection,
     Blockly.blockRendering.Connection);
+
+exports = InputConnection;
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index 6bd1c23fa..9c3252216 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -10,7 +10,8 @@
  * @author fenichel@google.com (Rachel Fenichel)
  */
 
-goog.provide('Blockly.blockRendering.StatementInput');
+goog.module('Blockly.blockRendering.StatementInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InputConnection');
 goog.require('Blockly.blockRendering.Types');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InputConnection}
  */
-Blockly.blockRendering.StatementInput = function(constants, input) {
-  Blockly.blockRendering.StatementInput.superClass_.constructor.call(this,
+const StatementInput = function(constants, input) {
+  StatementInput.superClass_.constructor.call(this,
       constants, input);
   this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
 
@@ -46,5 +47,7 @@ Blockly.blockRendering.StatementInput = function(constants, input) {
   }
   this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
 };
-Blockly.utils.object.inherits(Blockly.blockRendering.StatementInput,
+Blockly.utils.object.inherits(StatementInput,
     Blockly.blockRendering.InputConnection);
+
+exports = StatementInput;
diff --git a/tests/deps.js b/tests/deps.js
index 590b1a3d5..f5ad9dd09 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -148,12 +148,12 @@ goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/connections.js', ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/external_value_input.js', ['Blockly.blockRendering.ExternalValueInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/inline_input.js', ['Blockly.blockRendering.InlineInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/measurables/input_connection.js', ['Blockly.blockRendering.InputConnection'], ['Blockly.blockRendering.Connection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.Icon', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.SquareCorner'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Blockly.blockRendering.StatementInput'], ['Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 35cf6482e3799e86c822645fe8191c0d32e55e51 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:50:15 -0700
Subject: [PATCH 270/291] Migrate core/renderers/measurables/inputs.js named
 requires

---
 .../measurables/external_value_input.js       | 25 ++++++++++---------
 core/renderers/measurables/inline_input.js    | 25 ++++++++++---------
 .../renderers/measurables/input_connection.js | 25 ++++++++++---------
 core/renderers/measurables/statement_input.js | 25 ++++++++++---------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index 9832d0659..b0f7c9841 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -13,29 +13,30 @@
 goog.module('Blockly.blockRendering.ExternalValueInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InputConnection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const InputConnection = goog.require('Blockly.blockRendering.InputConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space an external value input
  * takes up during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The external value input to measure and store
+ * @param {!Input} input The external value input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
+ * @extends {InputConnection}
  */
 const ExternalValueInput = function(constants, input) {
   ExternalValueInput.superClass_.constructor.call(this,
       constants, input);
-  this.type |= Blockly.blockRendering.Types.EXTERNAL_VALUE_INPUT;
+  this.type |= Types.EXTERNAL_VALUE_INPUT;
   if (!this.connectedBlock) {
     this.height = this.shape.height;
   } else {
@@ -50,7 +51,7 @@ const ExternalValueInput = function(constants, input) {
   this.connectionHeight = this.shape.height;
   this.connectionWidth = this.shape.width;
 };
-Blockly.utils.object.inherits(ExternalValueInput,
-    Blockly.blockRendering.InputConnection);
+object.inherits(ExternalValueInput,
+    InputConnection);
 
 exports = ExternalValueInput;
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 3b3974d79..7b623e701 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -13,29 +13,30 @@
 goog.module('Blockly.blockRendering.InlineInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InputConnection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const InputConnection = goog.require('Blockly.blockRendering.InputConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space an inline input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The inline input to measure and store
+ * @param {!Input} input The inline input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
+ * @extends {InputConnection}
  */
 const InlineInput = function(constants, input) {
   InlineInput.superClass_.constructor.call(this,
       constants, input);
-  this.type |= Blockly.blockRendering.Types.INLINE_INPUT;
+  this.type |= Types.INLINE_INPUT;
 
   if (!this.connectedBlock) {
     this.height = this.constants_.EMPTY_INLINE_INPUT_HEIGHT;
@@ -60,7 +61,7 @@ const InlineInput = function(constants, input) {
   this.connectionOffsetX = this.isDynamicShape ?
       this.shape.connectionOffsetX(this.connectionWidth) : 0;
 };
-Blockly.utils.object.inherits(InlineInput,
-    Blockly.blockRendering.InputConnection);
+object.inherits(InlineInput,
+    InputConnection);
 
 exports = InlineInput;
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 67ed3c361..80efc5d15 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -12,29 +12,30 @@
 goog.module('Blockly.blockRendering.InputConnection');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.Connection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+const Connection = goog.require('Blockly.blockRendering.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * The base class to represent an input that takes up space on a block
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The input to measure and store information for.
+ * @param {!Input} input The input to measure and store information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.Connection}
+ * @extends {Connection}
  */
 const InputConnection = function(constants, input) {
   InputConnection.superClass_.constructor.call(this,
       constants, input.connection);
 
-  this.type |= Blockly.blockRendering.Types.INPUT;
+  this.type |= Types.INPUT;
   this.input = input;
   this.align = input.align;
   this.connectedBlock = input.connection && input.connection.targetBlock() ?
@@ -52,7 +53,7 @@ const InputConnection = function(constants, input) {
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
 };
-Blockly.utils.object.inherits(InputConnection,
-    Blockly.blockRendering.Connection);
+object.inherits(InputConnection,
+    Connection);
 
 exports = InputConnection;
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index 9c3252216..d094bc342 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -13,29 +13,30 @@
 goog.module('Blockly.blockRendering.StatementInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InputConnection');
-goog.require('Blockly.blockRendering.Types');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const InputConnection = goog.require('Blockly.blockRendering.InputConnection');
+const Types = goog.require('Blockly.blockRendering.Types');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a statement input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
+ * @param {!Input} input The statement input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InputConnection}
+ * @extends {InputConnection}
  */
 const StatementInput = function(constants, input) {
   StatementInput.superClass_.constructor.call(this,
       constants, input);
-  this.type |= Blockly.blockRendering.Types.STATEMENT_INPUT;
+  this.type |= Types.STATEMENT_INPUT;
 
   if (!this.connectedBlock) {
     this.height = this.constants_.EMPTY_STATEMENT_INPUT_HEIGHT;
@@ -47,7 +48,7 @@ const StatementInput = function(constants, input) {
   }
   this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
 };
-Blockly.utils.object.inherits(StatementInput,
-    Blockly.blockRendering.InputConnection);
+object.inherits(StatementInput,
+    InputConnection);
 
 exports = StatementInput;

From 88a7779cb28e8ef85541baa792a0f337c73b148d Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 15:58:46 -0700
Subject: [PATCH 271/291] clang-format core/renderers/measurables/inputs.js

---
 .../measurables/external_value_input.js         | 14 +++++---------
 core/renderers/measurables/inline_input.js      | 17 ++++++++---------
 core/renderers/measurables/input_connection.js  | 10 +++++-----
 core/renderers/measurables/statement_input.js   |  6 ++----
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index b0f7c9841..8835716c4 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -34,24 +34,20 @@ const object = goog.require('Blockly.utils.object');
  * @extends {InputConnection}
  */
 const ExternalValueInput = function(constants, input) {
-  ExternalValueInput.superClass_.constructor.call(this,
-      constants, input);
+  ExternalValueInput.superClass_.constructor.call(this, constants, input);
   this.type |= Types.EXTERNAL_VALUE_INPUT;
   if (!this.connectedBlock) {
     this.height = this.shape.height;
   } else {
-    this.height =
-        this.connectedBlockHeight - this.constants_.TAB_OFFSET_FROM_TOP -
-        this.constants_.MEDIUM_PADDING;
+    this.height = this.connectedBlockHeight -
+        this.constants_.TAB_OFFSET_FROM_TOP - this.constants_.MEDIUM_PADDING;
   }
-  this.width = this.shape.width +
-      this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
+  this.width = this.shape.width + this.constants_.EXTERNAL_VALUE_INPUT_PADDING;
 
   this.connectionOffsetY = this.constants_.TAB_OFFSET_FROM_TOP;
   this.connectionHeight = this.shape.height;
   this.connectionWidth = this.shape.width;
 };
-object.inherits(ExternalValueInput,
-    InputConnection);
+object.inherits(ExternalValueInput, InputConnection);
 
 exports = ExternalValueInput;
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 7b623e701..01ac0527d 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {InputConnection}
  */
 const InlineInput = function(constants, input) {
-  InlineInput.superClass_.constructor.call(this,
-      constants, input);
+  InlineInput.superClass_.constructor.call(this, constants, input);
   this.type |= Types.INLINE_INPUT;
 
   if (!this.connectedBlock) {
@@ -48,10 +47,10 @@ const InlineInput = function(constants, input) {
     this.height = this.connectedBlockHeight;
   }
 
-  this.connectionHeight = !this.isDynamicShape ? this.shape.height :
-      this.shape.height(this.height);
-  this.connectionWidth = !this.isDynamicShape ? this.shape.width :
-      this.shape.width(this.height);
+  this.connectionHeight =
+      !this.isDynamicShape ? this.shape.height : this.shape.height(this.height);
+  this.connectionWidth =
+      !this.isDynamicShape ? this.shape.width : this.shape.width(this.height);
   if (!this.connectedBlock) {
     this.width += this.connectionWidth * (this.isDynamicShape ? 2 : 1);
   }
@@ -59,9 +58,9 @@ const InlineInput = function(constants, input) {
       this.shape.connectionOffsetY(this.connectionHeight) :
       this.constants_.TAB_OFFSET_FROM_TOP;
   this.connectionOffsetX = this.isDynamicShape ?
-      this.shape.connectionOffsetX(this.connectionWidth) : 0;
+      this.shape.connectionOffsetX(this.connectionWidth) :
+      0;
 };
-object.inherits(InlineInput,
-    InputConnection);
+object.inherits(InlineInput, InputConnection);
 
 exports = InlineInput;
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 80efc5d15..e6353c643 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -32,14 +32,15 @@ const object = goog.require('Blockly.utils.object');
  * @extends {Connection}
  */
 const InputConnection = function(constants, input) {
-  InputConnection.superClass_.constructor.call(this,
-      constants, input.connection);
+  InputConnection.superClass_.constructor.call(
+      this, constants, input.connection);
 
   this.type |= Types.INPUT;
   this.input = input;
   this.align = input.align;
   this.connectedBlock = input.connection && input.connection.targetBlock() ?
-      input.connection.targetBlock() : null;
+      input.connection.targetBlock() :
+      null;
 
   if (this.connectedBlock) {
     const bBox = this.connectedBlock.getHeightWidth();
@@ -53,7 +54,6 @@ const InputConnection = function(constants, input) {
   this.connectionOffsetX = 0;
   this.connectionOffsetY = 0;
 };
-object.inherits(InputConnection,
-    Connection);
+object.inherits(InputConnection, Connection);
 
 exports = InputConnection;
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index d094bc342..6050496d7 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {InputConnection}
  */
 const StatementInput = function(constants, input) {
-  StatementInput.superClass_.constructor.call(this,
-      constants, input);
+  StatementInput.superClass_.constructor.call(this, constants, input);
   this.type |= Types.STATEMENT_INPUT;
 
   if (!this.connectedBlock) {
@@ -48,7 +47,6 @@ const StatementInput = function(constants, input) {
   }
   this.width = this.constants_.STATEMENT_INPUT_NOTCH_OFFSET + this.shape.width;
 };
-object.inherits(StatementInput,
-    InputConnection);
+object.inherits(StatementInput, InputConnection);
 
 exports = StatementInput;

From 87568c58696df25b8d3933b67badf2cf22f479ea Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:44:42 -0700
Subject: [PATCH 272/291] Split classes from
 core/renderers/geras/measurables/input.js into multiple files

---
 .../{inputs.js => inline_input.js}            | 30 +------------
 .../geras/measurables/statement_input.js      | 45 +++++++++++++++++++
 tests/deps.js                                 |  3 +-
 3 files changed, 49 insertions(+), 29 deletions(-)
 rename core/renderers/geras/measurables/{inputs.js => inline_input.js} (54%)
 create mode 100644 core/renderers/geras/measurables/statement_input.js

diff --git a/core/renderers/geras/measurables/inputs.js b/core/renderers/geras/measurables/inline_input.js
similarity index 54%
rename from core/renderers/geras/measurables/inputs.js
rename to core/renderers/geras/measurables/inline_input.js
index 6aca47b77..3a3cd861c 100644
--- a/core/renderers/geras/measurables/inputs.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -5,17 +5,15 @@
  */
 
 /**
- * @fileoverview Objects representing inputs with connections on a rendered
- * block.
+ * @fileoverview Objects representing inline inputs with connections on a
+ * rendered block.
  * @author kozbial@google.com (Monica Kozbial)
  */
 'use strict';
 
 goog.provide('Blockly.geras.InlineInput');
-goog.provide('Blockly.geras.StatementInput');
 
 goog.require('Blockly.blockRendering.InlineInput');
-goog.require('Blockly.blockRendering.StatementInput');
 goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.blockRendering.ConstantProvider');
@@ -46,27 +44,3 @@ Blockly.geras.InlineInput = function(constants, input) {
 };
 Blockly.utils.object.inherits(Blockly.geras.InlineInput,
     Blockly.blockRendering.InlineInput);
-
-/**
- * An object containing information about the space a statement input takes up
- * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
- *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
- *     information for.
- * @package
- * @constructor
- * @extends {Blockly.blockRendering.StatementInput}
- */
-Blockly.geras.StatementInput = function(constants, input) {
-  Blockly.geras.StatementInput.superClass_.constructor.call(
-      this, constants, input);
-
-  if (this.connectedBlock) {
-    // We allow the dark path to show on the parent block so that the child
-    // block looks embossed.  This takes up an extra pixel in both x and y.
-    this.height += this.constants_.DARK_PATH_OFFSET;
-  }
-};
-Blockly.utils.object.inherits(Blockly.geras.StatementInput,
-    Blockly.blockRendering.StatementInput);
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
new file mode 100644
index 000000000..e309b3207
--- /dev/null
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Objects representing statement inputs with connections on a
+ * rendered block.
+ * @author kozbial@google.com (Monica Kozbial)
+ */
+'use strict';
+
+goog.provide('Blockly.geras.StatementInput');
+
+goog.require('Blockly.blockRendering.StatementInput');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.blockRendering.ConstantProvider');
+goog.requireType('Blockly.Input');
+
+
+/**
+ * An object containing information about the space a statement input takes up
+ * during rendering
+ * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ *   constants provider.
+ * @param {!Blockly.Input} input The statement input to measure and store
+ *     information for.
+ * @package
+ * @constructor
+ * @extends {Blockly.blockRendering.StatementInput}
+ */
+Blockly.geras.StatementInput = function(constants, input) {
+  Blockly.geras.StatementInput.superClass_.constructor.call(
+      this, constants, input);
+
+  if (this.connectedBlock) {
+    // We allow the dark path to show on the parent block so that the child
+    // block looks embossed.  This takes up an extra pixel in both x and y.
+    this.height += this.constants_.DARK_PATH_OFFSET;
+  }
+};
+Blockly.utils.object.inherits(Blockly.geras.StatementInput,
+    Blockly.blockRendering.StatementInput);
diff --git a/tests/deps.js b/tests/deps.js
index f5ad9dd09..7d7c19c1d 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -143,7 +143,8 @@ goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawe
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/inputs.js', ['Blockly.geras.InlineInput', 'Blockly.geras.StatementInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});

From 26d4431ae54598ab66d1b68b17dae139f9042f0b Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:45:47 -0700
Subject: [PATCH 273/291] Migrate core/renderers/geras/measurables/input.js to
 goog.module

---
 core/renderers/geras/measurables/inline_input.js    | 11 +++++++----
 core/renderers/geras/measurables/statement_input.js | 11 +++++++----
 tests/deps.js                                       |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index 3a3cd861c..f8f4c6b9c 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.InlineInput');
+goog.module('Blockly.geras.InlineInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.InlineInput');
 goog.require('Blockly.utils.object');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.InlineInput}
  */
-Blockly.geras.InlineInput = function(constants, input) {
-  Blockly.geras.InlineInput.superClass_.constructor.call(
+const InlineInput = function(constants, input) {
+  InlineInput.superClass_.constructor.call(
       this, constants, input);
 
   if (this.connectedBlock) {
@@ -42,5 +43,7 @@ Blockly.geras.InlineInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(Blockly.geras.InlineInput,
+Blockly.utils.object.inherits(InlineInput,
     Blockly.blockRendering.InlineInput);
+
+exports = InlineInput;
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index e309b3207..289c0004a 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.geras.StatementInput');
+goog.module('Blockly.geras.StatementInput');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.blockRendering.StatementInput');
 goog.require('Blockly.utils.object');
@@ -31,8 +32,8 @@ goog.requireType('Blockly.Input');
  * @constructor
  * @extends {Blockly.blockRendering.StatementInput}
  */
-Blockly.geras.StatementInput = function(constants, input) {
-  Blockly.geras.StatementInput.superClass_.constructor.call(
+const StatementInput = function(constants, input) {
+  StatementInput.superClass_.constructor.call(
       this, constants, input);
 
   if (this.connectedBlock) {
@@ -41,5 +42,7 @@ Blockly.geras.StatementInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(Blockly.geras.StatementInput,
+Blockly.utils.object.inherits(StatementInput,
     Blockly.blockRendering.StatementInput);
+
+exports = StatementInput;
diff --git a/tests/deps.js b/tests/deps.js
index 7d7c19c1d..2c964f3c8 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -143,8 +143,8 @@ goog.addDependency('../../core/renderers/geras/drawer.js', ['Blockly.geras.Drawe
 goog.addDependency('../../core/renderers/geras/highlight_constants.js', ['Blockly.geras.HighlightConstantProvider'], ['Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/highlighter.js', ['Blockly.geras.Highlighter'], ['Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/info.js', ['Blockly.geras.RenderInfo'], ['Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.geras.InlineInput', 'Blockly.geras.StatementInput', 'Blockly.inputTypes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object']);
-goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);
+goog.addDependency('../../core/renderers/geras/measurables/inline_input.js', ['Blockly.geras.InlineInput'], ['Blockly.blockRendering.InlineInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/renderers/geras/measurables/statement_input.js', ['Blockly.geras.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/path_object.js', ['Blockly.geras.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/geras/renderer.js', ['Blockly.geras.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.geras.ConstantProvider', 'Blockly.geras.Drawer', 'Blockly.geras.HighlightConstantProvider', 'Blockly.geras.PathObject', 'Blockly.geras.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/measurables/base.js', ['Blockly.blockRendering.Measurable'], ['Blockly.blockRendering.Types'], {'lang': 'es6', 'module': 'goog'});

From 8f83073cdb9f859109257a933792d6e527f05e68 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:48:28 -0700
Subject: [PATCH 274/291] Migrate core/renderers/geras/measurables/input.js
 named requires

---
 .../geras/measurables/inline_input.js         | 20 +++++++++----------
 .../geras/measurables/statement_input.js      | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index f8f4c6b9c..95c97afd0 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -14,23 +14,24 @@
 goog.module('Blockly.geras.InlineInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.InlineInput');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+const BaseInlineInput = goog.require('Blockly.blockRendering.InlineInput');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space an inline input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The inline input to measure and store
+ * @param {!Input} input The inline input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.InlineInput}
+ * @extends {BaseInlineInput}
  */
 const InlineInput = function(constants, input) {
   InlineInput.superClass_.constructor.call(
@@ -43,7 +44,6 @@ const InlineInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(InlineInput,
-    Blockly.blockRendering.InlineInput);
+object.inherits(InlineInput, BaseInlineInput);
 
 exports = InlineInput;
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index 289c0004a..1ebbcaab0 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -14,23 +14,24 @@
 goog.module('Blockly.geras.StatementInput');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.blockRendering.StatementInput');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.blockRendering.ConstantProvider');
-goog.requireType('Blockly.Input');
+const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput');
+/* eslint-disable-next-line no-unused-vars */
+const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');
+/* eslint-disable-next-line no-unused-vars */
+const Input = goog.requireType('Blockly.Input');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
  * An object containing information about the space a statement input takes up
  * during rendering
- * @param {!Blockly.blockRendering.ConstantProvider} constants The rendering
+ * @param {!ConstantProvider} constants The rendering
  *   constants provider.
- * @param {!Blockly.Input} input The statement input to measure and store
+ * @param {!Input} input The statement input to measure and store
  *     information for.
  * @package
  * @constructor
- * @extends {Blockly.blockRendering.StatementInput}
+ * @extends {BaseStatementInput}
  */
 const StatementInput = function(constants, input) {
   StatementInput.superClass_.constructor.call(
@@ -42,7 +43,6 @@ const StatementInput = function(constants, input) {
     this.height += this.constants_.DARK_PATH_OFFSET;
   }
 };
-Blockly.utils.object.inherits(StatementInput,
-    Blockly.blockRendering.StatementInput);
+object.inherits(StatementInput, BaseStatementInput);
 
 exports = StatementInput;

From bdf16d88e09758ca8ec4952f447ef3b59d54ad72 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 10 Aug 2021 14:52:40 -0700
Subject: [PATCH 275/291] clang-format
 core/renderers/geras/measurables/input.js

---
 core/renderers/geras/measurables/inline_input.js    | 3 +--
 core/renderers/geras/measurables/statement_input.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index 95c97afd0..b0e3dd776 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {BaseInlineInput}
  */
 const InlineInput = function(constants, input) {
-  InlineInput.superClass_.constructor.call(
-      this, constants, input);
+  InlineInput.superClass_.constructor.call(this, constants, input);
 
   if (this.connectedBlock) {
     // We allow the dark path to show on the parent block so that the child
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index 1ebbcaab0..1c49f2b42 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -34,8 +34,7 @@ const object = goog.require('Blockly.utils.object');
  * @extends {BaseStatementInput}
  */
 const StatementInput = function(constants, input) {
-  StatementInput.superClass_.constructor.call(
-      this, constants, input);
+  StatementInput.superClass_.constructor.call(this, constants, input);
 
   if (this.connectedBlock) {
     // We allow the dark path to show on the parent block so that the child

From cf96aac58e252299ec83dc771118aef99d2455a1 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Wed, 11 Aug 2021 14:04:02 -0700
Subject: [PATCH 276/291] Migrate core/procedures.js to goog.module syntax
 (#5265)

* Migrate core/procedures.js to ES6 const/let

* Migrate core/procedures.js to goog.module

* Migrate core/procedures.js to named requires

* clang-format core/procedures.js

* Rename xml to utilsXml to disambiguate from Xml
---
 core/procedures.js | 315 ++++++++++++++++++++++-----------------------
 tests/deps.js      |   2 +-
 2 files changed, 158 insertions(+), 159 deletions(-)

diff --git a/core/procedures.js b/core/procedures.js
index 3323bb130..e63618e7c 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -14,38 +14,35 @@
  * @name Blockly.Procedures
  * @namespace
  */
-goog.provide('Blockly.Procedures');
+goog.module('Blockly.Procedures');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Blocks');
-goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Abstract = goog.requireType('Blockly.Events.Abstract');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Blocks = goog.require('Blockly.Blocks');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.Field');
+const Msg = goog.require('Blockly.Msg');
+const Names = goog.require('Blockly.Names');
+const Variables = goog.require('Blockly.Variables');
+const Workspace = goog.require('Blockly.Workspace');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const Xml = goog.require('Blockly.Xml');
+const utilsXml = goog.require('Blockly.utils.xml');
 /** @suppress {extraRequire} */
 goog.require('Blockly.Events.BlockChange');
-goog.require('Blockly.Field');
-goog.require('Blockly.internalConstants');
-goog.require('Blockly.Msg');
-goog.require('Blockly.Names');
-goog.require('Blockly.utils.xml');
-goog.require('Blockly.Workspace');
-goog.require('Blockly.Xml');
 
-goog.requireType('Blockly.Block');
-goog.requireType('Blockly.Events.Abstract');
-goog.requireType('Blockly.WorkspaceSvg');
-
-
-/**
- * Constant to separate procedure names from variables and generated functions
- * when running generators.
- * @deprecated Use Blockly.internalConstants.PROCEDURE_CATEGORY_NAME
- */
-Blockly.Procedures.NAME_TYPE =
-    Blockly.internalConstants.PROCEDURE_CATEGORY_NAME;
 
 /**
  * The default argument for a procedures_mutatorarg block.
  * @type {string}
  */
-Blockly.Procedures.DEFAULT_ARG = 'x';
+const DEFAULT_ARG = 'x';
+exports.DEFAULT_ARG = DEFAULT_ARG;
 
 /**
  * Procedure block type.
@@ -55,28 +52,32 @@ Blockly.Procedures.DEFAULT_ARG = 'x';
  *    getProcedureDef: function():!Array
  * }}
  */
-Blockly.Procedures.ProcedureBlock;
+let ProcedureBlock;
+exports.ProcedureBlock = ProcedureBlock;
 
 /**
  * Find all user-created procedure definitions in a workspace.
- * @param {!Blockly.Workspace} root Root workspace.
+ * @param {!Workspace} root Root workspace.
  * @return {!Array<!Array<!Array>>} Pair of arrays, the
  *     first contains procedures without return variables, the second with.
  *     Each procedure is defined by a three-element list of name, parameter
  *     list, and return value boolean.
  */
-Blockly.Procedures.allProcedures = function(root) {
-  var proceduresNoReturn = root.getBlocksByType('procedures_defnoreturn', false)
-      .map(function(block) {
-        return /** @type {!Blockly.Procedures.ProcedureBlock} */ (block).getProcedureDef();
+const allProcedures = function(root) {
+  const proceduresNoReturn =
+      root.getBlocksByType('procedures_defnoreturn', false)
+          .map(function(block) {
+            return /** @type {!ProcedureBlock} */ (block).getProcedureDef();
+          });
+  const proceduresReturn =
+      root.getBlocksByType('procedures_defreturn', false).map(function(block) {
+        return /** @type {!ProcedureBlock} */ (block).getProcedureDef();
       });
-  var proceduresReturn = root.getBlocksByType('procedures_defreturn', false).map(function(block) {
-    return /** @type {!Blockly.Procedures.ProcedureBlock} */ (block).getProcedureDef();
-  });
-  proceduresNoReturn.sort(Blockly.Procedures.procTupleComparator_);
-  proceduresReturn.sort(Blockly.Procedures.procTupleComparator_);
+  proceduresNoReturn.sort(procTupleComparator);
+  proceduresReturn.sort(procTupleComparator);
   return [proceduresNoReturn, proceduresReturn];
 };
+exports.allProcedures = allProcedures;
 
 /**
  * Comparison function for case-insensitive sorting of the first element of
@@ -84,9 +85,8 @@ Blockly.Procedures.allProcedures = function(root) {
  * @param {!Array} ta First tuple.
  * @param {!Array} tb Second tuple.
  * @return {number} -1, 0, or 1 to signify greater than, equality, or less than.
- * @private
  */
-Blockly.Procedures.procTupleComparator_ = function(ta, tb) {
+const procTupleComparator = function(ta, tb) {
   return ta[0].localeCompare(tb[0], undefined, {sensitivity: 'base'});
 };
 
@@ -95,18 +95,18 @@ Blockly.Procedures.procTupleComparator_ = function(ta, tb) {
  * Take the proposed procedure name, and return a legal name i.e. one that
  * is not empty and doesn't collide with other procedures.
  * @param {string} name Proposed procedure name.
- * @param {!Blockly.Block} block Block to disambiguate.
+ * @param {!Block} block Block to disambiguate.
  * @return {string} Non-colliding name.
  */
-Blockly.Procedures.findLegalName = function(name, block) {
+const findLegalName = function(name, block) {
   if (block.isInFlyout) {
     // Flyouts can have multiple procedures called 'do something'.
     return name;
   }
-  name = name || Blockly.Msg['UNNAMED_KEY'] || 'unnamed';
-  while (!Blockly.Procedures.isLegalName_(name, block.workspace, block)) {
+  name = name || Msg['UNNAMED_KEY'] || 'unnamed';
+  while (!isLegalName(name, block.workspace, block)) {
     // Collision with another procedure.
-    var r = name.match(/^(.*?)(\d+)$/);
+    const r = name.match(/^(.*?)(\d+)$/);
     if (!r) {
       name += '2';
     } else {
@@ -115,68 +115,68 @@ Blockly.Procedures.findLegalName = function(name, block) {
   }
   return name;
 };
+exports.findLegalName = findLegalName;
 
 /**
  * Does this procedure have a legal name?  Illegal names include names of
  * procedures already defined.
  * @param {string} name The questionable name.
- * @param {!Blockly.Workspace} workspace The workspace to scan for collisions.
- * @param {Blockly.Block=} opt_exclude Optional block to exclude from
+ * @param {!Workspace} workspace The workspace to scan for collisions.
+ * @param {Block=} opt_exclude Optional block to exclude from
  *     comparisons (one doesn't want to collide with oneself).
  * @return {boolean} True if the name is legal.
- * @private
  */
-Blockly.Procedures.isLegalName_ = function(name, workspace, opt_exclude) {
-  return !Blockly.Procedures.isNameUsed(name, workspace, opt_exclude);
+const isLegalName = function(name, workspace, opt_exclude) {
+  return !isNameUsed(name, workspace, opt_exclude);
 };
 
 /**
  * Return if the given name is already a procedure name.
  * @param {string} name The questionable name.
- * @param {!Blockly.Workspace} workspace The workspace to scan for collisions.
- * @param {Blockly.Block=} opt_exclude Optional block to exclude from
+ * @param {!Workspace} workspace The workspace to scan for collisions.
+ * @param {Block=} opt_exclude Optional block to exclude from
  *     comparisons (one doesn't want to collide with oneself).
  * @return {boolean} True if the name is used, otherwise return false.
  */
-Blockly.Procedures.isNameUsed = function(name, workspace, opt_exclude) {
-  var blocks = workspace.getAllBlocks(false);
+const isNameUsed = function(name, workspace, opt_exclude) {
+  const blocks = workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     if (blocks[i] == opt_exclude) {
       continue;
     }
     if (blocks[i].getProcedureDef) {
-      var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-        blocks[i]);
-      var procName = procedureBlock.getProcedureDef();
-      if (Blockly.Names.equals(procName[0], name)) {
+      const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
+      const procName = procedureBlock.getProcedureDef();
+      if (Names.equals(procName[0], name)) {
         return true;
       }
     }
   }
   return false;
 };
+exports.isNameUsed = isNameUsed;
 
 /**
  * Rename a procedure.  Called by the editable field.
  * @param {string} name The proposed new name.
  * @return {string} The accepted name.
- * @this {Blockly.Field}
+ * @this {Field}
  */
-Blockly.Procedures.rename = function(name) {
+const rename = function(name) {
   // Strip leading and trailing whitespace.  Beyond this, all names are legal.
   name = name.trim();
 
-  var legalName = Blockly.Procedures.findLegalName(name,
-      /** @type {!Blockly.Block} */ (this.getSourceBlock()));
-  var oldName = this.getValue();
+  const legalName = findLegalName(
+      name,
+      /** @type {!Block} */ (this.getSourceBlock()));
+  const oldName = this.getValue();
   if (oldName != name && oldName != legalName) {
     // Rename any callers.
-    var blocks = this.getSourceBlock().workspace.getAllBlocks(false);
-    for (var i = 0; i < blocks.length; i++) {
+    const blocks = this.getSourceBlock().workspace.getAllBlocks(false);
+    for (let i = 0; i < blocks.length; i++) {
       if (blocks[i].renameProcedure) {
-        var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-          blocks[i]);
+        const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
         procedureBlock.renameProcedure(
             /** @type {string} */ (oldName), legalName);
       }
@@ -184,45 +184,46 @@ Blockly.Procedures.rename = function(name) {
   }
   return legalName;
 };
+exports.rename = rename;
 
 /**
  * Construct the blocks required by the flyout for the procedure category.
- * @param {!Blockly.Workspace} workspace The workspace containing procedures.
+ * @param {!Workspace} workspace The workspace containing procedures.
  * @return {!Array<!Element>} Array of XML block elements.
  */
-Blockly.Procedures.flyoutCategory = function(workspace) {
-  var xmlList = [];
-  if (Blockly.Blocks['procedures_defnoreturn']) {
+const flyoutCategory = function(workspace) {
+  const xmlList = [];
+  if (Blocks['procedures_defnoreturn']) {
     // <block type="procedures_defnoreturn" gap="16">
     //     <field name="NAME">do something</field>
     // </block>
-    var block = Blockly.utils.xml.createElement('block');
+    const block = utilsXml.createElement('block');
     block.setAttribute('type', 'procedures_defnoreturn');
     block.setAttribute('gap', 16);
-    var nameField = Blockly.utils.xml.createElement('field');
+    const nameField = utilsXml.createElement('field');
     nameField.setAttribute('name', 'NAME');
-    nameField.appendChild(Blockly.utils.xml.createTextNode(
-        Blockly.Msg['PROCEDURES_DEFNORETURN_PROCEDURE']));
+    nameField.appendChild(
+      utilsXml.createTextNode(Msg['PROCEDURES_DEFNORETURN_PROCEDURE']));
     block.appendChild(nameField);
     xmlList.push(block);
   }
-  if (Blockly.Blocks['procedures_defreturn']) {
+  if (Blocks['procedures_defreturn']) {
     // <block type="procedures_defreturn" gap="16">
     //     <field name="NAME">do something</field>
     // </block>
-    var block = Blockly.utils.xml.createElement('block');
+    const block = utilsXml.createElement('block');
     block.setAttribute('type', 'procedures_defreturn');
     block.setAttribute('gap', 16);
-    var nameField = Blockly.utils.xml.createElement('field');
+    const nameField = utilsXml.createElement('field');
     nameField.setAttribute('name', 'NAME');
-    nameField.appendChild(Blockly.utils.xml.createTextNode(
-        Blockly.Msg['PROCEDURES_DEFRETURN_PROCEDURE']));
+    nameField.appendChild(
+      utilsXml.createTextNode(Msg['PROCEDURES_DEFRETURN_PROCEDURE']));
     block.appendChild(nameField);
     xmlList.push(block);
   }
-  if (Blockly.Blocks['procedures_ifreturn']) {
+  if (Blocks['procedures_ifreturn']) {
     // <block type="procedures_ifreturn" gap="16"></block>
-    var block = Blockly.utils.xml.createElement('block');
+    const block = utilsXml.createElement('block');
     block.setAttribute('type', 'procedures_ifreturn');
     block.setAttribute('gap', 16);
     xmlList.push(block);
@@ -233,22 +234,22 @@ Blockly.Procedures.flyoutCategory = function(workspace) {
   }
 
   function populateProcedures(procedureList, templateName) {
-    for (var i = 0; i < procedureList.length; i++) {
-      var name = procedureList[i][0];
-      var args = procedureList[i][1];
+    for (let i = 0; i < procedureList.length; i++) {
+      const name = procedureList[i][0];
+      const args = procedureList[i][1];
       // <block type="procedures_callnoreturn" gap="16">
       //   <mutation name="do something">
       //     <arg name="x"></arg>
       //   </mutation>
       // </block>
-      var block = Blockly.utils.xml.createElement('block');
+      const block = utilsXml.createElement('block');
       block.setAttribute('type', templateName);
       block.setAttribute('gap', 16);
-      var mutation = Blockly.utils.xml.createElement('mutation');
+      const mutation = utilsXml.createElement('mutation');
       mutation.setAttribute('name', name);
       block.appendChild(mutation);
-      for (var j = 0; j < args.length; j++) {
-        var arg = Blockly.utils.xml.createElement('arg');
+      for (let j = 0; j < args.length; j++) {
+        const arg = utilsXml.createElement('arg');
         arg.setAttribute('name', args[j]);
         mutation.appendChild(arg);
       }
@@ -256,157 +257,155 @@ Blockly.Procedures.flyoutCategory = function(workspace) {
     }
   }
 
-  var tuple = Blockly.Procedures.allProcedures(workspace);
+  const tuple = allProcedures(workspace);
   populateProcedures(tuple[0], 'procedures_callnoreturn');
   populateProcedures(tuple[1], 'procedures_callreturn');
   return xmlList;
 };
+exports.flyoutCategory = flyoutCategory;
 
 /**
  * Updates the procedure mutator's flyout so that the arg block is not a
  * duplicate of another arg.
- * @param {!Blockly.Workspace} workspace The procedure mutator's workspace. This
+ * @param {!Workspace} workspace The procedure mutator's workspace. This
  *     workspace's flyout is what is being updated.
- * @private
  */
-Blockly.Procedures.updateMutatorFlyout_ = function(workspace) {
-  var usedNames = [];
-  var blocks = workspace.getBlocksByType('procedures_mutatorarg', false);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+const updateMutatorFlyout = function(workspace) {
+  const usedNames = [];
+  const blocks = workspace.getBlocksByType('procedures_mutatorarg', false);
+  for (let i = 0, block; (block = blocks[i]); i++) {
     usedNames.push(block.getFieldValue('NAME'));
   }
 
-  var xml = Blockly.utils.xml.createElement('xml');
-  var argBlock = Blockly.utils.xml.createElement('block');
+  const xmlElement = utilsXml.createElement('xml');
+  const argBlock = utilsXml.createElement('block');
   argBlock.setAttribute('type', 'procedures_mutatorarg');
-  var nameField = Blockly.utils.xml.createElement('field');
+  const nameField = utilsXml.createElement('field');
   nameField.setAttribute('name', 'NAME');
-  var argValue = Blockly.Variables.generateUniqueNameFromOptions(
-      Blockly.Procedures.DEFAULT_ARG, usedNames);
-  var fieldContent = Blockly.utils.xml.createTextNode(argValue);
+  const argValue =
+      Variables.generateUniqueNameFromOptions(DEFAULT_ARG, usedNames);
+  const fieldContent = utilsXml.createTextNode(argValue);
 
   nameField.appendChild(fieldContent);
   argBlock.appendChild(nameField);
-  xml.appendChild(argBlock);
+  xmlElement.appendChild(argBlock);
 
-  workspace.updateToolbox(xml);
+  workspace.updateToolbox(xmlElement);
 };
 
 /**
  * Listens for when a procedure mutator is opened. Then it triggers a flyout
  * update and adds a mutator change listener to the mutator workspace.
- * @param {!Blockly.Events.Abstract} e The event that triggered this listener.
- * @package
+ * @param {!Abstract} e The event that triggered this listener.
  */
-Blockly.Procedures.mutatorOpenListener = function(e) {
-  if (!(e.type == Blockly.Events.BUBBLE_OPEN && e.bubbleType === 'mutator' &&
-      e.isOpen)) {
+const mutatorOpenListener = function(e) {
+  if (!(e.type == Events.BUBBLE_OPEN && e.bubbleType === 'mutator' &&
+        e.isOpen)) {
     return;
   }
-  var workspaceId = /** @type {string} */ (e.workspaceId);
-  var block = Blockly.Workspace.getById(workspaceId)
-      .getBlockById(e.blockId);
-  var type = block.type;
+  const workspaceId = /** @type {string} */ (e.workspaceId);
+  const block = Workspace.getById(workspaceId).getBlockById(e.blockId);
+  const type = block.type;
   if (type != 'procedures_defnoreturn' && type != 'procedures_defreturn') {
     return;
   }
-  var workspace = block.mutator.getWorkspace();
-  Blockly.Procedures.updateMutatorFlyout_(workspace);
-  workspace.addChangeListener(Blockly.Procedures.mutatorChangeListener_);
+  const workspace = block.mutator.getWorkspace();
+  updateMutatorFlyout(workspace);
+  workspace.addChangeListener(mutatorChangeListener);
 };
+/** @package */
+exports.mutatorOpenListener = mutatorOpenListener;
 
 /**
  * Listens for changes in a procedure mutator and triggers flyout updates when
  * necessary.
- * @param {!Blockly.Events.Abstract} e The event that triggered this listener.
- * @private
+ * @param {!Abstract} e The event that triggered this listener.
  */
-Blockly.Procedures.mutatorChangeListener_ = function(e) {
-  if (e.type != Blockly.Events.BLOCK_CREATE &&
-      e.type != Blockly.Events.BLOCK_DELETE &&
-      e.type != Blockly.Events.BLOCK_CHANGE) {
+const mutatorChangeListener = function(e) {
+  if (e.type != Events.BLOCK_CREATE && e.type != Events.BLOCK_DELETE &&
+      e.type != Events.BLOCK_CHANGE) {
     return;
   }
-  var workspaceId = /** @type {string} */ (e.workspaceId);
-  var workspace = /** @type {!Blockly.WorkspaceSvg} */
-      (Blockly.Workspace.getById(workspaceId));
-  Blockly.Procedures.updateMutatorFlyout_(workspace);
+  const workspaceId = /** @type {string} */ (e.workspaceId);
+  const workspace = /** @type {!WorkspaceSvg} */
+      (Workspace.getById(workspaceId));
+  updateMutatorFlyout(workspace);
 };
 
 /**
  * Find all the callers of a named procedure.
  * @param {string} name Name of procedure.
- * @param {!Blockly.Workspace} workspace The workspace to find callers in.
- * @return {!Array<!Blockly.Block>} Array of caller blocks.
+ * @param {!Workspace} workspace The workspace to find callers in.
+ * @return {!Array<!Block>} Array of caller blocks.
  */
-Blockly.Procedures.getCallers = function(name, workspace) {
-  var callers = [];
-  var blocks = workspace.getAllBlocks(false);
+const getCallers = function(name, workspace) {
+  const callers = [];
+  const blocks = workspace.getAllBlocks(false);
   // Iterate through every block and check the name.
-  for (var i = 0; i < blocks.length; i++) {
+  for (let i = 0; i < blocks.length; i++) {
     if (blocks[i].getProcedureCall) {
-      var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-        blocks[i]);
-      var procName = procedureBlock.getProcedureCall();
+      const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
+      const procName = procedureBlock.getProcedureCall();
       // Procedure name may be null if the block is only half-built.
-      if (procName && Blockly.Names.equals(procName, name)) {
+      if (procName && Names.equals(procName, name)) {
         callers.push(blocks[i]);
       }
     }
   }
   return callers;
 };
+exports.getCallers = getCallers;
 
 /**
  * When a procedure definition changes its parameters, find and edit all its
  * callers.
- * @param {!Blockly.Block} defBlock Procedure definition block.
+ * @param {!Block} defBlock Procedure definition block.
  */
-Blockly.Procedures.mutateCallers = function(defBlock) {
-  var oldRecordUndo = Blockly.Events.recordUndo;
-  var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-    defBlock);
-  var name = procedureBlock.getProcedureDef()[0];
-  var xmlElement = defBlock.mutationToDom(true);
-  var callers = Blockly.Procedures.getCallers(name, defBlock.workspace);
-  for (var i = 0, caller; (caller = callers[i]); i++) {
-    var oldMutationDom = caller.mutationToDom();
-    var oldMutation = oldMutationDom && Blockly.Xml.domToText(oldMutationDom);
+const mutateCallers = function(defBlock) {
+  const oldRecordUndo = Events.recordUndo;
+  const procedureBlock = /** @type {!ProcedureBlock} */ (defBlock);
+  const name = procedureBlock.getProcedureDef()[0];
+  const xmlElement = defBlock.mutationToDom(true);
+  const callers = getCallers(name, defBlock.workspace);
+  for (let i = 0, caller; (caller = callers[i]); i++) {
+    const oldMutationDom = caller.mutationToDom();
+    const oldMutation = oldMutationDom && Xml.domToText(oldMutationDom);
     caller.domToMutation(xmlElement);
-    var newMutationDom = caller.mutationToDom();
-    var newMutation = newMutationDom && Blockly.Xml.domToText(newMutationDom);
+    const newMutationDom = caller.mutationToDom();
+    const newMutation = newMutationDom && Xml.domToText(newMutationDom);
     if (oldMutation != newMutation) {
       // Fire a mutation on every caller block.  But don't record this as an
       // undo action since it is deterministically tied to the procedure's
       // definition mutation.
-      Blockly.Events.recordUndo = false;
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.BLOCK_CHANGE))(
+      Events.recordUndo = false;
+      Events.fire(new (Events.get(Events.BLOCK_CHANGE))(
           caller, 'mutation', null, oldMutation, newMutation));
-      Blockly.Events.recordUndo = oldRecordUndo;
+      Events.recordUndo = oldRecordUndo;
     }
   }
 };
+exports.mutateCallers = mutateCallers;
 
 /**
  * Find the definition block for the named procedure.
  * @param {string} name Name of procedure.
- * @param {!Blockly.Workspace} workspace The workspace to search.
- * @return {?Blockly.Block} The procedure definition block, or null not found.
+ * @param {!Workspace} workspace The workspace to search.
+ * @return {?Block} The procedure definition block, or null not found.
  */
-Blockly.Procedures.getDefinition = function(name, workspace) {
+const getDefinition = function(name, workspace) {
   // Do not assume procedure is a top block. Some languages allow nested
   // procedures. Also do not assume it is one of the built-in blocks. Only
   // rely on getProcedureDef.
-  var blocks = workspace.getAllBlocks(false);
-  for (var i = 0; i < blocks.length; i++) {
+  const blocks = workspace.getAllBlocks(false);
+  for (let i = 0; i < blocks.length; i++) {
     if (blocks[i].getProcedureDef) {
-      var procedureBlock = /** @type {!Blockly.Procedures.ProcedureBlock} */ (
-        blocks[i]);
-      var tuple = procedureBlock.getProcedureDef();
-      if (tuple && Blockly.Names.equals(tuple[0], name)) {
+      const procedureBlock = /** @type {!ProcedureBlock} */ (blocks[i]);
+      const tuple = procedureBlock.getProcedureDef();
+      if (tuple && Names.equals(tuple[0], name)) {
         return blocks[i];  // Can't use procedureBlock var due to type check.
       }
     }
   }
   return null;
 };
+exports.getDefinition = getDefinition;
diff --git a/tests/deps.js b/tests/deps.js
index 2c964f3c8..4e2796458 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -126,7 +126,7 @@ goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubbl
 goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.Variables', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
+goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Variables', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});

From 3bdcfd98217cba2d7dcf2720373f880dbb8ae1e0 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:23:49 -0700
Subject: [PATCH 277/291] Split core/ui_events.js into multiple files

---
 core/events/{ui_events.js => events_ui.js} | 45 ++---------------
 core/events/events_ui_base.js              | 58 ++++++++++++++++++++++
 tests/deps.js                              |  3 +-
 3 files changed, 64 insertions(+), 42 deletions(-)
 rename core/events/{ui_events.js => events_ui.js} (64%)
 create mode 100644 core/events/events_ui_base.js

diff --git a/core/events/ui_events.js b/core/events/events_ui.js
similarity index 64%
rename from core/events/ui_events.js
rename to core/events/events_ui.js
index 5d649a22f..be8500b33 100644
--- a/core/events/ui_events.js
+++ b/core/events/events_ui.js
@@ -5,59 +5,22 @@
  */
 
 /**
- * @fileoverview Events fired as a result of UI actions in Blockly's editor.
+ * @fileoverview (Deprecated) Events fired as a result of UI actions in
+ * Blockly's editor.
  * @author fraser@google.com (Neil Fraser)
  */
 'use strict';
 
 goog.provide('Blockly.Events.Ui');
-goog.provide('Blockly.Events.UiBase');
 
 goog.require('Blockly.Events');
-goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.Events.UiBase');
 goog.require('Blockly.registry');
 goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.Block');
 
 
-/**
- * Base class for a UI event.
- * UI events are events that don't need to be sent over the wire for multi-user
- * editing to work (e.g. scrolling the workspace, zooming, opening toolbox
- * categories).
- * UI events do not undo or redo.
- * @param {string=} opt_workspaceId The workspace identifier for this event.
- *    Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
- * @constructor
- */
-Blockly.Events.UiBase = function(opt_workspaceId) {
-  Blockly.Events.UiBase.superClass_.constructor.call(this);
-
-  /**
-   * Whether or not the event is blank (to be populated by fromJson).
-   * @type {boolean}
-   */
-  this.isBlank = typeof opt_workspaceId == 'undefined';
-
-  /**
-   * The workspace identifier for this event.
-   * @type {string}
-   */
-  this.workspaceId = opt_workspaceId ? opt_workspaceId : '';
-
-  // UI events do not undo or redo.
-  this.recordUndo = false;
-};
-Blockly.utils.object.inherits(Blockly.Events.UiBase, Blockly.Events.Abstract);
-
-/**
- * Whether or not the event is a UI event.
- * @type {boolean}
- */
-Blockly.Events.UiBase.prototype.isUiEvent = true;
-
 /**
  * Class for a UI event.
  * @param {?Blockly.Block=} opt_block The affected block.  Null for UI events
@@ -116,4 +79,4 @@ Blockly.Events.Ui.prototype.fromJson = function(json) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.UI,
-    Blockly.Events.Ui);
+    Blockly.Events.Ui);
\ No newline at end of file
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
new file mode 100644
index 000000000..b286b9283
--- /dev/null
+++ b/core/events/events_ui_base.js
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Base class for events fired as a result of UI actions in
+ * Blockly's editor.
+ * @author fraser@google.com (Neil Fraser)
+ */
+'use strict';
+
+goog.provide('Blockly.Events.UiBase');
+
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.utils.object');
+
+goog.requireType('Blockly.Block');
+
+
+/**
+ * Base class for a UI event.
+ * UI events are events that don't need to be sent over the wire for multi-user
+ * editing to work (e.g. scrolling the workspace, zooming, opening toolbox
+ * categories).
+ * UI events do not undo or redo.
+ * @param {string=} opt_workspaceId The workspace identifier for this event.
+ *    Undefined for a blank event.
+ * @extends {Blockly.Events.Abstract}
+ * @constructor
+ */
+Blockly.Events.UiBase = function(opt_workspaceId) {
+  Blockly.Events.UiBase.superClass_.constructor.call(this);
+
+  /**
+   * Whether or not the event is blank (to be populated by fromJson).
+   * @type {boolean}
+   */
+  this.isBlank = typeof opt_workspaceId == 'undefined';
+
+  /**
+   * The workspace identifier for this event.
+   * @type {string}
+   */
+  this.workspaceId = opt_workspaceId ? opt_workspaceId : '';
+
+  // UI events do not undo or redo.
+  this.recordUndo = false;
+};
+Blockly.utils.object.inherits(Blockly.Events.UiBase, Blockly.Events.Abstract);
+
+/**
+ * Whether or not the event is a UI event.
+ * @type {boolean}
+ */
+Blockly.Events.UiBase.prototype.isUiEvent = true;
diff --git a/tests/deps.js b/tests/deps.js
index 4e2796458..9d4b8a6bd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,12 +49,13 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_rename.js', ['Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/ws_comment_events.js', ['Blockly.Events.CommentBase', 'Blockly.Events.CommentChange', 'Blockly.Events.CommentCreate', 'Blockly.Events.CommentDelete', 'Blockly.Events.CommentMove'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.Xml', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml']);
 goog.addDependency('../../core/extensions.js', ['Blockly.Extensions'], ['Blockly.utils'], {'lang': 'es6', 'module': 'goog'});

From aa83199a55d4449f0ec99e85973b11dfe57f2622 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:25:33 -0700
Subject: [PATCH 278/291] Migrate core/events/events_ui.js to ES6 const/let

---
 core/events/events_ui.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index be8500b33..b28d86a2e 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -35,7 +35,7 @@ goog.requireType('Blockly.Block');
  */
 Blockly.Events.Ui = function(opt_block, opt_element, opt_oldValue,
     opt_newValue) {
-  var workspaceId = opt_block ? opt_block.workspace.id : undefined;
+  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
   Blockly.Events.Ui.superClass_.constructor.call(this, workspaceId);
 
   this.blockId = opt_block ? opt_block.id : null;
@@ -56,7 +56,7 @@ Blockly.Events.Ui.prototype.type = Blockly.Events.UI;
  * @return {!Object} JSON representation.
  */
 Blockly.Events.Ui.prototype.toJson = function() {
-  var json = Blockly.Events.Ui.superClass_.toJson.call(this);
+  const json = Blockly.Events.Ui.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.newValue !== undefined) {
     json['newValue'] = this.newValue;

From e16a0a4bce83dac71e6c1aeae4168d3620fda82f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:26:34 -0700
Subject: [PATCH 279/291] Migrate core/events/events_ui.js and
 core/events/events_ui_base.js to goog.module

---
 core/events/events_ui.js      | 22 ++++++++++++----------
 core/events/events_ui_base.js | 16 ++++++++--------
 tests/deps.js                 |  4 ++--
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index b28d86a2e..5504b61d6 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -11,7 +11,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.Ui');
+goog.module('Blockly.Events.Ui');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -33,30 +34,30 @@ goog.requireType('Blockly.Block');
  * @deprecated December 2020. Instead use a more specific UI event.
  * @constructor
  */
-Blockly.Events.Ui = function(opt_block, opt_element, opt_oldValue,
+const Ui = function(opt_block, opt_element, opt_oldValue,
     opt_newValue) {
   const workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  Blockly.Events.Ui.superClass_.constructor.call(this, workspaceId);
+  Ui.superClass_.constructor.call(this, workspaceId);
 
   this.blockId = opt_block ? opt_block.id : null;
   this.element = typeof opt_element == 'undefined' ? '' : opt_element;
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(Blockly.Events.Ui, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(Ui, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.Ui.prototype.type = Blockly.Events.UI;
+Ui.prototype.type = Blockly.Events.UI;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.Ui.prototype.toJson = function() {
-  const json = Blockly.Events.Ui.superClass_.toJson.call(this);
+Ui.prototype.toJson = function() {
+  const json = Ui.superClass_.toJson.call(this);
   json['element'] = this.element;
   if (this.newValue !== undefined) {
     json['newValue'] = this.newValue;
@@ -71,12 +72,13 @@ Blockly.Events.Ui.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.Ui.prototype.fromJson = function(json) {
-  Blockly.Events.Ui.superClass_.fromJson.call(this, json);
+Ui.prototype.fromJson = function(json) {
+  Ui.superClass_.fromJson.call(this, json);
   this.element = json['element'];
   this.newValue = json['newValue'];
   this.blockId = json['blockId'];
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.UI,
-    Blockly.Events.Ui);
\ No newline at end of file
+    Ui);
+exports = Ui;
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
index b286b9283..9d54f0dcf 100644
--- a/core/events/events_ui_base.js
+++ b/core/events/events_ui_base.js
@@ -11,14 +11,12 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.UiBase');
+goog.module('Blockly.Events.UiBase');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.utils.object');
 
-goog.requireType('Blockly.Block');
-
 
 /**
  * Base class for a UI event.
@@ -31,8 +29,8 @@ goog.requireType('Blockly.Block');
  * @extends {Blockly.Events.Abstract}
  * @constructor
  */
-Blockly.Events.UiBase = function(opt_workspaceId) {
-  Blockly.Events.UiBase.superClass_.constructor.call(this);
+const UiBase = function(opt_workspaceId) {
+  UiBase.superClass_.constructor.call(this);
 
   /**
    * Whether or not the event is blank (to be populated by fromJson).
@@ -49,10 +47,12 @@ Blockly.Events.UiBase = function(opt_workspaceId) {
   // UI events do not undo or redo.
   this.recordUndo = false;
 };
-Blockly.utils.object.inherits(Blockly.Events.UiBase, Blockly.Events.Abstract);
+Blockly.utils.object.inherits(UiBase, Blockly.Events.Abstract);
 
 /**
  * Whether or not the event is a UI event.
  * @type {boolean}
  */
-Blockly.Events.UiBase.prototype.isUiEvent = true;
+UiBase.prototype.isUiEvent = true;
+
+exports = UiBase;
diff --git a/tests/deps.js b/tests/deps.js
index 9d4b8a6bd..3da6c1e78 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -49,8 +49,8 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_ui.js', ['Blockly.Events.Ui'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
+goog.addDependency('../../core/events/events_ui_base.js', ['Blockly.Events.UiBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_base.js', ['Blockly.Events.VarBase'], ['Blockly.Events.Abstract', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_create.js', ['Blockly.Events.VarCreate'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_var_delete.js', ['Blockly.Events.VarDelete'], ['Blockly.Events', 'Blockly.Events.VarBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});

From 2826d70cac2e910916fb255f9fe443282f85f2e9 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:34:38 -0700
Subject: [PATCH 280/291] Migrate core/events/events_ui_base.js named requires

---
 core/events/events_ui.js      | 22 +++++++++++-----------
 core/events/events_ui_base.js |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index 5504b61d6..b191b986f 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -14,23 +14,23 @@
 goog.module('Blockly.Events.Ui');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.Events.UiBase');
-goog.require('Blockly.registry');
-goog.require('Blockly.utils.object');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+const UiBase = goog.require('Blockly.Events.UiBase');
+const object = goog.require('Blockly.utils.object');
+const registry = goog.require('Blockly.registry');
 
 
 /**
  * Class for a UI event.
- * @param {?Blockly.Block=} opt_block The affected block.  Null for UI events
+ * @param {?Block=} opt_block The affected block.  Null for UI events
  *     that do not have an associated block.  Undefined for a blank event.
  * @param {string=} opt_element One of 'selected', 'comment', 'mutatorOpen',
  *     etc.
  * @param {*=} opt_oldValue Previous value of element.
  * @param {*=} opt_newValue New value of element.
- * @extends {Blockly.Events.UiBase}
+ * @extends {UiBase}
  * @deprecated December 2020. Instead use a more specific UI event.
  * @constructor
  */
@@ -44,13 +44,13 @@ const Ui = function(opt_block, opt_element, opt_oldValue,
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-Blockly.utils.object.inherits(Ui, Blockly.Events.UiBase);
+object.inherits(Ui, UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Ui.prototype.type = Blockly.Events.UI;
+Ui.prototype.type = Events.UI;
 
 /**
  * Encode the event as JSON.
@@ -79,6 +79,6 @@ Ui.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-Blockly.registry.register(Blockly.registry.Type.EVENT, Blockly.Events.UI,
+registry.register(registry.Type.EVENT, Events.UI,
     Ui);
 exports = Ui;
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
index 9d54f0dcf..5bcf7270c 100644
--- a/core/events/events_ui_base.js
+++ b/core/events/events_ui_base.js
@@ -14,8 +14,8 @@
 goog.module('Blockly.Events.UiBase');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events.Abstract');
-goog.require('Blockly.utils.object');
+const Abstract = goog.require('Blockly.Events.Abstract');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -26,7 +26,7 @@ goog.require('Blockly.utils.object');
  * UI events do not undo or redo.
  * @param {string=} opt_workspaceId The workspace identifier for this event.
  *    Undefined for a blank event.
- * @extends {Blockly.Events.Abstract}
+ * @extends {Abstract}
  * @constructor
  */
 const UiBase = function(opt_workspaceId) {
@@ -47,7 +47,7 @@ const UiBase = function(opt_workspaceId) {
   // UI events do not undo or redo.
   this.recordUndo = false;
 };
-Blockly.utils.object.inherits(UiBase, Blockly.Events.Abstract);
+object.inherits(UiBase, Abstract);
 
 /**
  * Whether or not the event is a UI event.

From 75eab4f395fb85c14b6040f6d8a8797d7df5fe4c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Tue, 3 Aug 2021 16:36:55 -0700
Subject: [PATCH 281/291] clang-format core/events/events_ui.js

---
 core/events/events_ui.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index b191b986f..425b69ce4 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -34,8 +34,7 @@ const registry = goog.require('Blockly.registry');
  * @deprecated December 2020. Instead use a more specific UI event.
  * @constructor
  */
-const Ui = function(opt_block, opt_element, opt_oldValue,
-    opt_newValue) {
+const Ui = function(opt_block, opt_element, opt_oldValue, opt_newValue) {
   const workspaceId = opt_block ? opt_block.workspace.id : undefined;
   Ui.superClass_.constructor.call(this, workspaceId);
 
@@ -79,6 +78,5 @@ Ui.prototype.fromJson = function(json) {
   this.blockId = json['blockId'];
 };
 
-registry.register(registry.Type.EVENT, Events.UI,
-    Ui);
+registry.register(registry.Type.EVENT, Events.UI, Ui);
 exports = Ui;

From 2ba3b0ba97b32e04384fa4519c9ec5c60114064f Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 4 Aug 2021 15:17:14 -0700
Subject: [PATCH 282/291] Add newline to core/events/events_ui.js

---
 core/events/events_ui.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index 425b69ce4..5598f30a0 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -79,4 +79,5 @@ Ui.prototype.fromJson = function(json) {
 };
 
 registry.register(registry.Type.EVENT, Events.UI, Ui);
+
 exports = Ui;

From fdd9011637b58f03d50eeea61cc411750b534aea Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:56:12 -0700
Subject: [PATCH 283/291] Migrate core/insertion_marker_manager.js to ES6
 const/let

---
 core/insertion_marker_manager.js | 109 ++++++++++++++++---------------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 614f7e70b..ebe2b8900 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -225,12 +225,12 @@ Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
     if (this.topBlock_.rendered) {
       // Trigger a connection animation.
       // Determine which connection is inferior (lower in the source stack).
-      var inferiorConnection = this.localConnection_.isSuperior() ?
+      const inferiorConnection = this.localConnection_.isSuperior() ?
           this.closestConnection_ : this.localConnection_;
       Blockly.blockAnimations.connectionUiEffect(
           inferiorConnection.getSourceBlock());
       // Bring the just-edited stack to the front.
-      var rootBlock = this.topBlock_.getRootBlock();
+      const rootBlock = this.topBlock_.getRootBlock();
       rootBlock.bringToFront();
     }
   }
@@ -245,11 +245,11 @@ Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
  * @package
  */
 Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
-  var candidate = this.getCandidate_(dxy);
+  const candidate = this.getCandidate_(dxy);
 
   this.wouldDeleteBlock_ = this.shouldDelete_(candidate, dragTarget);
 
-  var shouldUpdate = this.wouldDeleteBlock_ ||
+  const shouldUpdate = this.wouldDeleteBlock_ ||
       this.shouldUpdatePreviews_(candidate, dxy);
 
   if (shouldUpdate) {
@@ -270,14 +270,15 @@ Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
-  var imType = sourceBlock.type;
+  const imType = sourceBlock.type;
 
   Blockly.Events.disable();
+  let result;
   try {
-    var result = this.workspace_.newBlock(imType);
+    result = this.workspace_.newBlock(imType);
     result.setInsertionMarker(true);
     if (sourceBlock.mutationToDom) {
-      var oldMutationDom = sourceBlock.mutationToDom();
+      const oldMutationDom = sourceBlock.mutationToDom();
       if (oldMutationDom) {
         result.domToMutation(oldMutationDom);
       }
@@ -285,19 +286,19 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
     // Copy field values from the other block.  These values may impact the
     // rendered size of the insertion marker.  Note that we do not care about
     // child blocks here.
-    for (var i = 0; i < sourceBlock.inputList.length; i++) {
-      var sourceInput = sourceBlock.inputList[i];
+    for (let i = 0; i < sourceBlock.inputList.length; i++) {
+      const sourceInput = sourceBlock.inputList[i];
       if (sourceInput.name == Blockly.constants.COLLAPSED_INPUT_NAME) {
         continue;  // Ignore the collapsed input.
       }
-      var resultInput = result.inputList[i];
+      const resultInput = result.inputList[i];
       if (!resultInput) {
         throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
             .replace('%1', 'an input'));
       }
-      for (var j = 0; j < sourceInput.fieldRow.length; j++) {
-        var sourceField = sourceInput.fieldRow[j];
-        var resultField = resultInput.fieldRow[j];
+      for (let j = 0; j < sourceInput.fieldRow.length; j++) {
+        const sourceField = sourceInput.fieldRow[j];
+        const resultField = resultInput.fieldRow[j];
         if (!resultField) {
           throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
               .replace('%1', 'a field'));
@@ -328,9 +329,9 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
-  var available = this.topBlock_.getConnections_(false);
+  const available = this.topBlock_.getConnections_(false);
   // Also check the last connection on this stack
-  var lastOnStack = this.topBlock_.lastConnectionInStack(true);
+  const lastOnStack = this.topBlock_.lastConnectionInStack(true);
   if (lastOnStack && lastOnStack != this.topBlock_.nextConnection) {
     available.push(lastOnStack);
     this.lastOnStack_ = lastOnStack;
@@ -359,9 +360,9 @@ Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function()
  */
 Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
     candidate, dxy) {
-  var candidateLocal = candidate.local;
-  var candidateClosest = candidate.closest;
-  var radius = candidate.radius;
+  const candidateLocal = candidate.local;
+  const candidateClosest = candidate.closest;
+  const radius = candidate.radius;
 
   // Found a connection!
   if (candidateLocal && candidateClosest) {
@@ -373,9 +374,9 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
           this.localConnection_ == candidateLocal) {
         return false;
       }
-      var xDiff = this.localConnection_.x + dxy.x - this.closestConnection_.x;
-      var yDiff = this.localConnection_.y + dxy.y - this.closestConnection_.y;
-      var curDistance = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
+      const xDiff = this.localConnection_.x + dxy.x - this.closestConnection_.x;
+      const yDiff = this.localConnection_.y + dxy.y - this.closestConnection_.y;
+      const curDistance = Math.sqrt(xDiff * xDiff + yDiff * yDiff);
       // Slightly prefer the existing preview over a new preview.
       return !(
           candidateClosest &&
@@ -406,13 +407,13 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
-  var radius = this.getStartRadius_();
-  var candidateClosest = null;
-  var candidateLocal = null;
+  let radius = this.getStartRadius_();
+  let candidateClosest = null;
+  let candidateLocal = null;
 
-  for (var i = 0; i < this.availableConnections_.length; i++) {
-    var myConnection = this.availableConnections_[i];
-    var neighbour = myConnection.closest(radius, dxy);
+  for (let i = 0; i < this.availableConnections_.length; i++) {
+    const myConnection = this.availableConnections_[i];
+    const neighbour = myConnection.closest(radius, dxy);
     if (neighbour.connection) {
       candidateClosest = neighbour.connection;
       candidateLocal = myConnection;
@@ -458,8 +459,8 @@ Blockly.InsertionMarkerManager.prototype.getStartRadius_ = function() {
 Blockly.InsertionMarkerManager.prototype.shouldDelete_ = function(
     candidate, dragTarget) {
   if (dragTarget) {
-    var componentManager = this.workspace_.getComponentManager();
-    var isDeleteArea = componentManager.hasCapability(dragTarget.id,
+    const componentManager = this.workspace_.getComponentManager();
+    const isDeleteArea = componentManager.hasCapability(dragTarget.id,
         Blockly.ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (
@@ -484,8 +485,8 @@ Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate)
   if (this.wouldDeleteBlock_) {
     return;
   }
-  var closest = candidate.closest;
-  var local = candidate.local;
+  const closest = candidate.closest;
+  const local = candidate.local;
 
   // Nothing to connect to.
   if (!closest) {
@@ -510,9 +511,9 @@ Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate)
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
-  var closest = this.closestConnection_;
-  var renderer = this.workspace_.getRenderer();
-  var method = renderer.getConnectionPreviewMethod(
+  const closest = this.closestConnection_;
+  const renderer = this.workspace_.getRenderer();
+  const method = renderer.getConnectionPreviewMethod(
       /** @type {!Blockly.RenderedConnection} */ (closest),
       /** @type {!Blockly.RenderedConnection} */ (this.localConnection_),
       this.topBlock_);
@@ -552,9 +553,9 @@ Blockly.InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate)
   } else {
     // If there's a new preview and there was an preview before, and either
     // connection has changed, remove the old preview.
-    var hadPreview = this.closestConnection_ && this.localConnection_;
-    var closestChanged = this.closestConnection_ != candidate.closest;
-    var localChanged = this.localConnection_ != candidate.local;
+    const hadPreview = this.closestConnection_ && this.localConnection_;
+    const closestChanged = this.closestConnection_ != candidate.closest;
+    const localChanged = this.localConnection_ != candidate.local;
 
     // Also hide if we had a preview before but now we're going to delete instead.
     if (hadPreview && (closestChanged || localChanged || this.wouldDeleteBlock_)) {
@@ -594,12 +595,12 @@ Blockly.InsertionMarkerManager.prototype.hidePreview_ = function() {
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
-  var local = this.localConnection_;
-  var closest = this.closestConnection_;
+  const local = this.localConnection_;
+  const closest = this.closestConnection_;
 
-  var isLastInStack = this.lastOnStack_ && local == this.lastOnStack_;
-  var imBlock = isLastInStack ? this.lastMarker_ : this.firstMarker_;
-  var imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
+  const isLastInStack = this.lastOnStack_ && local == this.lastOnStack_;
+  const imBlock = isLastInStack ? this.lastMarker_ : this.firstMarker_;
+  const imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
 
   if (imConn == this.markerConnection_) {
     throw Error('Made it to showInsertionMarker_ even though the marker isn\'t ' +
@@ -635,16 +636,16 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
     return;
   }
 
-  var imConn = this.markerConnection_;
-  var imBlock = imConn.getSourceBlock();
-  var markerNext = imBlock.nextConnection;
-  var markerPrev = imBlock.previousConnection;
-  var markerOutput = imBlock.outputConnection;
+  const imConn = this.markerConnection_;
+  const imBlock = imConn.getSourceBlock();
+  const markerNext = imBlock.nextConnection;
+  const markerPrev = imBlock.previousConnection;
+  const markerOutput = imBlock.outputConnection;
 
-  var isFirstInStatementStack =
+  const isFirstInStatementStack =
       (imConn == markerNext && !(markerPrev && markerPrev.targetConnection));
 
-  var isFirstInOutputStack =
+  const isFirstInOutputStack =
       imConn.type == Blockly.connectionTypes.INPUT_VALUE &&
       !(markerOutput && markerOutput.targetConnection);
   // The insertion marker is the first block in a stack.  Unplug won't do
@@ -655,10 +656,10 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   // Inside of a C-block, first statement connection.
   else if (imConn.type == Blockly.connectionTypes.NEXT_STATEMENT &&
       imConn != markerNext) {
-    var innerConnection = imConn.targetConnection;
+    const innerConnection = imConn.targetConnection;
     innerConnection.getSourceBlock().unplug(false);
 
-    var previousBlockNextConnection =
+    const previousBlockNextConnection =
         markerPrev ? markerPrev.targetConnection : null;
 
     imBlock.unplug(true);
@@ -675,7 +676,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   }
 
   this.markerConnection_ = null;
-  var svg = imBlock.getSvgRoot();
+  const svg = imBlock.getSvgRoot();
   if (svg) {
     svg.setAttribute('visibility', 'hidden');
   }
@@ -686,7 +687,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
  * @private
  */
 Blockly.InsertionMarkerManager.prototype.showInsertionInputOutline_ = function() {
-  var closest = this.closestConnection_;
+  const closest = this.closestConnection_;
   this.highlightedBlock_ = closest.getSourceBlock();
   this.highlightedBlock_.highlightShapeForInput(closest, true);
 };
@@ -727,7 +728,7 @@ Blockly.InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
  * @package
  */
 Blockly.InsertionMarkerManager.prototype.getInsertionMarkers = function() {
-  var result = [];
+  const result = [];
   if (this.firstMarker_) {
     result.push(this.firstMarker_);
   }

From 61eb96c8310fb278c2b09b7de6c27ea02892a656 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 16:59:11 -0700
Subject: [PATCH 284/291] Migrate core/insertion_marker_manager.js to
 goog.module

---
 core/insertion_marker_manager.js | 72 ++++++++++++++++++--------------
 tests/deps.js                    |  2 +-
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index ebe2b8900..07940f106 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -10,15 +10,21 @@
  */
 'use strict';
 
-goog.provide('Blockly.InsertionMarkerManager');
+goog.module('Blockly.InsertionMarkerManager');
+goog.module.declareLegacyNamespace();
 
+// TODO(#5073): Add Blockly require after fixing circular dependency.
+// goog.require('Blockly');
 goog.require('Blockly.blockAnimations');
+goog.require('Blockly.constants');
 goog.require('Blockly.ComponentManager');
 goog.require('Blockly.connectionTypes');
 goog.require('Blockly.Events');
 goog.require('Blockly.internalConstants');
 
 goog.requireType('Blockly.BlockSvg');
+goog.requireType('Blockly.IDeleteArea');
+goog.requireType('Blockly.IDragTarget');
 goog.requireType('Blockly.RenderedConnection');
 goog.requireType('Blockly.utils.Coordinate');
 goog.requireType('Blockly.WorkspaceSvg');
@@ -31,7 +37,7 @@ goog.requireType('Blockly.WorkspaceSvg');
  * @param {!Blockly.BlockSvg} block The top block in the stack being dragged.
  * @constructor
  */
-Blockly.InsertionMarkerManager = function(block) {
+const InsertionMarkerManager = function(block) {
   Blockly.selected = block;
 
   /**
@@ -142,7 +148,7 @@ Blockly.InsertionMarkerManager = function(block) {
  * could display.
  * @enum {number}
  */
-Blockly.InsertionMarkerManager.PREVIEW_TYPE = {
+InsertionMarkerManager.PREVIEW_TYPE = {
   INSERTION_MARKER: 0,
   INPUT_OUTLINE: 1,
   REPLACEMENT_FADE: 2,
@@ -154,7 +160,7 @@ Blockly.InsertionMarkerManager.PREVIEW_TYPE = {
  * @type {string}
  * @const
  */
-Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
+InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
     'manager tried to create a marker but the result is missing %1. If ' +
     'you are using a mutator, make sure your domToMutation method is ' +
     'properly defined.';
@@ -163,7 +169,7 @@ Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
  * Sever all links from this object.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.dispose = function() {
+InsertionMarkerManager.prototype.dispose = function() {
   this.availableConnections_.length = 0;
 
   Blockly.Events.disable();
@@ -184,7 +190,7 @@ Blockly.InsertionMarkerManager.prototype.dispose = function() {
  * change if a block is unplugged and the stack is healed.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.updateAvailableConnections = function() {
+InsertionMarkerManager.prototype.updateAvailableConnections = function() {
   this.availableConnections_ = this.initAvailableConnections_();
 };
 
@@ -194,7 +200,7 @@ Blockly.InsertionMarkerManager.prototype.updateAvailableConnections = function()
  * @return {boolean} True if the block would be deleted if dropped immediately.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.wouldDeleteBlock = function() {
+InsertionMarkerManager.prototype.wouldDeleteBlock = function() {
   return this.wouldDeleteBlock_;
 };
 
@@ -205,7 +211,7 @@ Blockly.InsertionMarkerManager.prototype.wouldDeleteBlock = function() {
  *   immediately.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.wouldConnectBlock = function() {
+InsertionMarkerManager.prototype.wouldConnectBlock = function() {
   return !!this.closestConnection_;
 };
 
@@ -214,7 +220,7 @@ Blockly.InsertionMarkerManager.prototype.wouldConnectBlock = function() {
  * This should be called at the end of a drag.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
+InsertionMarkerManager.prototype.applyConnections = function() {
   if (this.closestConnection_) {
     // Don't fire events for insertion markers.
     Blockly.Events.disable();
@@ -244,7 +250,7 @@ Blockly.InsertionMarkerManager.prototype.applyConnections = function() {
  *     currently over.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
+InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
   const candidate = this.getCandidate_(dxy);
 
   this.wouldDeleteBlock_ = this.shouldDelete_(candidate, dragTarget);
@@ -269,7 +275,7 @@ Blockly.InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
  *     block.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
+InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
   const imType = sourceBlock.type;
 
   Blockly.Events.disable();
@@ -293,14 +299,14 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
       }
       const resultInput = result.inputList[i];
       if (!resultInput) {
-        throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
+        throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
             .replace('%1', 'an input'));
       }
       for (let j = 0; j < sourceInput.fieldRow.length; j++) {
         const sourceField = sourceInput.fieldRow[j];
         const resultField = resultInput.fieldRow[j];
         if (!resultField) {
-          throw new Error(Blockly.InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
+          throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
               .replace('%1', 'a field'));
         }
         resultField.setValue(sourceField.getValue());
@@ -328,7 +334,7 @@ Blockly.InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlo
  *     connections.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
+InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
   const available = this.topBlock_.getConnections_(false);
   // Also check the last connection on this stack
   const lastOnStack = this.topBlock_.lastConnectionInStack(true);
@@ -358,7 +364,7 @@ Blockly.InsertionMarkerManager.prototype.initAvailableConnections_ = function()
  * @return {boolean} Whether the preview should be updated.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
+InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
     candidate, dxy) {
   const candidateLocal = candidate.local;
   const candidateClosest = candidate.closest;
@@ -406,7 +412,7 @@ Blockly.InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
  *     connection, and a radius.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
+InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
   let radius = this.getStartRadius_();
   let candidateClosest = null;
   let candidateLocal = null;
@@ -433,7 +439,7 @@ Blockly.InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
  *     connection.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.getStartRadius_ = function() {
+InsertionMarkerManager.prototype.getStartRadius_ = function() {
   // If there is already a connection highlighted,
   // increase the radius we check for making new connections.
   // Why? When a connection is highlighted, blocks move around when the insertion
@@ -456,7 +462,7 @@ Blockly.InsertionMarkerManager.prototype.getStartRadius_ = function() {
  *    block.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.shouldDelete_ = function(
+InsertionMarkerManager.prototype.shouldDelete_ = function(
     candidate, dragTarget) {
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
@@ -480,7 +486,7 @@ Blockly.InsertionMarkerManager.prototype.shouldDelete_ = function(
  *     connection, and a radius.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate) {
+InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate) {
   // Nope, don't add a marker.
   if (this.wouldDeleteBlock_) {
     return;
@@ -510,7 +516,7 @@ Blockly.InsertionMarkerManager.prototype.maybeShowPreview_ = function(candidate)
  * highlight or an insertion marker, and shows the appropriate one.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
+InsertionMarkerManager.prototype.showPreview_ = function() {
   const closest = this.closestConnection_;
   const renderer = this.workspace_.getRenderer();
   const method = renderer.getConnectionPreviewMethod(
@@ -519,13 +525,13 @@ Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
       this.topBlock_);
 
   switch (method) {
-    case Blockly.InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE:
+    case InsertionMarkerManager.PREVIEW_TYPE.INPUT_OUTLINE:
       this.showInsertionInputOutline_();
       break;
-    case Blockly.InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER:
+    case InsertionMarkerManager.PREVIEW_TYPE.INSERTION_MARKER:
       this.showInsertionMarker_();
       break;
-    case Blockly.InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE:
+    case InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE:
       this.showReplacementFade_();
       break;
   }
@@ -545,7 +551,7 @@ Blockly.InsertionMarkerManager.prototype.showPreview_ = function() {
  *     connection, and a radius.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
+InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
   // If there's no new preview, remove the old one but don't bother deleting it.
   // We might need it later, and this saves disposing of it and recreating it.
   if (!candidate.closest) {
@@ -574,7 +580,7 @@ Blockly.InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate)
  *  highlight or an insertion marker, and hides the appropriate one.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hidePreview_ = function() {
+InsertionMarkerManager.prototype.hidePreview_ = function() {
   if (this.closestConnection_ && this.closestConnection_.targetBlock() &&
       this.workspace_.getRenderer()
           .shouldHighlightConnection(this.closestConnection_)) {
@@ -594,7 +600,7 @@ Blockly.InsertionMarkerManager.prototype.hidePreview_ = function() {
  * manager state).
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
+InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
   const local = this.localConnection_;
   const closest = this.closestConnection_;
 
@@ -630,7 +636,7 @@ Blockly.InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
  * to their original state.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
+InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   if (!this.markerConnection_) {
     console.log('No insertion marker connection to disconnect');
     return;
@@ -686,7 +692,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
  * Shows an outline around the input the closest connection belongs to.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showInsertionInputOutline_ = function() {
+InsertionMarkerManager.prototype.showInsertionInputOutline_ = function() {
   const closest = this.closestConnection_;
   this.highlightedBlock_ = closest.getSourceBlock();
   this.highlightedBlock_.highlightShapeForInput(closest, true);
@@ -696,7 +702,7 @@ Blockly.InsertionMarkerManager.prototype.showInsertionInputOutline_ = function()
  * Hides any visible input outlines.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hideInsertionInputOutline_ = function() {
+InsertionMarkerManager.prototype.hideInsertionInputOutline_ = function() {
   this.highlightedBlock_.highlightShapeForInput(this.closestConnection_, false);
   this.highlightedBlock_ = null;
 };
@@ -706,7 +712,7 @@ Blockly.InsertionMarkerManager.prototype.hideInsertionInputOutline_ = function()
  * (the block that is currently connected to it).
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.showReplacementFade_ = function() {
+InsertionMarkerManager.prototype.showReplacementFade_ = function() {
   this.fadedBlock_ = this.closestConnection_.targetBlock();
   this.fadedBlock_.fadeForReplacement(true);
 };
@@ -715,7 +721,7 @@ Blockly.InsertionMarkerManager.prototype.showReplacementFade_ = function() {
  * Hides/Removes any visible fade affects.
  * @private
  */
-Blockly.InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
+InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
   this.fadedBlock_.fadeForReplacement(false);
   this.fadedBlock_ = null;
 };
@@ -727,7 +733,7 @@ Blockly.InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
  *     marker blocks.
  * @package
  */
-Blockly.InsertionMarkerManager.prototype.getInsertionMarkers = function() {
+InsertionMarkerManager.prototype.getInsertionMarkers = function() {
   const result = [];
   if (this.firstMarker_) {
     result.push(this.firstMarker_);
@@ -737,3 +743,5 @@ Blockly.InsertionMarkerManager.prototype.getInsertionMarkers = function() {
   }
   return result;
 };
+
+exports = InsertionMarkerManager;
diff --git a/tests/deps.js b/tests/deps.js
index 3da6c1e78..15bbfa67b 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -83,7 +83,7 @@ goog.addDependency('../../core/icon.js', ['Blockly.Icon'], ['Blockly.browserEven
 goog.addDependency('../../core/inject.js', ['Blockly.inject'], ['Blockly.BlockDragSurfaceSvg', 'Blockly.Css', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Grid', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ScrollbarPair', 'Blockly.Tooltip', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceSvg', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);
 goog.addDependency('../../core/input.js', ['Blockly.Input'], ['Blockly.FieldLabel', 'Blockly.constants', 'Blockly.fieldRegistry', 'Blockly.inputTypes'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/input_types.js', ['Blockly.inputTypes'], ['Blockly.connectionTypes'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.internalConstants'], {'lang': 'es5'});
+goog.addDependency('../../core/insertion_marker_manager.js', ['Blockly.InsertionMarkerManager'], ['Blockly.ComponentManager', 'Blockly.Events', 'Blockly.blockAnimations', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location.js', ['Blockly.IASTNodeLocation'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_svg.js', ['Blockly.IASTNodeLocationSvg'], [], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/interfaces/i_ast_node_location_with_block.js', ['Blockly.IASTNodeLocationWithBlock'], [], {'lang': 'es6', 'module': 'goog'});

From 0bb3f3af84b9ba1ccaa96fa6b01c93f05e0862af Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 17:00:42 -0700
Subject: [PATCH 285/291] Migrate core/insertion_marker_manager.js named
 requires

---
 core/insertion_marker_manager.js | 115 ++++++++++++++++---------------
 1 file changed, 60 insertions(+), 55 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 07940f106..64a8fa936 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -15,26 +15,31 @@ goog.module.declareLegacyNamespace();
 
 // TODO(#5073): Add Blockly require after fixing circular dependency.
 // goog.require('Blockly');
-goog.require('Blockly.blockAnimations');
-goog.require('Blockly.constants');
-goog.require('Blockly.ComponentManager');
-goog.require('Blockly.connectionTypes');
-goog.require('Blockly.Events');
-goog.require('Blockly.internalConstants');
-
-goog.requireType('Blockly.BlockSvg');
-goog.requireType('Blockly.IDeleteArea');
-goog.requireType('Blockly.IDragTarget');
-goog.requireType('Blockly.RenderedConnection');
-goog.requireType('Blockly.utils.Coordinate');
-goog.requireType('Blockly.WorkspaceSvg');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+const ComponentManager = goog.require('Blockly.ComponentManager');
+/* eslint-disable-next-line no-unused-vars */
+const Coordinate = goog.requireType('Blockly.utils.Coordinate');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const IDeleteArea = goog.requireType('Blockly.IDeleteArea');
+/* eslint-disable-next-line no-unused-vars */
+const IDragTarget = goog.requireType('Blockly.IDragTarget');
+/* eslint-disable-next-line no-unused-vars */
+const RenderedConnection = goog.requireType('Blockly.RenderedConnection');
+/* eslint-disable-next-line no-unused-vars */
+const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg');
+const blockAnimations = goog.require('Blockly.blockAnimations');
+const connectionTypes = goog.require('Blockly.connectionTypes');
+const constants = goog.require('Blockly.constants');
+const internalConstants = goog.require('Blockly.internalConstants');
 
 
 /**
  * Class that controls updates to connections during drags.  It is primarily
  * responsible for finding the closest eligible connection and highlighting or
  * unhiglighting it as needed during a drag.
- * @param {!Blockly.BlockSvg} block The top block in the stack being dragged.
+ * @param {!BlockSvg} block The top block in the stack being dragged.
  * @constructor
  */
 const InsertionMarkerManager = function(block) {
@@ -43,7 +48,7 @@ const InsertionMarkerManager = function(block) {
   /**
    * The top block in the stack being dragged.
    * Does not change during a drag.
-   * @type {!Blockly.BlockSvg}
+   * @type {!BlockSvg}
    * @private
    */
   this.topBlock_ = block;
@@ -51,7 +56,7 @@ const InsertionMarkerManager = function(block) {
   /**
    * The workspace on which these connections are being dragged.
    * Does not change during a drag.
-   * @type {!Blockly.WorkspaceSvg}
+   * @type {!WorkspaceSvg}
    * @private
    */
   this.workspace_ = block.workspace;
@@ -60,7 +65,7 @@ const InsertionMarkerManager = function(block) {
    * The last connection on the stack, if it's not the last connection on the
    * first block.
    * Set in initAvailableConnections, if at all.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.lastOnStack_ = null;
@@ -69,7 +74,7 @@ const InsertionMarkerManager = function(block) {
    * The insertion marker corresponding to the last block in the stack, if
    * that's not the same as the first block in the stack.
    * Set in initAvailableConnections, if at all
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.lastMarker_ = null;
@@ -77,7 +82,7 @@ const InsertionMarkerManager = function(block) {
   /**
    * The insertion marker that shows up between blocks to show where a block
    * would go if dropped immediately.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.firstMarker_ = this.createMarkerBlock_(this.topBlock_);
@@ -86,7 +91,7 @@ const InsertionMarkerManager = function(block) {
    * The connection that this block would connect to if released immediately.
    * Updated on every mouse move.
    * This is not on any of the blocks that are being dragged.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.closestConnection_ = null;
@@ -97,7 +102,7 @@ const InsertionMarkerManager = function(block) {
    * Updated on every mouse move.
    * This is on the top block that is being dragged or the last block in the
    * dragging stack.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.localConnection_ = null;
@@ -113,21 +118,21 @@ const InsertionMarkerManager = function(block) {
   /**
    * Connection on the insertion marker block that corresponds to
    * this.localConnection_ on the currently dragged block.
-   * @type {Blockly.RenderedConnection}
+   * @type {RenderedConnection}
    * @private
    */
   this.markerConnection_ = null;
 
   /**
    * The block that currently has an input being highlighted, or null.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.highlightedBlock_ = null;
 
   /**
    * The block being faded to indicate replacement, or null.
-   * @type {Blockly.BlockSvg}
+   * @type {BlockSvg}
    * @private
    */
   this.fadedBlock_ = null;
@@ -137,7 +142,7 @@ const InsertionMarkerManager = function(block) {
    * other blocks.  This includes all open connections on the top block, as well
    * as the last connection on the block stack.
    * Does not change during a drag.
-   * @type {!Array<!Blockly.RenderedConnection>}
+   * @type {!Array<!RenderedConnection>}
    * @private
    */
   this.availableConnections_ = this.initAvailableConnections_();
@@ -172,7 +177,7 @@ InsertionMarkerManager.DUPLICATE_BLOCK_ERROR = 'The insertion marker ' +
 InsertionMarkerManager.prototype.dispose = function() {
   this.availableConnections_.length = 0;
 
-  Blockly.Events.disable();
+  Events.disable();
   try {
     if (this.firstMarker_) {
       this.firstMarker_.dispose();
@@ -181,7 +186,7 @@ InsertionMarkerManager.prototype.dispose = function() {
       this.lastMarker_.dispose();
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
 };
 
@@ -223,9 +228,9 @@ InsertionMarkerManager.prototype.wouldConnectBlock = function() {
 InsertionMarkerManager.prototype.applyConnections = function() {
   if (this.closestConnection_) {
     // Don't fire events for insertion markers.
-    Blockly.Events.disable();
+    Events.disable();
     this.hidePreview_();
-    Blockly.Events.enable();
+    Events.enable();
     // Connect two blocks together.
     this.localConnection_.connect(this.closestConnection_);
     if (this.topBlock_.rendered) {
@@ -233,7 +238,7 @@ InsertionMarkerManager.prototype.applyConnections = function() {
       // Determine which connection is inferior (lower in the source stack).
       const inferiorConnection = this.localConnection_.isSuperior() ?
           this.closestConnection_ : this.localConnection_;
-      Blockly.blockAnimations.connectionUiEffect(
+      blockAnimations.connectionUiEffect(
           inferiorConnection.getSourceBlock());
       // Bring the just-edited stack to the front.
       const rootBlock = this.topBlock_.getRootBlock();
@@ -244,9 +249,9 @@ InsertionMarkerManager.prototype.applyConnections = function() {
 
 /**
  * Update connections based on the most recent move location.
- * @param {!Blockly.utils.Coordinate} dxy Position relative to drag start,
+ * @param {!Coordinate} dxy Position relative to drag start,
  *     in workspace units.
- * @param {?Blockly.IDragTarget} dragTarget The drag target that the block is
+ * @param {?IDragTarget} dragTarget The drag target that the block is
  *     currently over.
  * @package
  */
@@ -260,25 +265,25 @@ InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
 
   if (shouldUpdate) {
     // Don't fire events for insertion marker creation or movement.
-    Blockly.Events.disable();
+    Events.disable();
     this.maybeHidePreview_(candidate);
     this.maybeShowPreview_(candidate);
-    Blockly.Events.enable();
+    Events.enable();
   }
 };
 
 /**
  * Create an insertion marker that represents the given block.
- * @param {!Blockly.BlockSvg} sourceBlock The block that the insertion marker
+ * @param {!BlockSvg} sourceBlock The block that the insertion marker
  *     will represent.
- * @return {!Blockly.BlockSvg} The insertion marker that represents the given
+ * @return {!BlockSvg} The insertion marker that represents the given
  *     block.
  * @private
  */
 InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
   const imType = sourceBlock.type;
 
-  Blockly.Events.disable();
+  Events.disable();
   let result;
   try {
     result = this.workspace_.newBlock(imType);
@@ -294,7 +299,7 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
     // child blocks here.
     for (let i = 0; i < sourceBlock.inputList.length; i++) {
       const sourceInput = sourceBlock.inputList[i];
-      if (sourceInput.name == Blockly.constants.COLLAPSED_INPUT_NAME) {
+      if (sourceInput.name == constants.COLLAPSED_INPUT_NAME) {
         continue;  // Ignore the collapsed input.
       }
       const resultInput = result.inputList[i];
@@ -319,7 +324,7 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
     result.initSvg();
     result.getSvgRoot().setAttribute('visibility', 'hidden');
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
 
   return result;
@@ -330,7 +335,7 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
  * only be called once, at the beginning of a drag.
  * If the stack has more than one block, this function will populate
  * lastOnStack_ and create the corresponding insertion marker.
- * @return {!Array<!Blockly.RenderedConnection>} A list of available
+ * @return {!Array<!RenderedConnection>} A list of available
  *     connections.
  * @private
  */
@@ -342,11 +347,11 @@ InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
     available.push(lastOnStack);
     this.lastOnStack_ = lastOnStack;
     if (this.lastMarker_) {
-      Blockly.Events.disable();
+      Events.disable();
       try {
         this.lastMarker_.dispose();
       } finally {
-        Blockly.Events.enable();
+        Events.enable();
       }
     }
     this.lastMarker_ = this.createMarkerBlock_(lastOnStack.getSourceBlock());
@@ -359,7 +364,7 @@ InsertionMarkerManager.prototype.initAvailableConnections_ = function() {
  * updated based on the closest candidate and the current drag distance.
  * @param {!Object} candidate An object containing a local connection, a closest
  *     connection, and a radius.  Returned by getCandidate_.
- * @param {!Blockly.utils.Coordinate} dxy Position relative to drag start,
+ * @param {!Coordinate} dxy Position relative to drag start,
  *     in workspace units.
  * @return {boolean} Whether the preview should be updated.
  * @private
@@ -387,7 +392,7 @@ InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
       return !(
           candidateClosest &&
           radius > curDistance -
-                  Blockly.internalConstants.CURRENT_CONNECTION_PREFERENCE);
+                  internalConstants.CURRENT_CONNECTION_PREFERENCE);
     } else if (!this.localConnection_ && !this.closestConnection_) {
     // We weren't showing a preview before, but we should now.
       return true;
@@ -406,7 +411,7 @@ InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
 /**
  * Find the nearest valid connection, which may be the same as the current
  * closest connection.
- * @param {!Blockly.utils.Coordinate} dxy Position relative to drag start,
+ * @param {!Coordinate} dxy Position relative to drag start,
  *     in workspace units.
  * @return {!Object} An object containing a local connection, a closest
  *     connection, and a radius.
@@ -447,16 +452,16 @@ InsertionMarkerManager.prototype.getStartRadius_ = function() {
   // By increasing radiusConnection when a connection already exists,
   // we never "lose" the connection from the offset.
   if (this.closestConnection_ && this.localConnection_) {
-    return Blockly.internalConstants.CONNECTING_SNAP_RADIUS;
+    return internalConstants.CONNECTING_SNAP_RADIUS;
   }
-  return Blockly.internalConstants.SNAP_RADIUS;
+  return internalConstants.SNAP_RADIUS;
 };
 
 /**
  * Whether ending the drag would delete the block.
  * @param {!Object} candidate An object containing a local connection, a closest
  *    connection, and a radius.
- * @param {?Blockly.IDragTarget} dragTarget The drag target that the block is
+ * @param {?IDragTarget} dragTarget The drag target that the block is
  *     currently over.
  * @return {boolean} Whether dropping the block immediately would delete the
  *    block.
@@ -467,10 +472,10 @@ InsertionMarkerManager.prototype.shouldDelete_ = function(
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
     const isDeleteArea = componentManager.hasCapability(dragTarget.id,
-        Blockly.ComponentManager.Capability.DELETE_AREA);
+        ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (
-        /** @type {!Blockly.IDeleteArea} */ (dragTarget))
+        /** @type {!IDeleteArea} */ (dragTarget))
           .wouldDelete(this.topBlock_, candidate && !!candidate.closest);
     }
   }
@@ -520,8 +525,8 @@ InsertionMarkerManager.prototype.showPreview_ = function() {
   const closest = this.closestConnection_;
   const renderer = this.workspace_.getRenderer();
   const method = renderer.getConnectionPreviewMethod(
-      /** @type {!Blockly.RenderedConnection} */ (closest),
-      /** @type {!Blockly.RenderedConnection} */ (this.localConnection_),
+      /** @type {!RenderedConnection} */ (closest),
+      /** @type {!RenderedConnection} */ (this.localConnection_),
       this.topBlock_);
 
   switch (method) {
@@ -652,7 +657,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
       (imConn == markerNext && !(markerPrev && markerPrev.targetConnection));
 
   const isFirstInOutputStack =
-      imConn.type == Blockly.connectionTypes.INPUT_VALUE &&
+      imConn.type == connectionTypes.INPUT_VALUE &&
       !(markerOutput && markerOutput.targetConnection);
   // The insertion marker is the first block in a stack.  Unplug won't do
   // anything in that case.  Instead, unplug the following block.
@@ -660,7 +665,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
     imConn.targetBlock().unplug(false);
   }
   // Inside of a C-block, first statement connection.
-  else if (imConn.type == Blockly.connectionTypes.NEXT_STATEMENT &&
+  else if (imConn.type == connectionTypes.NEXT_STATEMENT &&
       imConn != markerNext) {
     const innerConnection = imConn.targetConnection;
     innerConnection.getSourceBlock().unplug(false);
@@ -729,7 +734,7 @@ InsertionMarkerManager.prototype.hideReplacementFade_ = function() {
 /**
  * Get a list of the insertion markers that currently exist.  Drags have 0, 1,
  * or 2 insertion markers.
- * @return {!Array<!Blockly.BlockSvg>} A possibly empty list of insertion
+ * @return {!Array<!BlockSvg>} A possibly empty list of insertion
  *     marker blocks.
  * @package
  */

From 390469435b4f114afe48f8a511476d489ad7239e Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 17:00:52 -0700
Subject: [PATCH 286/291] clang-format core/insertion_marker_manager.js

---
 core/insertion_marker_manager.js | 73 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index 64a8fa936..41be57fff 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -237,9 +237,9 @@ InsertionMarkerManager.prototype.applyConnections = function() {
       // Trigger a connection animation.
       // Determine which connection is inferior (lower in the source stack).
       const inferiorConnection = this.localConnection_.isSuperior() ?
-          this.closestConnection_ : this.localConnection_;
-      blockAnimations.connectionUiEffect(
-          inferiorConnection.getSourceBlock());
+          this.closestConnection_ :
+          this.localConnection_;
+      blockAnimations.connectionUiEffect(inferiorConnection.getSourceBlock());
       // Bring the just-edited stack to the front.
       const rootBlock = this.topBlock_.getRootBlock();
       rootBlock.bringToFront();
@@ -260,8 +260,8 @@ InsertionMarkerManager.prototype.update = function(dxy, dragTarget) {
 
   this.wouldDeleteBlock_ = this.shouldDelete_(candidate, dragTarget);
 
-  const shouldUpdate = this.wouldDeleteBlock_ ||
-      this.shouldUpdatePreviews_(candidate, dxy);
+  const shouldUpdate =
+      this.wouldDeleteBlock_ || this.shouldUpdatePreviews_(candidate, dxy);
 
   if (shouldUpdate) {
     // Don't fire events for insertion marker creation or movement.
@@ -304,15 +304,15 @@ InsertionMarkerManager.prototype.createMarkerBlock_ = function(sourceBlock) {
       }
       const resultInput = result.inputList[i];
       if (!resultInput) {
-        throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
-            .replace('%1', 'an input'));
+        throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR.replace(
+            '%1', 'an input'));
       }
       for (let j = 0; j < sourceInput.fieldRow.length; j++) {
         const sourceField = sourceInput.fieldRow[j];
         const resultField = resultInput.fieldRow[j];
         if (!resultField) {
-          throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR
-              .replace('%1', 'a field'));
+          throw new Error(InsertionMarkerManager.DUPLICATE_BLOCK_ERROR.replace(
+              '%1', 'a field'));
         }
         resultField.setValue(sourceField.getValue());
       }
@@ -391,20 +391,22 @@ InsertionMarkerManager.prototype.shouldUpdatePreviews_ = function(
       // Slightly prefer the existing preview over a new preview.
       return !(
           candidateClosest &&
-          radius > curDistance -
-                  internalConstants.CURRENT_CONNECTION_PREFERENCE);
+          radius >
+              curDistance - internalConstants.CURRENT_CONNECTION_PREFERENCE);
     } else if (!this.localConnection_ && !this.closestConnection_) {
-    // We weren't showing a preview before, but we should now.
+      // We weren't showing a preview before, but we should now.
       return true;
     } else {
-      console.error('Only one of localConnection_ and closestConnection_ was set.');
+      console.error(
+          'Only one of localConnection_ and closestConnection_ was set.');
     }
   } else {  // No connection found.
     // Only need to update if we were showing a preview before.
     return !!(this.localConnection_ && this.closestConnection_);
   }
 
-  console.error('Returning true from shouldUpdatePreviews, but it\'s not clear why.');
+  console.error(
+      'Returning true from shouldUpdatePreviews, but it\'s not clear why.');
   return true;
 };
 
@@ -431,11 +433,7 @@ InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
       radius = neighbour.radius;
     }
   }
-  return {
-    closest: candidateClosest,
-    local: candidateLocal,
-    radius: radius
-  };
+  return {closest: candidateClosest, local: candidateLocal, radius: radius};
 };
 
 /**
@@ -447,10 +445,10 @@ InsertionMarkerManager.prototype.getCandidate_ = function(dxy) {
 InsertionMarkerManager.prototype.getStartRadius_ = function() {
   // If there is already a connection highlighted,
   // increase the radius we check for making new connections.
-  // Why? When a connection is highlighted, blocks move around when the insertion
-  // marker is created, which could cause the connection became out of range.
-  // By increasing radiusConnection when a connection already exists,
-  // we never "lose" the connection from the offset.
+  // Why? When a connection is highlighted, blocks move around when the
+  // insertion marker is created, which could cause the connection became out of
+  // range. By increasing radiusConnection when a connection already exists, we
+  // never "lose" the connection from the offset.
   if (this.closestConnection_ && this.localConnection_) {
     return internalConstants.CONNECTING_SNAP_RADIUS;
   }
@@ -471,11 +469,11 @@ InsertionMarkerManager.prototype.shouldDelete_ = function(
     candidate, dragTarget) {
   if (dragTarget) {
     const componentManager = this.workspace_.getComponentManager();
-    const isDeleteArea = componentManager.hasCapability(dragTarget.id,
-        ComponentManager.Capability.DELETE_AREA);
+    const isDeleteArea = componentManager.hasCapability(
+        dragTarget.id, ComponentManager.Capability.DELETE_AREA);
     if (isDeleteArea) {
       return (
-        /** @type {!IDeleteArea} */ (dragTarget))
+                 /** @type {!IDeleteArea} */ (dragTarget))
           .wouldDelete(this.topBlock_, candidate && !!candidate.closest);
     }
   }
@@ -568,8 +566,10 @@ InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
     const closestChanged = this.closestConnection_ != candidate.closest;
     const localChanged = this.localConnection_ != candidate.local;
 
-    // Also hide if we had a preview before but now we're going to delete instead.
-    if (hadPreview && (closestChanged || localChanged || this.wouldDeleteBlock_)) {
+    // Also hide if we had a preview before but now we're going to delete
+    // instead.
+    if (hadPreview &&
+        (closestChanged || localChanged || this.wouldDeleteBlock_)) {
       this.hidePreview_();
     }
   }
@@ -587,8 +587,8 @@ InsertionMarkerManager.prototype.maybeHidePreview_ = function(candidate) {
  */
 InsertionMarkerManager.prototype.hidePreview_ = function() {
   if (this.closestConnection_ && this.closestConnection_.targetBlock() &&
-      this.workspace_.getRenderer()
-          .shouldHighlightConnection(this.closestConnection_)) {
+      this.workspace_.getRenderer().shouldHighlightConnection(
+          this.closestConnection_)) {
     this.closestConnection_.unhighlight();
   }
   if (this.fadedBlock_) {
@@ -614,7 +614,8 @@ InsertionMarkerManager.prototype.showInsertionMarker_ = function() {
   const imConn = imBlock.getMatchingConnection(local.getSourceBlock(), local);
 
   if (imConn == this.markerConnection_) {
-    throw Error('Made it to showInsertionMarker_ even though the marker isn\'t ' +
+    throw Error(
+        'Made it to showInsertionMarker_ even though the marker isn\'t ' +
         'changing');
   }
 
@@ -656,8 +657,7 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   const isFirstInStatementStack =
       (imConn == markerNext && !(markerPrev && markerPrev.targetConnection));
 
-  const isFirstInOutputStack =
-      imConn.type == connectionTypes.INPUT_VALUE &&
+  const isFirstInOutputStack = imConn.type == connectionTypes.INPUT_VALUE &&
       !(markerOutput && markerOutput.targetConnection);
   // The insertion marker is the first block in a stack.  Unplug won't do
   // anything in that case.  Instead, unplug the following block.
@@ -665,8 +665,8 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
     imConn.targetBlock().unplug(false);
   }
   // Inside of a C-block, first statement connection.
-  else if (imConn.type == connectionTypes.NEXT_STATEMENT &&
-      imConn != markerNext) {
+  else if (
+      imConn.type == connectionTypes.NEXT_STATEMENT && imConn != markerNext) {
     const innerConnection = imConn.targetConnection;
     innerConnection.getSourceBlock().unplug(false);
 
@@ -682,7 +682,8 @@ InsertionMarkerManager.prototype.hideInsertionMarker_ = function() {
   }
 
   if (imConn.targetConnection) {
-    throw Error('markerConnection_ still connected at the end of ' +
+    throw Error(
+        'markerConnection_ still connected at the end of ' +
         'disconnectInsertionMarker');
   }
 

From 66130e66689bfef1958ba6250a18c0507d76e3b5 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Mon, 2 Aug 2021 17:26:09 -0700
Subject: [PATCH 287/291] Migrate core/xml.js to ES6 const/let

---
 core/xml.js | 259 ++++++++++++++++++++++++++++------------------------
 1 file changed, 139 insertions(+), 120 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index b32489f0f..1b1db8966 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -39,18 +39,20 @@ goog.requireType('Blockly.WorkspaceCommentSvg');
  * @return {!Element} XML DOM element.
  */
 Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
-  var xml = Blockly.utils.xml.createElement('xml');
-  var variablesElement = Blockly.Xml.variablesToDom(
+  const xml = Blockly.utils.xml.createElement('xml');
+  const variablesElement = Blockly.Xml.variablesToDom(
       Blockly.Variables.allUsedVarModels(workspace));
   if (variablesElement.hasChildNodes()) {
     xml.appendChild(variablesElement);
   }
-  var comments = workspace.getTopComments(true);
-  for (var i = 0, comment; (comment = comments[i]); i++) {
+  const comments = workspace.getTopComments(true);
+  for (let i = 0; i < comments.length; i++) {
+    const comment = comments[i];
     xml.appendChild(comment.toXmlWithXY(opt_noId));
   }
-  var blocks = workspace.getTopBlocks(true);
-  for (var i = 0, block; (block = blocks[i]); i++) {
+  const blocks = workspace.getTopBlocks(true);
+  for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i];
     xml.appendChild(Blockly.Xml.blockToDomWithXY(block, opt_noId));
   }
   return xml;
@@ -63,9 +65,10 @@ Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
  * @return {!Element} Tree of XML elements.
  */
 Blockly.Xml.variablesToDom = function(variableList) {
-  var variables = Blockly.utils.xml.createElement('variables');
-  for (var i = 0, variable; (variable = variableList[i]); i++) {
-    var element = Blockly.utils.xml.createElement('variable');
+  const variables = Blockly.utils.xml.createElement('variables');
+  for (let i = 0; i < variableList.length; i++) {
+    const variable = variableList[i];
+    const element = Blockly.utils.xml.createElement('variable');
     element.appendChild(Blockly.utils.xml.createTextNode(variable.name));
     if (variable.type) {
       element.setAttribute('type', variable.type);
@@ -92,13 +95,13 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
     }
   }
 
-  var width;  // Not used in LTR.
+  let width;  // Not used in LTR.
   if (block.workspace.RTL) {
     width = block.workspace.getWidth();
   }
 
-  var element = Blockly.Xml.blockToDom(block, opt_noId);
-  var xy = block.getRelativeToSurfaceXY();
+  const element = Blockly.Xml.blockToDom(block, opt_noId);
+  const xy = block.getRelativeToSurfaceXY();
   element.setAttribute('x',
       Math.round(block.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
@@ -114,7 +117,7 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
  */
 Blockly.Xml.fieldToDom_ = function(field) {
   if (field.isSerializable()) {
-    var container = Blockly.utils.xml.createElement('field');
+    const container = Blockly.utils.xml.createElement('field');
     container.setAttribute('name', field.name || '');
     return field.toXml(container);
   }
@@ -130,9 +133,11 @@ Blockly.Xml.fieldToDom_ = function(field) {
  * @private
  */
 Blockly.Xml.allFieldsToDom_ = function(block, element) {
-  for (var i = 0, input; (input = block.inputList[i]); i++) {
-    for (var j = 0, field; (field = input.fieldRow[j]); j++) {
-      var fieldDom = Blockly.Xml.fieldToDom_(field);
+  for (let i = 0; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
+    for (let j = 0; j < input.fieldRow.length; j++) {
+      const field = input.fieldRow[j];
+      const fieldDom = Blockly.Xml.fieldToDom_(field);
       if (fieldDom) {
         element.appendChild(fieldDom);
       }
@@ -150,7 +155,7 @@ Blockly.Xml.allFieldsToDom_ = function(block, element) {
 Blockly.Xml.blockToDom = function(block, opt_noId) {
   // Skip over insertion markers.
   if (block.isInsertionMarker()) {
-    var child = block.getChildren(false)[0];
+    const child = block.getChildren(false)[0];
     if (child) {
       return Blockly.Xml.blockToDom(child);
     } else {
@@ -159,8 +164,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
     }
   }
 
-
-  var element =
+  const element =
       Blockly.utils.xml.createElement(block.isShadow() ? 'shadow' : 'block');
   element.setAttribute('type', block.type);
   if (!opt_noId) {
@@ -170,7 +174,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   }
   if (block.mutationToDom) {
     // Custom data for an advanced block.
-    var mutation = block.mutationToDom();
+    const mutation = block.mutationToDom();
     if (mutation && (mutation.hasChildNodes() || mutation.hasAttributes())) {
       element.appendChild(mutation);
     }
@@ -178,12 +182,12 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
 
   Blockly.Xml.allFieldsToDom_(block, element);
 
-  var commentText = block.getCommentText();
+  const commentText = block.getCommentText();
   if (commentText) {
-    var size = block.commentModel.size;
-    var pinned = block.commentModel.pinned;
+    const size = block.commentModel.size;
+    const pinned = block.commentModel.pinned;
 
-    var commentElement = Blockly.utils.xml.createElement('comment');
+    const commentElement = Blockly.utils.xml.createElement('comment');
     commentElement.appendChild(Blockly.utils.xml.createTextNode(commentText));
     commentElement.setAttribute('pinned', pinned);
     commentElement.setAttribute('h', size.height);
@@ -193,29 +197,30 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   }
 
   if (block.data) {
-    var dataElement = Blockly.utils.xml.createElement('data');
+    const dataElement = Blockly.utils.xml.createElement('data');
     dataElement.appendChild(Blockly.utils.xml.createTextNode(block.data));
     element.appendChild(dataElement);
   }
 
-  for (var i = 0, input; (input = block.inputList[i]); i++) {
-    var container;
-    var empty = true;
+  for (let i = 0; i < block.inputList.length; i++) {
+    const input = block.inputList[i];
+    let container;
+    let empty = true;
     if (input.type == Blockly.inputTypes.DUMMY) {
       continue;
     } else {
-      var childBlock = input.connection.targetBlock();
+      const childBlock = input.connection.targetBlock();
       if (input.type == Blockly.inputTypes.VALUE) {
         container = Blockly.utils.xml.createElement('value');
       } else if (input.type == Blockly.inputTypes.STATEMENT) {
         container = Blockly.utils.xml.createElement('statement');
       }
-      var shadow = input.connection.getShadowDom();
+      const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
         container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
       }
       if (childBlock) {
-        var elem = Blockly.Xml.blockToDom(childBlock, opt_noId);
+        const elem = Blockly.Xml.blockToDom(childBlock, opt_noId);
         if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
           container.appendChild(elem);
           empty = false;
@@ -247,16 +252,17 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
     element.setAttribute('editable', false);
   }
 
-  var nextBlock = block.getNextBlock();
+  const nextBlock = block.getNextBlock();
+  let container;
   if (nextBlock) {
-    var elem = Blockly.Xml.blockToDom(nextBlock, opt_noId);
+    const elem = Blockly.Xml.blockToDom(nextBlock, opt_noId);
     if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
-      var container = Blockly.utils.xml.createElement('next');
+      container = Blockly.utils.xml.createElement('next');
       container.appendChild(elem);
       element.appendChild(container);
     }
   }
-  var shadow = block.nextConnection && block.nextConnection.getShadowDom();
+  const shadow = block.nextConnection && block.nextConnection.getShadowDom();
   if (shadow && (!nextBlock || !nextBlock.isShadow())) {
     container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
   }
@@ -274,8 +280,8 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
 Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
   shadow = shadow.cloneNode(true);
   // Walk the tree looking for whitespace.  Don't prune whitespace in a tag.
-  var node = shadow;
-  var textNode;
+  let node = shadow;
+  let textNode;
   while (node) {
     if (opt_noId && node.nodeName == 'shadow') {
       // Strip off IDs from shadow blocks.  There should never be a 'block' as
@@ -316,7 +322,7 @@ Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
  * @return {string} Text representation.
  */
 Blockly.Xml.domToText = function(dom) {
-  var text = Blockly.utils.xml.domToText(dom);
+  const text = Blockly.utils.xml.domToText(dom);
   // Unpack self-closing tags.  These tags fail when embedded in HTML.
   // <block name="foo"/> -> <block name="foo"></block>
   return text.replace(/<(\w+)([^<]*)\/>/g, '<$1$2></$1>');
@@ -330,13 +336,13 @@ Blockly.Xml.domToText = function(dom) {
 Blockly.Xml.domToPrettyText = function(dom) {
   // This function is not guaranteed to be correct for all XML.
   // But it handles the XML that Blockly generates.
-  var blob = Blockly.Xml.domToText(dom);
+  const blob = Blockly.Xml.domToText(dom);
   // Place every open and close tag on its own line.
-  var lines = blob.split('<');
+  const lines = blob.split('<');
   // Indent every line.
-  var indent = '';
-  for (var i = 1; i < lines.length; i++) {
-    var line = lines[i];
+  let indent = '';
+  for (let i = 1; i < lines.length; i++) {
+    const line = lines[i];
     if (line[0] == '/') {
       indent = indent.substring(2);
     }
@@ -347,7 +353,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
   }
   // Pull simple tags back together.
   // E.g. <foo></foo>
-  var text = lines.join('\n');
+  let text = lines.join('\n');
   text = text.replace(/(<(\w+)\b[^>]*>[^\n]*)\n *<\/\2>/g, '$1</$2>');
   // Trim leading blank line.
   return text.replace(/^\n/, '');
@@ -361,7 +367,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
  * @throws if the text doesn't parse.
  */
 Blockly.Xml.textToDom = function(text) {
-  var doc = Blockly.utils.xml.textToDomDocument(text);
+  const doc = Blockly.utils.xml.textToDomDocument(text);
   if (!doc || !doc.documentElement ||
       doc.getElementsByTagName('parsererror').length) {
     throw Error('textToDom was unable to parse: ' + text);
@@ -379,7 +385,7 @@ Blockly.Xml.textToDom = function(text) {
 Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
   workspace.setResizesEnabled(false);
   workspace.clear();
-  var blockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const blockIds = Blockly.Xml.domToWorkspace(xml, workspace);
   workspace.setResizesEnabled(true);
   return blockIds;
 };
@@ -394,7 +400,7 @@ Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
  */
 Blockly.Xml.domToWorkspace = function(xml, workspace) {
   if (xml instanceof Blockly.Workspace) {
-    var swap = xml;
+    const swap = xml;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xml = workspace;
@@ -403,13 +409,13 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
                  'swap the arguments.');
   }
 
-  var width;  // Not used in LTR.
+  let width;  // Not used in LTR.
   if (workspace.RTL) {
     width = workspace.getWidth();
   }
-  var newBlockIds = [];  // A list of block IDs added by this call.
+  const newBlockIds = [];  // A list of block IDs added by this call.
   Blockly.utils.dom.startTextWidthCache();
-  var existingGroup = Blockly.Events.getGroup();
+  const existingGroup = Blockly.Events.getGroup();
   if (!existingGroup) {
     Blockly.Events.setGroup(true);
   }
@@ -418,21 +424,22 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(false);
   }
-  var variablesFirst = true;
+  let variablesFirst = true;
   try {
-    for (var i = 0, xmlChild; (xmlChild = xml.childNodes[i]); i++) {
-      var name = xmlChild.nodeName.toLowerCase();
-      var xmlChildElement = /** @type {!Element} */ (xmlChild);
+    for (let i = 0; i < xml.childNodes.length; i++) {
+      const xmlChild = xml.childNodes[i];
+      const name = xmlChild.nodeName.toLowerCase();
+      const xmlChildElement = /** @type {!Element} */ (xmlChild);
       if (name == 'block' ||
           (name == 'shadow' && !Blockly.Events.recordUndo)) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
-        var block = Blockly.Xml.domToBlock(xmlChildElement, workspace);
+        const block = Blockly.Xml.domToBlock(xmlChildElement, workspace);
         newBlockIds.push(block.id);
-        var blockX = xmlChildElement.hasAttribute('x') ?
+        const blockX = xmlChildElement.hasAttribute('x') ?
             parseInt(xmlChildElement.getAttribute('x'), 10) : 10;
-        var blockY = xmlChildElement.hasAttribute('y') ?
+        const blockY = xmlChildElement.hasAttribute('y') ?
             parseInt(xmlChildElement.getAttribute('y'), 10) : 10;
         if (!isNaN(blockX) && !isNaN(blockY)) {
           block.moveBy(workspace.RTL ? width - blockX : blockX, blockY);
@@ -495,26 +502,26 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
  * @return {!Array<string>} An array containing new block IDs.
  */
 Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
-  var bbox;  // Bounding box of the current blocks.
+  let bbox;  // Bounding box of the current blocks.
   // First check if we have a workspaceSvg, otherwise the blocks have no shape
   // and the position does not matter.
   if (Object.prototype.hasOwnProperty.call(workspace, 'scale')) {
     bbox = workspace.getBlocksBoundingBox();
   }
   // Load the new blocks into the workspace and get the IDs of the new blocks.
-  var newBlockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const newBlockIds = Blockly.Xml.domToWorkspace(xml, workspace);
   if (bbox && bbox.top != bbox.bottom) {  // check if any previous block
-    var offsetY = 0;  // offset to add to y of the new block
-    var offsetX = 0;
-    var farY = bbox.bottom;  // bottom position
-    var topX = workspace.RTL ? bbox.right : bbox.left;  // x of bounding box
+    let offsetY = 0;  // offset to add to y of the new block
+    let offsetX = 0;
+    const farY = bbox.bottom;  // bottom position
+    const topX = workspace.RTL ? bbox.right : bbox.left;  // x of bounding box
     // Check position of the new blocks.
-    var newLeftX = Infinity;  // x of top left corner
-    var newRightX = -Infinity;  // x of top right corner
-    var newY = Infinity;  // y of top corner
-    var ySeparation = 10;
-    for (var i = 0; i < newBlockIds.length; i++) {
-      var blockXY =
+    let newLeftX = Infinity;  // x of top left corner
+    let newRightX = -Infinity;  // x of top right corner
+    let newY = Infinity;  // y of top corner
+    const ySeparation = 10;
+    for (let i = 0; i < newBlockIds.length; i++) {
+      const blockXY =
           workspace.getBlockById(newBlockIds[i]).getRelativeToSurfaceXY();
       if (blockXY.y < newY) {
         newY = blockXY.y;
@@ -528,8 +535,8 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
     }
     offsetY = farY - newY + ySeparation;
     offsetX = workspace.RTL ? topX - newRightX : topX - newLeftX;
-    for (var i = 0; i < newBlockIds.length; i++) {
-      var block = workspace.getBlockById(newBlockIds[i]);
+    for (let i = 0; i < newBlockIds.length; i++) {
+      const block = workspace.getBlockById(newBlockIds[i]);
       block.moveBy(offsetX, offsetY);
     }
   }
@@ -545,7 +552,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
  */
 Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   if (xmlBlock instanceof Blockly.Workspace) {
-    var swap = xmlBlock;
+    const swap = xmlBlock;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xmlBlock = /** @type {!Element} */ (workspace);
@@ -555,19 +562,20 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   }
   // Create top-level block.
   Blockly.Events.disable();
-  var variablesBeforeCreation = workspace.getAllVariables();
+  const variablesBeforeCreation = workspace.getAllVariables();
+  let topBlock;
   try {
-    var topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
+    topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
     // Generate list of all blocks.
-    var blocks = topBlock.getDescendants(false);
+    const blocks = topBlock.getDescendants(false);
     if (workspace.rendered) {
       // Wait to track connections to speed up assembly.
       topBlock.setConnectionTracking(false);
       // Render each block.
-      for (var i = blocks.length - 1; i >= 0; i--) {
+      for (let i = blocks.length - 1; i >= 0; i--) {
         blocks[i].initSvg();
       }
-      for (var i = blocks.length - 1; i >= 0; i--) {
+      for (let i = blocks.length - 1; i >= 0; i--) {
         blocks[i].render(false);
       }
       // Populating the connection database may be deferred until after the
@@ -582,7 +590,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
       // TODO(@picklesrus): #387. Remove when domToBlock avoids resizing.
       workspace.resizeContents();
     } else {
-      for (var i = blocks.length - 1; i >= 0; i--) {
+      for (let i = blocks.length - 1; i >= 0; i--) {
         blocks[i].initModel();
       }
     }
@@ -590,11 +598,11 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
     Blockly.Events.enable();
   }
   if (Blockly.Events.isEnabled()) {
-    var newVariables = Blockly.Variables.getAddedVariables(workspace,
+    const newVariables = Blockly.Variables.getAddedVariables(workspace,
         variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
-    for (var i = 0; i < newVariables.length; i++) {
-      var thisVariable = newVariables[i];
+    for (let i = 0; i < newVariables.length; i++) {
+      const thisVariable = newVariables[i];
       Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(
           thisVariable));
     }
@@ -614,13 +622,14 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
  *     should be added.
  */
 Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
-  for (var i = 0, xmlChild; (xmlChild = xmlVariables.childNodes[i]); i++) {
+  for (let i = 0; i < xmlVariables.childNodes.length; i++) {
+    const xmlChild = xmlVariables.childNodes[i];
     if (xmlChild.nodeType != Blockly.utils.dom.NodeType.ELEMENT_NODE) {
       continue;  // Skip text nodes.
     }
-    var type = xmlChild.getAttribute('type');
-    var id = xmlChild.getAttribute('id');
-    var name = xmlChild.textContent;
+    const type = xmlChild.getAttribute('type');
+    const id = xmlChild.getAttribute('id');
+    const name = xmlChild.textContent;
 
     workspace.createVariable(name, type, id);
   }
@@ -647,11 +656,12 @@ Blockly.Xml.childNodeTagMap;
  *    node.
  */
 Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
-  var childNodeMap = {
+  const childNodeMap = {
     mutation: [], comment: [], data: [], field: [], input: [],
     next: []
   };
-  for (var i = 0, xmlChild; (xmlChild = xmlBlock.childNodes[i]); i++) {
+  for (let i = 0; i < xmlBlock.childNodes.length; i++) {
+    const xmlChild = xmlBlock.childNodes[i];
     if (xmlChild.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE) {
       // Ignore any text at the <block> level.  It's all whitespace anyway.
       continue;
@@ -701,8 +711,9 @@ Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
  * @private
  */
 Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
-  var shouldCallInitSvg = false;
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
+  let shouldCallInitSvg = false;
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
     // Custom data for an advanced block.
     if (block.domToMutation) {
       block.domToMutation(xmlChild);
@@ -722,11 +733,12 @@ Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var text = xmlChild.textContent;
-    var pinned = xmlChild.getAttribute('pinned') == 'true';
-    var width = parseInt(xmlChild.getAttribute('w'), 10);
-    var height = parseInt(xmlChild.getAttribute('h'), 10);
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const text = xmlChild.textContent;
+    const pinned = xmlChild.getAttribute('pinned') == 'true';
+    const width = parseInt(xmlChild.getAttribute('w'), 10);
+    const height = parseInt(xmlChild.getAttribute('h'), 10);
 
     block.setCommentText(text);
     block.commentModel.pinned = pinned;
@@ -749,7 +761,8 @@ Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
     block.data = xmlChild.textContent;
   }
 };
@@ -761,8 +774,9 @@ Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var nodeName = xmlChild.getAttribute('name');
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const nodeName = xmlChild.getAttribute('name');
     Blockly.Xml.domToField_(block, nodeName, xmlChild);
   }
 };
@@ -775,8 +789,9 @@ Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
  * @private
  */
 Blockly.Xml.findChildBlocks_ = function(xmlNode) {
-  var childBlockInfo = {childBlockElement: null, childShadowElement: null};
-  for (var i = 0, xmlChild; (xmlChild = xmlNode.childNodes[i]); i++) {
+  const childBlockInfo = {childBlockElement: null, childShadowElement: null};
+  for (let i = 0; i < xmlNode.childNodes.length; i++) {
+    const xmlChild = xmlNode.childNodes[i];
     if (xmlChild.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
       if (xmlChild.nodeName.toLowerCase() == 'block') {
         childBlockInfo.childBlockElement = /** @type {!Element} */ (xmlChild);
@@ -799,15 +814,16 @@ Blockly.Xml.findChildBlocks_ = function(xmlNode) {
  */
 Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
     prototypeName) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var nodeName = xmlChild.getAttribute('name');
-    var input = block.getInput(nodeName);
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const nodeName = xmlChild.getAttribute('name');
+    const input = block.getInput(nodeName);
     if (!input) {
       console.warn('Ignoring non-existent input ' + nodeName + ' in block ' +
           prototypeName);
       break;
     }
-    var childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
@@ -831,8 +847,9 @@ Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
  * @private
  */
 Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
-  for (var i = 0, xmlChild; (xmlChild = xmlChildren[i]); i++) {
-    var childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+  for (let i = 0; i < xmlChildren.length; i++) {
+    const xmlChild = xmlChildren[i];
+    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!block.nextConnection) {
         throw TypeError('Next statement does not exist.');
@@ -868,18 +885,18 @@ Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  */
 Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
     parentConnection, connectedToParentNext) {
-  var block = null;
-  var prototypeName = xmlBlock.getAttribute('type');
+  let block = null;
+  const prototypeName = xmlBlock.getAttribute('type');
   if (!prototypeName) {
     throw TypeError('Block type unspecified: ' + xmlBlock.outerHTML);
   }
-  var id = xmlBlock.getAttribute('id');
+  const id = xmlBlock.getAttribute('id');
   block = workspace.newBlock(prototypeName, id);
 
   // Preprocess childNodes so tags can be processed in a consistent order.
-  var xmlChildNameMap = Blockly.Xml.mapSupportedXmlTags_(xmlBlock);
+  const xmlChildNameMap = Blockly.Xml.mapSupportedXmlTags_(xmlBlock);
 
-  var shouldCallInitSvg =
+  const shouldCallInitSvg =
       Blockly.Xml.applyMutationTagNodes_(xmlChildNameMap.mutation, block);
   Blockly.Xml.applyCommentTagNodes_(xmlChildNameMap.comment, block);
   Blockly.Xml.applyDataTagNodes_(xmlChildNameMap.data, block);
@@ -915,34 +932,35 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
     block.initSvg();
   }
 
-  var inline = xmlBlock.getAttribute('inline');
+  const inline = xmlBlock.getAttribute('inline');
   if (inline) {
     block.setInputsInline(inline == 'true');
   }
-  var disabled = xmlBlock.getAttribute('disabled');
+  const disabled = xmlBlock.getAttribute('disabled');
   if (disabled) {
     block.setEnabled(disabled != 'true' && disabled != 'disabled');
   }
-  var deletable = xmlBlock.getAttribute('deletable');
+  const deletable = xmlBlock.getAttribute('deletable');
   if (deletable) {
     block.setDeletable(deletable == 'true');
   }
-  var movable = xmlBlock.getAttribute('movable');
+  const movable = xmlBlock.getAttribute('movable');
   if (movable) {
     block.setMovable(movable == 'true');
   }
-  var editable = xmlBlock.getAttribute('editable');
+  const editable = xmlBlock.getAttribute('editable');
   if (editable) {
     block.setEditable(editable == 'true');
   }
-  var collapsed = xmlBlock.getAttribute('collapsed');
+  const collapsed = xmlBlock.getAttribute('collapsed');
   if (collapsed) {
     block.setCollapsed(collapsed == 'true');
   }
   if (xmlBlock.nodeName.toLowerCase() == 'shadow') {
     // Ensure all children are also shadows.
-    var children = block.getChildren(false);
-    for (var i = 0, child; (child = children[i]); i++) {
+    const children = block.getChildren(false);
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
       if (!child.isShadow()) {
         throw TypeError('Shadow block not allowed non-shadow child.');
       }
@@ -964,7 +982,7 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
  * @private
  */
 Blockly.Xml.domToField_ = function(block, fieldName, xml) {
-  var field = block.getField(fieldName);
+  const field = block.getField(fieldName);
   if (!field) {
     console.warn('Ignoring non-existent field ' + fieldName + ' in block ' +
         block.type);
@@ -979,7 +997,8 @@ Blockly.Xml.domToField_ = function(block, fieldName, xml) {
  *     DocumentFragment if the block was an insertion marker.
  */
 Blockly.Xml.deleteNext = function(xmlBlock) {
-  for (var i = 0, child; (child = xmlBlock.childNodes[i]); i++) {
+  for (let i = 0; i < xmlBlock.childNodes.length; i++) {
+    const child = xmlBlock.childNodes[i];
     if (child.nodeName.toLowerCase() == 'next') {
       xmlBlock.removeChild(child);
       break;

From a64097d23f4767c1ac857db49b64382145490fad Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 12:44:00 -0700
Subject: [PATCH 288/291] Migrate core/xml.js to goog.module

---
 core/xml.js   | 146 +++++++++++++++++++++++++++-----------------------
 tests/deps.js |   2 +-
 2 files changed, 81 insertions(+), 67 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index 1b1db8966..b07d0a70e 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -14,10 +14,11 @@
  * @name Blockly.Xml
  * @namespace
  */
-goog.provide('Blockly.Xml');
+goog.module('Blockly.Xml');
+goog.module.declareLegacyNamespace();
+
 goog.require('Blockly.Events');
 goog.require('Blockly.inputTypes');
-goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.xml');
@@ -30,6 +31,7 @@ goog.requireType('Blockly.VariableModel');
 goog.requireType('Blockly.Workspace');
 goog.requireType('Blockly.WorkspaceComment');
 goog.requireType('Blockly.WorkspaceCommentSvg');
+goog.requireType('Blockly.Variables');
 
 
 /**
@@ -38,10 +40,10 @@ goog.requireType('Blockly.WorkspaceCommentSvg');
  * @param {boolean=} opt_noId True if the encoder should skip the block IDs.
  * @return {!Element} XML DOM element.
  */
-Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
+const workspaceToDom = function(workspace, opt_noId) {
   const xml = Blockly.utils.xml.createElement('xml');
-  const variablesElement = Blockly.Xml.variablesToDom(
-      Blockly.Variables.allUsedVarModels(workspace));
+  const variablesElement = variablesToDom(
+      goog.module.get('Blockly.Variables').allUsedVarModels(workspace));
   if (variablesElement.hasChildNodes()) {
     xml.appendChild(variablesElement);
   }
@@ -53,10 +55,11 @@ Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
   const blocks = workspace.getTopBlocks(true);
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];
-    xml.appendChild(Blockly.Xml.blockToDomWithXY(block, opt_noId));
+    xml.appendChild(blockToDomWithXY(block, opt_noId));
   }
   return xml;
 };
+exports.workspaceToDom = workspaceToDom;
 
 /**
  * Encode a list of variables as XML.
@@ -64,7 +67,7 @@ Blockly.Xml.workspaceToDom = function(workspace, opt_noId) {
  *     models.
  * @return {!Element} Tree of XML elements.
  */
-Blockly.Xml.variablesToDom = function(variableList) {
+const variablesToDom = function(variableList) {
   const variables = Blockly.utils.xml.createElement('variables');
   for (let i = 0; i < variableList.length; i++) {
     const variable = variableList[i];
@@ -78,6 +81,7 @@ Blockly.Xml.variablesToDom = function(variableList) {
   }
   return variables;
 };
+exports.variablesToDom = variablesToDom;
 
 /**
  * Encode a block subtree as XML with XY coordinates.
@@ -86,7 +90,7 @@ Blockly.Xml.variablesToDom = function(variableList) {
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
  */
-Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
+const blockToDomWithXY = function(block, opt_noId) {
   if (block.isInsertionMarker()) {  // Skip over insertion markers.
     block = block.getChildren(false)[0];
     if (!block) {
@@ -100,13 +104,14 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
     width = block.workspace.getWidth();
   }
 
-  const element = Blockly.Xml.blockToDom(block, opt_noId);
+  const element = blockToDom(block, opt_noId);
   const xy = block.getRelativeToSurfaceXY();
   element.setAttribute('x',
       Math.round(block.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
   return element;
 };
+exports.blockToDomWithXY = blockToDomWithXY;
 
 /**
  * Encode a field as XML.
@@ -115,7 +120,7 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
  *     serialized.
  * @private
  */
-Blockly.Xml.fieldToDom_ = function(field) {
+const fieldToDom_ = function(field) {
   if (field.isSerializable()) {
     const container = Blockly.utils.xml.createElement('field');
     container.setAttribute('name', field.name || '');
@@ -132,12 +137,12 @@ Blockly.Xml.fieldToDom_ = function(field) {
  *     attached.
  * @private
  */
-Blockly.Xml.allFieldsToDom_ = function(block, element) {
+const allFieldsToDom_ = function(block, element) {
   for (let i = 0; i < block.inputList.length; i++) {
     const input = block.inputList[i];
     for (let j = 0; j < input.fieldRow.length; j++) {
       const field = input.fieldRow[j];
-      const fieldDom = Blockly.Xml.fieldToDom_(field);
+      const fieldDom = fieldToDom_(field);
       if (fieldDom) {
         element.appendChild(fieldDom);
       }
@@ -152,12 +157,12 @@ Blockly.Xml.allFieldsToDom_ = function(block, element) {
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
  */
-Blockly.Xml.blockToDom = function(block, opt_noId) {
+const blockToDom = function(block, opt_noId) {
   // Skip over insertion markers.
   if (block.isInsertionMarker()) {
     const child = block.getChildren(false)[0];
     if (child) {
-      return Blockly.Xml.blockToDom(child);
+      return blockToDom(child);
     } else {
       // Disappears when appended.
       return new DocumentFragment();
@@ -180,7 +185,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
     }
   }
 
-  Blockly.Xml.allFieldsToDom_(block, element);
+  allFieldsToDom_(block, element);
 
   const commentText = block.getCommentText();
   if (commentText) {
@@ -217,10 +222,10 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
       }
       const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
-        container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
+        container.appendChild(cloneShadow_(shadow, opt_noId));
       }
       if (childBlock) {
-        const elem = Blockly.Xml.blockToDom(childBlock, opt_noId);
+        const elem = blockToDom(childBlock, opt_noId);
         if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
           container.appendChild(elem);
           empty = false;
@@ -255,7 +260,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   const nextBlock = block.getNextBlock();
   let container;
   if (nextBlock) {
-    const elem = Blockly.Xml.blockToDom(nextBlock, opt_noId);
+    const elem = blockToDom(nextBlock, opt_noId);
     if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
       container = Blockly.utils.xml.createElement('next');
       container.appendChild(elem);
@@ -264,11 +269,12 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
   }
   const shadow = block.nextConnection && block.nextConnection.getShadowDom();
   if (shadow && (!nextBlock || !nextBlock.isShadow())) {
-    container.appendChild(Blockly.Xml.cloneShadow_(shadow, opt_noId));
+    container.appendChild(cloneShadow_(shadow, opt_noId));
   }
 
   return element;
 };
+exports.blockToDom = blockToDom;
 
 /**
  * Deeply clone the shadow's DOM so that changes don't back-wash to the block.
@@ -277,7 +283,7 @@ Blockly.Xml.blockToDom = function(block, opt_noId) {
  * @return {!Element} A tree of XML elements.
  * @private
  */
-Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
+const cloneShadow_ = function(shadow, opt_noId) {
   shadow = shadow.cloneNode(true);
   // Walk the tree looking for whitespace.  Don't prune whitespace in a tag.
   let node = shadow;
@@ -321,22 +327,23 @@ Blockly.Xml.cloneShadow_ = function(shadow, opt_noId) {
  * @param {!Node} dom A tree of XML nodes.
  * @return {string} Text representation.
  */
-Blockly.Xml.domToText = function(dom) {
+const domToText = function(dom) {
   const text = Blockly.utils.xml.domToText(dom);
   // Unpack self-closing tags.  These tags fail when embedded in HTML.
   // <block name="foo"/> -> <block name="foo"></block>
   return text.replace(/<(\w+)([^<]*)\/>/g, '<$1$2></$1>');
 };
+exports.domToText = domToText;
 
 /**
  * Converts a DOM structure into properly indented text.
  * @param {!Node} dom A tree of XML elements.
  * @return {string} Text representation.
  */
-Blockly.Xml.domToPrettyText = function(dom) {
+const domToPrettyText = function(dom) {
   // This function is not guaranteed to be correct for all XML.
   // But it handles the XML that Blockly generates.
-  const blob = Blockly.Xml.domToText(dom);
+  const blob = domToText(dom);
   // Place every open and close tag on its own line.
   const lines = blob.split('<');
   // Indent every line.
@@ -358,6 +365,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
   // Trim leading blank line.
   return text.replace(/^\n/, '');
 };
+exports.domToPrettyText = domToPrettyText;
 
 /**
  * Converts an XML string into a DOM structure.
@@ -366,7 +374,7 @@ Blockly.Xml.domToPrettyText = function(dom) {
  *     document element.
  * @throws if the text doesn't parse.
  */
-Blockly.Xml.textToDom = function(text) {
+const textToDom = function(text) {
   const doc = Blockly.utils.xml.textToDomDocument(text);
   if (!doc || !doc.documentElement ||
       doc.getElementsByTagName('parsererror').length) {
@@ -374,6 +382,7 @@ Blockly.Xml.textToDom = function(text) {
   }
   return doc.documentElement;
 };
+exports.textToDom = textToDom;
 
 /**
  * Clear the given workspace then decode an XML DOM and
@@ -382,13 +391,14 @@ Blockly.Xml.textToDom = function(text) {
  * @param {!Blockly.Workspace} workspace The workspace.
  * @return {!Array<string>} An array containing new block IDs.
  */
-Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
+const clearWorkspaceAndLoadFromXml = function(xml, workspace) {
   workspace.setResizesEnabled(false);
   workspace.clear();
-  const blockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const blockIds = domToWorkspace(xml, workspace);
   workspace.setResizesEnabled(true);
   return blockIds;
 };
+exports.clearWorkspaceAndLoadFromXml = clearWorkspaceAndLoadFromXml;
 
 /**
  * Decode an XML DOM and create blocks on the workspace.
@@ -398,14 +408,14 @@ Blockly.Xml.clearWorkspaceAndLoadFromXml = function(xml, workspace) {
  * @suppress {strictModuleDepCheck} Suppress module check while workspace
  *     comments are not bundled in.
  */
-Blockly.Xml.domToWorkspace = function(xml, workspace) {
-  if (xml instanceof Blockly.Workspace) {
+const domToWorkspace = function(xml, workspace) {
+  if (xml instanceof goog.module.get('Blockly.Workspace')) {
     const swap = xml;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xml = workspace;
     workspace = swap;
-    console.warn('Deprecated call to Blockly.Xml.domToWorkspace, ' +
+    console.warn('Deprecated call to domToWorkspace, ' +
                  'swap the arguments.');
   }
 
@@ -435,7 +445,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
-        const block = Blockly.Xml.domToBlock(xmlChildElement, workspace);
+        const block = domToBlock(xmlChildElement, workspace);
         newBlockIds.push(block.id);
         const blockX = xmlChildElement.hasAttribute('x') ?
             parseInt(xmlChildElement.getAttribute('x'), 10) : 10;
@@ -470,7 +480,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
         }
       } else if (name == 'variables') {
         if (variablesFirst) {
-          Blockly.Xml.domToVariables(xmlChildElement, workspace);
+          domToVariables(xmlChildElement, workspace);
         } else {
           throw Error('\'variables\' tag must exist once before block and ' +
               'shadow tag elements in the workspace XML, but it was found in ' +
@@ -493,6 +503,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
       workspace));
   return newBlockIds;
 };
+exports.domToWorkspace = domToWorkspace;
 
 /**
  * Decode an XML DOM and create blocks on the workspace. Position the new
@@ -501,7 +512,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
  * @param {!Blockly.Workspace} workspace The workspace to add to.
  * @return {!Array<string>} An array containing new block IDs.
  */
-Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
+const appendDomToWorkspace = function(xml, workspace) {
   let bbox;  // Bounding box of the current blocks.
   // First check if we have a workspaceSvg, otherwise the blocks have no shape
   // and the position does not matter.
@@ -509,7 +520,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
     bbox = workspace.getBlocksBoundingBox();
   }
   // Load the new blocks into the workspace and get the IDs of the new blocks.
-  const newBlockIds = Blockly.Xml.domToWorkspace(xml, workspace);
+  const newBlockIds = domToWorkspace(xml, workspace);
   if (bbox && bbox.top != bbox.bottom) {  // check if any previous block
     let offsetY = 0;  // offset to add to y of the new block
     let offsetX = 0;
@@ -542,6 +553,7 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
   }
   return newBlockIds;
 };
+exports.appendDomToWorkspace = appendDomToWorkspace;
 
 /**
  * Decode an XML block tag and create a block (and possibly sub blocks) on the
@@ -550,14 +562,14 @@ Blockly.Xml.appendDomToWorkspace = function(xml, workspace) {
  * @param {!Blockly.Workspace} workspace The workspace.
  * @return {!Blockly.Block} The root block created.
  */
-Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
-  if (xmlBlock instanceof Blockly.Workspace) {
+const domToBlock = function(xmlBlock, workspace) {
+  if (xmlBlock instanceof goog.module.get('Blockly.Workspace')) {
     const swap = xmlBlock;
     // Closure Compiler complains here because the arguments are reversed.
     /** @suppress {checkTypes} */
     xmlBlock = /** @type {!Element} */ (workspace);
     workspace = swap;
-    console.warn('Deprecated call to Blockly.Xml.domToBlock, ' +
+    console.warn('Deprecated call to domToBlock, ' +
                  'swap the arguments.');
   }
   // Create top-level block.
@@ -565,7 +577,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   const variablesBeforeCreation = workspace.getAllVariables();
   let topBlock;
   try {
-    topBlock = Blockly.Xml.domToBlockHeadless_(xmlBlock, workspace);
+    topBlock = domToBlockHeadless_(xmlBlock, workspace);
     // Generate list of all blocks.
     const blocks = topBlock.getDescendants(false);
     if (workspace.rendered) {
@@ -598,7 +610,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
     Blockly.Events.enable();
   }
   if (Blockly.Events.isEnabled()) {
-    const newVariables = Blockly.Variables.getAddedVariables(workspace,
+    const newVariables = goog.module.get('Blockly.Variables').getAddedVariables(workspace,
         variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
@@ -613,7 +625,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
   }
   return topBlock;
 };
-
+exports.domToBlock = domToBlock;
 
 /**
  * Decode an XML list of variables and add the variables to the workspace.
@@ -621,7 +633,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
  * @param {!Blockly.Workspace} workspace The workspace to which the variable
  *     should be added.
  */
-Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
+const domToVariables = function(xmlVariables, workspace) {
   for (let i = 0; i < xmlVariables.childNodes.length; i++) {
     const xmlChild = xmlVariables.childNodes[i];
     if (xmlChild.nodeType != Blockly.utils.dom.NodeType.ELEMENT_NODE) {
@@ -634,6 +646,7 @@ Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
     workspace.createVariable(name, type, id);
   }
 };
+exports.domToVariables = domToVariables;
 
 /**
  * A mapping of nodeName to node for child nodes of xmlBlock.
@@ -646,16 +659,16 @@ Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
  *      next: !Array<!Element>
  *    }}
  */
-Blockly.Xml.childNodeTagMap;
+let childNodeTagMap;  // eslint-disable-line no-unused-vars
 
 /**
  * Creates a mapping of childNodes for each supported XML tag for the provided
  * xmlBlock. Logs a warning for any encountered unsupported tags.
  * @param {!Element} xmlBlock XML block element.
- * @return {!Blockly.Xml.childNodeTagMap} The childNode map from nodeName to
+ * @return {!childNodeTagMap} The childNode map from nodeName to
  *    node.
  */
-Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
+const mapSupportedXmlTags_ = function(xmlBlock) {
   const childNodeMap = {
     mutation: [], comment: [], data: [], field: [], input: [],
     next: []
@@ -671,7 +684,7 @@ Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
         childNodeMap.mutation.push(xmlChild);
         break;
       case 'comment':
-        if (!Blockly.Comment) {
+        if (!goog.module.get('Blockly.Comment')) {
           console.warn('Missing require for Blockly.Comment, ' +
               'ignoring block comment.');
           break;
@@ -710,7 +723,7 @@ Blockly.Xml.mapSupportedXmlTags_ = function(xmlBlock) {
  *    initialization (requiring initSvg call).
  * @private
  */
-Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
+const applyMutationTagNodes_ = function(xmlChildren, block) {
   let shouldCallInitSvg = false;
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -732,7 +745,7 @@ Blockly.Xml.applyMutationTagNodes_ = function(xmlChildren, block) {
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
+const applyCommentTagNodes_ = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const text = xmlChild.textContent;
@@ -760,7 +773,7 @@ Blockly.Xml.applyCommentTagNodes_ = function(xmlChildren, block) {
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
+const applyDataTagNodes_ = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     block.data = xmlChild.textContent;
@@ -773,11 +786,11 @@ Blockly.Xml.applyDataTagNodes_ = function(xmlChildren, block) {
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
+const applyFieldTagNodes_ = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const nodeName = xmlChild.getAttribute('name');
-    Blockly.Xml.domToField_(block, nodeName, xmlChild);
+    domToField_(block, nodeName, xmlChild);
   }
 };
 
@@ -788,7 +801,7 @@ Blockly.Xml.applyFieldTagNodes_ = function(xmlChildren, block) {
  *    found child block.
  * @private
  */
-Blockly.Xml.findChildBlocks_ = function(xmlNode) {
+const findChildBlocks_ = function(xmlNode) {
   const childBlockInfo = {childBlockElement: null, childShadowElement: null};
   for (let i = 0; i < xmlNode.childNodes.length; i++) {
     const xmlChild = xmlNode.childNodes[i];
@@ -812,7 +825,7 @@ Blockly.Xml.findChildBlocks_ = function(xmlNode) {
  * @param {string} prototypeName The prototype name of the block.
  * @private
  */
-Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
+const applyInputTagNodes_ = function(xmlChildren, workspace, block,
     prototypeName) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -823,12 +836,12 @@ Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
           prototypeName);
       break;
     }
-    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
       }
-      Blockly.Xml.domToBlockHeadless_(childBlockInfo.childBlockElement,
+      domToBlockHeadless_(childBlockInfo.childBlockElement,
           workspace, input.connection, false);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
@@ -846,10 +859,10 @@ Blockly.Xml.applyInputTagNodes_ = function(xmlChildren, workspace, block,
  * @param {!Blockly.Block} block The block to apply the child nodes on.
  * @private
  */
-Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
+const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
-    const childBlockInfo = Blockly.Xml.findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks_(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!block.nextConnection) {
         throw TypeError('Next statement does not exist.');
@@ -859,7 +872,7 @@ Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
         throw TypeError('Next statement is already connected.');
       }
       // Create child block.
-      Blockly.Xml.domToBlockHeadless_(childBlockInfo.childBlockElement,
+      domToBlockHeadless_(childBlockInfo.childBlockElement,
           workspace, block.nextConnection,
           true);
     }
@@ -883,7 +896,7 @@ Blockly.Xml.applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  * @return {!Blockly.Block} The root block created.
  * @private
  */
-Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
+const domToBlockHeadless_ = function(xmlBlock, workspace,
     parentConnection, connectedToParentNext) {
   let block = null;
   const prototypeName = xmlBlock.getAttribute('type');
@@ -894,12 +907,12 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
   block = workspace.newBlock(prototypeName, id);
 
   // Preprocess childNodes so tags can be processed in a consistent order.
-  const xmlChildNameMap = Blockly.Xml.mapSupportedXmlTags_(xmlBlock);
+  const xmlChildNameMap = mapSupportedXmlTags_(xmlBlock);
 
   const shouldCallInitSvg =
-      Blockly.Xml.applyMutationTagNodes_(xmlChildNameMap.mutation, block);
-  Blockly.Xml.applyCommentTagNodes_(xmlChildNameMap.comment, block);
-  Blockly.Xml.applyDataTagNodes_(xmlChildNameMap.data, block);
+      applyMutationTagNodes_(xmlChildNameMap.mutation, block);
+  applyCommentTagNodes_(xmlChildNameMap.comment, block);
+  applyDataTagNodes_(xmlChildNameMap.data, block);
 
   // Connect parent after processing mutation and before setting fields.
   if (parentConnection) {
@@ -922,10 +935,10 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
     }
   }
 
-  Blockly.Xml.applyFieldTagNodes_(xmlChildNameMap.field, block);
-  Blockly.Xml.applyInputTagNodes_(
+  applyFieldTagNodes_(xmlChildNameMap.field, block);
+  applyInputTagNodes_(
       xmlChildNameMap.input, workspace, block, prototypeName);
-  Blockly.Xml.applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
+  applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
 
   if (shouldCallInitSvg) {
     // InitSvg needs to be called after variable fields are loaded.
@@ -981,7 +994,7 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace,
  * @param {!Element} xml The field tag to decode.
  * @private
  */
-Blockly.Xml.domToField_ = function(block, fieldName, xml) {
+const domToField_ = function(block, fieldName, xml) {
   const field = block.getField(fieldName);
   if (!field) {
     console.warn('Ignoring non-existent field ' + fieldName + ' in block ' +
@@ -996,7 +1009,7 @@ Blockly.Xml.domToField_ = function(block, fieldName, xml) {
  * @param {!Element|!DocumentFragment} xmlBlock XML block element or an empty
  *     DocumentFragment if the block was an insertion marker.
  */
-Blockly.Xml.deleteNext = function(xmlBlock) {
+const deleteNext = function(xmlBlock) {
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
     const child = xmlBlock.childNodes[i];
     if (child.nodeName.toLowerCase() == 'next') {
@@ -1005,3 +1018,4 @@ Blockly.Xml.deleteNext = function(xmlBlock) {
     }
   }
 };
+exports.deleteNext = deleteNext;
diff --git a/tests/deps.js b/tests/deps.js
index 15bbfa67b..536c6dba6 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -224,7 +224,7 @@ goog.addDependency('../../core/workspace_comment_svg.js', ['Blockly.WorkspaceCom
 goog.addDependency('../../core/workspace_drag_surface_svg.js', ['Blockly.WorkspaceDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_dragger.js', ['Blockly.WorkspaceDragger'], ['Blockly.utils.Coordinate'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/workspace_svg.js', ['Blockly.WorkspaceSvg'], ['Blockly.BlockSvg', 'Blockly.ComponentManager', 'Blockly.ConnectionDB', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.ThemeChange', 'Blockly.Events.ViewportChange', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.MarkerManager', 'Blockly.MetricsManager', 'Blockly.Msg', 'Blockly.Options', 'Blockly.ThemeManager', 'Blockly.Themes.Classic', 'Blockly.TouchGesture', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.Xml', 'Blockly.blockRendering', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.internalConstants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6'});
+goog.addDependency('../../core/xml.js', ['Blockly.Xml'], ['Blockly.Events', 'Blockly.inputTypes', 'Blockly.utils.Size', 'Blockly.utils.dom', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/zoom_controls.js', ['Blockly.ZoomControls'], ['Blockly.ComponentManager', 'Blockly.Css', 'Blockly.Events', 'Blockly.Events.Click', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.internalConstants', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('base.js', [], []);
 

From 9666a3eb188ebe57ecdbb7b71a9195c477a04c6c Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 13:24:03 -0700
Subject: [PATCH 289/291] Migrate core/xml.js named requires

---
 core/xml.js | 170 ++++++++++++++++++++++++++--------------------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index b07d0a70e..43e187c58 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -10,69 +10,69 @@
  */
 'use strict';
 
-/**
- * @name Blockly.Xml
- * @namespace
- */
 goog.module('Blockly.Xml');
 goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.Events');
-goog.require('Blockly.inputTypes');
-goog.require('Blockly.utils.dom');
-goog.require('Blockly.utils.Size');
-goog.require('Blockly.utils.xml');
-
-goog.requireType('Blockly.Block');
+/* eslint-disable-next-line no-unused-vars */
+const Block = goog.requireType('Blockly.Block');
+const Events = goog.require('Blockly.Events');
+/* eslint-disable-next-line no-unused-vars */
+const Connection = goog.requireType('Blockly.Connection');
+/* eslint-disable-next-line no-unused-vars */
+const Field = goog.requireType('Blockly.Field');
+const Size = goog.require('Blockly.utils.Size');
+/* eslint-disable-next-line no-unused-vars */
+const VariableModel = goog.requireType('Blockly.VariableModel');
+/* eslint-disable-next-line no-unused-vars */
+const Workspace = goog.requireType('Blockly.Workspace');
+const dom = goog.require('Blockly.utils.dom');
+const inputTypes = goog.require('Blockly.inputTypes');
+const utilsXml = goog.require('Blockly.utils.xml');
 goog.requireType('Blockly.Comment');
-goog.requireType('Blockly.Connection');
-goog.requireType('Blockly.Field');
-goog.requireType('Blockly.VariableModel');
-goog.requireType('Blockly.Workspace');
+goog.requireType('Blockly.Variables');
 goog.requireType('Blockly.WorkspaceComment');
 goog.requireType('Blockly.WorkspaceCommentSvg');
-goog.requireType('Blockly.Variables');
 
 
 /**
  * Encode a block tree as XML.
- * @param {!Blockly.Workspace} workspace The workspace containing blocks.
+ * @param {!Workspace} workspace The workspace containing blocks.
  * @param {boolean=} opt_noId True if the encoder should skip the block IDs.
  * @return {!Element} XML DOM element.
  */
 const workspaceToDom = function(workspace, opt_noId) {
-  const xml = Blockly.utils.xml.createElement('xml');
+  const treeXml = utilsXml.createElement('xml');
   const variablesElement = variablesToDom(
       goog.module.get('Blockly.Variables').allUsedVarModels(workspace));
   if (variablesElement.hasChildNodes()) {
-    xml.appendChild(variablesElement);
+    treeXml.appendChild(variablesElement);
   }
   const comments = workspace.getTopComments(true);
   for (let i = 0; i < comments.length; i++) {
     const comment = comments[i];
-    xml.appendChild(comment.toXmlWithXY(opt_noId));
+    treeXml.appendChild(comment.toXmlWithXY(opt_noId));
   }
   const blocks = workspace.getTopBlocks(true);
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];
-    xml.appendChild(blockToDomWithXY(block, opt_noId));
+    treeXml.appendChild(blockToDomWithXY(block, opt_noId));
   }
-  return xml;
+  return treeXml;
 };
 exports.workspaceToDom = workspaceToDom;
 
 /**
  * Encode a list of variables as XML.
- * @param {!Array<!Blockly.VariableModel>} variableList List of all variable
+ * @param {!Array<!VariableModel>} variableList List of all variable
  *     models.
  * @return {!Element} Tree of XML elements.
  */
 const variablesToDom = function(variableList) {
-  const variables = Blockly.utils.xml.createElement('variables');
+  const variables = utilsXml.createElement('variables');
   for (let i = 0; i < variableList.length; i++) {
     const variable = variableList[i];
-    const element = Blockly.utils.xml.createElement('variable');
-    element.appendChild(Blockly.utils.xml.createTextNode(variable.name));
+    const element = utilsXml.createElement('variable');
+    element.appendChild(utilsXml.createTextNode(variable.name));
     if (variable.type) {
       element.setAttribute('type', variable.type);
     }
@@ -85,7 +85,7 @@ exports.variablesToDom = variablesToDom;
 
 /**
  * Encode a block subtree as XML with XY coordinates.
- * @param {!Blockly.Block} block The root block to encode.
+ * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
@@ -115,14 +115,14 @@ exports.blockToDomWithXY = blockToDomWithXY;
 
 /**
  * Encode a field as XML.
- * @param {!Blockly.Field} field The field to encode.
+ * @param {!Field} field The field to encode.
  * @return {?Element} XML element, or null if the field did not need to be
  *     serialized.
  * @private
  */
 const fieldToDom_ = function(field) {
   if (field.isSerializable()) {
-    const container = Blockly.utils.xml.createElement('field');
+    const container = utilsXml.createElement('field');
     container.setAttribute('name', field.name || '');
     return field.toXml(container);
   }
@@ -132,7 +132,7 @@ const fieldToDom_ = function(field) {
 /**
  * Encode all of a block's fields as XML and attach them to the given tree of
  * XML elements.
- * @param {!Blockly.Block} block A block with fields to be encoded.
+ * @param {!Block} block A block with fields to be encoded.
  * @param {!Element} element The XML element to which the field DOM should be
  *     attached.
  * @private
@@ -152,7 +152,7 @@ const allFieldsToDom_ = function(block, element) {
 
 /**
  * Encode a block subtree as XML.
- * @param {!Blockly.Block} block The root block to encode.
+ * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
  * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
  *     fragment if the block was an insertion marker.
@@ -170,7 +170,7 @@ const blockToDom = function(block, opt_noId) {
   }
 
   const element =
-      Blockly.utils.xml.createElement(block.isShadow() ? 'shadow' : 'block');
+      utilsXml.createElement(block.isShadow() ? 'shadow' : 'block');
   element.setAttribute('type', block.type);
   if (!opt_noId) {
     // It's important to use setAttribute here otherwise IE11 won't serialize
@@ -192,8 +192,8 @@ const blockToDom = function(block, opt_noId) {
     const size = block.commentModel.size;
     const pinned = block.commentModel.pinned;
 
-    const commentElement = Blockly.utils.xml.createElement('comment');
-    commentElement.appendChild(Blockly.utils.xml.createTextNode(commentText));
+    const commentElement = utilsXml.createElement('comment');
+    commentElement.appendChild(utilsXml.createTextNode(commentText));
     commentElement.setAttribute('pinned', pinned);
     commentElement.setAttribute('h', size.height);
     commentElement.setAttribute('w', size.width);
@@ -202,8 +202,8 @@ const blockToDom = function(block, opt_noId) {
   }
 
   if (block.data) {
-    const dataElement = Blockly.utils.xml.createElement('data');
-    dataElement.appendChild(Blockly.utils.xml.createTextNode(block.data));
+    const dataElement = utilsXml.createElement('data');
+    dataElement.appendChild(utilsXml.createTextNode(block.data));
     element.appendChild(dataElement);
   }
 
@@ -211,14 +211,14 @@ const blockToDom = function(block, opt_noId) {
     const input = block.inputList[i];
     let container;
     let empty = true;
-    if (input.type == Blockly.inputTypes.DUMMY) {
+    if (input.type == inputTypes.DUMMY) {
       continue;
     } else {
       const childBlock = input.connection.targetBlock();
-      if (input.type == Blockly.inputTypes.VALUE) {
-        container = Blockly.utils.xml.createElement('value');
-      } else if (input.type == Blockly.inputTypes.STATEMENT) {
-        container = Blockly.utils.xml.createElement('statement');
+      if (input.type == inputTypes.VALUE) {
+        container = utilsXml.createElement('value');
+      } else if (input.type == inputTypes.STATEMENT) {
+        container = utilsXml.createElement('statement');
       }
       const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
@@ -226,7 +226,7 @@ const blockToDom = function(block, opt_noId) {
       }
       if (childBlock) {
         const elem = blockToDom(childBlock, opt_noId);
-        if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
+        if (elem.nodeType == dom.NodeType.ELEMENT_NODE) {
           container.appendChild(elem);
           empty = false;
         }
@@ -261,8 +261,8 @@ const blockToDom = function(block, opt_noId) {
   let container;
   if (nextBlock) {
     const elem = blockToDom(nextBlock, opt_noId);
-    if (elem.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
-      container = Blockly.utils.xml.createElement('next');
+    if (elem.nodeType == dom.NodeType.ELEMENT_NODE) {
+      container = utilsXml.createElement('next');
       container.appendChild(elem);
       element.appendChild(container);
     }
@@ -300,19 +300,19 @@ const cloneShadow_ = function(shadow, opt_noId) {
       while (node && !node.nextSibling) {
         textNode = node;
         node = node.parentNode;
-        if (textNode.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE &&
+        if (textNode.nodeType == dom.NodeType.TEXT_NODE &&
             textNode.data.trim() == '' && node.firstChild != textNode) {
           // Prune whitespace after a tag.
-          Blockly.utils.dom.removeNode(textNode);
+          dom.removeNode(textNode);
         }
       }
       if (node) {
         textNode = node;
         node = node.nextSibling;
-        if (textNode.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE &&
+        if (textNode.nodeType == dom.NodeType.TEXT_NODE &&
             textNode.data.trim() == '') {
           // Prune whitespace before a tag.
-          Blockly.utils.dom.removeNode(textNode);
+          dom.removeNode(textNode);
         }
       }
     }
@@ -328,7 +328,7 @@ const cloneShadow_ = function(shadow, opt_noId) {
  * @return {string} Text representation.
  */
 const domToText = function(dom) {
-  const text = Blockly.utils.xml.domToText(dom);
+  const text = utilsXml.domToText(dom);
   // Unpack self-closing tags.  These tags fail when embedded in HTML.
   // <block name="foo"/> -> <block name="foo"></block>
   return text.replace(/<(\w+)([^<]*)\/>/g, '<$1$2></$1>');
@@ -375,7 +375,7 @@ exports.domToPrettyText = domToPrettyText;
  * @throws if the text doesn't parse.
  */
 const textToDom = function(text) {
-  const doc = Blockly.utils.xml.textToDomDocument(text);
+  const doc = utilsXml.textToDomDocument(text);
   if (!doc || !doc.documentElement ||
       doc.getElementsByTagName('parsererror').length) {
     throw Error('textToDom was unable to parse: ' + text);
@@ -388,7 +388,7 @@ exports.textToDom = textToDom;
  * Clear the given workspace then decode an XML DOM and
  * create blocks on the workspace.
  * @param {!Element} xml XML DOM.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @return {!Array<string>} An array containing new block IDs.
  */
 const clearWorkspaceAndLoadFromXml = function(xml, workspace) {
@@ -403,7 +403,7 @@ exports.clearWorkspaceAndLoadFromXml = clearWorkspaceAndLoadFromXml;
 /**
  * Decode an XML DOM and create blocks on the workspace.
  * @param {!Element} xml XML DOM.
- * @param {!Blockly.Workspace} workspace The workspace.
+ * @param {!Workspace} workspace The workspace.
  * @return {!Array<string>} An array containing new block IDs.
  * @suppress {strictModuleDepCheck} Suppress module check while workspace
  *     comments are not bundled in.
@@ -424,10 +424,10 @@ const domToWorkspace = function(xml, workspace) {
     width = workspace.getWidth();
   }
   const newBlockIds = [];  // A list of block IDs added by this call.
-  Blockly.utils.dom.startTextWidthCache();
-  const existingGroup = Blockly.Events.getGroup();
+  dom.startTextWidthCache();
+  const existingGroup = Events.getGroup();
   if (!existingGroup) {
-    Blockly.Events.setGroup(true);
+    Events.setGroup(true);
   }
 
   // Disable workspace resizes as an optimization.
@@ -441,7 +441,7 @@ const domToWorkspace = function(xml, workspace) {
       const name = xmlChild.nodeName.toLowerCase();
       const xmlChildElement = /** @type {!Element} */ (xmlChild);
       if (name == 'block' ||
-          (name == 'shadow' && !Blockly.Events.recordUndo)) {
+          (name == 'shadow' && !Events.recordUndo)) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
@@ -491,15 +491,15 @@ const domToWorkspace = function(xml, workspace) {
     }
   } finally {
     if (!existingGroup) {
-      Blockly.Events.setGroup(false);
+      Events.setGroup(false);
     }
-    Blockly.utils.dom.stopTextWidthCache();
+    dom.stopTextWidthCache();
   }
   // Re-enable workspace resizing.
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(true);
   }
-  Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.FINISHED_LOADING))(
+  Events.fire(new (Events.get(Events.FINISHED_LOADING))(
       workspace));
   return newBlockIds;
 };
@@ -509,7 +509,7 @@ exports.domToWorkspace = domToWorkspace;
  * Decode an XML DOM and create blocks on the workspace. Position the new
  * blocks immediately below prior blocks, aligned by their starting edge.
  * @param {!Element} xml The XML DOM.
- * @param {!Blockly.Workspace} workspace The workspace to add to.
+ * @param {!Workspace} workspace The workspace to add to.
  * @return {!Array<string>} An array containing new block IDs.
  */
 const appendDomToWorkspace = function(xml, workspace) {
@@ -559,8 +559,8 @@ exports.appendDomToWorkspace = appendDomToWorkspace;
  * Decode an XML block tag and create a block (and possibly sub blocks) on the
  * workspace.
  * @param {!Element} xmlBlock XML block element.
- * @param {!Blockly.Workspace} workspace The workspace.
- * @return {!Blockly.Block} The root block created.
+ * @param {!Workspace} workspace The workspace.
+ * @return {!Block} The root block created.
  */
 const domToBlock = function(xmlBlock, workspace) {
   if (xmlBlock instanceof goog.module.get('Blockly.Workspace')) {
@@ -573,7 +573,7 @@ const domToBlock = function(xmlBlock, workspace) {
                  'swap the arguments.');
   }
   // Create top-level block.
-  Blockly.Events.disable();
+  Events.disable();
   const variablesBeforeCreation = workspace.getAllVariables();
   let topBlock;
   try {
@@ -607,20 +607,20 @@ const domToBlock = function(xmlBlock, workspace) {
       }
     }
   } finally {
-    Blockly.Events.enable();
+    Events.enable();
   }
-  if (Blockly.Events.isEnabled()) {
+  if (Events.isEnabled()) {
     const newVariables = goog.module.get('Blockly.Variables').getAddedVariables(workspace,
         variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.VAR_CREATE))(
+      Events.fire(new (Events.get(Events.VAR_CREATE))(
           thisVariable));
     }
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Blockly.Events.fire(new (Blockly.Events.get(Blockly.Events.CREATE))(
+    Events.fire(new (Events.get(Events.CREATE))(
         topBlock));
   }
   return topBlock;
@@ -630,13 +630,13 @@ exports.domToBlock = domToBlock;
 /**
  * Decode an XML list of variables and add the variables to the workspace.
  * @param {!Element} xmlVariables List of XML variable elements.
- * @param {!Blockly.Workspace} workspace The workspace to which the variable
+ * @param {!Workspace} workspace The workspace to which the variable
  *     should be added.
  */
 const domToVariables = function(xmlVariables, workspace) {
   for (let i = 0; i < xmlVariables.childNodes.length; i++) {
     const xmlChild = xmlVariables.childNodes[i];
-    if (xmlChild.nodeType != Blockly.utils.dom.NodeType.ELEMENT_NODE) {
+    if (xmlChild.nodeType != dom.NodeType.ELEMENT_NODE) {
       continue;  // Skip text nodes.
     }
     const type = xmlChild.getAttribute('type');
@@ -675,7 +675,7 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
   };
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
     const xmlChild = xmlBlock.childNodes[i];
-    if (xmlChild.nodeType == Blockly.utils.dom.NodeType.TEXT_NODE) {
+    if (xmlChild.nodeType == dom.NodeType.TEXT_NODE) {
       // Ignore any text at the <block> level.  It's all whitespace anyway.
       continue;
     }
@@ -685,7 +685,7 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
         break;
       case 'comment':
         if (!goog.module.get('Blockly.Comment')) {
-          console.warn('Missing require for Blockly.Comment, ' +
+          console.warn('Missing require for Comment, ' +
               'ignoring block comment.');
           break;
         }
@@ -718,7 +718,7 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
 /**
  * Applies mutation tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @return {boolean} True if mutation may have added some elements that need
  *    initialization (requiring initSvg call).
  * @private
@@ -742,7 +742,7 @@ const applyMutationTagNodes_ = function(xmlChildren, block) {
 /**
  * Applies comment tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyCommentTagNodes_ = function(xmlChildren, block) {
@@ -756,7 +756,7 @@ const applyCommentTagNodes_ = function(xmlChildren, block) {
     block.setCommentText(text);
     block.commentModel.pinned = pinned;
     if (!isNaN(width) && !isNaN(height)) {
-      block.commentModel.size = new Blockly.utils.Size(width, height);
+      block.commentModel.size = new Size(width, height);
     }
 
     if (pinned && block.getCommentIcon && !block.isInFlyout) {
@@ -770,7 +770,7 @@ const applyCommentTagNodes_ = function(xmlChildren, block) {
 /**
  * Applies data tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyDataTagNodes_ = function(xmlChildren, block) {
@@ -783,7 +783,7 @@ const applyDataTagNodes_ = function(xmlChildren, block) {
 /**
  * Applies field tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyFieldTagNodes_ = function(xmlChildren, block) {
@@ -805,7 +805,7 @@ const findChildBlocks_ = function(xmlNode) {
   const childBlockInfo = {childBlockElement: null, childShadowElement: null};
   for (let i = 0; i < xmlNode.childNodes.length; i++) {
     const xmlChild = xmlNode.childNodes[i];
-    if (xmlChild.nodeType == Blockly.utils.dom.NodeType.ELEMENT_NODE) {
+    if (xmlChild.nodeType == dom.NodeType.ELEMENT_NODE) {
       if (xmlChild.nodeName.toLowerCase() == 'block') {
         childBlockInfo.childBlockElement = /** @type {!Element} */ (xmlChild);
       } else if (xmlChild.nodeName.toLowerCase() == 'shadow') {
@@ -819,9 +819,9 @@ const findChildBlocks_ = function(xmlNode) {
 /**
  * Applies input child nodes (value or statement) to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Workspace} workspace The workspace containing the given
+ * @param {!Workspace} workspace The workspace containing the given
  *    block.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @param {string} prototypeName The prototype name of the block.
  * @private
  */
@@ -854,9 +854,9 @@ const applyInputTagNodes_ = function(xmlChildren, workspace, block,
 /**
  * Applies next child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
- * @param {!Blockly.Workspace} workspace The workspace containing the given
+ * @param {!Workspace} workspace The workspace containing the given
  *    block.
- * @param {!Blockly.Block} block The block to apply the child nodes on.
+ * @param {!Block} block The block to apply the child nodes on.
  * @private
  */
 const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
@@ -888,12 +888,12 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  * Decode an XML block tag and create a block (and possibly sub blocks) on the
  * workspace.
  * @param {!Element} xmlBlock XML block element.
- * @param {!Blockly.Workspace} workspace The workspace.
- * @param {!Blockly.Connection=} parentConnection The parent connection to
+ * @param {!Workspace} workspace The workspace.
+ * @param {!Connection=} parentConnection The parent connection to
  *    to connect this block to after instantiating.
  * @param {boolean=} connectedToParentNext Whether the provided parent connection
  *    is a next connection, rather than output or statement.
- * @return {!Blockly.Block} The root block created.
+ * @return {!Block} The root block created.
  * @private
  */
 const domToBlockHeadless_ = function(xmlBlock, workspace,
@@ -989,7 +989,7 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
 
 /**
  * Decode an XML field tag and set the value of that field on the given block.
- * @param {!Blockly.Block} block The block that is currently being deserialized.
+ * @param {!Block} block The block that is currently being deserialized.
  * @param {string} fieldName The name of the field on the block.
  * @param {!Element} xml The field tag to decode.
  * @private

From 1d9371a3bc5ae90168bb0f3c938a34b671040444 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Thu, 5 Aug 2021 13:25:05 -0700
Subject: [PATCH 290/291] clang-format core/xml.js

---
 core/xml.js | 106 ++++++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index 43e187c58..4ebbe1cda 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -87,8 +87,8 @@ exports.variablesToDom = variablesToDom;
  * Encode a block subtree as XML with XY coordinates.
  * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
- * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
- *     fragment if the block was an insertion marker.
+ * @return {!Element|!DocumentFragment} Tree of XML elements or an empty
+ *     document fragment if the block was an insertion marker.
  */
 const blockToDomWithXY = function(block, opt_noId) {
   if (block.isInsertionMarker()) {  // Skip over insertion markers.
@@ -106,8 +106,8 @@ const blockToDomWithXY = function(block, opt_noId) {
 
   const element = blockToDom(block, opt_noId);
   const xy = block.getRelativeToSurfaceXY();
-  element.setAttribute('x',
-      Math.round(block.workspace.RTL ? width - xy.x : xy.x));
+  element.setAttribute(
+      'x', Math.round(block.workspace.RTL ? width - xy.x : xy.x));
   element.setAttribute('y', Math.round(xy.y));
   return element;
 };
@@ -154,8 +154,8 @@ const allFieldsToDom_ = function(block, element) {
  * Encode a block subtree as XML.
  * @param {!Block} block The root block to encode.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
- * @return {!Element|!DocumentFragment} Tree of XML elements or an empty document
- *     fragment if the block was an insertion marker.
+ * @return {!Element|!DocumentFragment} Tree of XML elements or an empty
+ *     document fragment if the block was an insertion marker.
  */
 const blockToDom = function(block, opt_noId) {
   // Skip over insertion markers.
@@ -169,8 +169,7 @@ const blockToDom = function(block, opt_noId) {
     }
   }
 
-  const element =
-      utilsXml.createElement(block.isShadow() ? 'shadow' : 'block');
+  const element = utilsXml.createElement(block.isShadow() ? 'shadow' : 'block');
   element.setAttribute('type', block.type);
   if (!opt_noId) {
     // It's important to use setAttribute here otherwise IE11 won't serialize
@@ -415,8 +414,9 @@ const domToWorkspace = function(xml, workspace) {
     /** @suppress {checkTypes} */
     xml = workspace;
     workspace = swap;
-    console.warn('Deprecated call to domToWorkspace, ' +
-                 'swap the arguments.');
+    console.warn(
+        'Deprecated call to domToWorkspace, ' +
+        'swap the arguments.');
   }
 
   let width;  // Not used in LTR.
@@ -440,17 +440,18 @@ const domToWorkspace = function(xml, workspace) {
       const xmlChild = xml.childNodes[i];
       const name = xmlChild.nodeName.toLowerCase();
       const xmlChildElement = /** @type {!Element} */ (xmlChild);
-      if (name == 'block' ||
-          (name == 'shadow' && !Events.recordUndo)) {
+      if (name == 'block' || (name == 'shadow' && !Events.recordUndo)) {
         // Allow top-level shadow blocks if recordUndo is disabled since
         // that means an undo is in progress.  Such a block is expected
         // to be moved to a nested destination in the next operation.
         const block = domToBlock(xmlChildElement, workspace);
         newBlockIds.push(block.id);
         const blockX = xmlChildElement.hasAttribute('x') ?
-            parseInt(xmlChildElement.getAttribute('x'), 10) : 10;
+            parseInt(xmlChildElement.getAttribute('x'), 10) :
+            10;
         const blockY = xmlChildElement.hasAttribute('y') ?
-            parseInt(xmlChildElement.getAttribute('y'), 10) : 10;
+            parseInt(xmlChildElement.getAttribute('y'), 10) :
+            10;
         if (!isNaN(blockX) && !isNaN(blockY)) {
           block.moveBy(workspace.RTL ? width - blockX : blockX, blockY);
         }
@@ -462,7 +463,8 @@ const domToWorkspace = function(xml, workspace) {
           const WorkspaceCommentSvg =
               goog.module.get('Blockly.WorkspaceCommentSvg');
           if (!WorkspaceCommentSvg) {
-            console.warn('Missing require for Blockly.WorkspaceCommentSvg, ' +
+            console.warn(
+                'Missing require for Blockly.WorkspaceCommentSvg, ' +
                 'ignoring workspace comment.');
           } else {
             WorkspaceCommentSvg.fromXml(
@@ -472,7 +474,8 @@ const domToWorkspace = function(xml, workspace) {
         } else {
           const WorkspaceComment = goog.module.get('Blockly.WorkspaceComment');
           if (!WorkspaceComment) {
-            console.warn('Missing require for Blockly.WorkspaceComment, ' +
+            console.warn(
+                'Missing require for Blockly.WorkspaceComment, ' +
                 'ignoring workspace comment.');
           } else {
             WorkspaceComment.fromXml(xmlChildElement, workspace);
@@ -482,7 +485,8 @@ const domToWorkspace = function(xml, workspace) {
         if (variablesFirst) {
           domToVariables(xmlChildElement, workspace);
         } else {
-          throw Error('\'variables\' tag must exist once before block and ' +
+          throw Error(
+              '\'variables\' tag must exist once before block and ' +
               'shadow tag elements in the workspace XML, but it was found in ' +
               'another location.');
         }
@@ -499,8 +503,7 @@ const domToWorkspace = function(xml, workspace) {
   if (workspace.setResizesEnabled) {
     workspace.setResizesEnabled(true);
   }
-  Events.fire(new (Events.get(Events.FINISHED_LOADING))(
-      workspace));
+  Events.fire(new (Events.get(Events.FINISHED_LOADING))(workspace));
   return newBlockIds;
 };
 exports.domToWorkspace = domToWorkspace;
@@ -522,14 +525,14 @@ const appendDomToWorkspace = function(xml, workspace) {
   // Load the new blocks into the workspace and get the IDs of the new blocks.
   const newBlockIds = domToWorkspace(xml, workspace);
   if (bbox && bbox.top != bbox.bottom) {  // check if any previous block
-    let offsetY = 0;  // offset to add to y of the new block
+    let offsetY = 0;                      // offset to add to y of the new block
     let offsetX = 0;
-    const farY = bbox.bottom;  // bottom position
+    const farY = bbox.bottom;                             // bottom position
     const topX = workspace.RTL ? bbox.right : bbox.left;  // x of bounding box
     // Check position of the new blocks.
-    let newLeftX = Infinity;  // x of top left corner
+    let newLeftX = Infinity;    // x of top left corner
     let newRightX = -Infinity;  // x of top right corner
-    let newY = Infinity;  // y of top corner
+    let newY = Infinity;        // y of top corner
     const ySeparation = 10;
     for (let i = 0; i < newBlockIds.length; i++) {
       const blockXY =
@@ -569,8 +572,9 @@ const domToBlock = function(xmlBlock, workspace) {
     /** @suppress {checkTypes} */
     xmlBlock = /** @type {!Element} */ (workspace);
     workspace = swap;
-    console.warn('Deprecated call to domToBlock, ' +
-                 'swap the arguments.');
+    console.warn(
+        'Deprecated call to domToBlock, ' +
+        'swap the arguments.');
   }
   // Create top-level block.
   Events.disable();
@@ -610,18 +614,17 @@ const domToBlock = function(xmlBlock, workspace) {
     Events.enable();
   }
   if (Events.isEnabled()) {
-    const newVariables = goog.module.get('Blockly.Variables').getAddedVariables(workspace,
-        variablesBeforeCreation);
+    const newVariables =
+        goog.module.get('Blockly.Variables')
+            .getAddedVariables(workspace, variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
     for (let i = 0; i < newVariables.length; i++) {
       const thisVariable = newVariables[i];
-      Events.fire(new (Events.get(Events.VAR_CREATE))(
-          thisVariable));
+      Events.fire(new (Events.get(Events.VAR_CREATE))(thisVariable));
     }
     // Block events come after var events, in case they refer to newly created
     // variables.
-    Events.fire(new (Events.get(Events.CREATE))(
-        topBlock));
+    Events.fire(new (Events.get(Events.CREATE))(topBlock));
   }
   return topBlock;
 };
@@ -669,10 +672,8 @@ let childNodeTagMap;  // eslint-disable-line no-unused-vars
  *    node.
  */
 const mapSupportedXmlTags_ = function(xmlBlock) {
-  const childNodeMap = {
-    mutation: [], comment: [], data: [], field: [], input: [],
-    next: []
-  };
+  const childNodeMap =
+      {mutation: [], comment: [], data: [], field: [], input: [], next: []};
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
     const xmlChild = xmlBlock.childNodes[i];
     if (xmlChild.nodeType == dom.NodeType.TEXT_NODE) {
@@ -685,7 +686,8 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
         break;
       case 'comment':
         if (!goog.module.get('Blockly.Comment')) {
-          console.warn('Missing require for Comment, ' +
+          console.warn(
+              'Missing require for Comment, ' +
               'ignoring block comment.');
           break;
         }
@@ -825,14 +827,15 @@ const findChildBlocks_ = function(xmlNode) {
  * @param {string} prototypeName The prototype name of the block.
  * @private
  */
-const applyInputTagNodes_ = function(xmlChildren, workspace, block,
-    prototypeName) {
+const applyInputTagNodes_ = function(
+    xmlChildren, workspace, block, prototypeName) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const nodeName = xmlChild.getAttribute('name');
     const input = block.getInput(nodeName);
     if (!input) {
-      console.warn('Ignoring non-existent input ' + nodeName + ' in block ' +
+      console.warn(
+          'Ignoring non-existent input ' + nodeName + ' in block ' +
           prototypeName);
       break;
     }
@@ -841,8 +844,8 @@ const applyInputTagNodes_ = function(xmlChildren, workspace, block,
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
       }
-      domToBlockHeadless_(childBlockInfo.childBlockElement,
-          workspace, input.connection, false);
+      domToBlockHeadless_(
+          childBlockInfo.childBlockElement, workspace, input.connection, false);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
     if (childBlockInfo.childShadowElement) {
@@ -872,8 +875,8 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
         throw TypeError('Next statement is already connected.');
       }
       // Create child block.
-      domToBlockHeadless_(childBlockInfo.childBlockElement,
-          workspace, block.nextConnection,
+      domToBlockHeadless_(
+          childBlockInfo.childBlockElement, workspace, block.nextConnection,
           true);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
@@ -891,13 +894,14 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  * @param {!Workspace} workspace The workspace.
  * @param {!Connection=} parentConnection The parent connection to
  *    to connect this block to after instantiating.
- * @param {boolean=} connectedToParentNext Whether the provided parent connection
+ * @param {boolean=} connectedToParentNext Whether the provided parent
+ *     connection
  *    is a next connection, rather than output or statement.
  * @return {!Block} The root block created.
  * @private
  */
-const domToBlockHeadless_ = function(xmlBlock, workspace,
-    parentConnection, connectedToParentNext) {
+const domToBlockHeadless_ = function(
+    xmlBlock, workspace, parentConnection, connectedToParentNext) {
   let block = null;
   const prototypeName = xmlBlock.getAttribute('type');
   if (!prototypeName) {
@@ -920,8 +924,7 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
       if (block.previousConnection) {
         parentConnection.connect(block.previousConnection);
       } else {
-        throw TypeError(
-            'Next block does not have previous statement.');
+        throw TypeError('Next block does not have previous statement.');
       }
     } else {
       if (block.outputConnection) {
@@ -936,8 +939,7 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
   }
 
   applyFieldTagNodes_(xmlChildNameMap.field, block);
-  applyInputTagNodes_(
-      xmlChildNameMap.input, workspace, block, prototypeName);
+  applyInputTagNodes_(xmlChildNameMap.input, workspace, block, prototypeName);
   applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
 
   if (shouldCallInitSvg) {
@@ -997,8 +999,8 @@ const domToBlockHeadless_ = function(xmlBlock, workspace,
 const domToField_ = function(block, fieldName, xml) {
   const field = block.getField(fieldName);
   if (!field) {
-    console.warn('Ignoring non-existent field ' + fieldName + ' in block ' +
-        block.type);
+    console.warn(
+        'Ignoring non-existent field ' + fieldName + ' in block ' + block.type);
     return;
   }
   field.fromXml(xml);

From d1d8863fe8d0cac0193cf65f6a369b8fc6e0956a Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 11 Aug 2021 15:42:02 -0700
Subject: [PATCH 291/291] Rename private methods in core/xml.js

---
 core/xml.js | 72 ++++++++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 42 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index 4ebbe1cda..661631d27 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -118,9 +118,8 @@ exports.blockToDomWithXY = blockToDomWithXY;
  * @param {!Field} field The field to encode.
  * @return {?Element} XML element, or null if the field did not need to be
  *     serialized.
- * @private
  */
-const fieldToDom_ = function(field) {
+const fieldToDom = function(field) {
   if (field.isSerializable()) {
     const container = utilsXml.createElement('field');
     container.setAttribute('name', field.name || '');
@@ -135,14 +134,13 @@ const fieldToDom_ = function(field) {
  * @param {!Block} block A block with fields to be encoded.
  * @param {!Element} element The XML element to which the field DOM should be
  *     attached.
- * @private
  */
-const allFieldsToDom_ = function(block, element) {
+const allFieldsToDom = function(block, element) {
   for (let i = 0; i < block.inputList.length; i++) {
     const input = block.inputList[i];
     for (let j = 0; j < input.fieldRow.length; j++) {
       const field = input.fieldRow[j];
-      const fieldDom = fieldToDom_(field);
+      const fieldDom = fieldToDom(field);
       if (fieldDom) {
         element.appendChild(fieldDom);
       }
@@ -184,7 +182,7 @@ const blockToDom = function(block, opt_noId) {
     }
   }
 
-  allFieldsToDom_(block, element);
+  allFieldsToDom(block, element);
 
   const commentText = block.getCommentText();
   if (commentText) {
@@ -221,7 +219,7 @@ const blockToDom = function(block, opt_noId) {
       }
       const shadow = input.connection.getShadowDom();
       if (shadow && (!childBlock || !childBlock.isShadow())) {
-        container.appendChild(cloneShadow_(shadow, opt_noId));
+        container.appendChild(cloneShadow(shadow, opt_noId));
       }
       if (childBlock) {
         const elem = blockToDom(childBlock, opt_noId);
@@ -268,7 +266,7 @@ const blockToDom = function(block, opt_noId) {
   }
   const shadow = block.nextConnection && block.nextConnection.getShadowDom();
   if (shadow && (!nextBlock || !nextBlock.isShadow())) {
-    container.appendChild(cloneShadow_(shadow, opt_noId));
+    container.appendChild(cloneShadow(shadow, opt_noId));
   }
 
   return element;
@@ -280,9 +278,8 @@ exports.blockToDom = blockToDom;
  * @param {!Element} shadow A tree of XML elements.
  * @param {boolean=} opt_noId True if the encoder should skip the block ID.
  * @return {!Element} A tree of XML elements.
- * @private
  */
-const cloneShadow_ = function(shadow, opt_noId) {
+const cloneShadow = function(shadow, opt_noId) {
   shadow = shadow.cloneNode(true);
   // Walk the tree looking for whitespace.  Don't prune whitespace in a tag.
   let node = shadow;
@@ -581,7 +578,7 @@ const domToBlock = function(xmlBlock, workspace) {
   const variablesBeforeCreation = workspace.getAllVariables();
   let topBlock;
   try {
-    topBlock = domToBlockHeadless_(xmlBlock, workspace);
+    topBlock = domToBlockHeadless(xmlBlock, workspace);
     // Generate list of all blocks.
     const blocks = topBlock.getDescendants(false);
     if (workspace.rendered) {
@@ -671,7 +668,7 @@ let childNodeTagMap;  // eslint-disable-line no-unused-vars
  * @return {!childNodeTagMap} The childNode map from nodeName to
  *    node.
  */
-const mapSupportedXmlTags_ = function(xmlBlock) {
+const mapSupportedXmlTags = function(xmlBlock) {
   const childNodeMap =
       {mutation: [], comment: [], data: [], field: [], input: [], next: []};
   for (let i = 0; i < xmlBlock.childNodes.length; i++) {
@@ -723,9 +720,8 @@ const mapSupportedXmlTags_ = function(xmlBlock) {
  * @param {!Block} block The block to apply the child nodes on.
  * @return {boolean} True if mutation may have added some elements that need
  *    initialization (requiring initSvg call).
- * @private
  */
-const applyMutationTagNodes_ = function(xmlChildren, block) {
+const applyMutationTagNodes = function(xmlChildren, block) {
   let shouldCallInitSvg = false;
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -745,9 +741,8 @@ const applyMutationTagNodes_ = function(xmlChildren, block) {
  * Applies comment tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyCommentTagNodes_ = function(xmlChildren, block) {
+const applyCommentTagNodes = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const text = xmlChild.textContent;
@@ -773,9 +768,8 @@ const applyCommentTagNodes_ = function(xmlChildren, block) {
  * Applies data tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyDataTagNodes_ = function(xmlChildren, block) {
+const applyDataTagNodes = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     block.data = xmlChild.textContent;
@@ -786,13 +780,12 @@ const applyDataTagNodes_ = function(xmlChildren, block) {
  * Applies field tag child nodes to the given block.
  * @param {!Array<!Element>} xmlChildren Child nodes.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyFieldTagNodes_ = function(xmlChildren, block) {
+const applyFieldTagNodes = function(xmlChildren, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
     const nodeName = xmlChild.getAttribute('name');
-    domToField_(block, nodeName, xmlChild);
+    domToField(block, nodeName, xmlChild);
   }
 };
 
@@ -801,9 +794,8 @@ const applyFieldTagNodes_ = function(xmlChildren, block) {
  * @param {!Element} xmlNode The XML node to extract child block info from.
  * @return {{childBlockElement: ?Element, childShadowElement: ?Element}} Any
  *    found child block.
- * @private
  */
-const findChildBlocks_ = function(xmlNode) {
+const findChildBlocks = function(xmlNode) {
   const childBlockInfo = {childBlockElement: null, childShadowElement: null};
   for (let i = 0; i < xmlNode.childNodes.length; i++) {
     const xmlChild = xmlNode.childNodes[i];
@@ -825,9 +817,8 @@ const findChildBlocks_ = function(xmlNode) {
  *    block.
  * @param {!Block} block The block to apply the child nodes on.
  * @param {string} prototypeName The prototype name of the block.
- * @private
  */
-const applyInputTagNodes_ = function(
+const applyInputTagNodes = function(
     xmlChildren, workspace, block, prototypeName) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
@@ -839,12 +830,12 @@ const applyInputTagNodes_ = function(
           prototypeName);
       break;
     }
-    const childBlockInfo = findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!input.connection) {
         throw TypeError('Input connection does not exist.');
       }
-      domToBlockHeadless_(
+      domToBlockHeadless(
           childBlockInfo.childBlockElement, workspace, input.connection, false);
     }
     // Set shadow after so we don't create a shadow we delete immediately.
@@ -860,12 +851,11 @@ const applyInputTagNodes_ = function(
  * @param {!Workspace} workspace The workspace containing the given
  *    block.
  * @param {!Block} block The block to apply the child nodes on.
- * @private
  */
-const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
+const applyNextTagNodes = function(xmlChildren, workspace, block) {
   for (let i = 0; i < xmlChildren.length; i++) {
     const xmlChild = xmlChildren[i];
-    const childBlockInfo = findChildBlocks_(xmlChild);
+    const childBlockInfo = findChildBlocks(xmlChild);
     if (childBlockInfo.childBlockElement) {
       if (!block.nextConnection) {
         throw TypeError('Next statement does not exist.');
@@ -875,7 +865,7 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
         throw TypeError('Next statement is already connected.');
       }
       // Create child block.
-      domToBlockHeadless_(
+      domToBlockHeadless(
           childBlockInfo.childBlockElement, workspace, block.nextConnection,
           true);
     }
@@ -898,9 +888,8 @@ const applyNextTagNodes_ = function(xmlChildren, workspace, block) {
  *     connection
  *    is a next connection, rather than output or statement.
  * @return {!Block} The root block created.
- * @private
  */
-const domToBlockHeadless_ = function(
+const domToBlockHeadless = function(
     xmlBlock, workspace, parentConnection, connectedToParentNext) {
   let block = null;
   const prototypeName = xmlBlock.getAttribute('type');
@@ -911,12 +900,12 @@ const domToBlockHeadless_ = function(
   block = workspace.newBlock(prototypeName, id);
 
   // Preprocess childNodes so tags can be processed in a consistent order.
-  const xmlChildNameMap = mapSupportedXmlTags_(xmlBlock);
+  const xmlChildNameMap = mapSupportedXmlTags(xmlBlock);
 
   const shouldCallInitSvg =
-      applyMutationTagNodes_(xmlChildNameMap.mutation, block);
-  applyCommentTagNodes_(xmlChildNameMap.comment, block);
-  applyDataTagNodes_(xmlChildNameMap.data, block);
+      applyMutationTagNodes(xmlChildNameMap.mutation, block);
+  applyCommentTagNodes(xmlChildNameMap.comment, block);
+  applyDataTagNodes(xmlChildNameMap.data, block);
 
   // Connect parent after processing mutation and before setting fields.
   if (parentConnection) {
@@ -938,9 +927,9 @@ const domToBlockHeadless_ = function(
     }
   }
 
-  applyFieldTagNodes_(xmlChildNameMap.field, block);
-  applyInputTagNodes_(xmlChildNameMap.input, workspace, block, prototypeName);
-  applyNextTagNodes_(xmlChildNameMap.next, workspace, block);
+  applyFieldTagNodes(xmlChildNameMap.field, block);
+  applyInputTagNodes(xmlChildNameMap.input, workspace, block, prototypeName);
+  applyNextTagNodes(xmlChildNameMap.next, workspace, block);
 
   if (shouldCallInitSvg) {
     // InitSvg needs to be called after variable fields are loaded.
@@ -994,9 +983,8 @@ const domToBlockHeadless_ = function(
  * @param {!Block} block The block that is currently being deserialized.
  * @param {string} fieldName The name of the field on the block.
  * @param {!Element} xml The field tag to decode.
- * @private
  */
-const domToField_ = function(block, fieldName, xml) {
+const domToField = function(block, fieldName, xml) {
   const field = block.getField(fieldName);
   if (!field) {
     console.warn(