Update: Pass file path to parse function (fixes eslint#5344)

annie · Aug 31, 2016 · d3d4290 · d3d4290
1 parent 326f457
commit d3d4290
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/lib/eslint.js b/lib/eslint.js
@@ -601,7 +601,7 @@ module.exports = (function() {
      * @returns {ASTNode} The AST if successful or null if not.
      * @private
      */
-    function parse(text, config) {
+    function parse(text, config, filePath) {
 
         let parser,
             parserOptions = {
@@ -610,7 +610,8 @@ module.exports = (function() {
                 raw: true,
                 tokens: true,
                 comment: true,
-                attachComment: true
+                attachComment: true,
+                filePath: filePath
             };
 
         try {
@@ -783,7 +784,8 @@ module.exports = (function() {
                     shebang = captured;
                     return "//" + captured;
                 }),
-                config
+                config,
+                currentFilename
             );
 
             if (ast) {

diff --git a/tests/fixtures/parsers/stub-parser.js b/tests/fixtures/parsers/stub-parser.js
@@ -0,0 +1,11 @@
+exports.parse = function(text, parserOptions) {
+    return {
+      "type": "Program",
+      "loc": {},
+      "range": [],
+      "body": [],
+      "comments": [],
+      "errors": [],
+      "tokens": []
+    };
+};
diff --git a/tests/lib/eslint.js b/tests/lib/eslint.js
@@ -101,6 +101,20 @@ describe("eslint", function() {
         });
     });
 
+    describe("parser", function() {
+
+        it("should have file path passed to it", function() {
+            const code = "/* this is code */";
+            const parserFixtures = path.join(__dirname, "../fixtures/parsers");
+            const parser = path.join(parserFixtures, "stub-parser.js");
+            const parseSpy = sinon.spy(require(parser), "parse");
+
+            eslint.verify(code, { parser }, filename, true);
+
+            sinon.assert.calledWithMatch(parseSpy, "", { filePath: filename });
+        });
+    });
+
     describe("getSourceLines()", function() {
 
         it("should get proper lines when using \\n as a line break", function() {