From 8e30d9ebd1d74d881b553eff959a77e3a27aaa13 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Tue, 3 Aug 2021 10:37:17 -0700 Subject: [PATCH 1/3] 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 Date: Tue, 3 Aug 2021 10:40:25 -0700 Subject: [PATCH 2/3] 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 Date: Tue, 3 Aug 2021 10:42:26 -0700 Subject: [PATCH 3/3] 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;