From 9014daedbbb0630ee438ab64302dd0e0697759ba Mon Sep 17 00:00:00 2001
From: Kendall Condon <goon.pri.low@gmail.com>
Date: Mon, 28 Jul 2025 14:07:46 -0400
Subject: [PATCH] zig fmt: properly check escape sequences

---
 lib/std/zig/Ast/Render.zig  |  2 +-
 lib/std/zig/parser_test.zig | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/std/zig/Ast/Render.zig b/lib/std/zig/Ast/Render.zig
index a501b21d102681d0f4905888753f4241112da2db..85ff1993a1a4458b108f020a029b7a7ff43d8426 100644
--- a/lib/std/zig/Ast/Render.zig
+++ b/lib/std/zig/Ast/Render.zig
@@ -3167,7 +3167,7 @@ fn renderIdentifier(r: *Render, token_index: Ast.TokenIndex, space: Space, quote
                     },
                     .failure => return renderQuotedIdentifier(r, token_index, space, false),
                 }
-                contents_i += esc_offset;
+                contents_i = esc_offset;
                 continue;
             },
             else => return renderQuotedIdentifier(r, token_index, space, false),
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
index 800caf0e9474e12c443f320611dd6478046955a9..ac3a52dfd41c97a12c1bf544d271de899a3c117b 100644
--- a/lib/std/zig/parser_test.zig
+++ b/lib/std/zig/parser_test.zig
@@ -6086,6 +6086,16 @@ test "zig fmt: seperate errors in error sets with comments" {
     );
 }
 
+test "zig fmt: proper escape checks" {
+    try testTransform(
+        \\@"\x41\x42\!"
+        \\
+    ,
+        \\@"AB\\!"
+        \\
+    );
+}
+
 test "zig fmt: field accesses on number literals" {
     try testCanonical(
         \\const a = 0xF .A;
-- 
2.54.0