chore: Organise imports (#8527)

* chore(deps): Add pretter-plugin-organize-imports * chore: Remove insignificant blank lines in import sections Since prettier-plugin-organize-imports sorts imports within sections separated by blank lines, but preserves the section divisions, remove any blank lines that are not dividing imports into meaningful sections. Do not remove blank lines separating side-effect-only imports from main imports. * chore: Remove unneded eslint-disable directives * chore: Organise imports
google · Aug 15, 2024 · ce22f42 · ce22f42
1 parent ec8f9c8
commit ce22f42
Show file tree

Hide file tree

Showing 274 changed files with 945 additions and 1,008 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -10,4 +10,6 @@ module.exports = {
   bracketSpacing: false,
   // Put HTML tag closing brackets on same line as last attribute.
   bracketSameLine: true,
+  // Organise imports using a plugin.
+  'plugins': ['prettier-plugin-organize-imports'],
 };
diff --git a/blocks/blocks.ts b/blocks/blocks.ts
@@ -6,6 +6,7 @@
 
 // Former goog.module ID: Blockly.libraryBlocks
 
+import type {BlockDefinition} from '../core/blocks.js';
 import * as lists from './lists.js';
 import * as logic from './logic.js';
 import * as loops from './loops.js';
@@ -14,7 +15,6 @@ import * as procedures from './procedures.js';
 import * as texts from './text.js';
 import * as variables from './variables.js';
 import * as variablesDynamic from './variables_dynamic.js';
-import type {BlockDefinition} from '../core/blocks.js';
 
 export {
   lists,

diff --git a/blocks/lists.ts b/blocks/lists.ts
@@ -6,22 +6,22 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.lists
 
-import * as fieldRegistry from '../core/field_registry.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import {Align} from '../core/inputs/align.js';
 import type {Block} from '../core/block.js';
-import type {Connection} from '../core/connection.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import type {FieldDropdown} from '../core/field_dropdown.js';
-import {Msg} from '../core/msg.js';
-import {MutatorIcon} from '../core/icons/mutator_icon.js';
-import type {Workspace} from '../core/workspace.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import type {Connection} from '../core/connection.js';
 import '../core/field_dropdown.js';
+import type {FieldDropdown} from '../core/field_dropdown.js';
+import * as fieldRegistry from '../core/field_registry.js';
+import {MutatorIcon} from '../core/icons/mutator_icon.js';
+import {Align} from '../core/inputs/align.js';
 import {ValueInput} from '../core/inputs/value_input.js';
+import {Msg} from '../core/msg.js';
+import * as xmlUtils from '../core/utils/xml.js';
+import type {Workspace} from '../core/workspace.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

diff --git a/blocks/logic.ts b/blocks/logic.ts
@@ -6,22 +6,22 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.logic
 
-import * as Events from '../core/events/events.js';
-import * as Extensions from '../core/extensions.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
 import type {Block} from '../core/block.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import type {Connection} from '../core/connection.js';
-import {Msg} from '../core/msg.js';
-import type {Workspace} from '../core/workspace.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import type {Connection} from '../core/connection.js';
+import * as Events from '../core/events/events.js';
+import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
+import * as Extensions from '../core/extensions.js';
 import '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/icons/mutator_icon.js';
+import {Msg} from '../core/msg.js';
+import * as xmlUtils from '../core/utils/xml.js';
+import type {Workspace} from '../core/workspace.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

diff --git a/blocks/loops.ts b/blocks/loops.ts
@@ -6,27 +6,27 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.loops
 
-import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
 import type {Block} from '../core/block.js';
+import {
+  createBlockDefinitionsFromJsonArray,
+  defineBlocks,
+} from '../core/common.js';
 import * as ContextMenu from '../core/contextmenu.js';
 import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
 import * as Events from '../core/events/events.js';
-import * as Extensions from '../core/extensions.js';
-import {Msg} from '../core/msg.js';
-import {
-  createBlockDefinitionsFromJsonArray,
-  defineBlocks,
-} from '../core/common.js';
+import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
 import * as eventUtils from '../core/events/utils.js';
+import * as Extensions from '../core/extensions.js';
 import '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/field_number.js';
 import '../core/field_variable.js';
-import '../core/icons/warning_icon.js';
 import {FieldVariable} from '../core/field_variable.js';
+import '../core/icons/warning_icon.js';
+import {Msg} from '../core/msg.js';
 import {WorkspaceSvg} from '../core/workspace_svg.js';
 
 /**

diff --git a/blocks/math.ts b/blocks/math.ts
@@ -6,18 +6,18 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.math
 
-import * as Extensions from '../core/extensions.js';
-import type {FieldDropdown} from '../core/field_dropdown.js';
-import * as xmlUtils from '../core/utils/xml.js';
 import type {Block} from '../core/block.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import * as Extensions from '../core/extensions.js';
 import '../core/field_dropdown.js';
+import type {FieldDropdown} from '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/field_number.js';
 import '../core/field_variable.js';
+import * as xmlUtils from '../core/utils/xml.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

diff --git a/blocks/procedures.ts b/blocks/procedures.ts
@@ -6,40 +6,40 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.procedures
 
-import * as ContextMenu from '../core/contextmenu.js';
-import * as Events from '../core/events/events.js';
-import * as Procedures from '../core/procedures.js';
-import * as Variables from '../core/variables.js';
-import * as Xml from '../core/xml.js';
-import * as fieldRegistry from '../core/field_registry.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
-import {Align} from '../core/inputs/align.js';
 import type {Block} from '../core/block.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import type {BlockCreate} from '../core/events/events_block_create.js';
-import type {BlockChange} from '../core/events/events_block_change.js';
 import type {BlockDefinition} from '../core/blocks.js';
+import * as common from '../core/common.js';
+import {defineBlocks} from '../core/common.js';
+import {config} from '../core/config.js';
 import type {Connection} from '../core/connection.js';
+import * as ContextMenu from '../core/contextmenu.js';
 import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
+import * as Events from '../core/events/events.js';
+import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
+import type {BlockChange} from '../core/events/events_block_change.js';
+import type {BlockCreate} from '../core/events/events_block_create.js';
 import * as eventUtils from '../core/events/utils.js';
 import {FieldCheckbox} from '../core/field_checkbox.js';
 import {FieldLabel} from '../core/field_label.js';
+import * as fieldRegistry from '../core/field_registry.js';
 import {FieldTextInput} from '../core/field_textinput.js';
-import {Msg} from '../core/msg.js';
+import '../core/icons/comment_icon.js';
 import {MutatorIcon as Mutator} from '../core/icons/mutator_icon.js';
+import '../core/icons/warning_icon.js';
+import {Align} from '../core/inputs/align.js';
+import {Msg} from '../core/msg.js';
 import {Names} from '../core/names.js';
+import * as Procedures from '../core/procedures.js';
+import * as xmlUtils from '../core/utils/xml.js';
 import type {VariableModel} from '../core/variable_model.js';
+import * as Variables from '../core/variables.js';
 import type {Workspace} from '../core/workspace.js';
 import type {WorkspaceSvg} from '../core/workspace_svg.js';
-import {config} from '../core/config.js';
-import {defineBlocks} from '../core/common.js';
-import '../core/icons/comment_icon.js';
-import '../core/icons/warning_icon.js';
-import * as common from '../core/common.js';
+import * as Xml from '../core/xml.js';
 
 /** A dictionary of the block definitions provided by this module. */
 export const blocks: {[key: string]: BlockDefinition} = {};

diff --git a/blocks/text.ts b/blocks/text.ts
@@ -6,25 +6,25 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.texts
 
-import * as Extensions from '../core/extensions.js';
-import * as fieldRegistry from '../core/field_registry.js';
-import * as xmlUtils from '../core/utils/xml.js';
-import {Align} from '../core/inputs/align.js';
 import type {Block} from '../core/block.js';
 import type {BlockSvg} from '../core/block_svg.js';
-import {Connection} from '../core/connection.js';
-import {FieldImage} from '../core/field_image.js';
-import {FieldDropdown} from '../core/field_dropdown.js';
-import {FieldTextInput} from '../core/field_textinput.js';
-import {Msg} from '../core/msg.js';
-import {MutatorIcon} from '../core/icons/mutator_icon.js';
-import type {Workspace} from '../core/workspace.js';
 import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import {Connection} from '../core/connection.js';
+import * as Extensions from '../core/extensions.js';
+import {FieldDropdown} from '../core/field_dropdown.js';
+import {FieldImage} from '../core/field_image.js';
+import * as fieldRegistry from '../core/field_registry.js';
+import {FieldTextInput} from '../core/field_textinput.js';
 import '../core/field_variable.js';
+import {MutatorIcon} from '../core/icons/mutator_icon.js';
+import {Align} from '../core/inputs/align.js';
 import {ValueInput} from '../core/inputs/value_input.js';
+import {Msg} from '../core/msg.js';
+import * as xmlUtils from '../core/utils/xml.js';
+import type {Workspace} from '../core/workspace.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

diff --git a/blocks/variables.ts b/blocks/variables.ts
@@ -6,22 +6,22 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.variables
 
-import * as ContextMenu from '../core/contextmenu.js';
-import * as Extensions from '../core/extensions.js';
-import * as Variables from '../core/variables.js';
 import type {Block} from '../core/block.js';
+import {
+  createBlockDefinitionsFromJsonArray,
+  defineBlocks,
+} from '../core/common.js';
+import * as ContextMenu from '../core/contextmenu.js';
 import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
+import * as Extensions from '../core/extensions.js';
+import '../core/field_label.js';
 import {FieldVariable} from '../core/field_variable.js';
 import {Msg} from '../core/msg.js';
+import * as Variables from '../core/variables.js';
 import type {WorkspaceSvg} from '../core/workspace_svg.js';
-import {
-  createBlockDefinitionsFromJsonArray,
-  defineBlocks,
-} from '../core/common.js';
-import '../core/field_label.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

diff --git a/blocks/variables_dynamic.ts b/blocks/variables_dynamic.ts
@@ -6,23 +6,23 @@
 
 // Former goog.module ID: Blockly.libraryBlocks.variablesDynamic
 
-import * as ContextMenu from '../core/contextmenu.js';
-import * as Extensions from '../core/extensions.js';
-import * as Variables from '../core/variables.js';
-import {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
 import type {Block} from '../core/block.js';
+import {
+  createBlockDefinitionsFromJsonArray,
+  defineBlocks,
+} from '../core/common.js';
+import * as ContextMenu from '../core/contextmenu.js';
 import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
+import {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
+import * as Extensions from '../core/extensions.js';
+import '../core/field_label.js';
 import {FieldVariable} from '../core/field_variable.js';
 import {Msg} from '../core/msg.js';
+import * as Variables from '../core/variables.js';
 import type {WorkspaceSvg} from '../core/workspace_svg.js';
-import {
-  createBlockDefinitionsFromJsonArray,
-  defineBlocks,
-} from '../core/common.js';
-import '../core/field_label.js';
 
 /**
  * A dictionary of the block definitions provided by this module.

diff --git a/core/block.ts b/core/block.ts
@@ -23,35 +23,35 @@ import * as common from './common.js';
 import {Connection} from './connection.js';
 import {ConnectionType} from './connection_type.js';
 import * as constants from './constants.js';
-import {DuplicateIconType} from './icons/exceptions.js';
 import type {Abstract} from './events/events_abstract.js';
 import type {BlockChange} from './events/events_block_change.js';
 import type {BlockMove} from './events/events_block_move.js';
-import * as deprecation from './utils/deprecation.js';
 import * as eventUtils from './events/utils.js';
 import * as Extensions from './extensions.js';
 import type {Field} from './field.js';
 import * as fieldRegistry from './field_registry.js';
-import {Input} from './inputs/input.js';
+import {DuplicateIconType} from './icons/exceptions.js';
+import {IconType} from './icons/icon_types.js';
+import type {MutatorIcon} from './icons/mutator_icon.js';
 import {Align} from './inputs/align.js';
+import {DummyInput} from './inputs/dummy_input.js';
+import {EndRowInput} from './inputs/end_row_input.js';
+import {Input} from './inputs/input.js';
+import {StatementInput} from './inputs/statement_input.js';
+import {ValueInput} from './inputs/value_input.js';
 import type {IASTNodeLocation} from './interfaces/i_ast_node_location.js';
-import {type IIcon} from './interfaces/i_icon.js';
 import {isCommentIcon} from './interfaces/i_comment_icon.js';
-import type {MutatorIcon} from './icons/mutator_icon.js';
+import {type IIcon} from './interfaces/i_icon.js';
+import * as registry from './registry.js';
 import * as Tooltip from './tooltip.js';
 import * as arrayUtils from './utils/array.js';
 import {Coordinate} from './utils/coordinate.js';
+import * as deprecation from './utils/deprecation.js';
 import * as idGenerator from './utils/idgenerator.js';
 import * as parsing from './utils/parsing.js';
-import * as registry from './registry.js';
 import {Size} from './utils/size.js';
 import type {VariableModel} from './variable_model.js';
 import type {Workspace} from './workspace.js';
-import {DummyInput} from './inputs/dummy_input.js';
-import {EndRowInput} from './inputs/end_row_input.js';
-import {ValueInput} from './inputs/value_input.js';
-import {StatementInput} from './inputs/statement_input.js';
-import {IconType} from './icons/icon_types.js';
 
 /**
  * Class for one block.