CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-06 00:20:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove more uses of AnyDuringMigration. (#6383)

Browse Source 
* refactor: Remove uses of AnyDuringMigration from flyout_base.ts.

* refactor: Remove uses of AnyDuringMigration from flyout_metrics_manager.ts.

* refactor: Remove uses of AnyDuringMigration from variables_dynamic.ts.

* refactor: Remove uses of AnyDuringMigration from procedures.ts.

* refactor: Remove uses of AnyDuringMigration from generator.ts.

* refactor: Remove some uses of AnyDuringMigration from menu.ts.

* refactor: Remove uses of AnyDuringMigration from mutator.ts.

* refactor: Remove uses of AnyDuringMigration from variables.ts.

* refactor: Remove uses of AnyDuringMigration from array.ts.

* refactor: Remove uses of AnyDuringMigration from aria.ts.

* refactor: Remove uses of AnyDuringMigration in basic_cursor.ts.

* refactor: Remove uses of AnyDuringMigration in dropdowndiv.ts.

* refactor: Remove uses of AnyDuringMigration in utils.ts.

* refactor: Remove uses of AnyDuringMigration from menuitem.ts.

* refactor: Remove uses of AnyDuringMigration from idgenerator.ts.

* refactor: Remove uses of AnyDuringMigration in block_animations.ts.

* refactor: Initialize definitions and functionNames in generator.ts by default.
This commit is contained in:
Aaron Dodson
2022-08-24 16:06:38 -07:00
committed by GitHub
parent e50ad59ffe
commit 3a36ed5116
19 changed files with 187 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/variables_dynamic.ts
View File

@@ -19,6 +19,7 @@ import {VariableModel} from './variable_model.js';
import * as Variables from './variables.js';
import type {Workspace} from './workspace.js';
import type {WorkspaceSvg} from './workspace_svg.js';
import type {FlyoutButton} from './flyout_button.js';
/**
@@ -37,7 +38,7 @@ export const CATEGORY_NAME = 'VARIABLE_DYNAMIC';
*
* @param button
*/
function stringButtonClickHandler(button: AnyDuringMigration) {
function stringButtonClickHandler(button: FlyoutButton) {
Variables.createVariableButtonHandler(
button.getTargetWorkspace(), undefined, 'String');
}
@@ -49,7 +50,7 @@ export const onCreateVariableButtonClick_String = stringButtonClickHandler;
*
* @param button
*/
function numberButtonClickHandler(button: AnyDuringMigration) {
function numberButtonClickHandler(button: FlyoutButton) {
Variables.createVariableButtonHandler(
button.getTargetWorkspace(), undefined, 'Number');
}
@@ -61,7 +62,7 @@ export const onCreateVariableButtonClick_Number = numberButtonClickHandler;
*
* @param button
*/
function colourButtonClickHandler(button: AnyDuringMigration) {
function colourButtonClickHandler(button: FlyoutButton) {
Variables.createVariableButtonHandler(
button.getTargetWorkspace(), undefined, 'Colour');
}
@@ -98,9 +99,7 @@ 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);
const blockList = flyoutCategoryBlocks(workspace);
xmlList = xmlList.concat(blockList);
return xmlList;
}
@@ -121,14 +120,8 @@ export function flyoutCategoryBlocks(workspace: Workspace): Element[] {
const firstVariable = variableModelList[variableModelList.length - 1];
const block = xml.createElement('block');
block.setAttribute('type', 'variables_set_dynamic');
// AnyDuringMigration because: Argument of type 'number' is not
// assignable to parameter of type 'string'.
block.setAttribute('gap', 24 as AnyDuringMigration);
// AnyDuringMigration because: Argument of type 'Element | null' is not
// assignable to parameter of type 'Node'.
block.appendChild(
Variables.generateVariableFieldDom(firstVariable) as
AnyDuringMigration);
block.setAttribute('gap', '24');
block.appendChild(Variables.generateVariableFieldDom(firstVariable));
xmlList.push(block);
}
if (Blocks['variables_get_dynamic']) {
@@ -136,13 +129,8 @@ export function flyoutCategoryBlocks(workspace: Workspace): Element[] {
for (let i = 0, variable; variable = variableModelList[i]; i++) {
const block = xml.createElement('block');
block.setAttribute('type', 'variables_get_dynamic');
// AnyDuringMigration because: Argument of type 'number' is not
// assignable to parameter of type 'string'.
block.setAttribute('gap', 8 as AnyDuringMigration);
// AnyDuringMigration because: Argument of type 'Element | null' is not
// assignable to parameter of type 'Node'.
block.appendChild(
Variables.generateVariableFieldDom(variable) as AnyDuringMigration);
block.setAttribute('gap', '8');
block.appendChild(Variables.generateVariableFieldDom(variable));
xmlList.push(block);
}
}