Fix: bugs about non-void-html-element-start-tag-with-trailing-solidus

Author: mysticatea

src/html/intermediate-tokenizer.ts

@@ -6,7 +6,6 @@
 import assert from "assert"
 import {ErrorCode, HasLocation, Namespace, ParseError, Token, VAttribute} from "../ast"
 import {debug} from "../common/debug"
-import {HTML_VOID_ELEMENT_TAGS} from "./util/tag-names"
 import {Tokenizer, TokenizerState, TokenType} from "./tokenizer"
 
 const DUMMY_PARENT: any = Object.freeze({})
@@ -343,9 +342,6 @@ export class IntermediateTokenizer {
 
         if (this.currentToken.type === "StartTag") {
             this.currentToken.selfClosing = true
-            if (!HTML_VOID_ELEMENT_TAGS.has(this.currentToken.name)) {
-                this.reportParseError(token, "non-void-html-element-start-tag-with-trailing-solidus")
-            }
         }
         else {
             this.reportParseError(token, "end-tag-with-trailing-solidus")

src/html/parser.ts

@@ -324,8 +324,14 @@ export class Parser {
         element.startTag.parent = element
         parent.children.push(element)
 
+        // Check whether the self-closing is valid.
+        const isVoid = (namespace === NS.HTML && HTML_VOID_ELEMENT_TAGS.has(element.name))
+        if (token.selfClosing && !isVoid && namespace === NS.HTML) {
+            this.reportParseError(token, "non-void-html-element-start-tag-with-trailing-solidus")
+        }
+
         // Vue.js supports self-closing elements even if it's not one of void elements.
-        if (token.selfClosing || HTML_VOID_ELEMENT_TAGS.has(element.name)) {
+        if (token.selfClosing || isVoid) {
             return
         }
 

test/fixtures/ast/cdata/ast.json

@@ -1153,13 +1153,6 @@
             }
         ],
         "comments": [],
-        "errors": [
-            {
-                "message": "non-void-html-element-start-tag-with-trailing-solidus (9:31)",
-                "index": 235,
-                "lineNumber": 9,
-                "column": 31
-            }
-        ]
+        "errors": []
     }
 }

test/fixtures/ast/error-unexpected-solidus-in-tag/ast.json

@@ -418,10 +418,10 @@
                 "column": 12
             },
             {
-                "message": "non-void-html-element-start-tag-with-trailing-solidus (2:15)",
-                "index": 26,
+                "message": "non-void-html-element-start-tag-with-trailing-solidus (2:4)",
+                "index": 15,
                 "lineNumber": 2,
-                "column": 15
+                "column": 4
             }
         ]
     }

test/fixtures/ast/math/ast.json

@@ -7091,13 +7091,6 @@
             }
         ],
         "comments": [],
-        "errors": [
-            {
-                "message": "non-void-html-element-start-tag-with-trailing-solidus (44:27)",
-                "index": 1433,
-                "lineNumber": 44,
-                "column": 27
-            }
-        ]
+        "errors": []
     }
 }

test/fixtures/ast/self-closing-elements/ast.json

@@ -543,22 +543,22 @@
         "comments": [],
         "errors": [
             {
-                "message": "non-void-html-element-start-tag-with-trailing-solidus (2:9)",
-                "index": 20,
+                "message": "non-void-html-element-start-tag-with-trailing-solidus (2:4)",
+                "index": 15,
                 "lineNumber": 2,
-                "column": 9
+                "column": 4
             },
             {
-                "message": "non-void-html-element-start-tag-with-trailing-solidus (3:9)",
-                "index": 32,
+                "message": "non-void-html-element-start-tag-with-trailing-solidus (3:4)",
+                "index": 27,
                 "lineNumber": 3,
-                "column": 9
+                "column": 4
             },
             {
-                "message": "non-void-html-element-start-tag-with-trailing-solidus (4:9)",
-                "index": 44,
+                "message": "non-void-html-element-start-tag-with-trailing-solidus (4:4)",
+                "index": 39,
                 "lineNumber": 4,
-                "column": 9
+                "column": 4
             }
         ]
     }

test/fixtures/ast/textarea/ast.json

@@ -1380,10 +1380,10 @@
         "comments": [],
         "errors": [
             {
-                "message": "non-void-html-element-start-tag-with-trailing-solidus (2:13)",
-                "index": 24,
+                "message": "non-void-html-element-start-tag-with-trailing-solidus (2:4)",
+                "index": 15,
                 "lineNumber": 2,
-                "column": 13
+                "column": 4
             }
         ]
     }