[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);
@@ -133,7 +139,8 @@ private static function parseListItem(ParserState $parserState, CSSList $list)
         } elseif ($parserState->comes('}')) {
             if ($isRoot) {
                 if ($parserState->getSettings()->usesLenientParsing()) {
-                    return DeclarationBlock::parse($parserState) ?? false;
+                    $parserState->consume(1);
+                    return self::parseListItem($parserState, $list);
                 } else {
                     throw new SourceException('Unopened {', $parserState->currentLine());
                 }

src/RuleSet/DeclarationBlock.php

@@ -74,8 +74,10 @@ public static function parse(ParserState $parserState, ?CSSList $list = null): ?
             }
         } catch (UnexpectedTokenException $e) {
             if ($parserState->getSettings()->usesLenientParsing()) {
-                if (!$parserState->comes('}')) {
-                    $parserState->consumeUntil('}', false, true);
+                if ($parserState->comes('}')) {
+                    $parserState->consume(1);
+                } else {
+                    $parserState->consumeUntil(['}', ParserState::EOF], false, true);
                 }
                 return null;
             } else {
@@ -307,7 +309,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 +349,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/ParserTest.php

@@ -718,6 +718,7 @@ public function invalidSelectorsInFile(): void
         $document = self::parsedStructureForFile('invalid-selectors', Settings::create()->withMultibyteSupport(true));
         $expected = '@keyframes mymove {from {top: 0px;}}
 #test {color: white;background: green;}
+#test {display: block;background: red;color: white;}
 #test {display: block;background: white;color: black;}';
         self::assertSame($expected, $document->render());
 
@@ -727,6 +728,7 @@ public function invalidSelectorsInFile(): void
 	.super-menu > li:last-of-type {border-right-width: 0;}
 	html[dir="rtl"] .super-menu > li:first-of-type {border-left-width: 1px;border-right-width: 0;}
 	html[dir="rtl"] .super-menu > li:last-of-type {border-left-width: 0;}}
+.super-menu.menu-floated {border-right-width: 1px;border-left-width: 1px;border-color: #5a4242;border-style: dotted;}
 body {background-color: red;}';
         self::assertSame($expected, $document->render());
     }
@@ -740,15 +742,6 @@ public function selectorEscapesInFile(): void
         $expected = '#\\# {color: red;}
 .col-sm-1\\/5 {width: 20%;}';
         self::assertSame($expected, $document->render());
-
-        $document = self::parsedStructureForFile('invalid-selectors-2', Settings::create()->withMultibyteSupport(true));
-        $expected = '@media only screen and (max-width: 1215px) {.breadcrumb {padding-left: 10px;}
-	.super-menu > li:first-of-type {border-left-width: 0;}
-	.super-menu > li:last-of-type {border-right-width: 0;}
-	html[dir="rtl"] .super-menu > li:first-of-type {border-left-width: 1px;border-right-width: 0;}
-	html[dir="rtl"] .super-menu > li:last-of-type {border-left-width: 0;}}
-body {background-color: red;}';
-        self::assertSame($expected, $document->render());
     }
 
     /**

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))'],
         ];