From 886cf73f8887ba9c905d1782e31102e07dd5e8bd Mon Sep 17 00:00:00 2001
From: 87flowers <87flowers@noreply.codeberg.org>
Date: Tue, 15 Oct 2024 16:16:36 +0100
Subject: [PATCH] std/render: Prefer wrapping with push/pop instead of using
 pushIndentOneShot

---
 lib/std/zig/render.zig | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
index c78a8cb07dfe..5e89df5866a4 100644
--- a/lib/std/zig/render.zig
+++ b/lib/std/zig/render.zig
@@ -454,8 +454,9 @@ fn renderExpression(r: *Render, node: Ast.Node.Index, space: Space) Error!void {
                 try renderToken(r, main_token, after_op_space); // catch keyword
             }
 
-            ais.pushIndentOneShot();
+            ais.pushIndent();
             try renderExpression(r, datas[node].rhs, space); // fallback
+            ais.popIndent();
         },
 
         .field_access => {
@@ -564,8 +565,9 @@ fn renderExpression(r: *Render, node: Ast.Node.Index, space: Space) Error!void {
                 try renderToken(r, op_token, .newline);
                 ais.popIndent();
             }
-            ais.pushIndentOneShot();
-            return renderExpression(r, infix.rhs, space);
+            ais.pushIndent();
+            try renderExpression(r, infix.rhs, space);
+            ais.popIndent();
         },
 
         .assign_destructure => {
@@ -594,8 +596,9 @@ fn renderExpression(r: *Render, node: Ast.Node.Index, space: Space) Error!void {
                 try renderToken(r, full.ast.equal_token, .newline);
                 ais.popIndent();
             }
-            ais.pushIndentOneShot();
-            return renderExpression(r, full.ast.value_expr, space);
+            ais.pushIndent();
+            try renderExpression(r, full.ast.value_expr, space);
+            ais.popIndent();
         },
 
         .bit_not,
@@ -1243,8 +1246,9 @@ fn renderVarDeclWithoutFixups(
         try renderToken(r, eq_token, eq_space); // =
         ais.popIndent();
     }
-    ais.pushIndentOneShot();
-    return renderExpression(r, var_decl.ast.init_node, space); // ;
+    ais.pushIndent();
+    try renderExpression(r, var_decl.ast.init_node, space); // ;
+    ais.popIndent();
 }
 
 fn renderIf(r: *Render, if_node: Ast.full.If, space: Space) Error!void {