Fix: tokenize the latest right curly brace (fixes #403) (#419)

* Fix: tokenize the latest right curly brace (fixes #403) * Chore: add link to an issue for a test
eslint · Aug 15, 2019 · 3f49224 · 3f49224
1 parent f5e58cc
commit 3f49224
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/lib/espree.js b/lib/espree.js
@@ -175,6 +175,9 @@ module.exports = () => Parser => class Espree extends Parser {
             this.next();
         } while (this.type !== tokTypes.eof);
 
+        // Consume the final eof token
+        this.next();
+
         const extra = this[STATE];
         const tokens = extra.tokens;
 

diff --git a/tests/lib/tokenize.js b/tests/lib/tokenize.js
@@ -199,4 +199,20 @@ describe("tokenize()", () => {
         espree.tokenize("foo", Object.freeze({ ecmaFeatures: Object.freeze({}) }));
     });
 
+    /**
+     * Make sure we tokenize closing curly brace in a block statement at end of file
+     * @see https://github.com/eslint/espree/issues/403 for more information
+     */
+    it("should produce tokens when } is the last token", () => {
+        const tokens = espree.tokenize("{}");
+
+        assert.deepStrictEqual(
+            tester.getRaw(tokens),
+            [
+                { type: "Punctuator", value: "{" },
+                { type: "Punctuator", value: "}" }
+            ]
+        );
+    });
+
 });