Validate selectors consistently. Fixes #3130 (#4483)

* Validate selectors consistently by including `isStandardSyntaxSelector` in `isStandardSyntaxRule`. Fixes #3130
stylelint · Dec 23, 2019 · 0f04539 · 0f04539
1 parent 0416635
commit 0f04539
Show file tree

Hide file tree

Showing 30 changed files with 37 additions and 103 deletions.
diff --git a/lib/rules/selector-attribute-brackets-space-inside/__tests__/index.js b/lib/rules/selector-attribute-brackets-space-inside/__tests__/index.js
@@ -106,6 +106,10 @@ testRule(rule, {
 			code: 'html { --custom-property-set: {} }',
 			description: 'custom property set in selector',
 		},
+		{
+			code: 'a[b=#{c}] { }',
+			description: 'ignore "invalid" selector (see #3130)',
+		},
 	],
 
 	reject: [

diff --git a/lib/rules/selector-attribute-operator-space-after/__tests__/index.js b/lib/rules/selector-attribute-operator-space-after/__tests__/index.js
@@ -271,6 +271,10 @@ testRule(rule, {
 			code: 'html { --custom-property-set: {} }',
 			description: 'custom property set in selector',
 		},
+		{
+			code: 'a[b=#{c}] { }',
+			description: 'ignore "invalid" selector (see #3130)',
+		},
 	],
 
 	reject: [

diff --git a/lib/rules/selector-attribute-operator-space-before/__tests__/index.js b/lib/rules/selector-attribute-operator-space-before/__tests__/index.js
@@ -271,6 +271,10 @@ testRule(rule, {
 			code: 'html { --custom-property-set: {} }',
 			description: 'custom property set in selector',
 		},
+		{
+			code: 'a[b=#{c}] { }',
+			description: 'ignore "invalid" selector (see #3130)',
+		},
 	],
 
 	reject: [

diff --git a/lib/rules/selector-attribute-quotes/index.js b/lib/rules/selector-attribute-quotes/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
@@ -30,10 +29,6 @@ const rule = function(expectation) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(rule.selector)) {
-				return;
-			}
-
 			if (!rule.selector.includes('[') || !rule.selector.includes('=')) {
 				return;
 			}

diff --git a/lib/rules/selector-class-pattern/index.js b/lib/rules/selector-class-pattern/index.js
@@ -50,10 +50,6 @@ const rule = function(pattern, options) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			if (selectors.some((s) => isKeyframeSelector(s))) {
 				return;
 			}

diff --git a/lib/rules/selector-combinator-space-after/__tests__/index.js b/lib/rules/selector-combinator-space-after/__tests__/index.js
@@ -149,6 +149,10 @@ testRule(rule, {
 			code: '.a { &:first-child {} }',
 			description: 'nesting and no combinators',
 		},
+		{
+			code: 'a[b=#{c}] { }',
+			description: 'ignore "invalid" selector (see #3130)',
+		},
 	],
 
 	reject: [

diff --git a/lib/rules/selector-combinator-space-before/__tests__/index.js b/lib/rules/selector-combinator-space-before/__tests__/index.js
@@ -137,6 +137,10 @@ testRule(rule, {
 			code: 'html { --custom-property-set: {} }',
 			description: 'custom property set in selector',
 		},
+		{
+			code: 'a[b=#{c}] { }',
+			description: 'ignore "invalid" selector (see #3130)',
+		},
 		{
 			code: 'namespace|type#id > .foo {}',
 			description: 'qualified ID with namespace',

diff --git a/lib/rules/selector-descendant-combinator-no-non-space/__tests__/index.js b/lib/rules/selector-descendant-combinator-no-non-space/__tests__/index.js
@@ -79,6 +79,10 @@ testRule(rule, {
       }
       `,
 		},
+		{
+			code: 'a[b=#{c}] { }',
+			description: 'ignore "invalid" selector (see #3130)',
+		},
 	],
 
 	reject: [

diff --git a/lib/rules/selector-id-pattern/index.js b/lib/rules/selector-id-pattern/index.js
@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
@@ -35,10 +34,6 @@ const rule = function(pattern) {
 
 			const selector = rule.selector;
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			parseSelector(selector, result, rule, (fullSelector) => {
 				fullSelector.walk((selectorNode) => {
 					if (selectorNode.type !== 'id') {

diff --git a/lib/rules/selector-max-attribute/index.js b/lib/rules/selector-max-attribute/index.js
@@ -3,7 +3,6 @@
 const _ = require('lodash');
 const isLogicalCombination = require('../../utils/isLogicalCombination');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const optionsMatches = require('../../utils/optionsMatches');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
@@ -82,10 +81,6 @@ function rule(max, options) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(ruleNode.selector)) {
-				return;
-			}
-
 			ruleNode.selectors.forEach((selector) => {
 				resolvedNestedSelector(selector, ruleNode).forEach((resolvedSelector) => {
 					parseSelector(resolvedSelector, result, ruleNode, (container) =>

diff --git a/lib/rules/selector-max-class/index.js b/lib/rules/selector-max-class/index.js
@@ -2,7 +2,6 @@
 
 const isLogicalCombination = require('../../utils/isLogicalCombination');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
 const resolvedNestedSelector = require('postcss-resolve-nested-selector');
@@ -57,10 +56,6 @@ function rule(max) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(ruleNode.selector)) {
-				return;
-			}
-
 			ruleNode.selectors.forEach((selector) => {
 				resolvedNestedSelector(selector, ruleNode).forEach((resolvedSelector) => {
 					parseSelector(resolvedSelector, result, ruleNode, (container) =>

diff --git a/lib/rules/selector-max-combinators/index.js b/lib/rules/selector-max-combinators/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
 const resolvedNestedSelector = require('postcss-resolve-nested-selector');
@@ -58,10 +57,6 @@ function rule(max) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(ruleNode.selector)) {
-				return;
-			}
-
 			ruleNode.selectors.forEach((selector) => {
 				resolvedNestedSelector(selector, ruleNode).forEach((resolvedSelector) => {
 					parseSelector(resolvedSelector, result, ruleNode, (container) =>

diff --git a/lib/rules/selector-max-compound-selectors/index.js b/lib/rules/selector-max-compound-selectors/index.js
@@ -2,7 +2,6 @@
 
 const isLogicalCombination = require('../../utils/isLogicalCombination');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
 const resolvedNestedSelector = require('postcss-resolve-nested-selector');
@@ -65,10 +64,6 @@ const rule = function(max) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(rule.selector)) {
-				return;
-			}
-
 			// Using `rule.selectors` gets us each selector if there is a comma separated set
 			rule.selectors.forEach((selector) => {
 				resolvedNestedSelector(selector, rule).forEach((resolvedSelector) => {

diff --git a/lib/rules/selector-max-id/index.js b/lib/rules/selector-max-id/index.js
@@ -2,7 +2,6 @@
 
 const isLogicalCombination = require('../../utils/isLogicalCombination');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
 const resolvedNestedSelector = require('postcss-resolve-nested-selector');
@@ -57,10 +56,6 @@ function rule(max) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(ruleNode.selector)) {
-				return;
-			}
-
 			ruleNode.selectors.forEach((selector) => {
 				resolvedNestedSelector(selector, ruleNode).forEach((resolvedSelector) => {
 					parseSelector(resolvedSelector, result, ruleNode, (container) =>

diff --git a/lib/rules/selector-max-pseudo-class/index.js b/lib/rules/selector-max-pseudo-class/index.js
@@ -2,7 +2,6 @@
 
 const isLogicalCombination = require('../../utils/isLogicalCombination');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const keywordSets = require('../../reference/keywordSets');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
@@ -71,10 +70,6 @@ function rule(max) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(ruleNode.selector)) {
-				return;
-			}
-
 			ruleNode.selectors.forEach((selector) => {
 				resolvedNestedSelector(selector, ruleNode).forEach((resolvedSelector) => {
 					parseSelector(resolvedSelector, result, rule, (selectorTree) => {

diff --git a/lib/rules/selector-max-specificity/index.js b/lib/rules/selector-max-specificity/index.js
@@ -145,10 +145,6 @@ const rule = function(max, options) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(rule.selector)) {
-				return;
-			}
-
 			// Using rule.selectors gets us each selector in the eventuality we have a comma separated set
 			rule.selectors.forEach((selector) => {
 				resolvedNestedSelector(selector, rule).forEach((resolvedSelector) => {

diff --git a/lib/rules/selector-max-type/index.js b/lib/rules/selector-max-type/index.js
@@ -94,17 +94,12 @@ function rule(max, options) {
 		}
 
 		root.walkRules((ruleNode) => {
-			const selector = ruleNode.selector;
 			const selectors = ruleNode.selectors;
 
 			if (!isStandardSyntaxRule(ruleNode)) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			if (selectors.some((s) => isKeyframeSelector(s))) {
 				return;
 			}

diff --git a/lib/rules/selector-max-universal/index.js b/lib/rules/selector-max-universal/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
 const resolvedNestedSelector = require('postcss-resolve-nested-selector');
@@ -60,10 +59,6 @@ function rule(max) {
 				return;
 			}
 
-			if (!isStandardSyntaxSelector(ruleNode.selector)) {
-				return;
-			}
-
 			const selectors = [];
 
 			selectorParser()

diff --git a/lib/rules/selector-nested-pattern/index.js b/lib/rules/selector-nested-pattern/index.js
@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const report = require('../../utils/report');
 const ruleMessages = require('../../utils/ruleMessages');
 const validateOptions = require('../../utils/validateOptions');
@@ -37,10 +36,6 @@ const rule = function(pattern) {
 
 			const selector = rule.selector;
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			if (normalizedPattern.test(selector)) {
 				return;
 			}

diff --git a/lib/rules/selector-no-qualifying-type/index.js b/lib/rules/selector-no-qualifying-type/index.js
@@ -72,11 +72,6 @@ const rule = function(enabled, options) {
 				return;
 			}
 
-			// Increasing performance
-			if (!isStandardSyntaxSelector(rule.selector)) {
-				return;
-			}
-
 			if (!isSelectorCharacters(rule.selector)) {
 				return;
 			}

diff --git a/lib/rules/selector-no-vendor-prefix/index.js b/lib/rules/selector-no-vendor-prefix/index.js
@@ -3,7 +3,6 @@
 const _ = require('lodash');
 const isAutoprefixable = require('../../utils/isAutoprefixable');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const optionsMatches = require('../../utils/optionsMatches');
 const parseSelector = require('../../utils/parseSelector');
 const report = require('../../utils/report');
@@ -42,10 +41,6 @@ const rule = function(actual, options) {
 
 			const selector = rule.selector;
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			parseSelector(selector, result, rule, (selectorTree) => {
 				selectorTree.walkPseudos((pseudoNode) => {
 					if (isAutoprefixable.selector(pseudoNode.value)) {

diff --git a/lib/rules/selector-pseudo-class-blacklist/index.js b/lib/rules/selector-pseudo-class-blacklist/index.js
@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const matchesStringOrRegExp = require('../../utils/matchesStringOrRegExp');
 const parseSelector = require('../../utils/parseSelector');
 const postcss = require('postcss');
@@ -34,10 +33,6 @@ const rule = function(blacklist) {
 
 			const selector = rule.selector;
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			if (!selector.includes(':')) {
 				return;
 			}

diff --git a/lib/rules/selector-pseudo-class-parentheses-space-inside/__tests__/index.js b/lib/rules/selector-pseudo-class-parentheses-space-inside/__tests__/index.js
@@ -46,6 +46,10 @@ testRule(rule, {
 			code: 'html { --custom-property-set: {} }',
 			description: 'custom property set in selector',
 		},
+		{
+			code: 'a[b=#{c}] { }',
+			description: 'ignore "invalid" selector (see #3130)',
+		},
 	],
 
 	reject: [

diff --git a/lib/rules/selector-pseudo-class-whitelist/index.js b/lib/rules/selector-pseudo-class-whitelist/index.js
@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const matchesStringOrRegExp = require('../../utils/matchesStringOrRegExp');
 const parseSelector = require('../../utils/parseSelector');
 const postcss = require('postcss');
@@ -34,10 +33,6 @@ const rule = function(whitelist) {
 
 			const selector = rule.selector;
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			if (!selector.includes(':')) {
 				return;
 			}

diff --git a/lib/rules/selector-pseudo-element-blacklist/index.js b/lib/rules/selector-pseudo-element-blacklist/index.js
@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const isStandardSyntaxRule = require('../../utils/isStandardSyntaxRule');
-const isStandardSyntaxSelector = require('../../utils/isStandardSyntaxSelector');
 const matchesStringOrRegExp = require('../../utils/matchesStringOrRegExp');
 const parseSelector = require('../../utils/parseSelector');
 const postcss = require('postcss');
@@ -34,10 +33,6 @@ const rule = function(blacklist) {
 
 			const selector = rule.selector;
 
-			if (!isStandardSyntaxSelector(selector)) {
-				return;
-			}
-
 			if (!selector.includes('::')) {
 				return;
 			}