Fix comments being omitted in the middle of a rule

MyIntervals · Sep 13, 2021 · 44c3a55 · 44c3a55
1 parent 70024fb
commit 44c3a55
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/src/CSSList/CSSList.php b/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());

diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php
@@ -2,6 +2,7 @@
 
 namespace Sabberworm\CSS\Parsing;
 
+use phpDocumentor\Reflection\Types\Boolean;
 use Sabberworm\CSS\Comment\Comment;
 use Sabberworm\CSS\Settings;
 
@@ -197,18 +198,24 @@ public function parseCharacter($bIsForIdentifier)
     }
 
     /**
+     * @param bool $consumeComments defaults to true
      * @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();

diff --git a/src/Rule/Rule.php b/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;
     }

diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -1120,6 +1120,20 @@ public function flatCommentExtracting()
         self::assertSame("Find Me!", $comments[0]->getComment());
     }
 
+    /**
+     * @test
+     */
+    public function innerCommentExtracting()
+    {
+        $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();
+        self::assertCount(1, $comments);
+        self::assertEquals("Find Me!", $comments[0]->getComment());
+    }
+
     /**
      * @test
      */