Fix comments being omitted in the middle of a rule

Also fixes comments between CSSLists.

Author: scq

src/CSSList/CSSList.php

@@ -89,7 +89,7 @@ public static function parseList(ParserState $oParserState, CSSList $oList)
                 $oListItem->setComments($comments);
                 $oList->append($oListItem);
             }
-            $oParserState->consumeWhiteSpace();
+            $oParserState->consumeWhiteSpace(false);
         }
         if (!$bIsRoot && !$bLenientParsing) {
             throw new SourceException("Unexpected end of document", $oParserState->currentLine());

src/Parsing/ParserState.php

@@ -197,18 +197,22 @@ public function parseCharacter($bIsForIdentifier)
     }
 
     /**
+     * @param bool $consumeComments
      * @return array<int, Comment>|void
      *
      * @throws UnexpectedEOFException
      * @throws UnexpectedTokenException
      */
-    public function consumeWhiteSpace()
+    public function consumeWhiteSpace($consumeComments = true)
     {
         $comments = [];
         do {
             while (preg_match('/\\s/isSu', $this->peek()) === 1) {
                 $this->consume(1);
             }
+            if (!$consumeComments) {
+                return;
+            }
             if ($this->oParserSettings->bLenientParsing) {
                 try {
                     $oComment = $this->consumeComment();

src/Rule/Rule.php

@@ -106,7 +106,7 @@ public static function parse(ParserState $oParserState)
         while ($oParserState->comes(';')) {
             $oParserState->consume(';');
         }
-        $oParserState->consumeWhiteSpace();
+        $oParserState->consumeWhiteSpace(false);
 
         return $oRule;
     }

tests/ParserTest.php

@@ -1120,6 +1120,19 @@ public function flatCommentExtracting()
         self::assertSame("Find Me!", $comments[0]->getComment());
     }
 
+    /**
+     * @test
+     */
+    public function testInnerCommentExtracting() {
+        $parser = new Parser('div {left:10px;/*Find Me!*/text-align:left;}');
+        $doc = $parser->parse();
+        $contents = $doc->getContents();
+        $divRules = $contents[0]->getRules();
+        $comments = $divRules[1]->getComments();
+        $this->assertCount(1, $comments);
+        $this->assertEquals("Find Me!", $comments[0]->getComment());
+    }
+
     /**
      * @test
      */