Fix wrong tokenize for lone ampersand (#158)

Author: ota-meshi

.github/workflows/CI.yml

@@ -91,7 +91,7 @@ jobs:
     - name: Build
       run: npm run -s build
     - name: Test
-      run: npm run -s test:mocha
+      run: npm run -s test:cover
     - name: Send Coverage
       run: npm run -s codecov
       env:

package.json

@@ -72,7 +72,8 @@
     "setup": "git submodule update --init && cd test/fixtures/eslint && npm install",
     "pretest": "run-s build lint",
     "test": "npm run -s test:mocha",
-    "test:mocha": "nyc mocha \"test/*.js\" --reporter dot --timeout 60000",
+    "test:mocha": "mocha --require ts-node/register \"test/*.js\" --reporter dot --timeout 60000",
+    "test:cover": "nyc mocha \"test/*.js\" --reporter dot --timeout 60000",
     "test:debug": "mocha --require ts-node/register/transpile-only \"test/*.js\" --reporter dot --timeout 60000",
     "preupdate-fixtures": "npm run -s build",
     "update-fixtures": "node scripts/update-fixtures-ast.js && node scripts/update-fixtures-document-fragment.js",

src/html/tokenizer.ts

@@ -1610,14 +1610,14 @@ export class Tokenizer {
         this.crStartOffset = this.offset - 1
         this.buffer = [AMPERSAND]
 
-        if (isWhitespace(cp) || cp === LESS_THAN_SIGN || cp === EOF) {
-            return this.reconsumeAs("CHARACTER_REFERENCE_END")
+        if (isDigit(cp) || isLetter(cp)) {
+            return this.reconsumeAs("NAMED_CHARACTER_REFERENCE")
         }
         if (cp === NUMBER_SIGN) {
             this.buffer.push(cp)
             return "NUMERIC_CHARACTER_REFERENCE"
         }
-        return this.reconsumeAs("NAMED_CHARACTER_REFERENCE")
+        return this.reconsumeAs("CHARACTER_REFERENCE_END")
     }
 
     /**
@@ -1818,7 +1818,7 @@ export class Tokenizer {
     }
 
     /**
-     * https://html.spec.whatwg.org/multipage/parsing.html#character-reference-end-state
+     * https://html.spec.whatwg.org/multipage/parsing.html#flush-code-points-consumed-as-a-character-reference
      * @param cp The current code point.
      * @returns The next state.
      */

test/espree.js

@@ -10,9 +10,13 @@ function parentMain() {
 
     describe("Loading espree from ESLint", () => {
         it("should load espree from the ESLint location.", (done) => {
-            spawn(process.execPath, [__filename, "--child1"], {
-                stdio: "inherit",
-            })
+            spawn(
+                process.execPath,
+                ["--require", "ts-node/register", __filename, "--child1"],
+                {
+                    stdio: "inherit",
+                },
+            )
                 .on("error", done)
                 .on("exit", (code) =>
                     code
@@ -21,9 +25,13 @@ function parentMain() {
                 )
         })
         it("should load espree from the ESLint location.", (done) => {
-            spawn(process.execPath, [__filename, "--child1"], {
-                stdio: "inherit",
-            })
+            spawn(
+                process.execPath,
+                ["--require", "ts-node/register", __filename, "--child1"],
+                {
+                    stdio: "inherit",
+                },
+            )
                 .on("error", done)
                 .on("exit", (code) =>
                     code
@@ -38,9 +46,13 @@ function parentMain() {
                 execSync("npm i", {
                     stdio: "inherit",
                 })
-                spawn(process.execPath, [__filename, "--child2"], {
-                    stdio: "inherit",
-                })
+                spawn(
+                    process.execPath,
+                    ["--require", "ts-node/register", __filename, "--child2"],
+                    {
+                        stdio: "inherit",
+                    },
+                )
                     .on("error", done)
                     .on("exit", (code) =>
                         code