build: ampersand selector lint rule not catching some cases

I noticed this while working on something else. The ampersand selector mixin looks for one `&` instance and then gives up, but there might be other ampersands inside the same selector which are invalid.

These changes update the logic to be a bit more robust and remove the limitation where failures weren't reported on private mixins.

Author: crisbeto

tools/stylelint/no-ampersand-beyond-selector-start.ts

@@ -1,6 +1,5 @@
 import {createPlugin, utils} from 'stylelint';
 import {basename} from 'path';
-import {Node} from './stylelint-postcss-types';
 
 const isStandardSyntaxRule = require('stylelint/lib/utils/isStandardSyntaxRule');
 const isStandardSyntaxSelector = require('stylelint/lib/utils/isStandardSyntaxSelector');
@@ -37,43 +36,37 @@ const plugin = createPlugin(ruleName, (isEnabled: boolean, _options?) => {
     }
 
     root.walkRules(rule => {
-      if (
-        rule.parent.type === 'rule' &&
-        isStandardSyntaxRule(rule) &&
-        isStandardSyntaxSelector(rule.selector) &&
-        // Using the ampersand at the beginning is fine, anything else can cause issues in themes.
-        rule.selector.indexOf('&') > 0) {
-
-        const mixinName = getClosestMixinName(rule);
-
-        // Skip rules inside private mixins.
-        if (!mixinName || !mixinName.startsWith('_')) {
-          utils.report({
-            result,
-            ruleName,
-            message: messages.expected(),
-            node: rule
-          });
-        }
+      if (rule.parent.type === 'rule' &&
+          isStandardSyntaxRule(rule) &&
+          isStandardSyntaxSelector(rule.selector) &&
+          hasInvalidAmpersandUsage(rule.selector)) {
+        utils.report({
+          result,
+          ruleName,
+          message: messages.expected(),
+          node: rule
+        });
       }
     });
   };
+});
 
-  /** Walks up the AST and finds the name of the closest mixin. */
-  function getClosestMixinName(node: Node): string | undefined {
-    let parent = node.parent;
-
-    while (parent) {
-      if (parent.type === 'atrule' && parent.name === 'mixin') {
-        return parent.params;
-      }
+function hasInvalidAmpersandUsage(selector: string): boolean {
+  let index = selector.indexOf('&');
 
-      parent = parent.parent;
+  while (index > -1) {
+    // The ampersand is invalid if it's used after the start of
+    // the selector and not in a combination with another selector.
+    if (index > 0 && selector[index - 1] === ' ' && (index === selector.length - 1 ||
+        selector[index + 1] === ' ' || selector[index + 1] === ',')) {
+      return true;
     }
 
-    return undefined;
+    index = selector.indexOf('&', index + 1);
   }
-});
+
+  return false;
+}
 
 plugin.ruleName = ruleName;
 plugin.messages = messages;