syntax: allowed tab as separator for dashed-blocks

nette · Sep 27, 2023 · 457bfbf · 457bfbf
1 parent 5715e17
commit 457bfbf
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 5 deletions.
diff --git a/src/Neon/Parser.php b/src/Neon/Parser.php
@@ -86,9 +86,14 @@ private function parseBlock(string $indent, bool $onlyBullets = false): Node
 			} elseif ($item->key !== null && $this->tokens->isNext('-')) { // special dash subblock
 				$item->value = $this->parseBlock($indent, onlyBullets: true);
 			}
-		} elseif ($item->key === null) {
-			$item->value = $this->parseBlock($indent . '  '); // open new block after dash
-
+		} elseif ($item->key === null) {  // open new block after dash
+			$save = $this->tokens->getPos();
+			try {
+				$item->value = $this->parseBlock($indent . "\t");
+			} catch (Exception) {
+				$this->tokens->seek($save);
+				$item->value = $this->parseBlock($indent . '  ');
+			}
 		} elseif ($this->tokens->isNext()) {
 			$item->value = $this->parseValue();
 			if ($this->tokens->isNext() && !$this->tokens->isNext(Token::Newline)) {

diff --git a/src/Neon/TokenStream.php b/src/Neon/TokenStream.php
@@ -29,6 +29,12 @@ public function getPos(): int
 	}
 
 
+	public function seek(int $position): void
+	{
+		$this->pos = $position;
+	}
+
+
 	/** @return Token[] */
 	public function getTokens(): array
 	{

diff --git a/tests/Neon/Decoder.array.phpt b/tests/Neon/Decoder.array.phpt
@@ -170,6 +170,57 @@ Assert::same(
 );
 
 
+Assert::same(
+	[
+		[
+			'a' => 'b',
+			'c' => 'd',
+		],
+	],
+	Neon::decode(<<<'XX'
+		-	a: b
+			c: d
+		XX),
+);
+
+
+Assert::same(
+	[
+		[
+			'a' => 'b',
+			[
+				'c' => 'd',
+				['e' => 'f'],
+			],
+		],
+	],
+	Neon::decode(<<<'XX'
+		-	a: b
+			-	c: d
+				- e: f
+		XX),
+);
+
+
+Assert::same(
+	[
+		[
+			'a' => 'b',
+			[
+				'c' => 'd',
+				'e' => 'f',
+			],
+		],
+	],
+	Neon::decode(<<<'XX'
+		- a: b
+		  -	c: d
+		  	e: f
+		XX),
+);
+
+
+
 Assert::same(
 	[
 		'root' => [['key1' => null, 'key3' => 123]],

diff --git a/tests/Neon/fixtures/Parser.nodes.neon b/tests/Neon/fixtures/Parser.nodes.neon
@@ -18,7 +18,7 @@ third:
   b: 2
 
 -
-  - c
+	- c
 
 dash subblock:
 - a

diff --git a/tests/Neon/fixtures/Parser.nodes.txt b/tests/Neon/fixtures/Parser.nodes.txt
@@ -467,7 +467,7 @@ Nette\Neon\Node\BlockArrayNode
    |  |  key: null
    |  |  value: Nette\Neon\Node\BlockArrayNode
    |  |  |  code: '- c'
-   |  |  |  indentation: '  '
+   |  |  |  indentation: '\t    '
    |  |  |  items: array (1)
    |  |  |  |  0 => Nette\Neon\Node\ArrayItemNode
    |  |  |  |  |  code: '- c'