Dedent: fixed indentation preservation for paired tags inside HTML

Author: davidkrmela

src/Latte/Compiler/TemplateParser.php

@@ -513,6 +513,11 @@ private function applyDedent(FragmentNode $fragment, Tag $startTag): void
 		$baseIndent = null;
 		$atLineStart = true;
 		$inlineChecked = false;
+		$root = $startTag;
+		while ($root->parent !== null) {
+			$root = $root->parent;
+		}
+		$tagIndentLen = $root->position->column - 1;
 
 		foreach ($fragment->children as $i => $child) {
 			if ($child instanceof Nodes\TextNode && $child->content === '') {
@@ -545,12 +550,15 @@ private function applyDedent(FragmentNode $fragment, Tag $startTag): void
 					if ($hasContent) {
 						preg_match('/^([ \t]+)/', $line, $m);
 						$baseIndent = $m[1] ?? null;
-						if ($baseIndent === null) {
-							return; // first content line has no indent
+						if ($baseIndent === null || strlen($baseIndent) <= $tagIndentLen) {
+							return; // first content line has no indent beyond tag level
 						}
 
 					} elseif ($continuesWithExpr) {
 						$baseIndent = $line;
+						if (strlen($baseIndent) <= $tagIndentLen) {
+							return;
+						}
 
 					} else {
 						continue; // blank line before detection
@@ -564,7 +572,7 @@ private function applyDedent(FragmentNode $fragment, Tag $startTag): void
 					continue; // blank line, strip silently
 				}
 
-				$line = substr($line, strlen((string) $baseIndent));
+				$line = substr($line, 0, $tagIndentLen) . substr($line, strlen((string) $baseIndent));
 			}
 
 			unset($line);

tests/common/dedent.phpt

@@ -115,6 +115,18 @@ test('expressions with OutputKeepIndentation and varying indent (issue #413)', f
 });
 
 
+test('foreach inside HTML - dedents only excess indentation', function () {
+	$result = dedent("<ul>\n\t{foreach \$items as \$item}\n\t\t<li>{\$item}</li>\n\t{/foreach}\n</ul>", ['items' => ['a', 'b']]);
+	Assert::same("<ul>\n\t<li>a</li>\n\t<li>b</li>\n</ul>", $result);
+});
+
+
+test('nested foreach/if inside HTML', function () {
+	$result = dedent("<ul>\n\t{foreach [0, 1, 2] as \$item}\n\t\t{if \$item}\n\t\t\t<li>{\$item}</li>\n\t\t{/if}\n\t{/foreach}\n</ul>");
+	Assert::same("<ul>\n\t<li>1</li>\n\t<li>2</li>\n</ul>", $result);
+});
+
+
 test('inconsistent indentation throws exception', function () {
 	Assert::exception(
 		fn() => dedent("{if true}\n\tHello\nWorld\n{/if}"),