Chore: small refactoring

Author: mysticatea

Diff for: src/script/index.ts

@@ -9,7 +9,6 @@ import sortedIndexBy from "lodash/sortedIndexBy"
 import {
     traverseNodes,
     ESLintArrayPattern,
-    ESLintBlockStatement,
     ESLintCallExpression,
     ESLintExpression,
     ESLintExpressionStatement,
@@ -132,24 +131,6 @@ function normalizeLeft(
     return [id]
 }
 
-/**
- * Remove references by name.
- * @param references The array of references to remove.
- * @param name The name of target references.
- */
-function removeByName(references: Reference[], name: string): void {
-    let i = 0
-    while (i < references.length) {
-        const reference = references[i]
-
-        if (reference.id.name === name) {
-            references.splice(i, 1)
-        } else {
-            i += 1
-        }
-    }
-}
-
 /**
  * Get the comma token before a given node.
  * @param tokens The token list.
@@ -500,20 +481,23 @@ export function parseVOnExpression(
     locationCalculator: LocationCalculator,
     parserOptions: any,
 ): ExpressionParseResult {
-    debug('[script] parse v-on expression: "{%s}"', code)
+    debug('[script] parse v-on expression: "void function($event){%s}"', code)
 
     if (code.trim() === "") {
         throwEmptyError(locationCalculator, "statements")
     }
 
     try {
         const ast = parseScriptFragment(
-            `{${code}}`,
-            locationCalculator.getSubCalculatorAfter(-1),
+            `void function($event){${code}}`,
+            locationCalculator.getSubCalculatorAfter(-22),
             parserOptions,
         ).ast
         const references = analyzeExternalReferences(ast, parserOptions)
-        const block = ast.body[0] as ESLintBlockStatement
+        const outermostStatement = ast.body[0] as ESLintExpressionStatement
+        const functionDecl = (outermostStatement.expression as ESLintUnaryExpression)
+            .argument as ESLintFunctionExpression
+        const block = functionDecl.body
         const body = block.body
         const firstStatement = first(body)
         const lastStatement = last(body)
@@ -548,13 +532,10 @@ export function parseVOnExpression(
             b.parent = expression
         }
 
-        // Remvoe braces.
-        tokens.shift()
+        // Remove braces.
+        tokens.splice(0, 6)
         tokens.pop()
 
-        // Remove $event: https://vuejs.org/v2/api/#v-on
-        removeByName(references, "$event")
-
         return { expression, tokens, comments, references, variables: [] }
     } catch (err) {
         return throwErrorAsAdjustingOutsideOfCode(err, code, locationCalculator)