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.

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

Fix: no-regex-spaces false positives and invalid autofix (fixes #12226) #12231

Merged
merged 4 commits into from Sep 29, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
158 changes: 114 additions & 44 deletions lib/rules/no-regex-spaces.js
Expand Up @@ -5,7 +5,28 @@

"use strict";

//------------------------------------------------------------------------------
// Requirements
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const regexpp = require("regexpp");

//------------------------------------------------------------------------------
// Helpers
//------------------------------------------------------------------------------

const regExpParser = new regexpp.RegExpParser();

/**
* Check if node is a string
* @param {ASTNode} node node to evaluate
* @returns {boolean} True if its a string
* @private
*/
function isString(node) {
return node && node.type === "Literal" && typeof node.value === "string";
}

//------------------------------------------------------------------------------
// Rule Definition
Expand All @@ -27,40 +48,80 @@ module.exports = {
},

create(context) {
const sourceCode = context.getSourceCode();

/**
* Validate regular expressions
* @param {ASTNode} node node to validate
* @param {string} value regular expression to validate
* @param {number} valueStart The start location of the regex/string literal. It will always be the case that
* `sourceCode.getText().slice(valueStart, valueStart + value.length) === value`
* Validate regular expression
*
* @param {ASTNode} nodeToReport Node to report.
* @param {string} pattern Regular expression pattern to validate.
* @param {string} rawPattern Raw representation of the pattern in the source code.
* @param {number} rawPatternStartRange Start range of the pattern in the source code.
* @param {string} flags Regular expression flags.
* @returns {void}
* @private
*/
function checkRegex(node, value, valueStart) {
const multipleSpacesRegex = /( {2,})( [+*{?]|[^+*{?]|$)/u,
regexResults = multipleSpacesRegex.exec(value);
function checkRegex(nodeToReport, pattern, rawPattern, rawPatternStartRange, flags) {

if (regexResults !== null) {
const count = regexResults[1].length;
// Skip if there are no consecutive spaces in the source code
if (!/ {2}/u.test(rawPattern)) {
return;
}

context.report({
node,
message: "Spaces are hard to count. Use {{{count}}}.",
data: { count },
fix(fixer) {
return fixer.replaceTextRange(
[valueStart + regexResults.index, valueStart + regexResults.index + count],
` {${count}}`
);
}
});
let ast;

/*
* TODO: (platinumazure) Fix message to use rule message
* substitution when api.report is fixed in lib/eslint.js.
*/
try {
ast = regExpParser.parsePattern(pattern, 0, pattern.length, flags.includes("u"));
} catch (e) {

// Ignore regular expressions with syntax errors
return;
}

const spaces = [];

regexpp.visitRegExpAST(ast, {
onCharacterEnter(character) {
if (
character.parent.type === "Alternative" &&
(character.raw === " " || character.raw === "\\ ")
) {
spaces.push(character);
mysticatea marked this conversation as resolved.
Show resolved Hide resolved
}
}
});

for (let i = 0; i < spaces.length - 1; i++) {
let j = i;

while (
j < spaces.length - 1 &&
spaces[j].end === spaces[j + 1].start &&
spaces[j + 1].raw === " "
) {
j++;
}

if (j > i) {
const count = j - i + 1;

context.report({
node: nodeToReport,
message: "Spaces are hard to count. Use {{{count}}}.",
data: { count },
fix(fixer) {
if (pattern !== rawPattern) {
return null;
}
return fixer.replaceTextRange(
[rawPatternStartRange + spaces[i + 1].start, rawPatternStartRange + spaces[j].end],
`{${count}}`
);
}
});

// Report only the first occurence of consecutive spaces
return;
}
}
}

Expand All @@ -71,25 +132,22 @@ module.exports = {
* @private
*/
function checkLiteral(node) {
const token = sourceCode.getFirstToken(node),
nodeType = token.type,
nodeValue = token.value;
if (node.regex) {
const pattern = node.regex.pattern;
const rawPattern = node.raw.slice(1, node.raw.lastIndexOf("/"));
const rawPatternStartRange = node.range[0] + 1;
const flags = node.regex.flags;

if (nodeType === "RegularExpression") {
checkRegex(node, nodeValue, token.range[0]);
checkRegex(
node,
pattern,
rawPattern,
rawPatternStartRange,
flags
);
}
}

/**
* Check if node is a string
* @param {ASTNode} node node to evaluate
* @returns {boolean} True if its a string
* @private
*/
function isString(node) {
return node && node.type === "Literal" && typeof node.value === "string";
}

/**
* Validate strings passed to the RegExp constructor
* @param {ASTNode} node node to validate
Expand All @@ -100,9 +158,22 @@ module.exports = {
const scope = context.getScope();
const regExpVar = astUtils.getVariableByName(scope, "RegExp");
const shadowed = regExpVar && regExpVar.defs.length > 0;
const patternNode = node.arguments[0];
const flagsNode = node.arguments[1];

if (node.callee.type === "Identifier" && node.callee.name === "RegExp" && isString(node.arguments[0]) && !shadowed) {
checkRegex(node, node.arguments[0].value, node.arguments[0].range[0] + 1);
if (node.callee.type === "Identifier" && node.callee.name === "RegExp" && isString(patternNode) && !shadowed) {
const pattern = patternNode.value;
const rawPattern = patternNode.raw.slice(1, -1);
const rawPatternStartRange = patternNode.range[0] + 1;
const flags = isString(flagsNode) ? flagsNode.value : "";

checkRegex(
node,
pattern,
rawPattern,
rawPatternStartRange,
flags
);
}
}

Expand All @@ -111,6 +182,5 @@ module.exports = {
CallExpression: checkFunction,
NewExpression: checkFunction
};

}
};