Merge pull request #132 from raxbg/grid_syntax_support

Add support for grid line names

Author: sabberworm

lib/Sabberworm/CSS/Parser.php

@@ -21,6 +21,7 @@
 use Sabberworm\CSS\Value\Color;
 use Sabberworm\CSS\Value\URL;
 use Sabberworm\CSS\Value\CSSString;
+use Sabberworm\CSS\Value\LineName;
 use Sabberworm\CSS\Rule\Rule;
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 use Sabberworm\CSS\Comment\Comment;
@@ -447,6 +448,8 @@ private function parsePrimitiveValue() {
 			$oValue = $this->parseStringValue();
 		} else if ($this->comes("progid:") && $this->oParserSettings->bLenientParsing) {
 			$oValue = $this->parseMicrosoftFilter();
+		} else if ($this->comes("[")) {
+			$oValue = $this->parseLineNameValue();
 		} else {
 			$oValue = $this->parseIdentifier(true, false);
 		}
@@ -480,6 +483,24 @@ private function parseNumericValue($bForColor = false) {
 		return new Size(floatval($sSize), $sUnit, $bForColor, $this->iLineNo);
 	}
 
+	private function parseLineNameValue() {
+		$this->consume('[');
+		$this->consumeWhiteSpace();
+		$aNames = array();
+		do {
+			if($this->oParserSettings->bLenientParsing) {
+				try {
+					$aNames[] = $this->parseIdentifier(false, true);
+				} catch(UnexpectedTokenException $e) {}
+			} else {
+				$aNames[] = $this->parseIdentifier(false, true);
+			}
+			$this->consumeWhiteSpace();
+		} while (!$this->comes(']'));
+		$this->consume(']');
+		return new LineName($aNames, $this->iLineNo);
+	}
+
 	private function parseColorValue() {
 		$aColor = array();
 		if ($this->comes('#')) {

lib/Sabberworm/CSS/Value/LineName.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Sabberworm\CSS\Value;
+
+class LineName extends ValueList {
+	public function __construct($aComponents = array(), $iLineNo = 0) {
+		parent::__construct($aComponents, ' ', $iLineNo);
+	}
+
+	public function __toString() {
+		return $this->render(new \Sabberworm\CSS\OutputFormat());
+	}
+
+	public function render(\Sabberworm\CSS\OutputFormat $oOutputFormat) {
+		return '[' . parent::render(\Sabberworm\CSS\OutputFormat::createCompact()) . ']';
+	}
+
+}

tests/Sabberworm/CSS/ParserTest.php

@@ -394,6 +394,25 @@ function testCalcInFile() {
 		$this->assertSame($sExpected, $oDoc->render());
 	}
 
+	function testGridLineNameInFile() {
+		$oDoc = $this->parsedStructureForFile('grid-linename', Settings::create()->withMultibyteSupport(true));
+		$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

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