style: fix lint errors reported after update

Author: cwillisf

src/fields/scratch_field_variable.ts

@@ -47,7 +47,7 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
     // dropdownCreate returns MenuOption[] rather than Blockly.MenuGenerator's
     // MenuOption[][] variant; the cast is needed to satisfy FieldVariable's
     // menuGenerator_ type while the actual runtime shape is compatible.
-    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate.bind(this) as unknown as Blockly.MenuGenerator
+    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate.bind(this)
   }
 
   initModel() {

src/index.ts

@@ -159,7 +159,7 @@ export function isContentNodeFocused(): boolean {
   return Blockly.getFocusManager().getFocusedNode() !== null
 }
 
-;(registerContinuousToolbox as () => void)()
+registerContinuousToolbox()
 Blockly.Scrollbar.scrollbarThickness = Blockly.Touch.TOUCH_ENABLED ? 14 : 11
 Blockly.FlyoutButton.TEXT_MARGIN_X = 40
 Blockly.FlyoutButton.TEXT_MARGIN_Y = 10

src/renderer/constants.ts

@@ -52,7 +52,7 @@ export class ConstantProvider extends Blockly.zelos.ConstantProvider {
    * @returns The shape object for the given connection.
    */
   override shapeFor(connection: Blockly.RenderedConnection): ReturnType<Blockly.zelos.ConstantProvider['shapeFor']> {
-    const connectionType = connection.type as Blockly.ConnectionType
+    const connectionType: Blockly.ConnectionType = connection.type
     let checks = connection.getCheck()
     const hexagonal = this.HEXAGONAL
     const rounded = this.ROUNDED

src/renderer/drawer.ts

@@ -64,7 +64,7 @@ export class Drawer extends Blockly.zelos.Drawer {
    */
   override drawConnectionHighlightPath(measurable: Blockly.blockRendering.Connection) {
     const conn = measurable.connectionModel
-    const connectionType = conn.type as Blockly.ConnectionType
+    const connectionType: Blockly.ConnectionType = conn.type
     if (connectionType === Blockly.ConnectionType.INPUT_VALUE && measurable.isDynamicShape) {
       const input = measurable as Blockly.blockRendering.InlineInput
       const EXPAND_X = 0.5

src/renderer/renderer.ts

@@ -65,7 +65,8 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    * @returns True if we should highlight the connection.
    */
   override shouldHighlightConnection(connection: Blockly.RenderedConnection): boolean {
-    return (connection.type as Blockly.ConnectionType) === Blockly.ConnectionType.INPUT_VALUE
+    const connectionType: Blockly.ConnectionType = connection.type
+    return connectionType === Blockly.ConnectionType.INPUT_VALUE
   }
 }
 

src/scratch_c_block_wrap.ts

@@ -28,7 +28,8 @@ Blockly.Connection.getConnectionForOrphanedConnection = function (
   // Apply the wrapping logic when the orphaned connection is a statement
   // connection (PREVIOUS_STATEMENT).  Value connections (OUTPUT_VALUE) are
   // already handled by the original implementation.
-  if ((orphanConnection.type as Blockly.ConnectionType) === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
+  const orphanType: Blockly.ConnectionType = orphanConnection.type
+  if (orphanType === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
     const checker = orphanConnection.getConnectionChecker()
     for (const input of startBlock.inputList) {
       const conn = input.connection
@@ -87,7 +88,7 @@ Reflect.set(
     if (markerPreviousConnection?.isConnected() && !markerNextConnection?.isConnected()) {
       for (const input of marker.inputList) {
         const conn = input.connection
-        const connType = conn?.type as Blockly.ConnectionType | undefined
+        const connType = conn?.type
         if (connType !== Blockly.ConnectionType.NEXT_STATEMENT || !conn?.isConnected()) {
           continue
         }

src/scratch_comment_bubble.ts

@@ -69,7 +69,7 @@ export class ScratchCommentBubble
     if (gesture) {
       // ScratchCommentBubble implements IBubble structurally but TypeScript
       // cannot verify it because IBubble.drag has a different signature here.
-      gesture.handleBubbleStart(e, this as unknown as Blockly.IBubble)
+      gesture.handleBubbleStart(e, this)
       Blockly.common.setSelected(this)
     }
   }

src/scratch_connection_checker.ts

@@ -50,8 +50,9 @@ class ScratchConnectionChecker extends Blockly.ConnectionChecker {
     // getConnectionForOrphanedConnection patch routes displaced blocks into
     // statement inputs, so we allow the connection when a suitable statement
     // input exists on the dragging block.
+    const bType: Blockly.ConnectionType = b.type
     if (
-      (b.type as Blockly.ConnectionType) === Blockly.ConnectionType.NEXT_STATEMENT &&
+      bType === Blockly.ConnectionType.NEXT_STATEMENT &&
       b.isConnected() &&
       !(a.getSourceBlock() as Blockly.Block).nextConnection
     ) {

tests/browser/scratch_field_dropdown.test.ts

@@ -25,9 +25,7 @@ import { registerScratchFieldDropdown } from '../../src/fields/scratch_field_dro
 let originalFieldDropdown: (new (...args: unknown[]) => Blockly.Field) | null = null
 
 beforeAll(() => {
-  originalFieldDropdown = Blockly.registry.getClass(Blockly.registry.Type.FIELD, 'field_dropdown') as
-    | (new (...args: unknown[]) => Blockly.Field)
-    | null
+  originalFieldDropdown = Blockly.registry.getClass(Blockly.registry.Type.FIELD, 'field_dropdown')
   registerScratchFieldDropdown()
   Blockly.Blocks.test_target_menu = {
     init(this: Blockly.Block) {

tests/unit/block_input_serialization.test.ts

@@ -319,7 +319,7 @@ describe('block input serialization round-trip', () => {
     const dom = Blockly.Xml.blockToDom(block, true)
     expect(dom).toBeInstanceOf(Element)
 
-    const xmlStr = new XMLSerializer().serializeToString(dom as Element)
+    const xmlStr = new XMLSerializer().serializeToString(dom)
     expect(xmlStr).toContain('name="VALUE"')
     expect(xmlStr).toContain('shadow')
     // With opt_noId, no element should have an id attribute