Zig has textobjects: helix's query, ported to the zig grammar pardes builds

pardes builds maxxnino/tree-sitter-zig, whose node names are not those of
the grammar helix's query targets, so the query is ported by hand
(vendor/queries/zig, its MPL header saying it is modified and how): a
function is a Decl holding an FnProto and a Block with pub beside it,
struct/enum/union one ContainerDecl, parameters and arguments ParamDeclList
and FnCallArguments, and comments come in three kinds. That grammar's
comments take their line's newline, and a node ending in a newline is now
taken without it, as helix's grammars have it. The replay test gains fifteen
Zig cases from the installed hx; none walks call arguments, which the
reference helix counts as parameters and 25.07.1's query does not.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

2 files changed, 24 insertions, 3 deletions

diff --git a/src/normal.zig b/src/normal.zig
index b68f9ba6..17ebaac6 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -1072,8 +1072,8 @@ test "one cursor holds no room for other ranges; a second range makes it and one
     try std.testing.expectEqual(@as(usize, 0), pane.body.sels.len);
 }
 
-test "tree-sitter textobject keys do in Python and JSON what hx 25.07.1 does" {
-    if (!syntax.supportsPath("a.py") or !syntax.supportsPath("a.json")) return;
+test "tree-sitter textobject keys do in Python, JSON and Zig what hx 25.07.1 does" {
+    if (!syntax.supportsPath("a.py") or !syntax.supportsPath("a.json") or !syntax.supportsPath("a.zig")) return;
     const gpa = std.testing.allocator;
     const p = try Pardes.init(gpa, .{ .tty_only = true, .cols = 80, .rows = 24 });
     defer p.deinit();
@@ -1097,6 +1097,24 @@ test "tree-sitter textobject keys do in Python and JSON what hx 25.07.1 does" {
         .{ .path = "/test.json", .text = "{\"a\": 1, \"b\": [1, 2]}\n", .keys = "]ed", .want = "{, \"b\": [1, 2]}\n" },
         .{ .path = "/test.json", .text = "{\"a\": 1, \"b\": [1, 2]}\n", .keys = "]e]ed", .want = "{\"a\": 1, }\n" },
         .{ .path = "/test.json", .text = "{\"a\": 1, \"b\": [1, 2]}\n", .keys = "8lmaed", .want = "{\"a\": 1,\"b\": [1, 2]}\n" },
+        // Zig: the query is helix's, ported to pardes's zig grammar. No case
+        // walks call arguments: the reference helix counts them as
+        // parameters and the installed 25.07.1's query does not.
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "]fd", .want = "const std = @import(\"std\");\n\n/// adds\n\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "5jmifd", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 \n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "5jmafd", .want = "const std = @import(\"std\");\n\n/// adds\n\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "]td", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\n\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "9jmitd", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n   x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "9jmatd", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\n\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "]Td", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\n\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "16jmiTd", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" \n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "3j11lmiad", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "3j11lmaad", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add( b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "]cd", .want = "const std = @import(\"std\");\n\n\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "4jmacd", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n   // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "16jf2[ad", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, ) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "16j[fd", .want = "const std = @import(\"std\");\n\n/// adds\n\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
+        .{ .path = "/test.zig", .text = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\nconst Color = enum { red, green };\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n", .keys = "]t]td", .want = "const std = @import(\"std\");\n\n/// adds\npub fn add(a: u32, b: u32) u32 {\n    // sum\n    return a + b;\n}\n\nconst Point = struct {\n    x: i32,\n    y: i32,\n};\n\n\n\ntest \"add works\" {\n    try std.testing.expectEqual(@as(u32, 3), add(1, 2));\n}\n" },
     }) |c| {
         const pane = try p.setTestFile(c.text);
         p.gpa.free(pane.file.?.path);
diff --git a/src/syntax.zig b/src/syntax.zig
index 3a83800b..4494945f 100644
--- a/src/syntax.zig
+++ b/src/syntax.zig
@@ -475,7 +475,10 @@ fn matchSpan(q: *const ts.Query, match: anytype, capture: u32, text: []const u8)
         const s: Span = .{ .from = c.node.startByte(), .to = c.node.endByte() };
         span = if (span) |old| .{ .from = @min(old.from, s.from), .to = @max(old.to, s.to) } else s;
     };
-    const found = span orelse return null;
+    var found = span orelse return null;
+    // a node that takes its line's newline (this zig grammar's comments)
+    // is the line without it, as helix's grammars have it
+    if (found.to > found.from + 1 and found.to <= text.len and text[found.to - 1] == '\n') found.to -= 1;
     const steps = q.predicatesForPattern(match.pattern_index);
     var i: usize = 0;
     while (i < steps.len) {