fix formatting when there is content inside of multiple tight tags (#68)

Andrew-LLL1210 · web-flow · commit 9db535ceb8cd · 2025-09-14T23:11:26.000+02:00
* properly indent content inside multiple tight tags

* all tests passing again
diff --git a/src/html/Ast.zig b/src/html/Ast.zig
@@ -992,9 +992,14 @@ pub fn render(ast: Ast, src: []const u8, w: *Writer) !void {
                     }
                 }
 
+                const child_is_vertical = if (ast.child(current)) |c|
+                    (c.kind == .text or c.open.start - current.open.end > 0)
+                else
+                    false;
                 if (!current.self_closing and
                     current.kind.isElement() and
-                    !current.kind.isVoid())
+                    !current.kind.isVoid() and
+                    child_is_vertical)
                 {
                     indentation += 1;
                 }
@@ -1017,9 +1022,14 @@ pub fn render(ast: Ast, src: []const u8, w: *Writer) !void {
                     current,
                 });
 
+                const child_was_vertical = if (ast.child(current)) |c|
+                    (c.kind == .text or c.open.start - current.open.end > 0)
+                else
+                    false;
                 if (!current.self_closing and
                     current.kind.isElement() and
-                    !current.kind.isVoid())
+                    !current.kind.isVoid() and
+                    child_was_vertical)
                 {
                     indentation -= 1;
                 }
@@ -1197,7 +1207,11 @@ pub fn render(ast: Ast, src: []const u8, w: *Writer) !void {
 
                     // if (std.mem.eql(u8, name, "path")) @breakpoint();
 
-                    const attr_indent = indentation - @intFromBool(!current.kind.isVoid() and !current.self_closing);
+                    const child_is_vertical = if (ast.child(current)) |c|
+                        (c.kind == .text or c.open.start - current.open.end > 0)
+                    else
+                        false;
+                    const attr_indent = indentation - @intFromBool(!current.kind.isVoid() and !current.self_closing and child_is_vertical);
                     const extra = blk: {
                         if (current.kind == .doctype) break :blk 1;
                         assert(current.kind.isElement());
@@ -1650,6 +1664,25 @@ test "newlines" {
     try std.testing.expectFmt(expected, "{f}", .{ast.formatter(case)});
 }
 
+test "tight tags inner indentation" {
+    const case = comptime std.fmt.comptimePrint(
+        \\<!DOCTYPE html>
+        \\<html>
+        \\{0c}<head></head>
+        \\{0c}<body>
+        \\{0c}{0c}<div><nav><ul>
+        \\{0c}{0c}{0c}<li></li>
+        \\{0c}{0c}</ul></nav></div>
+        \\{0c}</body>
+        \\</html>
+        \\
+    , .{'\t'});
+    const ast = try Ast.init(std.testing.allocator, case, .html, true);
+    defer ast.deinit(std.testing.allocator);
+
+    try std.testing.expectFmt(case, "{f}", .{ast.formatter(case)});
+}
+
 test "bad html" {
     // TODO: handle ast.errors.len != 0
     if (true) return error.SkipZigTest;
