Handle comments glued to block and rules

Author: Frederic Massart

lib/Sabberworm/CSS/Parser.php

@@ -298,9 +298,9 @@ private function parseCharacter($bIsForIdentifier) {
 	}
 
 	private function parseSelector() {
-		$aComments = $this->consumeWhiteSpace();
+		$aComments = array();
 		$oResult = new DeclarationBlock($this->iLineNo);
-		$oResult->setSelector($this->consumeUntil('{', false, true));
+		$oResult->setSelector($this->consumeUntil('{', false, true, $aComments));
 		$oResult->setComments($aComments);
 		$this->parseRuleSet($oResult);
 		return $oResult;
@@ -608,13 +608,12 @@ private function isEnd() {
 		return $this->iCurrentPosition >= $this->iLength;
 	}
 
-	private function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false) {
+	private function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false, array &$comments = array()) {
 		$aEnd = is_array($aEnd) ? $aEnd : array($aEnd);
 		$out = '';
 		$start = $this->iCurrentPosition;
 
 		while (($char = $this->consume(1)) !== '') {
-			$this->consumeComment();
 			if (in_array($char, $aEnd)) {
 				if ($bIncludeEnd) {
 					$out .= $char;
@@ -624,6 +623,9 @@ private function consumeUntil($aEnd, $bIncludeEnd = false, $consumeEnd = false)
 				return $out;
 			}
 			$out .= $char;
+			if ($comment = $this->consumeComment()) {
+				$comments[] = $comment;
+			}
 		}
 
 		$this->iCurrentPosition = $start;

tests/Sabberworm/CSS/ParserTest.php

@@ -542,6 +542,30 @@ function testCommentExtracting() {
 		$fooBarComments = $mediaRules[0]->getComments();
 		$this->assertCount(1, $fooBarComments);
 		$this->assertEquals("* Number 10 *", $fooBarComments[0]->getComment());
+
+		// Media -> declaration -> rule.
+		$fooBarRules = $mediaRules[0]->getRules();
+		$fooBarChildComments = $fooBarRules[0]->getComments();
+		$this->assertCount(1, $fooBarChildComments);
+		$this->assertEquals("* Number 10b *", $fooBarChildComments[0]->getComment());
+	}
+
+	function testFlatCommentExtracting() {
+		$parser = new Parser('div {/*Find Me!*/left:10px; text-align:left;}');
+		$doc = $parser->parse();
+		$contents = $doc->getContents();
+		$divRules = $contents[0]->getRules();
+		$comments = $divRules[0]->getComments();
+		$this->assertCount(1, $comments);
+		$this->assertEquals("Find Me!", $comments[0]->getComment());
 	}
 
+	function testTopLevelCommentExtracting() {
+		$parser = new Parser('/*Find Me!*/div {left:10px; text-align:left;}');
+		$doc = $parser->parse();
+		$contents = $doc->getContents();
+		$comments = $contents[0]->getComments();
+		$this->assertCount(1, $comments);
+		$this->assertEquals("Find Me!", $comments[0]->getComment());
+	}
 }

tests/files/comments.css

@@ -10,6 +10,7 @@
 @media /* Number 8 */screen /* Number 9 */{
     /** Number 10 **/
     #foo.bar {
+        /** Number 10b **/
         position: absolute;/**/
     }
 }