[BUGFIX] Parse comment(s) immediately preceding selector - part 2

Author: JakeQZ

src/CSSList/CSSList.php

@@ -72,9 +72,15 @@ public static function parseList(ParserState $parserState, CSSList $list): void
             $listItem = null;
             if ($usesLenientParsing) {
                 try {
+                    $positionBeforeParse = $parserState->currentColumn();
                     $listItem = self::parseListItem($parserState, $list);
                 } catch (UnexpectedTokenException $e) {
                     $listItem = false;
+                    // If the failed parsing did not consume anything ...
+                    if ($parserState->currentColumn() === $positionBeforeParse) {
+                        // ... the unexpected token needs to be skipped, otherwise there'll be an infinite loop.
+                        $parserState->consume(1);
+                    }
                 }
             } else {
                 $listItem = self::parseListItem($parserState, $list);

src/RuleSet/DeclarationBlock.php

@@ -75,7 +75,7 @@ public static function parse(ParserState $parserState, ?CSSList $list = null): ?
         } catch (UnexpectedTokenException $e) {
             if ($parserState->getSettings()->usesLenientParsing()) {
                 if (!$parserState->consumeIfComes('}')) {
-                    $parserState->consumeUntil('}', false, true);
+                    $parserState->consumeUntil(['}', ParserState::EOF], false, true);
                 }
                 return null;
             } else {
@@ -307,7 +307,6 @@ private static function parseSelector(ParserState $parserState, array &$comments
         static $stopCharacters = ['{', '}', '\'', '"', '(', ')', ','];
 
         while (true) {
-            $selectorParts[] = $parserState->consume(1);
             $selectorParts[] = $parserState->consumeUntil($stopCharacters, false, false, $comments);
             $nextCharacter = $parserState->peek();
             switch ($nextCharacter) {
@@ -348,12 +347,18 @@ private static function parseSelector(ParserState $parserState, array &$comments
                     }
                     break;
             }
+            $selectorParts[] = $parserState->consume(1);
         }
 
         if ($functionNestingLevel !== 0) {
             throw new UnexpectedTokenException(')', $nextCharacter);
         }
 
-        return \implode('', $selectorParts);
+        $selector = \implode('', $selectorParts);
+        if ($selector === '') {
+            throw new UnexpectedTokenException('selector', $nextCharacter, 'literal', $parserState->currentLine());
+        }
+
+        return $selector;
     }
 }

tests/Unit/RuleSet/DeclarationBlockTest.php

@@ -163,11 +163,9 @@ public function parsesTwoCommaSeparatedSelectors(string $firstSelector, 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 `)`' => [' )'],
+            'lone `(`' => ['('],
+            'lone `)`' => [')'],
             'unclosed `(`' => [':not(#your-mug'],
             'extra `)`' => [':not(#your-mug))'],
         ];