User parseIdentifier() for line name parsing

Author: raxbg

lib/Sabberworm/CSS/Parser.php

@@ -485,14 +485,19 @@ private function parseNumericValue($bForColor = false) {
 
 	private function parseLineNameValue() {
 		$this->consume('[');
-		$this->consumeWhiteSpace();
 		$sName = '';
-		while(!$this->comes(']')) {
-			$sName .= $this->parseCharacter(true);
+		try {
+			do {
+				$this->consumeWhiteSpace();
+				$sName .= $this->parseIdentifier(false, true) . ' ';
+			} while (!$this->comes(']'));
+		} catch (UnexpectedTokenException $e) {
+			if(!$this->oParserSettings->bLenientParsing && (!$sName || !$this->comes(']'))) {// This handles constructs like this [ linename ] in non lenient mode
+				throw $e;
+			}
 		}
-		$this->consumeWhiteSpace();
 		$this->consume(']');
-		return new LineName($sName, $this->iLineNo);
+		return new LineName(rtrim($sName), $this->iLineNo);
 	}
 
 	private function parseColorValue() {

tests/Sabberworm/CSS/ParserTest.php

@@ -396,10 +396,23 @@ function testCalcInFile() {
 
 	function testGridLineNameInFile() {
 		$oDoc = $this->parsedStructureForFile('grid-linename', Settings::create()->withMultibyteSupport(true));
-		$sExpected = '.test {grid-template-columns: [linename] 100px;}';
+		$sExpected = "div {grid-template-columns: [linename] 100px;}\nspan {grid-template-columns: [linename1 linename2] 100px;}";
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
+	function testEmptyGridLineNameLenientInFile() {
+		$oDoc = $this->parsedStructureForFile('empty-grid-linename');
+		$sExpected = '.test {grid-template-columns: [] 100px;}';
+		$this->assertSame($sExpected, $oDoc->render());
+	}
+
+	/**
+	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
+	*/
+	function testLineNameFailure() {
+		$this->parsedStructureForFile('-empty-grid-linename', Settings::create()->withLenientParsing(false));
+	}
+
 	/**
 	* @expectedException Sabberworm\CSS\Parsing\UnexpectedTokenException
 	*/

tests/files/-empty-grid-linename.css

@@ -0,0 +1 @@
+.test { grid-template-columns: [] 100px; }

tests/files/empty-grid-linename.css

@@ -0,0 +1 @@
+.test { grid-template-columns: [] 100px; }

tests/files/grid-linename.css

@@ -1 +1,2 @@
-.test { grid-template-columns: [linename] 100px; }
+div { grid-template-columns: [ linename ] 100px; }
+span { grid-template-columns: [ linename1 linename2 ] 100px; }