From b0475b0c68b4e8e877a63e270ea2fe45833f07f7 Mon Sep 17 00:00:00 2001 From: Christopher Allen Date: Fri, 24 Jun 2022 19:33:39 +0100 Subject: [PATCH] chore: Fix whitespace (#6243) * fix: Remove spurious blank lines Remove extraneous blank lines introduced by deletion of 'use strict'; pragmas. Also fix the location of the goog.declareModuleId call in core/utils/array.ts. * fix: Add missing double-blank-line before body of modules Our convention is to have two blank lines between the imports (or module ID, if there are no imports) and the beginning of the body of the module. Enforce this. * fix: one addition format error for PR #6243 --- core/block.ts | 2 -- core/block_animations.ts | 2 +- core/block_drag_surface.ts | 1 - core/block_dragger.ts | 1 - core/block_svg.ts | 1 - core/blockly.ts | 2 -- core/blockly_options.ts | 1 - core/blocks.ts | 1 - core/browser_events.ts | 2 -- core/bubble.ts | 1 - core/bubble_dragger.ts | 1 - core/bump_objects.ts | 1 - core/clipboard.ts | 1 - core/comment.ts | 1 - core/common.ts | 1 - core/component_manager.ts | 1 - core/config.ts | 2 +- core/connection.ts | 1 - core/connection_checker.ts | 1 - core/connection_db.ts | 1 - core/connection_type.ts | 1 - core/constants.ts | 1 - core/contextmenu.ts | 1 - core/contextmenu_items.ts | 1 - core/contextmenu_registry.ts | 1 - core/css.ts | 1 - core/delete_area.ts | 2 -- core/dialog.ts | 2 +- core/drag_target.ts | 2 -- core/dropdowndiv.ts | 1 - core/events/events.ts | 1 - core/events/events_abstract.ts | 1 - core/events/events_block_base.ts | 1 - core/events/events_block_change.ts | 1 - core/events/events_block_create.ts | 1 - core/events/events_block_delete.ts | 1 - core/events/events_block_drag.ts | 1 - core/events/events_block_move.ts | 2 +- core/events/events_bubble_open.ts | 1 - core/events/events_click.ts | 1 - core/events/events_comment_base.ts | 1 - core/events/events_comment_change.ts | 1 - core/events/events_comment_create.ts | 1 - core/events/events_comment_delete.ts | 1 - core/events/events_comment_move.ts | 1 - core/events/events_marker_move.ts | 1 - core/events/events_selected.ts | 1 - core/events/events_theme_change.ts | 1 - core/events/events_toolbox_item_select.ts | 1 - core/events/events_trashcan_open.ts | 1 - core/events/events_ui.ts | 1 - core/events/events_ui_base.ts | 1 - core/events/events_var_base.ts | 1 - core/events/events_var_create.ts | 1 - core/events/events_var_delete.ts | 1 - core/events/events_var_rename.ts | 1 - core/events/events_viewport.ts | 1 - core/events/utils.ts | 1 - core/events/workspace_events.ts | 1 - core/extensions.ts | 1 - core/field.ts | 1 - core/field_angle.ts | 1 - core/field_checkbox.ts | 1 - core/field_colour.ts | 1 - core/field_dropdown.ts | 2 -- core/field_image.ts | 1 - core/field_label.ts | 1 - core/field_label_serializable.ts | 1 - core/field_multilineinput.ts | 1 - core/field_number.ts | 1 - core/field_registry.ts | 1 - core/field_textinput.ts | 1 - core/field_variable.ts | 1 - core/flyout_base.ts | 1 - core/flyout_button.ts | 1 - core/flyout_horizontal.ts | 1 - core/flyout_metrics_manager.ts | 1 - core/flyout_vertical.ts | 1 - core/generator.ts | 1 - core/gesture.ts | 2 -- core/grid.ts | 1 - core/icon.ts | 1 - core/inject.ts | 1 - core/input.ts | 1 - core/input_types.ts | 1 - core/insertion_marker_manager.ts | 2 -- core/interfaces/i_ast_node_location.ts | 2 +- core/interfaces/i_ast_node_location_svg.ts | 1 - core/interfaces/i_ast_node_location_with_block.ts | 2 -- core/interfaces/i_autohideable.ts | 2 -- core/interfaces/i_block_dragger.ts | 1 - core/interfaces/i_bounded_element.ts | 1 - core/interfaces/i_bubble.ts | 1 - core/interfaces/i_collapsible_toolbox_item.ts | 1 - core/interfaces/i_component.ts | 2 -- core/interfaces/i_connection_checker.ts | 1 - core/interfaces/i_contextmenu.ts | 1 - core/interfaces/i_copyable.ts | 1 - core/interfaces/i_deletable.ts | 1 - core/interfaces/i_delete_area.ts | 2 -- core/interfaces/i_drag_target.ts | 2 -- core/interfaces/i_draggable.ts | 1 - core/interfaces/i_flyout.ts | 1 - core/interfaces/i_keyboard_accessible.ts | 1 - core/interfaces/i_metrics_manager.ts | 1 - core/interfaces/i_movable.ts | 1 - core/interfaces/i_positionable.ts | 1 - core/interfaces/i_registrable.ts | 2 -- core/interfaces/i_registrable_field.ts | 2 +- core/interfaces/i_selectable.ts | 1 - core/interfaces/i_selectable_toolbox_item.ts | 1 - core/interfaces/i_serializer.ts | 2 -- core/interfaces/i_styleable.ts | 1 - core/interfaces/i_toolbox.ts | 1 - core/interfaces/i_toolbox_item.ts | 1 - core/internal_constants.ts | 1 - core/keyboard_nav/ast_node.ts | 1 - core/keyboard_nav/basic_cursor.ts | 1 - core/keyboard_nav/cursor.ts | 2 +- core/keyboard_nav/marker.ts | 1 - core/keyboard_nav/tab_navigate_cursor.ts | 1 - core/marker_manager.ts | 1 - core/menu.ts | 1 - core/menuitem.ts | 1 - core/metrics_manager.ts | 1 - core/msg.ts | 1 - core/mutator.ts | 1 - core/names.ts | 1 - core/options.ts | 1 - core/positionable_helpers.ts | 1 - core/procedures.ts | 1 - core/registry.ts | 2 -- core/rendered_connection.ts | 2 +- core/renderers/common/block_rendering.ts | 2 +- core/renderers/common/constants.ts | 2 +- core/renderers/common/debug.ts | 1 - core/renderers/common/debugger.ts | 2 -- core/renderers/common/drawer.ts | 1 - core/renderers/common/i_path_object.ts | 2 -- core/renderers/common/info.ts | 1 - core/renderers/common/marker_svg.ts | 1 - core/renderers/common/path_object.ts | 1 - core/renderers/common/renderer.ts | 1 - core/renderers/geras/constants.ts | 1 - core/renderers/geras/drawer.ts | 1 - core/renderers/geras/geras.ts | 2 +- core/renderers/geras/highlight_constants.ts | 2 +- core/renderers/geras/highlighter.ts | 1 - core/renderers/geras/info.ts | 1 - core/renderers/geras/measurables/inline_input.ts | 1 - core/renderers/geras/measurables/statement_input.ts | 1 - core/renderers/geras/path_object.ts | 1 - core/renderers/geras/renderer.ts | 1 - core/renderers/measurables/base.ts | 1 - core/renderers/measurables/bottom_row.ts | 1 - core/renderers/measurables/connection.ts | 2 +- core/renderers/measurables/external_value_input.ts | 1 - core/renderers/measurables/field.ts | 1 - core/renderers/measurables/hat.ts | 1 - core/renderers/measurables/icon.ts | 1 - core/renderers/measurables/in_row_spacer.ts | 1 - core/renderers/measurables/inline_input.ts | 1 - core/renderers/measurables/input_connection.ts | 1 - core/renderers/measurables/input_row.ts | 1 - core/renderers/measurables/jagged_edge.ts | 1 - core/renderers/measurables/next_connection.ts | 1 - core/renderers/measurables/output_connection.ts | 1 - core/renderers/measurables/previous_connection.ts | 1 - core/renderers/measurables/round_corner.ts | 1 - core/renderers/measurables/row.ts | 1 - core/renderers/measurables/spacer_row.ts | 1 - core/renderers/measurables/square_corner.ts | 1 - core/renderers/measurables/statement_input.ts | 1 - core/renderers/measurables/top_row.ts | 1 - core/renderers/measurables/types.ts | 1 - core/renderers/minimalist/constants.ts | 1 - core/renderers/minimalist/drawer.ts | 1 - core/renderers/minimalist/info.ts | 1 - core/renderers/minimalist/minimalist.ts | 2 +- core/renderers/minimalist/renderer.ts | 1 - core/renderers/thrasos/info.ts | 1 - core/renderers/thrasos/renderer.ts | 1 - core/renderers/thrasos/thrasos.ts | 2 +- core/renderers/zelos/constants.ts | 3 +-- core/renderers/zelos/drawer.ts | 1 - core/renderers/zelos/info.ts | 1 - core/renderers/zelos/marker_svg.ts | 1 - core/renderers/zelos/measurables/bottom_row.ts | 1 - core/renderers/zelos/measurables/inputs.ts | 1 - core/renderers/zelos/measurables/row_elements.ts | 1 - core/renderers/zelos/measurables/top_row.ts | 1 - core/renderers/zelos/path_object.ts | 1 - core/renderers/zelos/renderer.ts | 1 - core/renderers/zelos/zelos.ts | 2 +- core/scrollbar.ts | 3 ++- core/scrollbar_pair.ts | 1 - core/serialization/blocks.ts | 1 - core/serialization/exceptions.ts | 1 - core/serialization/priorities.ts | 2 -- core/serialization/registry.ts | 1 - core/serialization/variables.ts | 1 - core/serialization/workspaces.ts | 1 - core/shortcut_items.ts | 1 - core/shortcut_registry.ts | 1 - core/sprites.ts | 1 - core/theme.ts | 1 - core/theme/classic.ts | 1 - core/theme/themes.ts | 2 +- core/theme/zelos.ts | 1 - core/theme_manager.ts | 1 - core/toolbox/category.ts | 1 - core/toolbox/collapsible_category.ts | 2 -- core/toolbox/separator.ts | 1 - core/toolbox/toolbox.ts | 1 - core/toolbox/toolbox_item.ts | 1 - core/tooltip.ts | 1 - core/touch.ts | 2 -- core/touch_gesture.ts | 2 -- core/trashcan.ts | 1 - core/utils.ts | 2 +- core/utils/aria.ts | 1 - core/utils/array.ts | 6 ++---- core/utils/colour.ts | 2 +- core/utils/coordinate.ts | 2 +- core/utils/deprecation.ts | 1 - core/utils/dom.ts | 1 - core/utils/idgenerator.ts | 1 - core/utils/keycodes.ts | 1 - core/utils/math.ts | 1 - core/utils/metrics.ts | 1 - core/utils/object.ts | 2 +- core/utils/parsing.ts | 1 - core/utils/rect.ts | 1 - core/utils/sentinel.ts | 1 - core/utils/size.ts | 1 - core/utils/string.ts | 1 - core/utils/style.ts | 1 - core/utils/svg.ts | 1 - core/utils/svg_math.ts | 3 --- core/utils/svg_paths.ts | 1 - core/utils/toolbox.ts | 3 +-- core/utils/useragent.ts | 2 +- core/utils/xml.ts | 2 +- core/variable_map.ts | 1 - core/variable_model.ts | 1 - core/variables.ts | 2 +- core/variables_dynamic.ts | 2 -- core/warning.ts | 1 - core/widgetdiv.ts | 1 - core/workspace.ts | 1 - core/workspace_audio.ts | 1 - core/workspace_comment.ts | 1 - core/workspace_comment_svg.ts | 1 - core/workspace_drag_surface_svg.ts | 2 -- core/workspace_dragger.ts | 1 - core/workspace_svg.ts | 1 - core/xml.ts | 2 -- core/zoom_controls.ts | 1 - 258 files changed, 30 insertions(+), 290 deletions(-) diff --git a/core/block.ts b/core/block.ts index 6c131a4eb..230767f90 100644 --- a/core/block.ts +++ b/core/block.ts @@ -8,7 +8,6 @@ * @fileoverview The class representing one block. */ - /** * The class representing one block. * @class @@ -708,7 +707,6 @@ export class Block implements IASTNodeLocation, IDeletable { ' superior block.'); } - // This block hasn't actually moved on-screen, so there's no need to // update // its connection locations. diff --git a/core/block_animations.ts b/core/block_animations.ts index e1891c435..7466bffc2 100644 --- a/core/block_animations.ts +++ b/core/block_animations.ts @@ -8,7 +8,6 @@ * @fileoverview Methods animating a block on connection and disconnection. */ - /** * Methods animating a block on connection and disconnection. * @namespace Blockly.blockAnimations @@ -21,6 +20,7 @@ import {BlockSvg} from './block_svg.js'; import * as dom from './utils/dom.js'; import {Svg} from './utils/svg.js'; + /** A bounding box for a cloned block. */ interface CloneRect { x: number; diff --git a/core/block_drag_surface.ts b/core/block_drag_surface.ts index d02880ca7..34376c9d0 100644 --- a/core/block_drag_surface.ts +++ b/core/block_drag_surface.ts @@ -13,7 +13,6 @@ * while dragging blocks. */ - /** * 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 diff --git a/core/block_dragger.ts b/core/block_dragger.ts index 67144bfb9..7483c8ec2 100644 --- a/core/block_dragger.ts +++ b/core/block_dragger.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for dragging a block visually. */ - /** * Methods for dragging a block visually. * @class diff --git a/core/block_svg.ts b/core/block_svg.ts index b21cb87bf..05f76ae69 100644 --- a/core/block_svg.ts +++ b/core/block_svg.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for graphically rendering a block as SVG. */ - /** * Methods for graphically rendering a block as SVG. * @class diff --git a/core/blockly.ts b/core/blockly.ts index 8d2a3bc72..e7554ab95 100644 --- a/core/blockly.ts +++ b/core/blockly.ts @@ -8,7 +8,6 @@ * @fileoverview The top level namespace used to access the Blockly library. */ - /** * The top level namespace used to access the Blockly library. * @namespace Blockly @@ -349,7 +348,6 @@ export const defineBlocksWithJsonArray = export const setParentContainer = (common as AnyDuringMigration).setParentContainer; - /** * Returns the dimensions of the specified SVG image. * @param svg SVG image. diff --git a/core/blockly_options.ts b/core/blockly_options.ts index f2f59564d..775669f92 100644 --- a/core/blockly_options.ts +++ b/core/blockly_options.ts @@ -8,7 +8,6 @@ * @fileoverview Object that defines user-specified options for the workspace. */ - /** * Object that defines user-specified options for the workspace. * @namespace Blockly.BlocklyOptions diff --git a/core/blocks.ts b/core/blocks.ts index 30fca303a..c57e5a8bd 100644 --- a/core/blocks.ts +++ b/core/blocks.ts @@ -8,7 +8,6 @@ * @fileoverview A mapping of block type names to block prototype objects. */ - /** * A mapping of block type names to block prototype objects. * @namespace Blockly.blocks diff --git a/core/browser_events.ts b/core/browser_events.ts index 3ee02842f..aebbfd28f 100644 --- a/core/browser_events.ts +++ b/core/browser_events.ts @@ -8,7 +8,6 @@ * @fileoverview Browser event handling. */ - /** * Browser event handling. * @namespace Blockly.browserEvents @@ -116,7 +115,6 @@ export function conditionalBind( return bindData; } - /** * Bind an event handler that should be called regardless of whether it is part * of the active touch stream. diff --git a/core/bubble.ts b/core/bubble.ts index f163c0aac..aff2ccd32 100644 --- a/core/bubble.ts +++ b/core/bubble.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a UI bubble. */ - /** * Object representing a UI bubble. * @class diff --git a/core/bubble_dragger.ts b/core/bubble_dragger.ts index 33f56a313..2066fdfa9 100644 --- a/core/bubble_dragger.ts +++ b/core/bubble_dragger.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for dragging a bubble visually. */ - /** * Methods for dragging a bubble visually. * @class diff --git a/core/bump_objects.ts b/core/bump_objects.ts index 2417ec6ac..29a08b4cc 100644 --- a/core/bump_objects.ts +++ b/core/bump_objects.ts @@ -8,7 +8,6 @@ * @fileoverview Utilities for bumping objects back into worksapce bounds. */ - /** * Utilities for bumping objects back into worksapce bounds. * @namespace Blockly.bumpObjects diff --git a/core/clipboard.ts b/core/clipboard.ts index 12eddbff6..3474b9310 100644 --- a/core/clipboard.ts +++ b/core/clipboard.ts @@ -8,7 +8,6 @@ * @fileoverview Blockly's internal clipboard for managing copy-paste. */ - /** * Blockly's internal clipboard for managing copy-paste. * @namespace Blockly.clipboard diff --git a/core/comment.ts b/core/comment.ts index 9d87971ad..d8a03ed09 100644 --- a/core/comment.ts +++ b/core/comment.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a code comment. */ - /** * Object representing a code comment. * @class diff --git a/core/common.ts b/core/common.ts index 167c83518..2abbc4a50 100644 --- a/core/common.ts +++ b/core/common.ts @@ -9,7 +9,6 @@ * must not be at the top level to avoid circular dependencies. */ - /** * Common functions used both internally and externally, but which * must not be at the top level to avoid circular dependencies. diff --git a/core/component_manager.ts b/core/component_manager.ts index a47a58850..8e048494a 100644 --- a/core/component_manager.ts +++ b/core/component_manager.ts @@ -8,7 +8,6 @@ * @fileoverview Manager for all items registered with the workspace. */ - /** * Manager for all items registered with the workspace. * @class diff --git a/core/config.ts b/core/config.ts index dad542670..2d65d2b2b 100644 --- a/core/config.ts +++ b/core/config.ts @@ -10,7 +10,6 @@ * generally recommended. */ - /** * All the values that we expect developers to be able to change * before injecting Blockly. Changing these values during run time is not @@ -20,6 +19,7 @@ import * as goog from '../closure/goog/goog.js'; goog.declareModuleId('Blockly.config'); + /** * All the values that we expect developers to be able to change * before injecting Blockly. diff --git a/core/connection.ts b/core/connection.ts index bba7a2fe8..3f0e96875 100644 --- a/core/connection.ts +++ b/core/connection.ts @@ -8,7 +8,6 @@ * @fileoverview Components for creating connections between blocks. */ - /** * Components for creating connections between blocks. * @class diff --git a/core/connection_checker.ts b/core/connection_checker.ts index d81216cea..9b07b30d5 100644 --- a/core/connection_checker.ts +++ b/core/connection_checker.ts @@ -9,7 +9,6 @@ * potential connection is safe and valid. */ - /** * An object that encapsulates logic for checking whether a * potential connection is safe and valid. diff --git a/core/connection_db.ts b/core/connection_db.ts index d84ccaf9d..28a7135a7 100644 --- a/core/connection_db.ts +++ b/core/connection_db.ts @@ -10,7 +10,6 @@ * Sorted by y coordinate. */ - /** * A database of all the rendered connections that could * possibly be connected to (i.e. not collapsed, etc). diff --git a/core/connection_type.ts b/core/connection_type.ts index b9e21f0db..337fa225c 100644 --- a/core/connection_type.ts +++ b/core/connection_type.ts @@ -8,7 +8,6 @@ * @fileoverview An enum for the possible types of connections. */ - /** * An enum for the possible types of connections. * @namespace Blockly.ConnectionType diff --git a/core/constants.ts b/core/constants.ts index 26aac3619..15f08f077 100644 --- a/core/constants.ts +++ b/core/constants.ts @@ -8,7 +8,6 @@ * @fileoverview Blockly constants. */ - /** * Blockly constants. * @namespace Blockly.constants diff --git a/core/contextmenu.ts b/core/contextmenu.ts index 6c9a67cea..df67e6776 100644 --- a/core/contextmenu.ts +++ b/core/contextmenu.ts @@ -8,7 +8,6 @@ * @fileoverview Functionality for the right-click context menus. */ - /** * Functionality for the right-click context menus. * @namespace Blockly.ContextMenu diff --git a/core/contextmenu_items.ts b/core/contextmenu_items.ts index 62342eef4..1372e65dc 100644 --- a/core/contextmenu_items.ts +++ b/core/contextmenu_items.ts @@ -8,7 +8,6 @@ * @fileoverview Registers default context menu items. */ - /** * Registers default context menu items. * @namespace Blockly.ContextMenuItems diff --git a/core/contextmenu_registry.ts b/core/contextmenu_registry.ts index ae23362d0..7bbf5c3c3 100644 --- a/core/contextmenu_registry.ts +++ b/core/contextmenu_registry.ts @@ -8,7 +8,6 @@ * @fileoverview Registry for context menu option items. */ - /** * Registry for context menu option items. * @class diff --git a/core/css.ts b/core/css.ts index 08c435000..02300946c 100644 --- a/core/css.ts +++ b/core/css.ts @@ -8,7 +8,6 @@ * @fileoverview Inject Blockly's CSS synchronously. */ - /** * Inject Blockly's CSS synchronously. * @namespace Blockly.Css diff --git a/core/delete_area.ts b/core/delete_area.ts index 17aced846..da7870745 100644 --- a/core/delete_area.ts +++ b/core/delete_area.ts @@ -9,8 +9,6 @@ * bubble that is dropped on top of it. */ - - /** * The abstract class for a component that can delete a block or * bubble that is dropped on top of it. diff --git a/core/dialog.ts b/core/dialog.ts index 1bf8dae8e..f839cfba3 100644 --- a/core/dialog.ts +++ b/core/dialog.ts @@ -9,7 +9,6 @@ * alert/confirmation dialogs. */ - /** * Wrapper functions around JS functions for showing alert/confirmation dialogs. * @namespace Blockly.dialog @@ -17,6 +16,7 @@ import * as goog from '../closure/goog/goog.js'; goog.declareModuleId('Blockly.dialog'); + let alertImplementation = function( message: AnyDuringMigration, opt_callback: AnyDuringMigration) { window.alert(message); diff --git a/core/drag_target.ts b/core/drag_target.ts index cb1167556..8f2178302 100644 --- a/core/drag_target.ts +++ b/core/drag_target.ts @@ -9,8 +9,6 @@ * block or bubble is dragged over or dropped on top of it. */ - - /** * The abstract class for a component with custom behaviour when a * block or bubble is dragged over or dropped on top of it. diff --git a/core/dropdowndiv.ts b/core/dropdowndiv.ts index ce9d37276..0b5d350e8 100644 --- a/core/dropdowndiv.ts +++ b/core/dropdowndiv.ts @@ -10,7 +10,6 @@ * The drop-down can be kept inside the workspace, animate in/out, etc. */ - /** * A div that floats on top of the workspace, for drop-down menus. * @class diff --git a/core/events/events.ts b/core/events/events.ts index db5338d24..e65f225d2 100644 --- a/core/events/events.ts +++ b/core/events/events.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of actions in Blockly's editor. */ - /** * Events fired as a result of actions in Blockly's editor. * @namespace Blockly.Events diff --git a/core/events/events_abstract.ts b/core/events/events_abstract.ts index 755107a65..078dfdbae 100644 --- a/core/events/events_abstract.ts +++ b/core/events/events_abstract.ts @@ -9,7 +9,6 @@ * Blockly's editor. */ - /** * Abstract class for events fired as a result of actions in * Blockly's editor. diff --git a/core/events/events_block_base.ts b/core/events/events_block_base.ts index 8b7189335..af0484d5b 100644 --- a/core/events/events_block_base.ts +++ b/core/events/events_block_base.ts @@ -8,7 +8,6 @@ * @fileoverview Base class for all types of block events. */ - /** * Base class for all types of block events. * @class diff --git a/core/events/events_block_change.ts b/core/events/events_block_change.ts index 7a683e097..81e167458 100644 --- a/core/events/events_block_change.ts +++ b/core/events/events_block_change.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a block change event. */ - /** * Class for a block change event. * @class diff --git a/core/events/events_block_create.ts b/core/events/events_block_create.ts index 62d8ee816..f4edff923 100644 --- a/core/events/events_block_create.ts +++ b/core/events/events_block_create.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a block creation event. */ - /** * Class for a block creation event. * @class diff --git a/core/events/events_block_delete.ts b/core/events/events_block_delete.ts index 3e947c795..cc9bc1ebd 100644 --- a/core/events/events_block_delete.ts +++ b/core/events/events_block_delete.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a block delete event. */ - /** * Class for a block delete event. * @class diff --git a/core/events/events_block_drag.ts b/core/events/events_block_drag.ts index 3c571b8cd..2ddf87cbf 100644 --- a/core/events/events_block_drag.ts +++ b/core/events/events_block_drag.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a block drag. */ - /** * Events fired as a block drag. * @class diff --git a/core/events/events_block_move.ts b/core/events/events_block_move.ts index c8c8d444a..c9621d29c 100644 --- a/core/events/events_block_move.ts +++ b/core/events/events_block_move.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a block move event. */ - /** * Class for a block move event. * @class @@ -25,6 +24,7 @@ import {Coordinate} from '../utils/coordinate.js'; import {BlockBase} from './events_block_base.js'; import * as eventUtils from './utils.js'; + interface BlockLocation { parentId: string; inputName: string; diff --git a/core/events/events_bubble_open.ts b/core/events/events_bubble_open.ts index 32fec5a87..4f7bcda11 100644 --- a/core/events/events_bubble_open.ts +++ b/core/events/events_bubble_open.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of bubble open. */ - /** * Events fired as a result of bubble open. * @class diff --git a/core/events/events_click.ts b/core/events/events_click.ts index 117aaaf7e..e92900324 100644 --- a/core/events/events_click.ts +++ b/core/events/events_click.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of UI click in Blockly's editor. */ - /** * Events fired as a result of UI click in Blockly's editor. * @class diff --git a/core/events/events_comment_base.ts b/core/events/events_comment_base.ts index 2c512607a..54f4d93c8 100644 --- a/core/events/events_comment_base.ts +++ b/core/events/events_comment_base.ts @@ -8,7 +8,6 @@ * @fileoverview Base class for comment events. */ - /** * Base class for comment events. * @class diff --git a/core/events/events_comment_change.ts b/core/events/events_comment_change.ts index 748504f7e..4553fcf44 100644 --- a/core/events/events_comment_change.ts +++ b/core/events/events_comment_change.ts @@ -8,7 +8,6 @@ * @fileoverview Class for comment change event. */ - /** * Class for comment change event. * @class diff --git a/core/events/events_comment_create.ts b/core/events/events_comment_create.ts index f053da77d..6afc6cb50 100644 --- a/core/events/events_comment_create.ts +++ b/core/events/events_comment_create.ts @@ -8,7 +8,6 @@ * @fileoverview Class for comment creation event. */ - /** * Class for comment creation event. * @class diff --git a/core/events/events_comment_delete.ts b/core/events/events_comment_delete.ts index b4ffdbd7c..d72754cd7 100644 --- a/core/events/events_comment_delete.ts +++ b/core/events/events_comment_delete.ts @@ -8,7 +8,6 @@ * @fileoverview Class for comment deletion event. */ - /** * Class for comment deletion event. * @class diff --git a/core/events/events_comment_move.ts b/core/events/events_comment_move.ts index 5dc53fe3a..04879b723 100644 --- a/core/events/events_comment_move.ts +++ b/core/events/events_comment_move.ts @@ -8,7 +8,6 @@ * @fileoverview Class for comment move event. */ - /** * Class for comment move event. * @class diff --git a/core/events/events_marker_move.ts b/core/events/events_marker_move.ts index c587e87ac..1ebc9e6fb 100644 --- a/core/events/events_marker_move.ts +++ b/core/events/events_marker_move.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of a marker move. */ - /** * Events fired as a result of a marker move. * @class diff --git a/core/events/events_selected.ts b/core/events/events_selected.ts index 0bd5eeb4a..3034af1a5 100644 --- a/core/events/events_selected.ts +++ b/core/events/events_selected.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of element select action. */ - /** * Events fired as a result of element select action. * @class diff --git a/core/events/events_theme_change.ts b/core/events/events_theme_change.ts index 5c0a577e4..c3648a2a4 100644 --- a/core/events/events_theme_change.ts +++ b/core/events/events_theme_change.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of a theme update. */ - /** * Events fired as a result of a theme update. * @class diff --git a/core/events/events_toolbox_item_select.ts b/core/events/events_toolbox_item_select.ts index fbb13e32c..db6c3b2eb 100644 --- a/core/events/events_toolbox_item_select.ts +++ b/core/events/events_toolbox_item_select.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of selecting an item on the toolbox. */ - /** * Events fired as a result of selecting an item on the toolbox. * @class diff --git a/core/events/events_trashcan_open.ts b/core/events/events_trashcan_open.ts index 5774bbf97..0940517f5 100644 --- a/core/events/events_trashcan_open.ts +++ b/core/events/events_trashcan_open.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of trashcan flyout open and close. */ - /** * Events fired as a result of trashcan flyout open and close. * @class diff --git a/core/events/events_ui.ts b/core/events/events_ui.ts index cc3ca3aba..d667bc114 100644 --- a/core/events/events_ui.ts +++ b/core/events/events_ui.ts @@ -9,7 +9,6 @@ * Blockly's editor. */ - /** * (Deprecated) Events fired as a result of UI actions in * Blockly's editor. diff --git a/core/events/events_ui_base.ts b/core/events/events_ui_base.ts index b6bee2e98..8f9c2fd3d 100644 --- a/core/events/events_ui_base.ts +++ b/core/events/events_ui_base.ts @@ -9,7 +9,6 @@ * Blockly's editor. */ - /** * Base class for events fired as a result of UI actions in * Blockly's editor. diff --git a/core/events/events_var_base.ts b/core/events/events_var_base.ts index 976870cd1..70b4d131c 100644 --- a/core/events/events_var_base.ts +++ b/core/events/events_var_base.ts @@ -8,7 +8,6 @@ * @fileoverview Abstract class for a variable event. */ - /** * Abstract class for a variable event. * @class diff --git a/core/events/events_var_create.ts b/core/events/events_var_create.ts index 088621670..c8ce8fe8a 100644 --- a/core/events/events_var_create.ts +++ b/core/events/events_var_create.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a variable creation event. */ - /** * Class for a variable creation event. * @class diff --git a/core/events/events_var_delete.ts b/core/events/events_var_delete.ts index de4f4de0a..5fd30f66f 100644 --- a/core/events/events_var_delete.ts +++ b/core/events/events_var_delete.ts @@ -8,7 +8,6 @@ * @fileoverview Classes for all types of variable events. */ - /** * Classes for all types of variable events. * @class diff --git a/core/events/events_var_rename.ts b/core/events/events_var_rename.ts index 0c53ccd6a..4fefd49ef 100644 --- a/core/events/events_var_rename.ts +++ b/core/events/events_var_rename.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a variable rename event. */ - /** * Class for a variable rename event. * @class diff --git a/core/events/events_viewport.ts b/core/events/events_viewport.ts index fa712c3a0..45609717b 100644 --- a/core/events/events_viewport.ts +++ b/core/events/events_viewport.ts @@ -8,7 +8,6 @@ * @fileoverview Events fired as a result of a viewport change. */ - /** * Events fired as a result of a viewport change. * @class diff --git a/core/events/utils.ts b/core/events/utils.ts index 26727a767..e62eb92ec 100644 --- a/core/events/utils.ts +++ b/core/events/utils.ts @@ -9,7 +9,6 @@ * actions in Blockly's editor. */ - /** * Helper methods for events that are fired as a result of * actions in Blockly's editor. diff --git a/core/events/workspace_events.ts b/core/events/workspace_events.ts index 0b0b942b8..643b85f68 100644 --- a/core/events/workspace_events.ts +++ b/core/events/workspace_events.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a finished loading workspace event. */ - /** * Class for a finished loading workspace event. * @class diff --git a/core/extensions.ts b/core/extensions.ts index 8a3325071..bb78978fe 100644 --- a/core/extensions.ts +++ b/core/extensions.ts @@ -11,7 +11,6 @@ * array attribute. */ - /** * Extensions are functions that help initialize blocks, usually * adding dynamic behavior such as onchange handlers and mutators. These diff --git a/core/field.ts b/core/field.ts index fedc1fb50..c1803246e 100644 --- a/core/field.ts +++ b/core/field.ts @@ -10,7 +10,6 @@ * instances would be FieldTextInput, FieldDropdown, etc. */ - /** * Field. Used for editable titles, variables, etc. * This is an abstract class that defines the UI on the block. Actual diff --git a/core/field_angle.ts b/core/field_angle.ts index d9b0d2578..9686d2627 100644 --- a/core/field_angle.ts +++ b/core/field_angle.ts @@ -8,7 +8,6 @@ * @fileoverview Angle input field. */ - /** * Angle input field. * @class diff --git a/core/field_checkbox.ts b/core/field_checkbox.ts index b425ffef0..1b5b4f6b7 100644 --- a/core/field_checkbox.ts +++ b/core/field_checkbox.ts @@ -8,7 +8,6 @@ * @fileoverview Checkbox field. Checked or not checked. */ - /** * Checkbox field. Checked or not checked. * @class diff --git a/core/field_colour.ts b/core/field_colour.ts index 615aa8ede..c61df51f3 100644 --- a/core/field_colour.ts +++ b/core/field_colour.ts @@ -8,7 +8,6 @@ * @fileoverview Colour input field. */ - /** * Colour input field. * @class diff --git a/core/field_dropdown.ts b/core/field_dropdown.ts index 13111d619..1b450cdd2 100644 --- a/core/field_dropdown.ts +++ b/core/field_dropdown.ts @@ -10,7 +10,6 @@ * properties with the context menu. */ - /** * Dropdown input field. Used for editable titles and variables. * In the interests of a consistent UI, the toolbox shares some functions and @@ -121,7 +120,6 @@ export class FieldDropdown extends Field { opt_validator?: Function, opt_config?: AnyDuringMigration) { super(Field.SKIP_SETUP); - // If we pass SKIP_SETUP, don't do *anything* with the menu generator. if (menuGenerator === Field.SKIP_SETUP) { return; diff --git a/core/field_image.ts b/core/field_image.ts index ed09e74ff..7fd935f97 100644 --- a/core/field_image.ts +++ b/core/field_image.ts @@ -8,7 +8,6 @@ * @fileoverview Image field. Used for pictures, icons, etc. */ - /** * Image field. Used for pictures, icons, etc. * @class diff --git a/core/field_label.ts b/core/field_label.ts index 4aba87499..b770f80c6 100644 --- a/core/field_label.ts +++ b/core/field_label.ts @@ -9,7 +9,6 @@ * labels, etc. */ - /** * Non-editable, non-serializable text field. Used for titles, * labels, etc. diff --git a/core/field_label_serializable.ts b/core/field_label_serializable.ts index d8293bc06..2f45cfef5 100644 --- a/core/field_label_serializable.ts +++ b/core/field_label_serializable.ts @@ -10,7 +10,6 @@ * edited programmatically. */ - /** * Non-editable, serializable text field. Behaves like a * normal label but is serialized to XML. It may only be diff --git a/core/field_multilineinput.ts b/core/field_multilineinput.ts index f7e913657..063ec9b96 100644 --- a/core/field_multilineinput.ts +++ b/core/field_multilineinput.ts @@ -8,7 +8,6 @@ * @fileoverview Text Area field. */ - /** * Text Area field. * @class diff --git a/core/field_number.ts b/core/field_number.ts index 3da1b9dd7..9951aae98 100644 --- a/core/field_number.ts +++ b/core/field_number.ts @@ -8,7 +8,6 @@ * @fileoverview Number input field */ - /** * Number input field * @class diff --git a/core/field_registry.ts b/core/field_registry.ts index a3229f611..4f09b9802 100644 --- a/core/field_registry.ts +++ b/core/field_registry.ts @@ -10,7 +10,6 @@ * fields based on JSON. */ - /** * Fields can be created based on a JSON definition. This file * contains methods for registering those JSON definitions, and building the diff --git a/core/field_textinput.ts b/core/field_textinput.ts index c4da00fa6..cecd92135 100644 --- a/core/field_textinput.ts +++ b/core/field_textinput.ts @@ -8,7 +8,6 @@ * @fileoverview Text input field. */ - /** * Text input field. * @class diff --git a/core/field_variable.ts b/core/field_variable.ts index 8aa7fd2a0..e3816c983 100644 --- a/core/field_variable.ts +++ b/core/field_variable.ts @@ -8,7 +8,6 @@ * @fileoverview Variable input field. */ - /** * Variable input field. * @class diff --git a/core/flyout_base.ts b/core/flyout_base.ts index 33c9232e5..169d3415c 100644 --- a/core/flyout_base.ts +++ b/core/flyout_base.ts @@ -8,7 +8,6 @@ * @fileoverview Flyout tray containing blocks which may be created. */ - /** * Flyout tray containing blocks which may be created. * @class diff --git a/core/flyout_button.ts b/core/flyout_button.ts index 445646520..ae7f9eb26 100644 --- a/core/flyout_button.ts +++ b/core/flyout_button.ts @@ -8,7 +8,6 @@ * @fileoverview Class for a button in the flyout. */ - /** * Class for a button in the flyout. * @class diff --git a/core/flyout_horizontal.ts b/core/flyout_horizontal.ts index 569464242..859f65cde 100644 --- a/core/flyout_horizontal.ts +++ b/core/flyout_horizontal.ts @@ -8,7 +8,6 @@ * @fileoverview Horizontal flyout tray containing blocks which may be created. */ - /** * Horizontal flyout tray containing blocks which may be created. * @class diff --git a/core/flyout_metrics_manager.ts b/core/flyout_metrics_manager.ts index 60747e8c3..b59f174a2 100644 --- a/core/flyout_metrics_manager.ts +++ b/core/flyout_metrics_manager.ts @@ -8,7 +8,6 @@ * @fileoverview Calculates and reports flyout workspace metrics. */ - /** * Calculates and reports flyout workspace metrics. * @class diff --git a/core/flyout_vertical.ts b/core/flyout_vertical.ts index 23c720083..1545eef84 100644 --- a/core/flyout_vertical.ts +++ b/core/flyout_vertical.ts @@ -8,7 +8,6 @@ * @fileoverview Layout code for a vertical variant of the flyout. */ - /** * Layout code for a vertical variant of the flyout. * @class diff --git a/core/generator.ts b/core/generator.ts index e2c5d9c31..bd45d4660 100644 --- a/core/generator.ts +++ b/core/generator.ts @@ -9,7 +9,6 @@ * Blockly code. */ - /** * Utility functions for generating executable code from * Blockly code. diff --git a/core/gesture.ts b/core/gesture.ts index 665e647e5..6bba2dd67 100644 --- a/core/gesture.ts +++ b/core/gesture.ts @@ -9,7 +9,6 @@ * or a tap. */ - /** * The class representing an in-progress gesture, usually a drag * or a tap. @@ -52,7 +51,6 @@ import {WorkspaceDragger} from './workspace_dragger.js'; import {WorkspaceSvg} from './workspace_svg.js'; - /** * Note: In this file "start" refers to touchstart, mousedown, and pointerstart * events. "End" refers to touchend, mouseup, and pointerend events. diff --git a/core/grid.ts b/core/grid.ts index 5107d3705..57102f059 100644 --- a/core/grid.ts +++ b/core/grid.ts @@ -9,7 +9,6 @@ * Blockly. */ - /** * Object for configuring and updating a workspace grid in * Blockly. diff --git a/core/icon.ts b/core/icon.ts index 5e5c17724..464851de8 100644 --- a/core/icon.ts +++ b/core/icon.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing an icon on a block. */ - /** * Object representing an icon on a block. * @class diff --git a/core/inject.ts b/core/inject.ts index 4bd643d7a..06c965c40 100644 --- a/core/inject.ts +++ b/core/inject.ts @@ -8,7 +8,6 @@ * @fileoverview Functions for injecting Blockly into a web page. */ - /** * Functions for injecting Blockly into a web page. * @namespace Blockly.inject diff --git a/core/input.ts b/core/input.ts index 739a23ad8..2ce0d47c7 100644 --- a/core/input.ts +++ b/core/input.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing an input (value, statement, or dummy). */ - /** * Object representing an input (value, statement, or dummy). * @class diff --git a/core/input_types.ts b/core/input_types.ts index c06022631..c7ef64382 100644 --- a/core/input_types.ts +++ b/core/input_types.ts @@ -8,7 +8,6 @@ * @fileoverview An enum for the possible types of inputs. */ - /** * An enum for the possible types of inputs. * @namespace Blockly.inputTypes diff --git a/core/insertion_marker_manager.ts b/core/insertion_marker_manager.ts index 835840f85..abbc06e71 100644 --- a/core/insertion_marker_manager.ts +++ b/core/insertion_marker_manager.ts @@ -8,7 +8,6 @@ * @fileoverview Class that controls updates to connections during drags. */ - /** * Class that controls updates to connections during drags. * @class @@ -53,7 +52,6 @@ const DUPLICATE_BLOCK_ERROR = 'The insertion marker ' + 'you are using a mutator, make sure your domToMutation method is ' + 'properly defined.'; - export enum PreviewType { INSERTION_MARKER = 0, INPUT_OUTLINE = 1, diff --git a/core/interfaces/i_ast_node_location.ts b/core/interfaces/i_ast_node_location.ts index 9924bd3a6..c9929382f 100644 --- a/core/interfaces/i_ast_node_location.ts +++ b/core/interfaces/i_ast_node_location.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an AST node location. */ - /** * The interface for an AST node location. * @namespace Blockly.IASTNodeLocation @@ -16,6 +15,7 @@ import * as goog from '../../closure/goog/goog.js'; goog.declareModuleId('Blockly.IASTNodeLocation'); + /** * An AST node location interface. * @alias Blockly.IASTNodeLocation diff --git a/core/interfaces/i_ast_node_location_svg.ts b/core/interfaces/i_ast_node_location_svg.ts index f28d062be..fe1f0926e 100644 --- a/core/interfaces/i_ast_node_location_svg.ts +++ b/core/interfaces/i_ast_node_location_svg.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an AST node location SVG. */ - /** * The interface for an AST node location SVG. * @namespace Blockly.IASTNodeLocationSvg diff --git a/core/interfaces/i_ast_node_location_with_block.ts b/core/interfaces/i_ast_node_location_with_block.ts index c42c6e782..fad003bae 100644 --- a/core/interfaces/i_ast_node_location_with_block.ts +++ b/core/interfaces/i_ast_node_location_with_block.ts @@ -9,8 +9,6 @@ * block. */ - - /** * The interface for an AST node location that has an associated * block. diff --git a/core/interfaces/i_autohideable.ts b/core/interfaces/i_autohideable.ts index 5ec93eb04..2ba5cf201 100644 --- a/core/interfaces/i_autohideable.ts +++ b/core/interfaces/i_autohideable.ts @@ -9,8 +9,6 @@ * when WorkspaceSvg.hideChaff is called. */ - - /** * The interface for a component that is automatically hidden * when WorkspaceSvg.hideChaff is called. diff --git a/core/interfaces/i_block_dragger.ts b/core/interfaces/i_block_dragger.ts index 2a2711c5b..710b79aff 100644 --- a/core/interfaces/i_block_dragger.ts +++ b/core/interfaces/i_block_dragger.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a block dragger. */ - /** * The interface for a block dragger. * @namespace Blockly.IBlockDragger diff --git a/core/interfaces/i_bounded_element.ts b/core/interfaces/i_bounded_element.ts index e2925e4b6..b112474e8 100644 --- a/core/interfaces/i_bounded_element.ts +++ b/core/interfaces/i_bounded_element.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a bounded element. */ - /** * The interface for a bounded element. * @namespace Blockly.IBoundedElement diff --git a/core/interfaces/i_bubble.ts b/core/interfaces/i_bubble.ts index a65382932..771ad49f8 100644 --- a/core/interfaces/i_bubble.ts +++ b/core/interfaces/i_bubble.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a bubble. */ - /** * The interface for a bubble. * @namespace Blockly.IBubble diff --git a/core/interfaces/i_collapsible_toolbox_item.ts b/core/interfaces/i_collapsible_toolbox_item.ts index 6cb4f117d..93f567d3c 100644 --- a/core/interfaces/i_collapsible_toolbox_item.ts +++ b/core/interfaces/i_collapsible_toolbox_item.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a collapsible toolbox item. */ - /** * The interface for a collapsible toolbox item. * @namespace Blockly.ICollapsibleToolboxItem diff --git a/core/interfaces/i_component.ts b/core/interfaces/i_component.ts index 6dc09205c..9f8a19660 100644 --- a/core/interfaces/i_component.ts +++ b/core/interfaces/i_component.ts @@ -9,8 +9,6 @@ * the ComponentManager. */ - - /** * Interface for a workspace component that can be registered with * the ComponentManager. diff --git a/core/interfaces/i_connection_checker.ts b/core/interfaces/i_connection_checker.ts index f6ee5695d..1d7a1e313 100644 --- a/core/interfaces/i_connection_checker.ts +++ b/core/interfaces/i_connection_checker.ts @@ -9,7 +9,6 @@ * checking whether a potential connection is safe and valid. */ - /** * The interface for an object that encapsulates logic for * checking whether a potential connection is safe and valid. diff --git a/core/interfaces/i_contextmenu.ts b/core/interfaces/i_contextmenu.ts index abc4a6487..983e9a78b 100644 --- a/core/interfaces/i_contextmenu.ts +++ b/core/interfaces/i_contextmenu.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an object that supports a right-click. */ - /** * The interface for an object that supports a right-click. * @namespace Blockly.IContextMenu diff --git a/core/interfaces/i_copyable.ts b/core/interfaces/i_copyable.ts index 60986b062..7cd224485 100644 --- a/core/interfaces/i_copyable.ts +++ b/core/interfaces/i_copyable.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an object that is copyable. */ - /** * The interface for an object that is copyable. * @namespace Blockly.ICopyable diff --git a/core/interfaces/i_deletable.ts b/core/interfaces/i_deletable.ts index 50087de30..599313d45 100644 --- a/core/interfaces/i_deletable.ts +++ b/core/interfaces/i_deletable.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an object that is deletable. */ - /** * The interface for an object that is deletable. * @namespace Blockly.IDeletable diff --git a/core/interfaces/i_delete_area.ts b/core/interfaces/i_delete_area.ts index e8d473ebc..0d21fba82 100644 --- a/core/interfaces/i_delete_area.ts +++ b/core/interfaces/i_delete_area.ts @@ -9,8 +9,6 @@ * that is dropped on top of it. */ - - /** * The interface for a component that can delete a block or bubble * that is dropped on top of it. diff --git a/core/interfaces/i_drag_target.ts b/core/interfaces/i_drag_target.ts index 9adb41aa3..f6026b332 100644 --- a/core/interfaces/i_drag_target.ts +++ b/core/interfaces/i_drag_target.ts @@ -9,8 +9,6 @@ * block is dropped on top of it. */ - - /** * The interface for a component that has a handler for when a * block is dropped on top of it. diff --git a/core/interfaces/i_draggable.ts b/core/interfaces/i_draggable.ts index 3482ff226..24f12a840 100644 --- a/core/interfaces/i_draggable.ts +++ b/core/interfaces/i_draggable.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an object that is draggable. */ - /** * The interface for an object that is draggable. * @namespace Blockly.IDraggable diff --git a/core/interfaces/i_flyout.ts b/core/interfaces/i_flyout.ts index 2d135bd96..8c64efae6 100644 --- a/core/interfaces/i_flyout.ts +++ b/core/interfaces/i_flyout.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a flyout. */ - /** * The interface for a flyout. * @namespace Blockly.IFlyout diff --git a/core/interfaces/i_keyboard_accessible.ts b/core/interfaces/i_keyboard_accessible.ts index 02f0184dd..eb644f7db 100644 --- a/core/interfaces/i_keyboard_accessible.ts +++ b/core/interfaces/i_keyboard_accessible.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for objects that handle keyboard shortcuts. */ - /** * The interface for objects that handle keyboard shortcuts. * @namespace Blockly.IKeyboardAccessible diff --git a/core/interfaces/i_metrics_manager.ts b/core/interfaces/i_metrics_manager.ts index 8ab503a8d..dd267ac10 100644 --- a/core/interfaces/i_metrics_manager.ts +++ b/core/interfaces/i_metrics_manager.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a metrics manager. */ - /** * The interface for a metrics manager. * @namespace Blockly.IMetricsManager diff --git a/core/interfaces/i_movable.ts b/core/interfaces/i_movable.ts index 02452c71d..6bc904941 100644 --- a/core/interfaces/i_movable.ts +++ b/core/interfaces/i_movable.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an object that is movable. */ - /** * The interface for an object that is movable. * @namespace Blockly.IMovable diff --git a/core/interfaces/i_positionable.ts b/core/interfaces/i_positionable.ts index b8c205d0b..91c82817f 100644 --- a/core/interfaces/i_positionable.ts +++ b/core/interfaces/i_positionable.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a positionable UI element. */ - /** * The interface for a positionable UI element. * @namespace Blockly.IPositionable diff --git a/core/interfaces/i_registrable.ts b/core/interfaces/i_registrable.ts index dc8850690..c25749244 100644 --- a/core/interfaces/i_registrable.ts +++ b/core/interfaces/i_registrable.ts @@ -9,8 +9,6 @@ * (Ex. Toolbox, Fields, Renderers) */ - - /** * The interface for a Blockly component that can be registered. * (Ex. Toolbox, Fields, Renderers) diff --git a/core/interfaces/i_registrable_field.ts b/core/interfaces/i_registrable_field.ts index 9feb479d7..f6929b9f8 100644 --- a/core/interfaces/i_registrable_field.ts +++ b/core/interfaces/i_registrable_field.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a Blockly field that can be registered. */ - /** * The interface for a Blockly field that can be registered. * @namespace Blockly.IRegistrableField @@ -19,6 +18,7 @@ goog.declareModuleId('Blockly.IRegistrableField'); /* eslint-disable-next-line no-unused-vars */ import {Field} from '../field.js'; + type fromJson = (p1: object) => Field; /** diff --git a/core/interfaces/i_selectable.ts b/core/interfaces/i_selectable.ts index cf7e945a4..497f0c1c5 100644 --- a/core/interfaces/i_selectable.ts +++ b/core/interfaces/i_selectable.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an object that is selectable. */ - /** * The interface for an object that is selectable. * @namespace Blockly.ISelectable diff --git a/core/interfaces/i_selectable_toolbox_item.ts b/core/interfaces/i_selectable_toolbox_item.ts index 01af0d45b..4b8292243 100644 --- a/core/interfaces/i_selectable_toolbox_item.ts +++ b/core/interfaces/i_selectable_toolbox_item.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a selectable toolbox item. */ - /** * The interface for a selectable toolbox item. * @namespace Blockly.ISelectableToolboxItem diff --git a/core/interfaces/i_serializer.ts b/core/interfaces/i_serializer.ts index 86bd9ef61..3f1d8ebfd 100644 --- a/core/interfaces/i_serializer.ts +++ b/core/interfaces/i_serializer.ts @@ -9,8 +9,6 @@ * serializing part of the workspace. */ - - /** * The record type for an object containing functions for * serializing part of the workspace. diff --git a/core/interfaces/i_styleable.ts b/core/interfaces/i_styleable.ts index 1439a937a..292e18d56 100644 --- a/core/interfaces/i_styleable.ts +++ b/core/interfaces/i_styleable.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for an object that a style can be added to. */ - /** * The interface for an object that a style can be added to. * @namespace Blockly.IStyleable diff --git a/core/interfaces/i_toolbox.ts b/core/interfaces/i_toolbox.ts index 12bf4397a..cc3929cf4 100644 --- a/core/interfaces/i_toolbox.ts +++ b/core/interfaces/i_toolbox.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a toolbox. */ - /** * The interface for a toolbox. * @namespace Blockly.IToolbox diff --git a/core/interfaces/i_toolbox_item.ts b/core/interfaces/i_toolbox_item.ts index 303481dad..2353f7598 100644 --- a/core/interfaces/i_toolbox_item.ts +++ b/core/interfaces/i_toolbox_item.ts @@ -8,7 +8,6 @@ * @fileoverview The interface for a toolbox item. */ - /** * The interface for a toolbox item. * @namespace Blockly.IToolboxItem diff --git a/core/internal_constants.ts b/core/internal_constants.ts index 1d4e4b364..3668b91e8 100644 --- a/core/internal_constants.ts +++ b/core/internal_constants.ts @@ -9,7 +9,6 @@ * use these constants outside of the core library. */ - /** * Module that provides constants for use inside Blockly. Do not * use these constants outside of the core library. diff --git a/core/keyboard_nav/ast_node.ts b/core/keyboard_nav/ast_node.ts index 735f843ff..5a55cc816 100644 --- a/core/keyboard_nav/ast_node.ts +++ b/core/keyboard_nav/ast_node.ts @@ -9,7 +9,6 @@ * Used to traverse the Blockly AST. */ - /** * The class representing an AST node. * Used to traverse the Blockly AST. diff --git a/core/keyboard_nav/basic_cursor.ts b/core/keyboard_nav/basic_cursor.ts index b6fbc784d..53416da04 100644 --- a/core/keyboard_nav/basic_cursor.ts +++ b/core/keyboard_nav/basic_cursor.ts @@ -9,7 +9,6 @@ * Used to demo switching between different cursors. */ - /** * The class representing a basic cursor. * Used to demo switching between different cursors. diff --git a/core/keyboard_nav/cursor.ts b/core/keyboard_nav/cursor.ts index 520bc78ec..2db5007a5 100644 --- a/core/keyboard_nav/cursor.ts +++ b/core/keyboard_nav/cursor.ts @@ -9,7 +9,6 @@ * Used primarily for keyboard navigation. */ - /** * The class representing a cursor. * Used primarily for keyboard navigation. @@ -23,6 +22,7 @@ import * as registry from '../registry.js'; import {ASTNode} from './ast_node.js'; import {Marker} from './marker.js'; + /** * Class for a cursor. * A cursor controls how a user navigates the Blockly AST. diff --git a/core/keyboard_nav/marker.ts b/core/keyboard_nav/marker.ts index 5c1fbda2a..db1c6bc60 100644 --- a/core/keyboard_nav/marker.ts +++ b/core/keyboard_nav/marker.ts @@ -9,7 +9,6 @@ * Used primarily for keyboard navigation to show a marked location. */ - /** * The class representing a marker. * Used primarily for keyboard navigation to show a marked location. diff --git a/core/keyboard_nav/tab_navigate_cursor.ts b/core/keyboard_nav/tab_navigate_cursor.ts index 8b77cb9ab..6f6810e9d 100644 --- a/core/keyboard_nav/tab_navigate_cursor.ts +++ b/core/keyboard_nav/tab_navigate_cursor.ts @@ -9,7 +9,6 @@ * between tab navigable fields. */ - /** * The class representing a cursor that is used to navigate * between tab navigable fields. diff --git a/core/marker_manager.ts b/core/marker_manager.ts index 6d04c0ab2..37f92dc28 100644 --- a/core/marker_manager.ts +++ b/core/marker_manager.ts @@ -8,7 +8,6 @@ * @fileoverview Object in charge of managing markers and the cursor. */ - /** * Object in charge of managing markers and the cursor. * @class diff --git a/core/menu.ts b/core/menu.ts index b96188513..8ffecd1c8 100644 --- a/core/menu.ts +++ b/core/menu.ts @@ -8,7 +8,6 @@ * @fileoverview Blockly menu similar to Closure's goog.ui.Menu */ - /** * Blockly menu similar to Closure's goog.ui.Menu * @class diff --git a/core/menuitem.ts b/core/menuitem.ts index 586e9d841..4798c9f36 100644 --- a/core/menuitem.ts +++ b/core/menuitem.ts @@ -8,7 +8,6 @@ * @fileoverview Blockly menu item similar to Closure's goog.ui.MenuItem */ - /** * Blockly menu item similar to Closure's goog.ui.MenuItem * @class diff --git a/core/metrics_manager.ts b/core/metrics_manager.ts index b23b47114..f5b158c4f 100644 --- a/core/metrics_manager.ts +++ b/core/metrics_manager.ts @@ -8,7 +8,6 @@ * @fileoverview Calculates and reports workspace metrics. */ - /** * Calculates and reports workspace metrics. * @class diff --git a/core/msg.ts b/core/msg.ts index e0a398198..d4c9be7b4 100644 --- a/core/msg.ts +++ b/core/msg.ts @@ -8,7 +8,6 @@ * @fileoverview Empty name space for the Message singleton. */ - /** * Empty name space for the Message singleton. * @namespace Blockly.Msg diff --git a/core/mutator.ts b/core/mutator.ts index a1a2904dd..ca57cb457 100644 --- a/core/mutator.ts +++ b/core/mutator.ts @@ -9,7 +9,6 @@ * user to change the shape of a block using a nested blocks editor. */ - /** * Object representing a mutator dialog. A mutator allows the * user to change the shape of a block using a nested blocks editor. diff --git a/core/names.ts b/core/names.ts index 78f499855..d4e8ce0ce 100644 --- a/core/names.ts +++ b/core/names.ts @@ -8,7 +8,6 @@ * @fileoverview Utility functions for handling variable and procedure names. */ - /** * Utility functions for handling variable and procedure names. * @class diff --git a/core/options.ts b/core/options.ts index 28356ab11..ad5ef3672 100644 --- a/core/options.ts +++ b/core/options.ts @@ -8,7 +8,6 @@ * @fileoverview Object that controls settings for the workspace. */ - /** * Object that controls settings for the workspace. * @class diff --git a/core/positionable_helpers.ts b/core/positionable_helpers.ts index e796203b2..f752c8405 100644 --- a/core/positionable_helpers.ts +++ b/core/positionable_helpers.ts @@ -8,7 +8,6 @@ * @fileoverview Utility functions for positioning UI elements. */ - /** * Utility functions for positioning UI elements. * @namespace Blockly.uiPosition diff --git a/core/procedures.ts b/core/procedures.ts index 058a1f858..5f4267d6e 100644 --- a/core/procedures.ts +++ b/core/procedures.ts @@ -8,7 +8,6 @@ * @fileoverview Utility functions for handling procedures. */ - /** * Utility functions for handling procedures. * @namespace Blockly.Procedures diff --git a/core/registry.ts b/core/registry.ts index 956430b24..9327f8a3a 100644 --- a/core/registry.ts +++ b/core/registry.ts @@ -9,7 +9,6 @@ * for registering and unregistering different types of classes. */ - /** * This file is a universal registry that provides generic methods * for registering and unregistering different types of classes. @@ -102,7 +101,6 @@ export class Type { } } - // Type.CONNECTION_CHECKER = new Type('connectionChecker'); // Type.CURSOR = new Type('cursor'); diff --git a/core/rendered_connection.ts b/core/rendered_connection.ts index ae352d971..0c9df83ec 100644 --- a/core/rendered_connection.ts +++ b/core/rendered_connection.ts @@ -8,7 +8,6 @@ * @fileoverview Components for creating connections between blocks. */ - /** * Components for creating connections between blocks. * @class @@ -34,6 +33,7 @@ import {Svg} from './utils/svg.js'; import * as svgMath from './utils/svg_math.js'; import * as svgPaths from './utils/svg_paths.js'; + /** A shape that has a pathDown property. */ interface PathDownShape { pathDown: string; diff --git a/core/renderers/common/block_rendering.ts b/core/renderers/common/block_rendering.ts index 240632b45..cf09f07c6 100644 --- a/core/renderers/common/block_rendering.ts +++ b/core/renderers/common/block_rendering.ts @@ -8,7 +8,6 @@ * @fileoverview Namespace for block rendering functionality. */ - /** * Namespace for block rendering functionality. * @namespace Blockly.blockRendering @@ -53,6 +52,7 @@ import {MarkerSvg} from './marker_svg.js'; import {PathObject} from './path_object.js'; import {Renderer} from './renderer.js'; + /** * Returns whether the debugger is turned on. * @return Whether the debugger is turned on. diff --git a/core/renderers/common/constants.ts b/core/renderers/common/constants.ts index efc1c0d57..c65bd8e8f 100644 --- a/core/renderers/common/constants.ts +++ b/core/renderers/common/constants.ts @@ -8,7 +8,6 @@ * @fileoverview An object that provides constants for rendering blocks. */ - /** * An object that provides constants for rendering blocks. * @class @@ -27,6 +26,7 @@ import {Svg} from '../../utils/svg.js'; import * as svgPaths from '../../utils/svg_paths.js'; import * as userAgent from '../../utils/useragent.js'; + /** An object containing sizing and path information about outside corners. */ export interface OutsideCorners { topLeft: string; diff --git a/core/renderers/common/debug.ts b/core/renderers/common/debug.ts index 9a59d6563..61d830e2a 100644 --- a/core/renderers/common/debug.ts +++ b/core/renderers/common/debug.ts @@ -8,7 +8,6 @@ * @fileoverview Block rendering debugging functionality. */ - /** * Block rendering debugging functionality. * @namespace Blockly.blockRendering.debug diff --git a/core/renderers/common/debugger.ts b/core/renderers/common/debugger.ts index 316f0f84e..5ddb99164 100644 --- a/core/renderers/common/debugger.ts +++ b/core/renderers/common/debugger.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for rendering debug graphics. */ - /** * Methods for rendering debug graphics. * @class @@ -197,7 +196,6 @@ export class Debug { } } - if (Types.isInput(elem) && elem instanceof InputConnection && Debug.config.connections) { this.drawConnection(elem.connectionModel); diff --git a/core/renderers/common/drawer.ts b/core/renderers/common/drawer.ts index d1a328783..83f14134a 100644 --- a/core/renderers/common/drawer.ts +++ b/core/renderers/common/drawer.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for graphically rendering a block as SVG. */ - /** * Methods for graphically rendering a block as SVG. * @class diff --git a/core/renderers/common/i_path_object.ts b/core/renderers/common/i_path_object.ts index d3bae3042..2e6cd7fc4 100644 --- a/core/renderers/common/i_path_object.ts +++ b/core/renderers/common/i_path_object.ts @@ -9,8 +9,6 @@ * elements. */ - - /** * The interface for an object that owns a block's rendering SVG * elements. diff --git a/core/renderers/common/info.ts b/core/renderers/common/info.ts index 8d2b6ded0..356417676 100644 --- a/core/renderers/common/info.ts +++ b/core/renderers/common/info.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for graphically rendering a block as SVG. */ - /** * Methods for graphically rendering a block as SVG. * @class diff --git a/core/renderers/common/marker_svg.ts b/core/renderers/common/marker_svg.ts index 52d139c68..d6bb11596 100644 --- a/core/renderers/common/marker_svg.ts +++ b/core/renderers/common/marker_svg.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for graphically rendering a marker as SVG. */ - /** * Methods for graphically rendering a marker as SVG. * @class diff --git a/core/renderers/common/path_object.ts b/core/renderers/common/path_object.ts index 857b9b21b..143ee3ad5 100644 --- a/core/renderers/common/path_object.ts +++ b/core/renderers/common/path_object.ts @@ -8,7 +8,6 @@ * @fileoverview An object that owns a block's rendering SVG elements. */ - /** * An object that owns a block's rendering SVG elements. * @class diff --git a/core/renderers/common/renderer.ts b/core/renderers/common/renderer.ts index f4d7bdaf1..83375fe34 100644 --- a/core/renderers/common/renderer.ts +++ b/core/renderers/common/renderer.ts @@ -8,7 +8,6 @@ * @fileoverview Base renderer. */ - /** * Base renderer. * @class diff --git a/core/renderers/geras/constants.ts b/core/renderers/geras/constants.ts index 762c4f71b..a3ee2f3ef 100644 --- a/core/renderers/geras/constants.ts +++ b/core/renderers/geras/constants.ts @@ -9,7 +9,6 @@ * mode. */ - /** * An object that provides constants for rendering blocks in Geras * mode. diff --git a/core/renderers/geras/drawer.ts b/core/renderers/geras/drawer.ts index e389b50ec..074cda967 100644 --- a/core/renderers/geras/drawer.ts +++ b/core/renderers/geras/drawer.ts @@ -8,7 +8,6 @@ * @fileoverview Renderer that preserves the look and feel of Blockly pre-2019. */ - /** * Renderer that preserves the look and feel of Blockly pre-2019. * @class diff --git a/core/renderers/geras/geras.ts b/core/renderers/geras/geras.ts index 296f53ebb..3840f534f 100644 --- a/core/renderers/geras/geras.ts +++ b/core/renderers/geras/geras.ts @@ -6,7 +6,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - /** * Re-exports of Blockly.geras.* modules. * @namespace Blockly.geras @@ -24,6 +23,7 @@ import {StatementInput} from './measurables/statement_input.js'; import {PathObject} from './path_object.js'; import {Renderer} from './renderer.js'; + export { ConstantProvider, Drawer, diff --git a/core/renderers/geras/highlight_constants.ts b/core/renderers/geras/highlight_constants.ts index 85553b8ae..36bbcbdeb 100644 --- a/core/renderers/geras/highlight_constants.ts +++ b/core/renderers/geras/highlight_constants.ts @@ -8,7 +8,6 @@ * @fileoverview Objects for rendering highlights on blocks. */ - /** * Objects for rendering highlights on blocks. * @class @@ -20,6 +19,7 @@ import * as svgPaths from '../../utils/svg_paths.js'; /* eslint-disable-next-line no-unused-vars */ import {ConstantProvider} from '../common/constants.js'; + /** An object containing sizing and path information about an outside corner. */ export interface OutsideCorner { height: number; diff --git a/core/renderers/geras/highlighter.ts b/core/renderers/geras/highlighter.ts index 1b3a84c14..24e27cb5d 100644 --- a/core/renderers/geras/highlighter.ts +++ b/core/renderers/geras/highlighter.ts @@ -9,7 +9,6 @@ * compatibility mode. */ - /** * Methods for adding highlights on block, for rendering in * compatibility mode. diff --git a/core/renderers/geras/info.ts b/core/renderers/geras/info.ts index d94700ffb..589c334db 100644 --- a/core/renderers/geras/info.ts +++ b/core/renderers/geras/info.ts @@ -9,7 +9,6 @@ * Geras: spirit of old age. */ - /** * Old (compatibility) renderer. * Geras: spirit of old age. diff --git a/core/renderers/geras/measurables/inline_input.ts b/core/renderers/geras/measurables/inline_input.ts index 09bbca32c..c4dac4d36 100644 --- a/core/renderers/geras/measurables/inline_input.ts +++ b/core/renderers/geras/measurables/inline_input.ts @@ -9,7 +9,6 @@ * rendered block. */ - /** * Objects representing inline inputs with connections on a * rendered block. diff --git a/core/renderers/geras/measurables/statement_input.ts b/core/renderers/geras/measurables/statement_input.ts index bbe322c3a..f2969ba6b 100644 --- a/core/renderers/geras/measurables/statement_input.ts +++ b/core/renderers/geras/measurables/statement_input.ts @@ -9,7 +9,6 @@ * rendered block. */ - /** * Objects representing statement inputs with connections on a * rendered block. diff --git a/core/renderers/geras/path_object.ts b/core/renderers/geras/path_object.ts index 7e109e39d..b6e3445a8 100644 --- a/core/renderers/geras/path_object.ts +++ b/core/renderers/geras/path_object.ts @@ -8,7 +8,6 @@ * @fileoverview An object that owns a block's rendering SVG elements. */ - /** * An object that owns a block's rendering SVG elements. * @class diff --git a/core/renderers/geras/renderer.ts b/core/renderers/geras/renderer.ts index 88be51beb..08179fdaa 100644 --- a/core/renderers/geras/renderer.ts +++ b/core/renderers/geras/renderer.ts @@ -8,7 +8,6 @@ * @fileoverview Geras renderer. */ - /** * Geras renderer. * @class diff --git a/core/renderers/measurables/base.ts b/core/renderers/measurables/base.ts index 28475e73a..9ce34df69 100644 --- a/core/renderers/measurables/base.ts +++ b/core/renderers/measurables/base.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for graphically rendering a block as SVG. */ - /** * Methods for graphically rendering a block as SVG. * @class diff --git a/core/renderers/measurables/bottom_row.ts b/core/renderers/measurables/bottom_row.ts index 9ad5579e0..2fc174707 100644 --- a/core/renderers/measurables/bottom_row.ts +++ b/core/renderers/measurables/bottom_row.ts @@ -9,7 +9,6 @@ * of its subcomponents. */ - /** * Object representing a bottom row on a rendered block. * of its subcomponents. diff --git a/core/renderers/measurables/connection.ts b/core/renderers/measurables/connection.ts index aafe24b83..da62e5331 100644 --- a/core/renderers/measurables/connection.ts +++ b/core/renderers/measurables/connection.ts @@ -9,7 +9,6 @@ * rendering. */ - /** * Base class representing the space a connection takes up during * rendering. @@ -26,6 +25,7 @@ import {ConstantProvider, Shape} from '../common/constants.js'; import {Measurable} from './base.js'; import {Types} from './types.js'; + /** * The base class to represent a connection and the space that it takes up on * the block. diff --git a/core/renderers/measurables/external_value_input.ts b/core/renderers/measurables/external_value_input.ts index 371389090..a0f420c42 100644 --- a/core/renderers/measurables/external_value_input.ts +++ b/core/renderers/measurables/external_value_input.ts @@ -9,7 +9,6 @@ * rendered block. */ - /** * Class representing external value inputs with connections on a * rendered block. diff --git a/core/renderers/measurables/field.ts b/core/renderers/measurables/field.ts index 4a6e2a0e4..209ab501d 100644 --- a/core/renderers/measurables/field.ts +++ b/core/renderers/measurables/field.ts @@ -9,7 +9,6 @@ * block. */ - /** * Objects representing a field in a row of a rendered * block. diff --git a/core/renderers/measurables/hat.ts b/core/renderers/measurables/hat.ts index 230690329..e259c790a 100644 --- a/core/renderers/measurables/hat.ts +++ b/core/renderers/measurables/hat.ts @@ -9,7 +9,6 @@ * block. */ - /** * Objects representing a hat in a row of a rendered * block. diff --git a/core/renderers/measurables/icon.ts b/core/renderers/measurables/icon.ts index 05c623ca2..5cb00108d 100644 --- a/core/renderers/measurables/icon.ts +++ b/core/renderers/measurables/icon.ts @@ -9,7 +9,6 @@ * block. */ - /** * Objects representing an icon in a row of a rendered * block. diff --git a/core/renderers/measurables/in_row_spacer.ts b/core/renderers/measurables/in_row_spacer.ts index e65cd88f6..81da62329 100644 --- a/core/renderers/measurables/in_row_spacer.ts +++ b/core/renderers/measurables/in_row_spacer.ts @@ -9,7 +9,6 @@ * block. */ - /** * Objects representing a spacer in a row of a rendered * block. diff --git a/core/renderers/measurables/inline_input.ts b/core/renderers/measurables/inline_input.ts index 5d8bd0fe2..38240e5fa 100644 --- a/core/renderers/measurables/inline_input.ts +++ b/core/renderers/measurables/inline_input.ts @@ -9,7 +9,6 @@ * block. */ - /** * Class representing inline inputs with connections on a rendered * block. diff --git a/core/renderers/measurables/input_connection.ts b/core/renderers/measurables/input_connection.ts index 99818ed88..65fb2e382 100644 --- a/core/renderers/measurables/input_connection.ts +++ b/core/renderers/measurables/input_connection.ts @@ -8,7 +8,6 @@ * @fileoverview Class representing inputs with connections on a rendered block. */ - /** * Class representing inputs with connections on a rendered block. * @class diff --git a/core/renderers/measurables/input_row.ts b/core/renderers/measurables/input_row.ts index 0a265fc0b..2e778edcc 100644 --- a/core/renderers/measurables/input_row.ts +++ b/core/renderers/measurables/input_row.ts @@ -9,7 +9,6 @@ * rendered block. */ - /** * Object representing a row that holds one or more inputs on a * rendered block. diff --git a/core/renderers/measurables/jagged_edge.ts b/core/renderers/measurables/jagged_edge.ts index e2429ab8b..dbd23defe 100644 --- a/core/renderers/measurables/jagged_edge.ts +++ b/core/renderers/measurables/jagged_edge.ts @@ -9,7 +9,6 @@ * block. */ - /** * Objects representing a jagged edge in a row of a rendered * block. diff --git a/core/renderers/measurables/next_connection.ts b/core/renderers/measurables/next_connection.ts index fdfea7984..80ef3d95b 100644 --- a/core/renderers/measurables/next_connection.ts +++ b/core/renderers/measurables/next_connection.ts @@ -9,7 +9,6 @@ * rendering. */ - /** * Class representing the space a next connection takes up during * rendering. diff --git a/core/renderers/measurables/output_connection.ts b/core/renderers/measurables/output_connection.ts index 2bea581ce..6e410a219 100644 --- a/core/renderers/measurables/output_connection.ts +++ b/core/renderers/measurables/output_connection.ts @@ -9,7 +9,6 @@ * during rendering. */ - /** * Class representing the space a output connection takes up * during rendering. diff --git a/core/renderers/measurables/previous_connection.ts b/core/renderers/measurables/previous_connection.ts index 6314b7b62..bc95db3cc 100644 --- a/core/renderers/measurables/previous_connection.ts +++ b/core/renderers/measurables/previous_connection.ts @@ -9,7 +9,6 @@ * during rendering. */ - /** * Class representing the space a previous connection takes up * during rendering. diff --git a/core/renderers/measurables/round_corner.ts b/core/renderers/measurables/round_corner.ts index f64ac31b3..531540af8 100644 --- a/core/renderers/measurables/round_corner.ts +++ b/core/renderers/measurables/round_corner.ts @@ -9,7 +9,6 @@ * block. */ - /** * Objects representing a round corner in a row of a rendered * block. diff --git a/core/renderers/measurables/row.ts b/core/renderers/measurables/row.ts index 884a7fc3d..efd0ccc9e 100644 --- a/core/renderers/measurables/row.ts +++ b/core/renderers/measurables/row.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a single row on a rendered block. */ - /** * Object representing a single row on a rendered block. * @class diff --git a/core/renderers/measurables/spacer_row.ts b/core/renderers/measurables/spacer_row.ts index 6648aa1de..1c9fee6da 100644 --- a/core/renderers/measurables/spacer_row.ts +++ b/core/renderers/measurables/spacer_row.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a spacer between two rows. */ - /** * Object representing a spacer between two rows. * @class diff --git a/core/renderers/measurables/square_corner.ts b/core/renderers/measurables/square_corner.ts index f5161a761..2fac2846d 100644 --- a/core/renderers/measurables/square_corner.ts +++ b/core/renderers/measurables/square_corner.ts @@ -9,7 +9,6 @@ * block. */ - /** * Objects representing a square corner in a row of a rendered * block. diff --git a/core/renderers/measurables/statement_input.ts b/core/renderers/measurables/statement_input.ts index ecb376466..253a83ed1 100644 --- a/core/renderers/measurables/statement_input.ts +++ b/core/renderers/measurables/statement_input.ts @@ -9,7 +9,6 @@ * rendered block. */ - /** * Class representing statement inputs with connections on a * rendered block. diff --git a/core/renderers/measurables/top_row.ts b/core/renderers/measurables/top_row.ts index 0fd633977..3c5d0bdc3 100644 --- a/core/renderers/measurables/top_row.ts +++ b/core/renderers/measurables/top_row.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a top row on a rendered block. */ - /** * Object representing a top row on a rendered block. * @class diff --git a/core/renderers/measurables/types.ts b/core/renderers/measurables/types.ts index f1fa6588b..2bcb9fb99 100644 --- a/core/renderers/measurables/types.ts +++ b/core/renderers/measurables/types.ts @@ -8,7 +8,6 @@ * @fileoverview Measurable types. */ - /** * Measurable types. * @namespace Blockly.blockRendering.Types diff --git a/core/renderers/minimalist/constants.ts b/core/renderers/minimalist/constants.ts index a9ef7e89c..af1f45589 100644 --- a/core/renderers/minimalist/constants.ts +++ b/core/renderers/minimalist/constants.ts @@ -9,7 +9,6 @@ * minimalist renderer. */ - /** * An object that provides constants for rendering blocks in the * minimalist renderer. diff --git a/core/renderers/minimalist/drawer.ts b/core/renderers/minimalist/drawer.ts index 09d90f3e9..2cd3c026a 100644 --- a/core/renderers/minimalist/drawer.ts +++ b/core/renderers/minimalist/drawer.ts @@ -8,7 +8,6 @@ * @fileoverview Minimalist rendering drawer. */ - /** * Minimalist rendering drawer. * @class diff --git a/core/renderers/minimalist/info.ts b/core/renderers/minimalist/info.ts index e24d4a228..44cb90aa9 100644 --- a/core/renderers/minimalist/info.ts +++ b/core/renderers/minimalist/info.ts @@ -8,7 +8,6 @@ * @fileoverview Minimalist render info object. */ - /** * Minimalist render info object. * @class diff --git a/core/renderers/minimalist/minimalist.ts b/core/renderers/minimalist/minimalist.ts index 4218e30a5..a6f9dbcec 100644 --- a/core/renderers/minimalist/minimalist.ts +++ b/core/renderers/minimalist/minimalist.ts @@ -6,7 +6,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - /** * Re-exports of Blockly.minimalist.* modules. * @namespace Blockly.minimalist @@ -19,4 +18,5 @@ import {Drawer} from './drawer.js'; import {RenderInfo} from './info.js'; import {Renderer} from './renderer.js'; + export {ConstantProvider, Drawer, Renderer, RenderInfo}; diff --git a/core/renderers/minimalist/renderer.ts b/core/renderers/minimalist/renderer.ts index 518ed3321..7914be96e 100644 --- a/core/renderers/minimalist/renderer.ts +++ b/core/renderers/minimalist/renderer.ts @@ -8,7 +8,6 @@ * @fileoverview Minimalist renderer. */ - /** * Minimalist renderer. * @class diff --git a/core/renderers/thrasos/info.ts b/core/renderers/thrasos/info.ts index d14cbbbf7..397fb9b58 100644 --- a/core/renderers/thrasos/info.ts +++ b/core/renderers/thrasos/info.ts @@ -9,7 +9,6 @@ * Thrasos: spirit of boldness. */ - /** * New (evolving) renderer. * Thrasos: spirit of boldness. diff --git a/core/renderers/thrasos/renderer.ts b/core/renderers/thrasos/renderer.ts index 643607eb7..af2695b77 100644 --- a/core/renderers/thrasos/renderer.ts +++ b/core/renderers/thrasos/renderer.ts @@ -8,7 +8,6 @@ * @fileoverview Thrasos renderer. */ - /** * Thrasos renderer. * @class diff --git a/core/renderers/thrasos/thrasos.ts b/core/renderers/thrasos/thrasos.ts index 38a008e66..2be08faff 100644 --- a/core/renderers/thrasos/thrasos.ts +++ b/core/renderers/thrasos/thrasos.ts @@ -6,7 +6,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - /** * Re-exports of Blockly.thrasos.* modules. * @namespace Blockly.thrasos @@ -17,4 +16,5 @@ goog.declareModuleId('Blockly.thrasos'); import {RenderInfo} from './info.js'; import {Renderer} from './renderer.js'; + export {Renderer, RenderInfo}; diff --git a/core/renderers/zelos/constants.ts b/core/renderers/zelos/constants.ts index 43d94d67d..7cee8884b 100644 --- a/core/renderers/zelos/constants.ts +++ b/core/renderers/zelos/constants.ts @@ -9,7 +9,6 @@ * mode. */ - /** * An object that provides constants for rendering blocks in Zelos * mode. @@ -28,6 +27,7 @@ import * as svgPaths from '../../utils/svg_paths.js'; /* eslint-disable-next-line no-unused-vars */ import {ConstantProvider as BaseConstantProvider, Shape} from '../common/constants.js'; + /** An object containing sizing and path information about inside corners. */ export interface InsideCorners { width: number; @@ -40,7 +40,6 @@ export interface InsideCorners { pathBottomRight: string; } - /** * An object that provides constants for rendering blocks in Zelos mode. * @alias Blockly.zelos.ConstantProvider diff --git a/core/renderers/zelos/drawer.ts b/core/renderers/zelos/drawer.ts index ba8583c17..f03efdb4a 100644 --- a/core/renderers/zelos/drawer.ts +++ b/core/renderers/zelos/drawer.ts @@ -8,7 +8,6 @@ * @fileoverview Zelos renderer. */ - /** * Zelos renderer. * @class diff --git a/core/renderers/zelos/info.ts b/core/renderers/zelos/info.ts index bdf6e7fe2..35ea9cbcb 100644 --- a/core/renderers/zelos/info.ts +++ b/core/renderers/zelos/info.ts @@ -9,7 +9,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - /** * Makecode/scratch-style renderer. * @class diff --git a/core/renderers/zelos/marker_svg.ts b/core/renderers/zelos/marker_svg.ts index 2eec1c73f..767478eb3 100644 --- a/core/renderers/zelos/marker_svg.ts +++ b/core/renderers/zelos/marker_svg.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for graphically rendering a marker as SVG. */ - /** * Methods for graphically rendering a marker as SVG. * @class diff --git a/core/renderers/zelos/measurables/bottom_row.ts b/core/renderers/zelos/measurables/bottom_row.ts index 1cbc870c8..a562ac600 100644 --- a/core/renderers/zelos/measurables/bottom_row.ts +++ b/core/renderers/zelos/measurables/bottom_row.ts @@ -8,7 +8,6 @@ * @fileoverview An object representing the bottom row of a rendered block. */ - /** * An object representing the bottom row of a rendered block. * @class diff --git a/core/renderers/zelos/measurables/inputs.ts b/core/renderers/zelos/measurables/inputs.ts index cc3c338a0..d53baa21b 100644 --- a/core/renderers/zelos/measurables/inputs.ts +++ b/core/renderers/zelos/measurables/inputs.ts @@ -9,7 +9,6 @@ * a rendered block. */ - /** * Zelos specific objects representing inputs with connections on * a rendered block. diff --git a/core/renderers/zelos/measurables/row_elements.ts b/core/renderers/zelos/measurables/row_elements.ts index d820180b4..a1c22dcdf 100644 --- a/core/renderers/zelos/measurables/row_elements.ts +++ b/core/renderers/zelos/measurables/row_elements.ts @@ -9,7 +9,6 @@ * rendered block. */ - /** * Zelos specific objects representing elements in a row of a * rendered block. diff --git a/core/renderers/zelos/measurables/top_row.ts b/core/renderers/zelos/measurables/top_row.ts index f926d8cf0..1e25b77ba 100644 --- a/core/renderers/zelos/measurables/top_row.ts +++ b/core/renderers/zelos/measurables/top_row.ts @@ -8,7 +8,6 @@ * @fileoverview An object representing the top row of a rendered block. */ - /** * An object representing the top row of a rendered block. * @class diff --git a/core/renderers/zelos/path_object.ts b/core/renderers/zelos/path_object.ts index ec8daed82..762d9c88a 100644 --- a/core/renderers/zelos/path_object.ts +++ b/core/renderers/zelos/path_object.ts @@ -8,7 +8,6 @@ * @fileoverview An object that owns a block's rendering SVG elements. */ - /** * An object that owns a block's rendering SVG elements. * @class diff --git a/core/renderers/zelos/renderer.ts b/core/renderers/zelos/renderer.ts index ec23794ee..61b7a9431 100644 --- a/core/renderers/zelos/renderer.ts +++ b/core/renderers/zelos/renderer.ts @@ -8,7 +8,6 @@ * @fileoverview Zelos renderer. */ - /** * Zelos renderer. * @class diff --git a/core/renderers/zelos/zelos.ts b/core/renderers/zelos/zelos.ts index 6eff5491a..4158d3f5a 100644 --- a/core/renderers/zelos/zelos.ts +++ b/core/renderers/zelos/zelos.ts @@ -6,7 +6,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - /** * Re-exports of Blockly.zelos.* modules. * @namespace Blockly.zelos @@ -25,6 +24,7 @@ import {TopRow} from './measurables/top_row.js'; import {PathObject} from './path_object.js'; import {Renderer} from './renderer.js'; + export { BottomRow, ConstantProvider, diff --git a/core/scrollbar.ts b/core/scrollbar.ts index 6c41f243f..fe40af371 100644 --- a/core/scrollbar.ts +++ b/core/scrollbar.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a scrollbar. */ - /** * Object representing a scrollbar. * @class @@ -26,6 +25,8 @@ import {Svg} from './utils/svg.js'; import * as svgMath from './utils/svg_math.js'; /* eslint-disable-next-line no-unused-vars */ import {WorkspaceSvg} from './workspace_svg.js'; + + /** * A note on units: most of the numbers that are in CSS pixels are scaled if the * scrollbar is in a mutator. diff --git a/core/scrollbar_pair.ts b/core/scrollbar_pair.ts index 1ca47e496..ba4511914 100644 --- a/core/scrollbar_pair.ts +++ b/core/scrollbar_pair.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a pair of scrollbars. */ - /** * Object representing a pair of scrollbars. * @class diff --git a/core/serialization/blocks.ts b/core/serialization/blocks.ts index 83d56655d..8a3416c6d 100644 --- a/core/serialization/blocks.ts +++ b/core/serialization/blocks.ts @@ -9,7 +9,6 @@ * containing state. */ - /** * Handles serializing blocks to plain JavaScript objects only containing state. * @namespace Blockly.serialization.blocks diff --git a/core/serialization/exceptions.ts b/core/serialization/exceptions.ts index 520fdcd87..d86a00dda 100644 --- a/core/serialization/exceptions.ts +++ b/core/serialization/exceptions.ts @@ -8,7 +8,6 @@ * @fileoverview Contains custom errors thrown by the serialization system. */ - /** * Contains custom errors thrown by the serialization system. * @namespace Blockly.serialization.exceptions diff --git a/core/serialization/priorities.ts b/core/serialization/priorities.ts index 9ef857fb8..8aa79d977 100644 --- a/core/serialization/priorities.ts +++ b/core/serialization/priorities.ts @@ -10,8 +10,6 @@ * serializers. Higher priorities are deserialized first. */ - - /** * The top level namespace for priorities of plugin serializers. * Includes constants for the priorities of different plugin serializers. Higher diff --git a/core/serialization/registry.ts b/core/serialization/registry.ts index 3845fd094..3572f854d 100644 --- a/core/serialization/registry.ts +++ b/core/serialization/registry.ts @@ -9,7 +9,6 @@ * variables, plugins, etc). */ - /** * Contains functions registering serializers (eg blocks, variables, plugins, * etc). diff --git a/core/serialization/variables.ts b/core/serialization/variables.ts index 539aac16c..6b329bc21 100644 --- a/core/serialization/variables.ts +++ b/core/serialization/variables.ts @@ -9,7 +9,6 @@ * containing state. */ - /** * Handles serializing variables to plain JavaScript objects, only containing * state. diff --git a/core/serialization/workspaces.ts b/core/serialization/workspaces.ts index ff21f4bd5..9dc6b4b56 100644 --- a/core/serialization/workspaces.ts +++ b/core/serialization/workspaces.ts @@ -9,7 +9,6 @@ * plain JavaScript objects. */ - /** * Contains top-level functions for serializing workspaces to plain JavaScript * objects. diff --git a/core/shortcut_items.ts b/core/shortcut_items.ts index 6fde435ed..247df7086 100644 --- a/core/shortcut_items.ts +++ b/core/shortcut_items.ts @@ -8,7 +8,6 @@ * @fileoverview Registers default keyboard shortcuts. */ - /** * Registers default keyboard shortcuts. * @namespace Blockly.ShortcutItems diff --git a/core/shortcut_registry.ts b/core/shortcut_registry.ts index ddc5321e2..bda0d529c 100644 --- a/core/shortcut_registry.ts +++ b/core/shortcut_registry.ts @@ -9,7 +9,6 @@ * key codes used to execute those shortcuts. */ - /** * The namespace used to keep track of keyboard shortcuts and the * key codes used to execute those shortcuts. diff --git a/core/sprites.ts b/core/sprites.ts index 059d12e97..13e256121 100644 --- a/core/sprites.ts +++ b/core/sprites.ts @@ -17,7 +17,6 @@ goog.declareModuleId('Blockly.sprite'); * and zoom controls. */ - /** * Contains the path to a single png tat holds the images for the trashcan * as well as the zoom controls. diff --git a/core/theme.ts b/core/theme.ts index a64b80358..93f7a8720 100644 --- a/core/theme.ts +++ b/core/theme.ts @@ -8,7 +8,6 @@ * @fileoverview The class representing a theme. */ - /** * The class representing a theme. * @class diff --git a/core/theme/classic.ts b/core/theme/classic.ts index 55780eb84..39facbc33 100644 --- a/core/theme/classic.ts +++ b/core/theme/classic.ts @@ -9,7 +9,6 @@ * Contains multi-coloured border to create shadow effect. */ - /** * Classic theme. * Contains multi-coloured border to create shadow effect. diff --git a/core/theme/themes.ts b/core/theme/themes.ts index caa316ed5..ebc813ac4 100644 --- a/core/theme/themes.ts +++ b/core/theme/themes.ts @@ -8,7 +8,6 @@ * @fileoverview Namespace for themes. */ - /** * Namespace for themes. * @namespace Blockly.Themes @@ -19,4 +18,5 @@ goog.declareModuleId('Blockly.Themes'); import {Classic} from './classic.js'; import {Zelos} from './zelos.js'; + export {Classic, Zelos}; diff --git a/core/theme/zelos.ts b/core/theme/zelos.ts index ae42a8601..bb415c063 100644 --- a/core/theme/zelos.ts +++ b/core/theme/zelos.ts @@ -8,7 +8,6 @@ * @fileoverview Zelos theme. */ - /** * Zelos theme. * @namespace Blockly.Themes.Zelos diff --git a/core/theme_manager.ts b/core/theme_manager.ts index 4fcfaf466..5d7cd8928 100644 --- a/core/theme_manager.ts +++ b/core/theme_manager.ts @@ -9,7 +9,6 @@ * and UI components. */ - /** * Object in charge of storing and updating a workspace theme * and UI components. diff --git a/core/toolbox/category.ts b/core/toolbox/category.ts index 52d327434..a916a0c9d 100644 --- a/core/toolbox/category.ts +++ b/core/toolbox/category.ts @@ -8,7 +8,6 @@ * @fileoverview A toolbox category used to organize blocks in the toolbox. */ - /** * A toolbox category used to organize blocks in the toolbox. * @class diff --git a/core/toolbox/collapsible_category.ts b/core/toolbox/collapsible_category.ts index b3d37b919..32e39e66f 100644 --- a/core/toolbox/collapsible_category.ts +++ b/core/toolbox/collapsible_category.ts @@ -8,7 +8,6 @@ * @fileoverview A toolbox category used to organize blocks in the toolbox. */ - /** * A toolbox category used to organize blocks in the toolbox. * @class @@ -262,7 +261,6 @@ export interface CssConfig { contents: string|null; } - registry.register( registry.Type.TOOLBOX_ITEM, CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory); diff --git a/core/toolbox/separator.ts b/core/toolbox/separator.ts index 808fae9b2..14e73fe2b 100644 --- a/core/toolbox/separator.ts +++ b/core/toolbox/separator.ts @@ -8,7 +8,6 @@ * @fileoverview A separator used for separating toolbox categories. */ - /** * A separator used for separating toolbox categories. * @class diff --git a/core/toolbox/toolbox.ts b/core/toolbox/toolbox.ts index 01509d2f2..395a672c9 100644 --- a/core/toolbox/toolbox.ts +++ b/core/toolbox/toolbox.ts @@ -8,7 +8,6 @@ * @fileoverview Toolbox from whence to create blocks. */ - /** * Toolbox from whence to create blocks. * @class diff --git a/core/toolbox/toolbox_item.ts b/core/toolbox/toolbox_item.ts index e4650a1ef..c98727bd1 100644 --- a/core/toolbox/toolbox_item.ts +++ b/core/toolbox/toolbox_item.ts @@ -8,7 +8,6 @@ * @fileoverview An item in the toolbox. */ - /** * An item in the toolbox. * @class diff --git a/core/tooltip.ts b/core/tooltip.ts index dd5c21a3c..e46b2c3ee 100644 --- a/core/tooltip.ts +++ b/core/tooltip.ts @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - /** * Library to create tooltips for Blockly. * First, call createDom() after onload. diff --git a/core/touch.ts b/core/touch.ts index de7391b9f..68247a006 100644 --- a/core/touch.ts +++ b/core/touch.ts @@ -8,7 +8,6 @@ * @fileoverview Touch handling for Blockly. */ - /** * Touch handling for Blockly. * @namespace Blockly.Touch @@ -270,7 +269,6 @@ export function isTouchEvent(e: Event|PseudoEvent): boolean { return e.type.startsWith('touch') || e.type.startsWith('pointer'); } - /** * Split an event into an array of events, one per changed touch or mouse * point. diff --git a/core/touch_gesture.ts b/core/touch_gesture.ts index ad5a2cc13..00d074b6c 100644 --- a/core/touch_gesture.ts +++ b/core/touch_gesture.ts @@ -9,7 +9,6 @@ * for both pointer and touch events. */ - /** * The class extends Gesture to support pinch to zoom * for both pointer and touch events. @@ -31,7 +30,6 @@ import {WorkspaceSvg} from './workspace_svg.js'; * events. "End" refers to touchend, mouseup, and pointerend events. */ - /** A multiplier used to convert the gesture scale to a zoom in delta. */ const ZOOM_IN_MULTIPLIER = 5; diff --git a/core/trashcan.ts b/core/trashcan.ts index 5dd2ae484..05fb4c12c 100644 --- a/core/trashcan.ts +++ b/core/trashcan.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a trash can icon. */ - /** * Object representing a trash can icon. * @class diff --git a/core/utils.ts b/core/utils.ts index 67bd7cda9..2730f9712 100644 --- a/core/utils.ts +++ b/core/utils.ts @@ -8,7 +8,6 @@ * @fileoverview Utility methods. */ - /** * Utility methods. * @namespace Blockly.utils @@ -46,6 +45,7 @@ import * as xml from './utils/xml.js'; /* eslint-disable-next-line no-unused-vars */ import {WorkspaceSvg} from './workspace_svg.js'; + export { aria, arrayUtils as array, diff --git a/core/utils/aria.ts b/core/utils/aria.ts index cea6a1735..daef600b6 100644 --- a/core/utils/aria.ts +++ b/core/utils/aria.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * ARIA-related constants and utilities. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/array.ts b/core/utils/array.ts index e2643670f..38b3481be 100644 --- a/core/utils/array.ts +++ b/core/utils/array.ts @@ -8,8 +8,9 @@ * @fileoverview Utility methods related to arrays. */ - /** @namespace Blockly.utils.array */ +import * as goog from '../../closure/goog/goog.js'; +goog.declareModuleId('Blockly.utils.array'); /** @@ -19,9 +20,6 @@ * @return True if an element was removed. * @alias Blockly.array.removeElem */ -import * as goog from '../../closure/goog/goog.js'; -goog.declareModuleId('Blockly.utils.array'); - export function removeElem( arr: AnyDuringMigration[], value: AnyDuringMigration): boolean { const i = arr.indexOf(value); diff --git a/core/utils/colour.ts b/core/utils/colour.ts index d3f6b445d..df19454ba 100644 --- a/core/utils/colour.ts +++ b/core/utils/colour.ts @@ -8,7 +8,6 @@ * @fileoverview Utility methods for colour manipulation. */ - /** * Utility methods for colour manipulation. * @namespace Blockly.utils.colour @@ -16,6 +15,7 @@ import * as goog from '../../closure/goog/goog.js'; goog.declareModuleId('Blockly.utils.colour'); + /** * The richness of block colours, regardless of the hue. * Must be in the range of 0 (inclusive) to 1 (exclusive). diff --git a/core/utils/coordinate.ts b/core/utils/coordinate.ts index 9528a7feb..58390cdbf 100644 --- a/core/utils/coordinate.ts +++ b/core/utils/coordinate.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Utility methods for coordinate manipulation. * These methods are not specific to Blockly, and could be factored out into @@ -20,6 +19,7 @@ import * as goog from '../../closure/goog/goog.js'; goog.declareModuleId('Blockly.utils.Coordinate'); + /** * Class for representing coordinates and positions. * @alias Blockly.utils.Coordinate diff --git a/core/utils/deprecation.ts b/core/utils/deprecation.ts index 1130dcd40..d4917e667 100644 --- a/core/utils/deprecation.ts +++ b/core/utils/deprecation.ts @@ -9,7 +9,6 @@ * This method is not specific to Blockly. */ - /** * Helper function for warning developers about deprecations. * This method is not specific to Blockly. diff --git a/core/utils/dom.ts b/core/utils/dom.ts index f9cbdab74..4f1165a56 100644 --- a/core/utils/dom.ts +++ b/core/utils/dom.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Utility methods for DOM manipulation. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/idgenerator.ts b/core/utils/idgenerator.ts index 2294ba09c..d292deec3 100644 --- a/core/utils/idgenerator.ts +++ b/core/utils/idgenerator.ts @@ -8,7 +8,6 @@ * @fileoverview Generators for unique IDs. */ - /** * Generators for unique IDs. * @namespace Blockly.utils.idGenerator diff --git a/core/utils/keycodes.ts b/core/utils/keycodes.ts index 87c8ac9dc..50c677167 100644 --- a/core/utils/keycodes.ts +++ b/core/utils/keycodes.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Constant declarations for common key codes. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/math.ts b/core/utils/math.ts index 44645ab45..c930b2627 100644 --- a/core/utils/math.ts +++ b/core/utils/math.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Utility methods for math. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/metrics.ts b/core/utils/metrics.ts index 60c0c69df..2ec83b7e0 100644 --- a/core/utils/metrics.ts +++ b/core/utils/metrics.ts @@ -8,7 +8,6 @@ * @fileoverview Workspace metrics definitions. */ - /** * Workspace metrics definitions. * @namespace Blockly.utils.Metrics diff --git a/core/utils/object.ts b/core/utils/object.ts index 69696dcd8..0fdca542c 100644 --- a/core/utils/object.ts +++ b/core/utils/object.ts @@ -8,7 +8,6 @@ * @fileoverview Utility methods for objects. */ - /** * Utility methods for objects. * @namespace Blockly.utils.object @@ -18,6 +17,7 @@ goog.declareModuleId('Blockly.utils.object'); import * as deprecation from './utils/deprecation.js'; + /** * Inherit the prototype methods from one constructor into another. * @param childCtor Child class. diff --git a/core/utils/parsing.ts b/core/utils/parsing.ts index a6a04430c..2600afc1b 100644 --- a/core/utils/parsing.ts +++ b/core/utils/parsing.ts @@ -8,7 +8,6 @@ * @fileoverview Utility methods related to block and message parsing. */ - /** * @namespace Blockly.utils.parsing */ diff --git a/core/utils/rect.ts b/core/utils/rect.ts index d31e3b2af..9364bcc66 100644 --- a/core/utils/rect.ts +++ b/core/utils/rect.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Utility methods for rectangle manipulation. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/sentinel.ts b/core/utils/sentinel.ts index 6016dd8e4..ab1636a81 100644 --- a/core/utils/sentinel.ts +++ b/core/utils/sentinel.ts @@ -8,7 +8,6 @@ * @fileoverview A type used to create flag values (e.g. SKIP_SETUP). */ - /** * A type used to create flag values. * @class diff --git a/core/utils/size.ts b/core/utils/size.ts index 082e4ba52..d2a236e0d 100644 --- a/core/utils/size.ts +++ b/core/utils/size.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Utility methods for size calculation. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/string.ts b/core/utils/string.ts index a3d6d94cd..a2cda9e76 100644 --- a/core/utils/string.ts +++ b/core/utils/string.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Utility methods for string manipulation. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/style.ts b/core/utils/style.ts index 3482bfe85..4ef2f26ef 100644 --- a/core/utils/style.ts +++ b/core/utils/style.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Utilities for element styles. * These methods are not specific to Blockly, and could be factored out into diff --git a/core/utils/svg.ts b/core/utils/svg.ts index 3c40a96e8..d91ac7724 100644 --- a/core/utils/svg.ts +++ b/core/utils/svg.ts @@ -9,7 +9,6 @@ * all SVG tag names used by Blockly. */ - /** * Defines the Svg class. Its constants enumerate * all SVG tag names used by Blockly. diff --git a/core/utils/svg_math.ts b/core/utils/svg_math.ts index f792528b3..f5c867376 100644 --- a/core/utils/svg_math.ts +++ b/core/utils/svg_math.ts @@ -8,7 +8,6 @@ * @fileoverview Utility methods for SVG math. */ - /** * Utility methods realted to figuring out positions of SVG elements. * @namespace Blockly.utils.svgMath @@ -44,7 +43,6 @@ const XY_REGEX: RegExp = /translate\(\s*([-+\d.e]+)([ ,]\s*([-+\d.e]+)\s*)?/; const XY_STYLE_REGEX: RegExp = /transform:\s*translate(?:3d)?\(\s*([-+\d.e]+)\s*px([ ,]\s*([-+\d.e]+)\s*px)?/; - /** * Return the coordinates of the top-left corner of this element relative to * its parent. Only for SVG elements and children (e.g. rect, g, path). @@ -265,7 +263,6 @@ export function svgSize(svg: SVGElement): Size { Number(svg.getAttribute('data-cached-height'))); } - export const TEST_ONLY = { XY_REGEX, XY_STYLE_REGEX, diff --git a/core/utils/svg_paths.ts b/core/utils/svg_paths.ts index bdfe964bc..c13a4d839 100644 --- a/core/utils/svg_paths.ts +++ b/core/utils/svg_paths.ts @@ -9,7 +9,6 @@ * SPDX-License-Identifier: Apache-2.0 */ - /** * Methods for creating parts of SVG path strings. See * @namespace Blockly.utils.svgPaths diff --git a/core/utils/toolbox.ts b/core/utils/toolbox.ts index decb344a7..4ace275aa 100644 --- a/core/utils/toolbox.ts +++ b/core/utils/toolbox.ts @@ -8,7 +8,6 @@ * @fileoverview Utility functions for the toolbox and flyout. */ - /** * Utility functions for the toolbox and flyout. * @namespace Blockly.utils.toolbox @@ -28,9 +27,9 @@ import {ConnectionState} from '../serialization/blocks.js'; import {CssConfig as CategoryCssConfig} from '../toolbox/category.js'; import {CssConfig as SeparatorCssConfig} from '../toolbox/separator.js'; import * as Xml from '../xml.js'; - import * as userAgent from './useragent.js'; + /** * The information needed to create a block in the toolbox. * Note that disabled has a different type for backwards compatibility. diff --git a/core/utils/useragent.ts b/core/utils/useragent.ts index 717d646cb..587936e9a 100644 --- a/core/utils/useragent.ts +++ b/core/utils/useragent.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * Useragent detection. * These methods are not specific to Blockly, and could be factored out into @@ -20,6 +19,7 @@ import * as goog from '../../closure/goog/goog.js'; goog.declareModuleId('Blockly.utils.userAgent'); + /** The raw useragent string. */ let rawUserAgent: string; diff --git a/core/utils/xml.ts b/core/utils/xml.ts index 779631318..169e78086 100644 --- a/core/utils/xml.ts +++ b/core/utils/xml.ts @@ -10,7 +10,6 @@ * a JavaScript framework such as Closure. */ - /** * XML element manipulation. * These methods are not specific to Blockly, and could be factored out into @@ -20,6 +19,7 @@ import * as goog from '../../closure/goog/goog.js'; goog.declareModuleId('Blockly.utils.xml'); + /** * Namespace for Blockly's XML. * @alias Blockly.utils.xml.NAME_SPACE diff --git a/core/variable_map.ts b/core/variable_map.ts index 918a998ea..b661ce95b 100644 --- a/core/variable_map.ts +++ b/core/variable_map.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a map of variables and their types. */ - /** * Object representing a map of variables and their types. * @class diff --git a/core/variable_model.ts b/core/variable_model.ts index d92c16b1e..d60cefef5 100644 --- a/core/variable_model.ts +++ b/core/variable_model.ts @@ -8,7 +8,6 @@ * @fileoverview Components for the variable model. */ - /** * Components for the variable model. * @class diff --git a/core/variables.ts b/core/variables.ts index 3cf8cd0e1..f3bc3a9f5 100644 --- a/core/variables.ts +++ b/core/variables.ts @@ -8,7 +8,6 @@ * @fileoverview Utility functions for handling variables. */ - /** * Utility functions for handling variables. * @namespace Blockly.Variables @@ -27,6 +26,7 @@ import {Workspace} from './workspace.js'; import {WorkspaceSvg} from './workspace_svg.js'; import * as Xml from './xml.js'; + /** * String for use in the "custom" attribute of a category in toolbox XML. * This string indicates that the category should be dynamically populated with diff --git a/core/variables_dynamic.ts b/core/variables_dynamic.ts index f1e08b74b..86fa7cd44 100644 --- a/core/variables_dynamic.ts +++ b/core/variables_dynamic.ts @@ -8,7 +8,6 @@ * @fileoverview Utility functions for handling typed variables. */ - /** * Utility functions for handling typed variables. * @@ -84,7 +83,6 @@ export function flyoutCategory(workspace: WorkspaceSvg): Element[] { workspace.registerButtonCallback( 'CREATE_VARIABLE_COLOUR', colourButtonClickHandler); - // AnyDuringMigration because: Argument of type 'WorkspaceSvg' is not // assignable to parameter of type 'Workspace'. const blockList = flyoutCategoryBlocks(workspace as AnyDuringMigration); diff --git a/core/warning.ts b/core/warning.ts index 069944c1d..f8b03f2b1 100644 --- a/core/warning.ts +++ b/core/warning.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a warning. */ - /** * Object representing a warning. * @class diff --git a/core/widgetdiv.ts b/core/widgetdiv.ts index b32ef8e80..6a7f57235 100644 --- a/core/widgetdiv.ts +++ b/core/widgetdiv.ts @@ -10,7 +10,6 @@ * E.g. text input areas, colour pickers, context menus. */ - /** * A div that floats on top of Blockly. This singleton contains * temporary HTML UI widgets that the user is currently interacting with. diff --git a/core/workspace.ts b/core/workspace.ts index 9cefa4155..83c5a05a9 100644 --- a/core/workspace.ts +++ b/core/workspace.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a workspace. */ - /** * Object representing a workspace. * @class diff --git a/core/workspace_audio.ts b/core/workspace_audio.ts index f4895c601..f09bab36f 100644 --- a/core/workspace_audio.ts +++ b/core/workspace_audio.ts @@ -9,7 +9,6 @@ * workspace. */ - /** * Object in charge of loading, storing, and playing audio for a * workspace. diff --git a/core/workspace_comment.ts b/core/workspace_comment.ts index c6293ed09..e7b2d320e 100644 --- a/core/workspace_comment.ts +++ b/core/workspace_comment.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a code comment on the workspace. */ - /** * Object representing a code comment on the workspace. * @class diff --git a/core/workspace_comment_svg.ts b/core/workspace_comment_svg.ts index 0ee492685..506b43320 100644 --- a/core/workspace_comment_svg.ts +++ b/core/workspace_comment_svg.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a code comment on a rendered workspace. */ - /** * Object representing a code comment on a rendered workspace. * @class diff --git a/core/workspace_drag_surface_svg.ts b/core/workspace_drag_surface_svg.ts index 2456e1dae..d6f8fb613 100644 --- a/core/workspace_drag_surface_svg.ts +++ b/core/workspace_drag_surface_svg.ts @@ -11,8 +11,6 @@ * blocks are never repainted during drag improving performance. */ - - /** * An SVG that floats on top of the workspace. * Blocks are moved into this SVG during a drag, improving performance. diff --git a/core/workspace_dragger.ts b/core/workspace_dragger.ts index b6ce899ba..052106564 100644 --- a/core/workspace_dragger.ts +++ b/core/workspace_dragger.ts @@ -8,7 +8,6 @@ * @fileoverview Methods for dragging a workspace visually. */ - /** * Methods for dragging a workspace visually. * @class diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts index 2c4d10ed4..ebf3cc269 100644 --- a/core/workspace_svg.ts +++ b/core/workspace_svg.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a workspace rendered as SVG. */ - /** * Object representing a workspace rendered as SVG. * @class diff --git a/core/xml.ts b/core/xml.ts index 537104880..cf963ae13 100644 --- a/core/xml.ts +++ b/core/xml.ts @@ -8,7 +8,6 @@ * @fileoverview XML reader and writer. */ - /** * XML reader and writer. * @namespace Blockly.Xml @@ -906,7 +905,6 @@ function applyNextTagNodes( } } - /** * Decode an XML block tag and create a block (and possibly sub blocks) on the * workspace. diff --git a/core/zoom_controls.ts b/core/zoom_controls.ts index feee88517..0d062b22b 100644 --- a/core/zoom_controls.ts +++ b/core/zoom_controls.ts @@ -8,7 +8,6 @@ * @fileoverview Object representing a zoom icons. */ - /** * Object representing a zoom icons. * @class