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 false positives for flush comments containing a comma in selector-max-universal #3817

Merged
merged 5 commits into from
Jan 10, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions lib/rules/selector-max-universal/__tests__/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ testRule(rule, {
{
code: "foo .bar {}"
},
{
code: ".foo,/* .class, */.bar {}"
},
{
code: "#foo {}"
},
Expand Down
17 changes: 16 additions & 1 deletion lib/rules/selector-max-universal/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const parseSelector = require("../../utils/parseSelector");
const report = require("../../utils/report");
const resolvedNestedSelector = require("postcss-resolve-nested-selector");
const ruleMessages = require("../../utils/ruleMessages");
const selectorParser = require("postcss-selector-parser");
const validateOptions = require("../../utils/validateOptions");

const ruleName = "selector-max-universal";
Expand Down Expand Up @@ -75,7 +76,21 @@ function rule(max) {
return;
}

ruleNode.selectors.forEach(selector => {
const selectors = [];

selectorParser()
.astSync(ruleNode.selector)
.walk(node => {
if (node.type === "selector") {
selectors.push(
String(node)
.replace(/^(\s*)/m, "")
.replace(/(\s*)$/m, "")
);
}
});

selectors.forEach(selector => {
resolvedNestedSelector(selector, ruleNode).forEach(resolvedSelector => {
parseSelector(resolvedSelector, result, ruleNode, container =>
checkSelector(container, ruleNode)
Expand Down