Fix: bugs about short name directives and improve error messages.

Author: mysticatea

src/ast/errors.ts

@@ -70,7 +70,7 @@ export class ParseError extends SyntaxError {
      * @param column The column number of this error.
      */
     constructor(message: string, code: ErrorCode | undefined, offset: number, line: number, column: number) {
-        super(`${message} (${line}:${column})`)
+        super(message)
         this.code = code
         this.index = offset
         this.lineNumber = line

src/common/location-calculator.ts

@@ -81,13 +81,13 @@ export class LocationCalculator {
     }
 
     /**
-     * Calculate the location of the given offset.
-     * @param offset The offset to calculate their location.
+     * Calculate the location of the given index.
+     * @param index The index to calculate their location.
      * @param lineTerminators The list of the offset of line terminators.
      * @returns The location of the offset.
      */
-    getLocation(offset: number): Location {
-        return this._getLocation(this.baseOffset + offset)
+    getLocation(index: number): Location {
+        return this._getLocation(this.baseOffset + index)
     }
 
     /**
@@ -123,7 +123,10 @@ export class LocationCalculator {
      * @param error The error to modify their location.
      */
     fixErrorLocation(error: ParseError) {
-        error.index = error.index + this.baseOffset
+        const gap = this._getGap(error.index)
+        const diff = this.baseOffset + Math.max(0, gap)
+
+        error.index += diff
 
         const loc = this._getLocation(error.index)
         error.lineNumber = loc.line

src/html/parser.ts

@@ -14,7 +14,7 @@ import {HTML_CAN_BE_LEFT_OPEN_TAGS, HTML_NON_FHRASING_TAGS, HTML_RAWTEXT_TAGS, H
 import {IntermediateToken, IntermediateTokenizer, EndTag, Mustache, StartTag, Text} from "./intermediate-tokenizer"
 import {Tokenizer} from "./tokenizer"
 
-const DIRECTIVE_NAME = /^(?:v-|[:@]).+[^.:@]$/
+const DIRECTIVE_NAME = /^(?:v-|[:@]).*[^.:@]$/
 const DT_DD = /^d[dt]$/
 const DUMMY_PARENT: any = Object.freeze({})
 

src/script/index.ts

@@ -107,6 +107,24 @@ function removeByName(references: Reference[], name: string): void {
     }
 }
 
+/**
+ * Throw syntax error for empty.
+ * @param locationCalculator The location calculator to get line/column.
+ */
+function throwEmptyError(locationCalculator: LocationCalculator, expected: string): never {
+    const loc = locationCalculator.getLocation(0)
+    const err = new ParseError(
+        `Expected to be ${expected}, but got empty.`,
+        undefined,
+        0,
+        loc.line,
+        loc.column
+    )
+    locationCalculator.fixErrorLocation(err)
+
+    throw err
+}
+
 /**
  * Parse the given source code.
  *
@@ -218,6 +236,10 @@ export function parseScriptElement(node: VElement, globalLocationCalculator: Loc
 export function parseExpression(code: string, locationCalculator: LocationCalculator, parserOptions: any): ExpressionParseResult {
     debug("[script] parse expression: \"(%s)\"", code)
 
+    if (code.trim() === "") {
+        throwEmptyError(locationCalculator, "an expression")
+    }
+
     const ast = parseScriptFragment(
         `(${code})`,
         locationCalculator.getSubCalculatorAfter(-1),
@@ -246,6 +268,10 @@ export function parseVForExpression(code: string, locationCalculator: LocationCa
     const processedCode = replaceAliasParens(code)
     debug("[script] parse v-for expression: \"for(%s);\"", processedCode)
 
+    if (code.trim() === "") {
+        throwEmptyError(locationCalculator, "'<alias> in <expression>'")
+    }
+
     const replaced = processedCode !== code
     const ast = parseScriptFragment(
         `for(let ${processedCode});`,
@@ -313,6 +339,10 @@ export function parseVForExpression(code: string, locationCalculator: LocationCa
 export function parseVOnExpression(code: string, locationCalculator: LocationCalculator, parserOptions: any): ExpressionParseResult {
     debug("[script] parse v-on expression: \"{%s}\"", code)
 
+    if (code.trim() === "") {
+        throwEmptyError(locationCalculator, "statements")
+    }
+
     const ast = parseScriptFragment(
         `{${code}}`,
         locationCalculator.getSubCalculatorAfter(-1),

src/template/index.ts

@@ -221,16 +221,6 @@ function insertError(document: VDocumentFragment | null, error: ParseError): voi
  * @param directiveName The name of this directive.
  */
 function parseAttributeValue(code: string, parserOptions: any, globalLocationCalculator: LocationCalculator, node: VLiteral, directiveName: string): ExpressionParseResult {
-    if (node.value.trim() === "") {
-        throw new ParseError(
-            "Unexpected empty",
-            undefined,
-            node.range[0],
-            node.loc.start.line,
-            node.loc.end.line
-        )
-    }
-
     const firstChar = code[node.range[0]]
     const quoted = (firstChar === "\"" || firstChar === "'")
     const locationCalculator = globalLocationCalculator.getSubCalculatorAfter(node.range[0] + (quoted ? 1 : 0))

test/fixtures/ast/attributes/ast.json

@@ -1757,7 +1757,7 @@
         "comments": [],
         "errors": [
             {
-                "message": "missing-attribute-value (3:11)",
+                "message": "missing-attribute-value",
                 "index": 40,
                 "lineNumber": 3,
                 "column": 11

test/fixtures/ast/bogus-comments/ast.json

@@ -372,25 +372,25 @@
         ],
         "errors": [
             {
-                "message": "unexpected-question-mark-instead-of-tag-name (2:5)",
+                "message": "unexpected-question-mark-instead-of-tag-name",
                 "index": 16,
                 "lineNumber": 2,
                 "column": 5
             },
             {
-                "message": "invalid-first-character-of-tag-name (3:6)",
+                "message": "invalid-first-character-of-tag-name",
                 "index": 43,
                 "lineNumber": 3,
                 "column": 6
             },
             {
-                "message": "cdata-in-html-content (5:12)",
+                "message": "cdata-in-html-content",
                 "index": 80,
                 "lineNumber": 5,
                 "column": 12
             },
             {
-                "message": "incorrectly-opened-comment (6:6)",
+                "message": "incorrectly-opened-comment",
                 "index": 96,
                 "lineNumber": 6,
                 "column": 6

test/fixtures/ast/comments-2/ast.json

@@ -1090,25 +1090,25 @@
         ],
         "errors": [
             {
-                "message": "abrupt-closing-of-empty-comment (15:8)",
+                "message": "abrupt-closing-of-empty-comment",
                 "index": 209,
                 "lineNumber": 15,
                 "column": 8
             },
             {
-                "message": "abrupt-closing-of-empty-comment (16:9)",
+                "message": "abrupt-closing-of-empty-comment",
                 "index": 220,
                 "lineNumber": 16,
                 "column": 9
             },
             {
-                "message": "nested-comment (17:12)",
+                "message": "nested-comment",
                 "index": 234,
                 "lineNumber": 17,
                 "column": 12
             },
             {
-                "message": "incorrectly-closed-comment (18:12)",
+                "message": "incorrectly-closed-comment",
                 "index": 249,
                 "lineNumber": 18,
                 "column": 12

test/fixtures/ast/directive-arguments/ast.json

@@ -993,7 +993,7 @@
         "comments": [],
         "errors": [
             {
-                "message": "missing-attribute-value (3:15)",
+                "message": "missing-attribute-value",
                 "index": 48,
                 "lineNumber": 3,
                 "column": 15