Decoder: fixed JSON parsing with \n before comma

nette · Apr 28, 2024 · 8e38e87 · 8e38e87
1 parent 1e453c4
commit 8e38e87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Neon/Parser.php b/src/Neon/Parser.php
@@ -211,12 +211,12 @@ private function parseBraces(): Node\InlineArrayNode
 
 		$this->injectPos($item, $item->startTokenPos, $item->value->endTokenPos);
 
-		if ($this->tokens->consume(',', Token::Newline)) {
-			goto loop;
-		}
-
+		$old = $this->tokens->getPos();
 		while ($this->tokens->consume(Token::Newline));
-		if (!$this->tokens->isNext($endBrace)) {
+		$this->tokens->consume(',');
+		if ($old !== $this->tokens->getPos()) {
+			goto loop;
+		} elseif (!$this->tokens->isNext($endBrace)) {
 			$this->tokens->error();
 		}
 

diff --git a/tests/Neon/Decoder.inline.array.phpt b/tests/Neon/Decoder.inline.array.phpt
@@ -66,3 +66,7 @@ Assert::same(
 
 // JSON compatibility
 Assert::same(['a' => true], Neon::decode('{"a":true}'));
+Assert::same([1, 2], Neon::decode('[1,2]'));
+Assert::same([1, 2], Neon::decode("[1\n,2]"));
+Assert::same([1, 2], Neon::decode("[1,\n2]"));
+Assert::same([1, 2], Neon::decode("[1\n,\n2]"));