From 4a88f460c4e505deeca7e4fea4135e958be06c74 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Tue, 17 Mar 2026 08:56:48 -0700
Subject: [PATCH] terminal/tmux: stylistic cleanups

---
 src/terminal/tmux/control.zig | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/terminal/tmux/control.zig b/src/terminal/tmux/control.zig
index f68a748f1..3b94eb16b 100644
--- a/src/terminal/tmux/control.zig
+++ b/src/terminal/tmux/control.zig
@@ -48,11 +48,6 @@ pub const Parser = struct {
         block,
     };
 
-    const BlockTerminator = enum {
-        end,
-        err,
-    };
-
     pub fn deinit(self: *Parser) void {
         // If we're in a broken state, we already deinited
         // the buffer, so we don't need to do anything.
@@ -122,16 +117,22 @@ pub const Parser = struct {
                 const line = written[idx..];
 
                 if (parseBlockTerminator(line)) |terminator| {
-                    const err = terminator == .err;
-                    const output = std.mem.trimRight(u8, written[0..idx], "\r\n");
-
-                    // If it is an error then log it.
-                    if (err) log.warn("tmux control mode error={s}", .{output});
+                    const output = std.mem.trimRight(
+                        u8,
+                        written[0..idx],
+                        "\r\n",
+                    );
 
                     // Important: do not clear buffer since the notification
                     // contains it.
                     self.state = .idle;
-                    return if (err) .{ .block_err = output } else .{ .block_end = output };
+                    switch (terminator) {
+                        .end => return .{ .block_end = output },
+                        .err => {
+                            log.warn("tmux control mode error={s}", .{output});
+                            return .{ .block_err = output };
+                        },
+                    }
                 }
 
                 // Didn't end the block, continue accumulating.
@@ -147,6 +148,8 @@ pub const Parser = struct {
 
     const ParseError = error{RegexError};
 
+    const BlockTerminator = enum { end, err };
+
     /// Block payload is raw data, so a line only terminates a block if it
     /// exactly matches tmux's `%end`/`%error` guard-line shape.
     fn parseBlockTerminator(line_raw: []const u8) ?BlockTerminator {
@@ -169,6 +172,9 @@ pub const Parser = struct {
         const flags = fields.next() orelse return null;
         const extra = fields.next();
 
+        // In the future, we should compare these to the %begin block
+        // because the tmux source guarantees that these always match and
+        // that is a more robust way to match.
         _ = std.fmt.parseInt(usize, time, 10) catch return null;
         _ = std.fmt.parseInt(usize, command_id, 10) catch return null;
         _ = std.fmt.parseInt(usize, flags, 10) catch return null;