Match selectors with comments or quoted strings

Author: raxbg

lib/Sabberworm/CSS/Property/Selector.php

@@ -38,7 +38,7 @@ class Selector {
 	/ix';
 
 	const SELECTOR_VALIDATION_RX = '/
-	^((?:[a-zA-Z0-9\x{00A0}-\x{FFFF}_\^\$\|\*\=\"\'\~\[\]\(\)\-\s\.:#\+\>]*(?:\\\\.)?)*|\s*?[\+-]?\d+\%\s*)$
+	^((?:[a-zA-Z0-9\x{00A0}-\x{FFFF}_\^\$\|\*\=\"\'\~\[\]\(\)\-\s\.:#\+\>]*(?:\\\\.)?(?:\'.*?\')?(?:\".*?\")?)*|\s*?[\+-]?\d+\%\s*)$
 	/ux';
 
 	private $sSelector;
@@ -50,7 +50,7 @@ public static function isValid($sSelector) {
 
 	public function __construct($sSelector, $bCalculateSpecificity = false) {
 		if (!Selector::isValid($sSelector)) {
-			throw new UnexpectedTokenException("Selector did not match '{self::SELECTOR_VALIDATION_RX}'.", $sSelector, "custom");
+			throw new UnexpectedTokenException("Selector did not match '" . self::SELECTOR_VALIDATION_RX . "'.", $sSelector, "custom");
 		}
 		$this->setSelector($sSelector);
 		if ($bCalculateSpecificity) {

lib/Sabberworm/CSS/RuleSet/DeclarationBlock.php

@@ -30,7 +30,19 @@ public static function parse(ParserState $oParserState) {
 		$aComments = array();
 		$oResult = new DeclarationBlock($oParserState->currentLine());
 		try {
-			$oResult->setSelector($oParserState->consume(1) . $oParserState->consumeUntil(array('{', '}'), false, false, $aComments));
+			$aSelectorParts = array();
+			$sStringWrapperChar = false;
+			do {
+				$aSelectorParts[] = $oParserState->consume(1) . $oParserState->consumeUntil(array('{', '}', '\'', '"'), false, false, $aComments);
+				if ( in_array($oParserState->peek(), array('\'', '"')) && substr(end($aSelectorParts), -1) != "\\" ) {
+					if ( $sStringWrapperChar === false ) {
+						$sStringWrapperChar = $oParserState->peek();
+					} else if ($sStringWrapperChar == $oParserState->peek()) {
+						$sStringWrapperChar = false;
+					}
+				}
+			} while (!in_array($oParserState->peek(), array('{', '}')) || $sStringWrapperChar !== false);
+			$oResult->setSelector(implode('', $aSelectorParts));
 			if ($oParserState->comes('{')) {
 				$oParserState->consume(1);
 			}

tests/Sabberworm/CSS/ParserTest.php

@@ -465,6 +465,14 @@ function testSelectorEscapesInFile() {
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
+	function testSelectorIgnoresInFile() {
+		$oDoc = $this->parsedStructureForFile('selector-ignores', Settings::create()->withMultibyteSupport(true));
+		$sExpected = '.some[selectors-may=\'contain-a-{\'] {}
+.this-selector  .valid {width: 100px;}
+@media only screen and (min-width: 200px) {.test {prop: val;}}';
+		$this->assertSame($sExpected, $oDoc->render());
+	}
+
 	/**
 	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
 	*/