[CLEANUP] Extract method DeclarationBlock::parseSelector

Closes #1324

Author: JakeQZ

src/Parsing/ParserState.php

@@ -279,6 +279,27 @@ public function consume($value = 1): string
         return $result;
     }
 
+    /**
+     * If the possibly-expected next content is next, consume it.
+     *
+     * @param non-empty-string $nextContent
+     *
+     * @return bool whether the possibly-expected content was found and consumed
+     */
+    public function consumeIfComes(string $nextContent): bool
+    {
+        $length = $this->strlen($nextContent);
+        if (!$this->streql($this->substr($this->currentPosition, $length), $nextContent)) {
+            return false;
+        }
+
+        $numberOfLines = \substr_count($nextContent, "\n");
+        $this->lineNumber += $numberOfLines;
+        $this->currentPosition += $this->strlen($nextContent);
+
+        return true;
+    }
+
     /**
      * @param string $expression
      * @param int<1, max>|null $maximumLength
@@ -343,6 +364,10 @@ public function consumeUntil(
         $consumedCharacters = '';
         $start = $this->currentPosition;
 
+        $comment = $this->consumeComment();
+        if ($comment instanceof Comment) {
+            $comments[] = $comment;
+        }
         while (!$this->isEnd()) {
             $character = $this->consume(1);
             if (\in_array($character, $stopCharacters, true)) {

src/RuleSet/DeclarationBlock.php

@@ -283,19 +283,33 @@ public function render(OutputFormat $outputFormat): string
     private static function parseSelectors(ParserState $parserState, array &$comments = []): array
     {
         $selectors = [];
+
+        while (true) {
+            $selectors[] = self::parseSelector($parserState, $comments);
+            if (!$parserState->consumeIfComes(',')) {
+                break;
+            }
+        }
+
+        return $selectors;
+    }
+
+    /**
+     * @param list<Comment> $comments
+     *
+     * @throws UnexpectedTokenException
+     */
+    private static function parseSelector(ParserState $parserState, array &$comments = []): string
+    {
         $selectorParts = [];
         $stringWrapperCharacter = null;
         $functionNestingLevel = 0;
-        $consumedNextCharacter = false;
         static $stopCharacters = ['{', '}', '\'', '"', '(', ')', ','];
 
-        do {
-            if (!$consumedNextCharacter) {
-                $selectorParts[] = $parserState->consume(1);
-            }
+        while (true) {
+            $selectorParts[] = $parserState->consume(1);
             $selectorParts[] = $parserState->consumeUntil($stopCharacters, false, false, $comments);
             $nextCharacter = $parserState->peek();
-            $consumedNextCharacter = false;
             switch ($nextCharacter) {
                 case '\'':
                     // The fallthrough is intentional.
@@ -321,22 +335,24 @@ private static function parseSelectors(ParserState $parserState, array &$comment
                         --$functionNestingLevel;
                     }
                     break;
+                case '{':
+                case '}':
+                    if (!\is_string($stringWrapperCharacter)) {
+                        break 2;
+                    }
+                    break;
                 case ',':
                     if (!\is_string($stringWrapperCharacter) && $functionNestingLevel === 0) {
-                        $selectors[] = \implode('', $selectorParts);
-                        $selectorParts = [];
-                        $parserState->consume(1);
-                        $consumedNextCharacter = true;
+                        break 2;
                     }
                     break;
             }
-        } while (!\in_array($nextCharacter, ['{', '}'], true) || \is_string($stringWrapperCharacter));
+        }
 
         if ($functionNestingLevel !== 0) {
             throw new UnexpectedTokenException(')', $nextCharacter);
         }
-        $selectors[] = \implode('', $selectorParts); // add final or only selector
 
-        return $selectors;
+        return \implode('', $selectorParts);
     }
 }

tests/ParserTest.php

@@ -1048,10 +1048,9 @@ public function commentExtracting(): void
         $fooBarBlock = $nodes[1];
         self::assertInstanceOf(Commentable::class, $fooBarBlock);
         $fooBarBlockComments = $fooBarBlock->getComments();
-        // TODO Support comments in selectors.
-        // $this->assertCount(2, $fooBarBlockComments);
-        // $this->assertSame("* Number 4 *", $fooBarBlockComments[0]->getComment());
-        // $this->assertSame("* Number 5 *", $fooBarBlockComments[1]->getComment());
+        self::assertCount(2, $fooBarBlockComments);
+        self::assertSame(' Number 4 ', $fooBarBlockComments[0]->getComment());
+        self::assertSame(' Number 5 ', $fooBarBlockComments[1]->getComment());
 
         // Declaration rules.
         self::assertInstanceOf(DeclarationBlock::class, $fooBarBlock);