From f2f878db8c647072dec07620399f26793db4e559 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Wed, 21 Apr 2021 16:46:04 -0700 Subject: [PATCH] Fix multiple strict require warnings (#4793) --- core/block.js | 2 +- core/block_svg.js | 7 ++++--- core/blockly.js | 1 + core/browser_events.js | 1 + core/bubble.js | 2 +- core/connection.js | 2 +- core/field.js | 11 +++++++---- core/field_angle.js | 2 ++ core/field_dropdown.js | 1 + core/field_multilineinput.js | 3 +++ core/field_textinput.js | 2 ++ core/flyout_base.js | 4 ++-- core/flyout_button.js | 1 + core/flyout_horizontal.js | 1 + core/flyout_vertical.js | 1 + core/gesture.js | 1 + core/inject.js | 5 ++++- core/interfaces/i_bubble.js | 5 +++-- core/toolbox/category.js | 1 + core/toolbox/collapsible_category.js | 2 +- core/toolbox/separator.js | 2 +- core/toolbox/toolbox.js | 8 ++++---- core/toolbox/toolbox_item.js | 3 ++- core/trashcan.js | 2 +- core/workspace.js | 2 +- core/workspace_svg.js | 2 +- 26 files changed, 49 insertions(+), 25 deletions(-) diff --git a/core/block.js b/core/block.js index a3e6b01ac..a8015b0be 100644 --- a/core/block.js +++ b/core/block.js @@ -29,6 +29,7 @@ goog.require('Blockly.Events.BlockDelete'); goog.require('Blockly.Events.BlockMove'); goog.require('Blockly.Extensions'); goog.require('Blockly.fieldRegistry'); +goog.require('Blockly.IASTNodeLocation'); goog.require('Blockly.Input'); goog.require('Blockly.inputTypes'); goog.require('Blockly.Tooltip'); @@ -41,7 +42,6 @@ goog.require('Blockly.Workspace'); goog.requireType('Blockly.Comment'); goog.requireType('Blockly.Events.Abstract'); goog.requireType('Blockly.Field'); -goog.requireType('Blockly.IASTNodeLocation'); goog.requireType('Blockly.Mutator'); goog.requireType('Blockly.utils.Size'); goog.requireType('Blockly.VariableModel'); diff --git a/core/block_svg.js b/core/block_svg.js index eadc785fa..9687c61bc 100644 --- a/core/block_svg.js +++ b/core/block_svg.js @@ -27,6 +27,9 @@ goog.require('Blockly.Events'); 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.Msg'); goog.require('Blockly.RenderedConnection'); goog.require('Blockly.TabNavigateCursor'); @@ -39,6 +42,7 @@ 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'); @@ -46,9 +50,6 @@ goog.requireType('Blockly.blockRendering.Debug'); goog.requireType('Blockly.Comment'); goog.requireType('Blockly.Connection'); goog.requireType('Blockly.Field'); -goog.requireType('Blockly.IASTNodeLocationSvg'); -goog.requireType('Blockly.IBoundedElement'); -goog.requireType('Blockly.ICopyable'); goog.requireType('Blockly.Input'); goog.requireType('Blockly.Mutator'); goog.requireType('Blockly.Theme'); diff --git a/core/blockly.js b/core/blockly.js index e6a569336..cc13900b7 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -19,6 +19,7 @@ goog.provide('Blockly'); goog.require('Blockly.browserEvents'); goog.require('Blockly.connectionTypes'); goog.require('Blockly.constants'); +goog.require('Blockly.DropDownDiv'); goog.require('Blockly.Events'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); diff --git a/core/browser_events.js b/core/browser_events.js index 98bf661d7..471ce0a46 100644 --- a/core/browser_events.js +++ b/core/browser_events.js @@ -13,6 +13,7 @@ goog.provide('Blockly.browserEvents'); goog.require('Blockly.Touch'); +goog.require('Blockly.utils.global'); /** diff --git a/core/bubble.js b/core/bubble.js index c65dba459..ae9c37f9e 100644 --- a/core/bubble.js +++ b/core/bubble.js @@ -13,6 +13,7 @@ goog.provide('Blockly.Bubble'); goog.require('Blockly.browserEvents'); +goog.require('Blockly.IBubble'); goog.require('Blockly.Scrollbar'); goog.require('Blockly.Touch'); goog.require('Blockly.utils'); @@ -27,7 +28,6 @@ goog.require('Blockly.Workspace'); goog.requireType('Blockly.BlockDragSurfaceSvg'); goog.requireType('Blockly.BlockSvg'); -goog.requireType('Blockly.IBubble'); goog.requireType('Blockly.MetricsManager'); goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/connection.js b/core/connection.js index e5a632a32..3ca9081e0 100644 --- a/core/connection.js +++ b/core/connection.js @@ -18,11 +18,11 @@ goog.require('Blockly.constants'); goog.require('Blockly.Events'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockMove'); +goog.require('Blockly.IASTNodeLocationWithBlock'); goog.require('Blockly.utils.deprecation'); goog.require('Blockly.Xml'); goog.requireType('Blockly.Block'); -goog.requireType('Blockly.IASTNodeLocationWithBlock'); goog.requireType('Blockly.IConnectionChecker'); goog.requireType('Blockly.Input'); diff --git a/core/field.js b/core/field.js index c0ec9db80..8ae7654eb 100644 --- a/core/field.js +++ b/core/field.js @@ -15,11 +15,17 @@ goog.provide('Blockly.Field'); goog.require('Blockly.browserEvents'); +goog.require('Blockly.DropDownDiv'); goog.require('Blockly.Events'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); /** @suppress {extraRequire} */ goog.require('Blockly.Gesture'); +goog.require('Blockly.IASTNodeLocationSvg'); +goog.require('Blockly.IASTNodeLocationWithBlock'); +goog.require('Blockly.IKeyboardAccessible'); +goog.require('Blockly.IRegistrable'); +goog.require('Blockly.MarkerManager'); goog.require('Blockly.Tooltip'); goog.require('Blockly.utils'); goog.require('Blockly.utils.dom'); @@ -28,15 +34,12 @@ goog.require('Blockly.utils.Size'); goog.require('Blockly.utils.style'); goog.require('Blockly.utils.Svg'); goog.require('Blockly.utils.userAgent'); +goog.require('Blockly.WidgetDiv'); goog.requireType('Blockly.Block'); goog.requireType('Blockly.blockRendering.ConstantProvider'); goog.requireType('Blockly.BlockSvg'); -goog.requireType('Blockly.IASTNodeLocationSvg'); -goog.requireType('Blockly.IASTNodeLocationWithBlock'); -goog.requireType('Blockly.IKeyboardAccessible'); goog.requireType('Blockly.Input'); -goog.requireType('Blockly.IRegistrable'); goog.requireType('Blockly.ShortcutRegistry'); goog.requireType('Blockly.utils.Coordinate'); goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/field_angle.js b/core/field_angle.js index a78f0008b..2a3f1e631 100644 --- a/core/field_angle.js +++ b/core/field_angle.js @@ -18,10 +18,12 @@ goog.require('Blockly.DropDownDiv'); goog.require('Blockly.fieldRegistry'); goog.require('Blockly.FieldTextInput'); goog.require('Blockly.utils.dom'); +goog.require('Blockly.utils.KeyCodes'); goog.require('Blockly.utils.math'); goog.require('Blockly.utils.object'); goog.require('Blockly.utils.Svg'); goog.require('Blockly.utils.userAgent'); +goog.require('Blockly.WidgetDiv'); /** diff --git a/core/field_dropdown.js b/core/field_dropdown.js index 17ecc6292..0c5e29ad8 100644 --- a/core/field_dropdown.js +++ b/core/field_dropdown.js @@ -14,6 +14,7 @@ goog.provide('Blockly.FieldDropdown'); +goog.require('Blockly.DropDownDiv'); goog.require('Blockly.Field'); goog.require('Blockly.fieldRegistry'); goog.require('Blockly.Menu'); diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js index b0e782a66..2306925e5 100644 --- a/core/field_multilineinput.js +++ b/core/field_multilineinput.js @@ -15,6 +15,8 @@ goog.provide('Blockly.FieldMultilineInput'); goog.require('Blockly.Css'); +goog.require('Blockly.Field'); +goog.require('Blockly.fieldRegistry'); goog.require('Blockly.FieldTextInput'); goog.require('Blockly.utils'); goog.require('Blockly.utils.aria'); @@ -23,6 +25,7 @@ goog.require('Blockly.utils.KeyCodes'); goog.require('Blockly.utils.object'); goog.require('Blockly.utils.Svg'); goog.require('Blockly.utils.userAgent'); +goog.require('Blockly.WidgetDiv'); /** diff --git a/core/field_textinput.js b/core/field_textinput.js index 4d8a8f04d..9488eb429 100644 --- a/core/field_textinput.js +++ b/core/field_textinput.js @@ -13,6 +13,7 @@ goog.provide('Blockly.FieldTextInput'); goog.require('Blockly.browserEvents'); +goog.require('Blockly.DropDownDiv'); goog.require('Blockly.Events'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); @@ -26,6 +27,7 @@ goog.require('Blockly.utils.dom'); goog.require('Blockly.utils.KeyCodes'); goog.require('Blockly.utils.object'); goog.require('Blockly.utils.userAgent'); +goog.require('Blockly.WidgetDiv'); goog.requireType('Blockly.BlockSvg'); goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/flyout_base.js b/core/flyout_base.js index 971ca8914..41cccbc8a 100644 --- a/core/flyout_base.js +++ b/core/flyout_base.js @@ -24,6 +24,8 @@ goog.require('Blockly.Events.VarCreate'); goog.require('Blockly.FlyoutMetricsManager'); /** @suppress {extraRequire} */ goog.require('Blockly.Gesture'); +goog.require('Blockly.IDeleteArea'); +goog.require('Blockly.IFlyout'); goog.require('Blockly.ScrollbarPair'); goog.require('Blockly.Tooltip'); /** @suppress {extraRequire} */ @@ -39,8 +41,6 @@ goog.require('Blockly.Xml'); goog.requireType('Blockly.BlockSvg'); goog.requireType('Blockly.FlyoutButton'); -goog.requireType('Blockly.IDeleteArea'); -goog.requireType('Blockly.IFlyout'); goog.requireType('Blockly.Options'); goog.requireType('Blockly.utils.Rect'); diff --git a/core/flyout_button.js b/core/flyout_button.js index cf996f46d..643790d9f 100644 --- a/core/flyout_button.js +++ b/core/flyout_button.js @@ -17,6 +17,7 @@ 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'); diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js index 07d9803db..951d84aac 100644 --- a/core/flyout_horizontal.js +++ b/core/flyout_horizontal.js @@ -16,6 +16,7 @@ goog.provide('Blockly.HorizontalFlyout'); goog.require('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.constants'); +goog.require('Blockly.DropDownDiv'); goog.require('Blockly.Flyout'); goog.require('Blockly.registry'); goog.require('Blockly.Scrollbar'); diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js index 66f754107..142e50aa9 100644 --- a/core/flyout_vertical.js +++ b/core/flyout_vertical.js @@ -16,6 +16,7 @@ goog.provide('Blockly.VerticalFlyout'); goog.require('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.constants'); +goog.require('Blockly.DropDownDiv'); goog.require('Blockly.Flyout'); goog.require('Blockly.registry'); goog.require('Blockly.Scrollbar'); diff --git a/core/gesture.js b/core/gesture.js index 858792c50..8b759989f 100644 --- a/core/gesture.js +++ b/core/gesture.js @@ -26,6 +26,7 @@ goog.require('Blockly.Tooltip'); goog.require('Blockly.Touch'); goog.require('Blockly.utils'); goog.require('Blockly.utils.Coordinate'); +goog.require('Blockly.Workspace'); goog.require('Blockly.WorkspaceDragger'); goog.requireType('Blockly.BlockSvg'); diff --git a/core/inject.js b/core/inject.js index f2ec195f7..1997314fd 100644 --- a/core/inject.js +++ b/core/inject.js @@ -25,12 +25,15 @@ goog.require('Blockly.Tooltip'); goog.require('Blockly.utils'); goog.require('Blockly.utils.aria'); goog.require('Blockly.utils.dom'); +goog.require('Blockly.utils.math'); goog.require('Blockly.utils.Svg'); goog.require('Blockly.utils.userAgent'); +goog.require('Blockly.Workspace'); goog.require('Blockly.WorkspaceDragSurfaceSvg'); goog.require('Blockly.WorkspaceSvg'); +goog.require('Blockly.WidgetDiv'); -goog.requireType('Blockly.Workspace'); +goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js index aad591aee..e9e2671cc 100644 --- a/core/interfaces/i_bubble.js +++ b/core/interfaces/i_bubble.js @@ -13,9 +13,10 @@ goog.provide('Blockly.IBubble'); +goog.require('Blockly.IContextMenu'); +goog.require('Blockly.IDeletable'); + goog.requireType('Blockly.BlockDragSurfaceSvg'); -goog.requireType('Blockly.IContextMenu'); -goog.requireType('Blockly.IDeletable'); goog.requireType('Blockly.utils.Coordinate'); diff --git a/core/toolbox/category.js b/core/toolbox/category.js index 04d80df2b..eec4782dc 100644 --- a/core/toolbox/category.js +++ b/core/toolbox/category.js @@ -12,6 +12,7 @@ goog.provide('Blockly.ToolboxCategory'); +goog.require('Blockly.ISelectableToolboxItem'); goog.require('Blockly.registry'); goog.require('Blockly.ToolboxItem'); goog.require('Blockly.utils'); diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js index f7693a97f..ad9469a0c 100644 --- a/core/toolbox/collapsible_category.js +++ b/core/toolbox/collapsible_category.js @@ -12,6 +12,7 @@ goog.provide('Blockly.CollapsibleToolboxCategory'); +goog.require('Blockly.ICollapsibleToolboxItem'); goog.require('Blockly.registry'); goog.require('Blockly.ToolboxCategory'); goog.require('Blockly.ToolboxItem'); @@ -21,7 +22,6 @@ goog.require('Blockly.utils.dom'); goog.require('Blockly.utils.object'); goog.require('Blockly.utils.toolbox'); -goog.requireType('Blockly.ICollapsibleToolboxItem'); goog.requireType('Blockly.IToolbox'); goog.requireType('Blockly.IToolboxItem'); diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js index 2c51cd4a0..3c9ac14f3 100644 --- a/core/toolbox/separator.js +++ b/core/toolbox/separator.js @@ -13,12 +13,12 @@ goog.provide('Blockly.ToolboxSeparator'); +goog.require('Blockly.IToolboxItem'); goog.require('Blockly.registry'); goog.require('Blockly.ToolboxItem'); goog.require('Blockly.utils.dom'); goog.requireType('Blockly.IToolbox'); -goog.requireType('Blockly.IToolboxItem'); goog.requireType('Blockly.utils.toolbox'); diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js index 8ed72afdf..eda04ab99 100644 --- a/core/toolbox/toolbox.js +++ b/core/toolbox/toolbox.js @@ -20,6 +20,10 @@ goog.require('Blockly.Css'); goog.require('Blockly.Events'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.ToolboxItemSelect'); +goog.require('Blockly.IDeleteArea'); +goog.require('Blockly.IKeyboardAccessible'); +goog.require('Blockly.IStyleable'); +goog.require('Blockly.IToolbox'); goog.require('Blockly.Options'); goog.require('Blockly.registry'); goog.require('Blockly.Touch'); @@ -30,12 +34,8 @@ goog.require('Blockly.utils.Rect'); goog.require('Blockly.utils.toolbox'); goog.requireType('Blockly.ICollapsibleToolboxItem'); -goog.requireType('Blockly.IDeleteArea'); goog.requireType('Blockly.IFlyout'); -goog.requireType('Blockly.IKeyboardAccessible'); goog.requireType('Blockly.ISelectableToolboxItem'); -goog.requireType('Blockly.IStyleable'); -goog.requireType('Blockly.IToolbox'); goog.requireType('Blockly.IToolboxItem'); goog.requireType('Blockly.ShortcutRegistry'); goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js index e7c807667..9a868d9d3 100644 --- a/core/toolbox/toolbox_item.js +++ b/core/toolbox/toolbox_item.js @@ -12,9 +12,10 @@ goog.provide('Blockly.ToolboxItem'); +goog.require('Blockly.IToolboxItem'); + goog.requireType('Blockly.ICollapsibleToolboxItem'); goog.requireType('Blockly.IToolbox'); -goog.requireType('Blockly.IToolboxItem'); goog.requireType('Blockly.utils.toolbox'); goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/trashcan.js b/core/trashcan.js index 6c00dca52..d6236330b 100644 --- a/core/trashcan.js +++ b/core/trashcan.js @@ -18,6 +18,7 @@ goog.require('Blockly.constants'); goog.require('Blockly.Events'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.TrashcanOpen'); +goog.require('Blockly.IDeleteArea'); goog.require('Blockly.IPositionable'); goog.require('Blockly.Options'); goog.require('Blockly.registry'); @@ -30,7 +31,6 @@ goog.require('Blockly.utils.toolbox'); goog.require('Blockly.Xml'); goog.requireType('Blockly.Events.Abstract'); -goog.requireType('Blockly.IDeleteArea'); goog.requireType('Blockly.IFlyout'); goog.requireType('Blockly.WorkspaceSvg'); diff --git a/core/workspace.js b/core/workspace.js index 820c966dc..7dd4c0c1c 100644 --- a/core/workspace.js +++ b/core/workspace.js @@ -15,6 +15,7 @@ goog.provide('Blockly.Workspace'); /** @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'); @@ -24,7 +25,6 @@ goog.require('Blockly.VariableMap'); goog.requireType('Blockly.Block'); goog.requireType('Blockly.ConnectionDB'); goog.requireType('Blockly.Events.Abstract'); -goog.requireType('Blockly.IASTNodeLocation'); goog.requireType('Blockly.IConnectionChecker'); goog.requireType('Blockly.utils.toolbox'); goog.requireType('Blockly.VariableModel'); diff --git a/core/workspace_svg.js b/core/workspace_svg.js index 3c668add1..baf17fb63 100644 --- a/core/workspace_svg.js +++ b/core/workspace_svg.js @@ -29,6 +29,7 @@ goog.require('Blockly.Events.ThemeChange'); goog.require('Blockly.Events.ViewportChange'); goog.require('Blockly.Gesture'); goog.require('Blockly.Grid'); +goog.require('Blockly.IASTNodeLocationSvg'); goog.require('Blockly.MarkerManager'); /** @suppress {extraRequire} */ goog.require('Blockly.MetricsManager'); @@ -59,7 +60,6 @@ goog.requireType('Blockly.BlockDragSurfaceSvg'); goog.requireType('Blockly.blockRendering.Renderer'); goog.requireType('Blockly.Cursor'); goog.requireType('Blockly.FlyoutButton'); -goog.requireType('Blockly.IASTNodeLocationSvg'); goog.requireType('Blockly.IBoundedElement'); goog.requireType('Blockly.IFlyout'); goog.requireType('Blockly.IMetricsManager');