From 26195a6d9ca5bde23470fd7c23bbb06c1f679ae2 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 16 Aug 2021 08:49:49 -0700
Subject: [PATCH] Migrate core/renderers/minimalist/info.js to goog.module
 syntax (#5364)

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

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

* clang-format core/renderers/minimalist/info.js
---
 core/renderers/minimalist/info.js | 33 ++++++++++++++++++-------------
 tests/deps.js                     |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js
index d7bbae6bf..a2d40f041 100644
--- a/core/renderers/minimalist/info.js
+++ b/core/renderers/minimalist/info.js
@@ -9,10 +9,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.minimalist');
-goog.provide('Blockly.minimalist.RenderInfo');
+goog.module('Blockly.minimalist.RenderInfo');
+goog.module.declareLegacyNamespace();
 
-goog.require('Blockly.utils.object');
+const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
+/* eslint-disable-next-line no-unused-vars */
+const BlockSvg = goog.requireType('Blockly.BlockSvg');
+/* eslint-disable-next-line no-unused-vars */
+const Renderer = goog.requireType('Blockly.minimalist.Renderer');
+const object = goog.require('Blockly.utils.object');
 
 
 /**
@@ -22,24 +27,24 @@ goog.require('Blockly.utils.object');
  * may choose to rerender when getSize() is called).  However, calling it
  * repeatedly may be expensive.
  *
- * @param {!Blockly.minimalist.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.minimalist.RenderInfo = function(renderer, block) {
-  Blockly.minimalist.RenderInfo.superClass_.constructor.call(this, renderer, block);
-
+const RenderInfo = function(renderer, block) {
+  RenderInfo.superClass_.constructor.call(this, renderer, block);
 };
-Blockly.utils.object.inherits(Blockly.minimalist.RenderInfo,
-    Blockly.blockRendering.RenderInfo);
+object.inherits(RenderInfo, BaseRenderInfo);
 
 /**
  * Get the block renderer in use.
- * @return {!Blockly.minimalist.Renderer} The block renderer in use.
+ * @return {!Renderer} The block renderer in use.
  * @package
  */
-Blockly.minimalist.RenderInfo.prototype.getRenderer = function() {
-  return /** @type {!Blockly.minimalist.Renderer} */ (this.renderer_);
+RenderInfo.prototype.getRenderer = function() {
+  return /** @type {!Renderer} */ (this.renderer_);
 };
+
+exports = RenderInfo;
diff --git a/tests/deps.js b/tests/deps.js
index 7e1c01916..ad8c0479c 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -159,7 +159,7 @@ goog.addDependency('../../core/renderers/measurables/statement_input.js', ['Bloc
 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'], {'lang': 'es6', 'module': 'goog'});
 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/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 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'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
 goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']);