[BUGFIX] Allow comma-separated arguments in selectors

This is the backport of #1292 and releated changes.

Author: JakeQZ

CHANGELOG.md

@@ -55,6 +55,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+- Parse selector functions (like `:not`) with comma-separated arguments (#1292)
 - Parse quoted attribute selector value containing comma (#1323)
 - Allow comma in selectors (e.g. `:not(html, body)`) (#1293)
 - Set line number when `RuleSet::addRule()` called with only column number set

src/RuleSet/DeclarationBlock.php

@@ -60,8 +60,9 @@ public static function parse(ParserState $oParserState, $oList = null)
             $selectors = [];
             $selectorParts = [];
             $stringWrapperCharacter = null;
+            $functionNestingLevel = 0;
             $consumedNextCharacter = false;
-            static $stopCharacters = ['{', '}', '\'', '"', ','];
+            static $stopCharacters = ['{', '}', '\'', '"', '(', ')', ','];
             do {
                 if (!$consumedNextCharacter) {
                     $selectorParts[] = $oParserState->consume(1);
@@ -81,8 +82,21 @@ public static function parse(ParserState $oParserState, $oList = null)
                             }
                         }
                         break;
-                    case ',':
+                    case '(':
                         if (!\is_string($stringWrapperCharacter)) {
+                            ++$functionNestingLevel;
+                        }
+                        break;
+                    case ')':
+                        if (!\is_string($stringWrapperCharacter)) {
+                            if ($functionNestingLevel <= 0) {
+                                throw new UnexpectedTokenException('anything but', ')');
+                            }
+                            --$functionNestingLevel;
+                        }
+                        break;
+                    case ',':
+                        if (!\is_string($stringWrapperCharacter) && $functionNestingLevel === 0) {
                             $selectors[] = \implode('', $selectorParts);
                             $selectorParts = [];
                             $oParserState->consume(1);
@@ -91,6 +105,9 @@ public static function parse(ParserState $oParserState, $oList = null)
                         break;
                 }
             } while (!\in_array($nextCharacter, ['{', '}'], true) || \is_string($stringWrapperCharacter));
+            if ($functionNestingLevel !== 0) {
+                throw new UnexpectedTokenException(')', $nextCharacter);
+            }
             $selectors[] = \implode('', $selectorParts); // add final or only selector
             $oResult->setSelectors($selectors, $oList);
             if ($oParserState->comes('{')) {

tests/Unit/RuleSet/DeclarationBlockTest.php

@@ -58,6 +58,7 @@ public static function provideSelector(): array
             'pseudo-class' => [':hover'],
             'type & pseudo-class' => ['a:hover'],
             '`not`' => [':not(#your-mug)'],
+            '`not` with multiple arguments' => [':not(#your-mug, .their-mug)'],
             'pseudo-element' => ['::before'],
             'attribute with `"`' => ['[alt="{}()[]\\"\',"]'],
             'attribute with `\'`' => ['[alt=\'{}()[]"\\\',\']'],
@@ -105,6 +106,40 @@ public function parsesTwoCommaSeparatedSelectors(string $firstSelector, string $
         self::assertSame([$firstSelector, $secondSelector], self::getSelectorsAsStrings($subject));
     }
 
+    /**
+     * @return array<non-empty-string, array{0: non-empty-string}>
+     */
+    public static function provideInvalidSelector(): array
+    {
+        // TODO: the `parse` method consumes the first character without inspection,
+        // so the 'lone' test strings are prefixed with a space.
+        return [
+            'lone `(`' => [' ('],
+            'lone `)`' => [' )'],
+            'unclosed `(`' => [':not(#your-mug'],
+            'extra `)`' => [':not(#your-mug))'],
+        ];
+    }
+
+    /**
+     * @test
+     *
+     * @param non-empty-string $selector
+     *
+     * @dataProvider provideInvalidSelector
+     */
+    public function parseSkipsBlockWithInvalidSelector(string $selector): void
+    {
+        static $nextCss = ' .next {}';
+        $css = $selector . ' {}' . $nextCss;
+        $parserState = new ParserState($css, Settings::create());
+
+        $subject = DeclarationBlock::parse($parserState);
+
+        self::assertNull($subject);
+        self::assertTrue($parserState->comes($nextCss));
+    }
+
     /**
      * @return array<string>
      */