Fixed Unit testing + Fixed issue when unit testing + added empty line between comments except last one

Author: Ruud68

src/CSSList/CSSList.php

@@ -69,8 +69,11 @@ public static function parseList(ParserState $oParserState, CSSList $oList)
             $oParserState = new ParserState($oParserState, Settings::create());
         }
         $bLenientParsing = $oParserState->getSettings()->bLenientParsing;
+        $comments=[];
         while (!$oParserState->isEnd()) {
-            $comments = $oParserState->consumeWhiteSpace();
+            if (empty($comments)) {
+                $comments = $oParserState->consumeWhiteSpace();
+            }
             $oListItem = null;
             if ($bLenientParsing) {
                 try {
@@ -89,6 +92,7 @@ public static function parseList(ParserState $oParserState, CSSList $oList)
                 $oListItem->setComments($comments);
                 $oList->append($oListItem);
             }
+            $comments = $oParserState->consumeWhiteSpace();
         }
         if (!$bIsRoot && !$bLenientParsing) {
             throw new SourceException("Unexpected end of document", $oParserState->currentLine());
@@ -413,11 +417,15 @@ public function render(OutputFormat $oOutputFormat)
             $sRendered = $oOutputFormat->safely(function () use ($oNextLevel, $oContent) {
                 $sResult = '';
                 $aComments = $oContent->getComments();
+                $c = count($aComments);
 
-                foreach ($aComments as $oComment)
+                foreach ($aComments as $i => $oComment)
                 {
                     $sResult .= $oComment->render($oNextLevel);
                     $sResult .= $oNextLevel->spaceAfterBlocks();
+                    if ($c-1 !== $i) {
+                        $sResult .= $oNextLevel->spaceAfterBlocks();
+                    }
                 }
                 return $sResult . $oContent->render($oNextLevel);
             });

src/Rule/Rule.php

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

src/RuleSet/RuleSet.php

@@ -275,11 +275,15 @@ public function render(OutputFormat $oOutputFormat)
                 $sRendered = $oOutputFormat->safely(function () use ($oRule, $oOutputFormat) {
                     $sResult = '';
                     $aComments = $oRule->getComments();
+                    $c = count($aComments);
 
-                    foreach ($aComments as $oComment)
+                    foreach ($aComments as $i => $oComment)
                     {
                         $sResult .= $oComment->render($oOutputFormat);
                         $sResult .= $oOutputFormat->nextLevel()->spaceBeforeRules();
+                        if ($c-1 !== $i) {
+                            $sResult .= $oOutputFormat->nextLevel()->spaceBeforeRules();
+                        }
                     }
                     return $sResult . $oRule->render($oOutputFormat->nextLevel());
                 });

tests/ParserTest.php

@@ -309,7 +309,17 @@ public function manipulation()
             . "\n"
             . '               domain(mozilla.org),'
             . "\n"
-            . '               regexp("https:.*") {body {color: purple;background: yellow;}}'
+            . '               regexp("https:.*") {/* CSS rules here apply to:'
+            . "\n"
+            . '     + The page "https://www.w3.org/".'
+            . "\n"
+            . '     + Any page whose URL begins with "https://www.w3.org/Style/"'
+            . "\n"
+            . '     + Any page whose URL\'s host is "mozilla.org" or ends with'
+            . "\n"
+            . '       ".mozilla.org"'
+            . "\n"
+            . '     + Any page whose URL starts with "https:" *//* make the above-mentioned pages really ugly */body {color: purple;background: yellow;}}'
             . "\n"
             . '@media screen and (orientation: landscape) {@-ms-viewport {width: 1024px;height: 768px;}}'
             . "\n"
@@ -348,7 +358,17 @@ public function manipulation()
             . "\n"
             . '               domain(mozilla.org),'
             . "\n"
-            . '               regexp("https:.*") {#my_id body {color: purple;background: yellow;}}'
+            . '               regexp("https:.*") {/* CSS rules here apply to:'
+            . "\n"
+            . '     + The page "https://www.w3.org/".'
+            . "\n"
+            . '     + Any page whose URL begins with "https://www.w3.org/Style/"'
+            . "\n"
+            . '     + Any page whose URL\'s host is "mozilla.org" or ends with'
+            . "\n"
+            . '       ".mozilla.org"'
+            . "\n"
+            . '     + Any page whose URL starts with "https:" *//* make the above-mentioned pages really ugly */#my_id body {color: purple;background: yellow;}}'
             . "\n"
             . '@media screen and (orientation: landscape) {@-ms-viewport {width: 1024px;height: 768px;}}'
             . "\n"
@@ -532,9 +552,9 @@ public function createShorthands()
     public function namespaces()
     {
         $oDoc = $this->parsedStructureForFile('namespaces');
-        $sExpected = '@namespace toto "http://toto.example.org";
+        $sExpected = '/* From the spec at https://www.w3.org/TR/css3-namespace/ */@namespace toto "http://toto.example.org";
 @namespace "http://example.com/foo";
-@namespace foo url("http://www.example.com/");
+/* From an introduction at https://www.blooberry.com/indexdot/css/syntax/atrules/namespace.htm */@namespace foo url("http://www.example.com/");
 @namespace foo url("http://www.example.com/");
 foo|test {gaga: 1;}
 |test {gaga: 2;}';
@@ -626,9 +646,13 @@ public function selectorRemoval()
     public function comments()
     {
         $oDoc = $this->parsedStructureForFile('comments');
-        $sExpected = '@import url("some/url.css") screen;
-.foo, #bar {background-color: #000;}
-@media screen {#foo.bar {position: absolute;}}';
+        $sExpected = <<<EXPECTED
+/**
+ * Comments Hell.
+ */@import url("some/url.css") screen;
+.foo, #bar {/* Number 6 */background-color: #000;}
+@media screen {/** Number 10 **/#foo.bar {/** Number 10b **/position: absolute;}}
+EXPECTED;
         self::assertSame($sExpected, $oDoc->render());
     }