Prevent parseForESLint() behavior from changing after parse() is called

lib/analyze-scope.js

@@ -318,9 +318,16 @@ module.exports = function(ast, parserOptions) {
     impliedStrict: false,
     sourceType: ast.sourceType,
     ecmaVersion: parserOptions.ecmaVersion || 6,
-    childVisitorKeys,
     fallback,
   };
+
+  if (OriginalReferencer._babelEslintPatched) {
+    require("./patch-eslint-scope")(parserOptions);
+    return escope.analyze(ast, options);
+  }
+
+  options.childVisitorKeys = childVisitorKeys;
+
   const scopeManager = new escope.ScopeManager(options);
   const referencer = new Referencer(options, scopeManager);
 

lib/index.js

@@ -1,18 +1,19 @@
 "use strict";
 
-let patched = false;
-
 exports.parse = function(code, options) {
-  patched = true;
-  return require("./parse-with-patch")(code, options);
+  return exports.parseForESLint(code, options).ast;
 };
 
 exports.parseForESLint = function(code, options) {
-  if (!patched && options.eslintVisitorKeys && options.eslintScopeManager) {
+  options = options || {};
+  options.ecmaVersion = options.ecmaVersion || 6;
+  options.sourceType = options.sourceType || "module";
+  options.allowImportExportEverywhere =
+    options.allowImportExportEverywhere || false;
+
+  if (options.eslintVisitorKeys && options.eslintScopeManager) {
     return require("./parse-with-scope")(code, options);
   }
-
-  patched = true;
   return { ast: require("./parse-with-patch")(code, options) };
 };