[BUGFIX] Allow comma-separated arguments in selectors

Fixes #138.
Fixes #360.
Fixes #1289.

Author: JakeQZ

CHANGELOG.md

@@ -110,6 +110,8 @@ Please also have a look at our
 
 ### Fixed
 
+- Selector functions (like `:not`) with comma-separated arguments are now
+  parsed correclty (#1292)
 - Parse quoted attribute selector value containing comma (#1323)
 - Allow comma in selectors (e.g. `:not(html, body)`) (#1293)
 - Insert `Rule` before sibling even with different property name

src/Parsing/ParserState.php

@@ -345,6 +345,10 @@ public function consumeUntil(
         $start = $this->currentPosition;
 
         while (!$this->isEnd()) {
+            $comment = $this->consumeComment();
+            if ($comment instanceof Comment) {
+                $comments[] = $comment;
+            }
             $character = $this->consume(1);
             if (\in_array($character, $stopCharacters, true)) {
                 if ($includeEnd) {

src/RuleSet/DeclarationBlock.php

@@ -43,8 +43,9 @@ public static function parse(ParserState $parserState, ?CSSList $list = null): ?
             $selectors = [];
             $selectorParts = [];
             $stringWrapperCharacter = null;
+            $functionNestingLevel = 0;
             $consumedNextCharacter = false;
-            static $stopCharacters = ['{', '}', '\'', '"', ','];
+            static $stopCharacters = ['{', '}', '\'', '"', '(', ')', ','];
             do {
                 if (!$consumedNextCharacter) {
                     $selectorParts[] = $parserState->consume(1);
@@ -64,8 +65,21 @@ public static function parse(ParserState $parserState, ?CSSList $list = 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 = [];
                             $parserState->consume(1);

tests/Unit/RuleSet/DeclarationBlockTest.php

@@ -67,6 +67,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=\'{}()[]"\\\',\']'],