Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New: Allow parsers to supply Visitor Keys/Fallback (fixes #8392) #8582

Closed
wants to merge 1 commit into from
Closed

New: Allow parsers to supply Visitor Keys/Fallback (fixes #8392) #8582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions lib/eslint.js
View file
Open in desktop
Expand Up @@ -41,6 +41,8 @@ const assert = require("assert"),
* @property {ASTNode} ast The ESTree AST Program node.
* @property {Object} services An object containing additional services related
* to the parser.
* @property {VisitorKeys} visitorKeys Visitor Keys
* @property {VisitorFallback} visitorFallback Visitor Fallback function
*/

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -873,7 +875,14 @@ module.exports = (function() {

// save config so rules can access as necessary
currentConfig = config;
traverser = new Traverser();

const visitorKeys = (parseResult) ? parseResult.visitorKeys : null;
const visitorFallback = (parseResult) ? parseResult.visitorFallback : null;

traverser = new Traverser(
visitorKeys,
visitorFallback
);

const ecmaFeatures = currentConfig.parserOptions.ecmaFeatures;
const ecmaVersion = currentConfig.parserOptions.ecmaVersion;
Expand All @@ -885,7 +894,8 @@ module.exports = (function() {
impliedStrict: ecmaFeatures.impliedStrict,
ecmaVersion,
sourceType: currentConfig.parserOptions.sourceType,
fallback: Traverser.getKeys
childVisitorKeys: traverser.getVisitorKeys(),
fallback: traverser.getVisitorFallback()
});

currentScopes = scopeManager.scopes;
Expand Down
18 changes: 17 additions & 1 deletion lib/util/traverser.js
View file
Open in desktop
Expand Up @@ -38,11 +38,27 @@ estraverse.VisitorKeys.RestElement.push("typeAnnotation");
* @constructor
*/
class Traverser extends estraverse.Controller {
constructor(visitorKeys, visitorFallback) {
super();

this.visitorKeys = visitorKeys || estraverse.VisitorKeys;
this.visitorFallback = visitorFallback || Traverser.getKeys;
}

traverse(node, visitor) {
visitor.fallback = Traverser.getKeys;
visitor.keys = this.visitorKeys;
visitor.fallback = this.visitorFallback;
return super.traverse(node, visitor);
}

getVisitorKeys() {
return this.visitorKeys;
}

getVisitorFallback() {
return this.visitorFallback;
}

/**
* Calculates the keys to use for traversal.
* @param {ASTNode} node The node to read keys from.
Expand Down