PhpWriter::removeCommentsPass() replaces comment with space to preven…

…t unwanted result ie. 'a/**/b' will not result to 'ab'
nette · Nov 26, 2021 · d8a4621 · d8a4621
1 parent ad5f99e
commit d8a4621
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
@@ -274,9 +274,7 @@ public function removeCommentsPass(MacroTokens $tokens): MacroTokens
 	{
 		$res = new MacroTokens;
 		while ($tokens->nextToken()) {
-			if (!$tokens->isCurrent($tokens::T_COMMENT)) {
-				$res->append($tokens->currentToken());
-			}
+			$res->append($tokens->isCurrent($tokens::T_COMMENT) ? ' ' : $tokens->currentToken());
 		}
 		return $res;
 	}

diff --git a/tests/Latte/Compiler.special.phpt b/tests/Latte/Compiler.special.phpt
@@ -33,3 +33,8 @@ Assert::match(
 	'%A%echo LR\Filters::escapeHtmlText(test(fn () => 1))%A%',
 	$latte->compile('{test(fn () => 1)}')
 );
+
+Assert::match(
+	"%A%('foo')/ **/('bar')%A%",
+	$latte->compile('{(foo)//**/**/(bar)}')
+);
diff --git a/tests/Latte/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt
@@ -87,10 +87,11 @@ test('special', function () {
 	Assert::same("'symbol' => \$this->var, ", formatArgs('symbol => $this -> var, '));
 	Assert::same("'symbol' => \$this->VAR, ", formatArgs('symbol => $this -> VAR, '));
 	Assert::same("'symbol' => \$this->var", formatArgs('symbol => $this -> var'));
-	Assert::same("'symbol1' => 'value'", formatArgs('symbol1 => /*value,* /symbol2=>*/value/**/'));
+	Assert::same("'symbol1' =>  'value' ", formatArgs('symbol1 => /*value,* /symbol2=>*/value/**/'));
 	Assert::same('(array)', formatArgs('(array)'));
 	Assert::same('func()[1]', formatArgs('func()[1]'));
 	Assert::same('$var = match(7) {8 => true, default => false,}', formatArgs('$var = match(7) {8 => true, default => false,}'));
+	Assert::same('a b', formatArgs('a/**/b'));
 });