summaryrefslogtreecommitdiff
path: root/src/pardes.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-06 19:06:32 -0300
committerGabriel Schneider <[email protected]>2026-10-22 10:03:15 -0300
commit046979b877f02a91cf52cc86b84c5619cb9363d3 (patch)
treeb0a4696329949029aef88be34e242a45b1babfc4 /src/pardes.zig
parentd65ec3394ff619118d9208718477469c673a5598 (diff)
downloadpardes-046979b877f02a91cf52cc86b84c5619cb9363d3.tar.gz
pardes-046979b877f02a91cf52cc86b84c5619cb9363d3.zip
Def and Refs in a language-served file's tag, a diff viewer's tinted word edits, context rows that hold still under a scroll, and the pardes skill
Def and Refs (gd, gr, Ctrl-click; chorded 2-1 at the selection) for a file a language server speaks for; hunks.zig stacks a unified diff as a diff viewer does, its changed words on a tinted ground as delta's do; the tree-sitter context rows stay put while the body glides under a scroll; .agents/skills gains the pardes skill beside pardes-9p.
Diffstat (limited to 'src/pardes.zig')
-rw-r--r--src/pardes.zig115
1 files changed, 111 insertions, 4 deletions
diff --git a/src/pardes.zig b/src/pardes.zig
index 2a74e441..29192c33 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -480,6 +480,7 @@ pub const Loc = struct {
test {
_ = @import("tagline.zig");
+ _ = @import("hunks.zig");
_ = @import("builtins_json.zig");
_ = @import("exec.zig");
_ = @import("look.zig");
@@ -864,7 +865,7 @@ test "TreeContext command and custom tag survive a workspace round trip" {
p.gpa.free(pane.file.?.path);
pane.file.?.path = path;
if (!panes.File.supportsContext(pane)) return error.SkipZigTest;
- try std.testing.expectEqualStrings(tagline.context_pane_tail, tagline.curTail(pane));
+ try std.testing.expectEqualStrings(if (lsp.speaks("/test.zig")) tagline.lsp_context_pane_tail else tagline.context_pane_tail, tagline.curTail(pane));
try std.testing.expect(!pane.file.?.tree_context);
try std.testing.expect(p.executeBuiltinLine(0, "TreeContext on"));
try std.testing.expect(pane.file.?.tree_context);
@@ -920,7 +921,7 @@ test "Togglettymode builtin and keyboard chord share mode transitions including
try std.testing.expectEqualStrings("unchanged\n", file.file.?.content);
}
-test "Filter is ordered after Del and toggles only its terminal pane" {
+test "Filter is ordered after Del and toggles only its terminal or +Pager pane" {
const testing = std.testing;
const del = std.meta.stringToEnum(Builtin, "Del") orelse return error.MissingDelBuiltin;
const filter = std.meta.stringToEnum(Builtin, "Filter") orelse return error.MissingFilterBuiltin;
@@ -954,6 +955,17 @@ test "Filter is ordered after Del and toggles only its terminal pane" {
try testing.expect(p.executeBuiltinLine(0, "Filter"));
try testing.expect(first.tty_filter);
try testing.expect(!second.tty_filter);
+
+ // A +Pager opens filtered, with Filter on its tag and no line numbers;
+ // a second is a pane of its own.
+ const pager_id = try panes.Output.openPager(p, 0, "/tmp");
+ const pager_pane = p.panes[pager_id].?;
+ try testing.expect(pager_pane.tty_filter);
+ try testing.expectEqualStrings(tagline.pager_pane_tail, tagline.curTail(pager_pane));
+ try testing.expectEqual(@as(u16, 0), panes.File.gutterWidth(pager_pane));
+ try testing.expect(p.executeBuiltinLine(pager_id, "Filter"));
+ try testing.expect(!pager_pane.tty_filter);
+ try testing.expect(try panes.Output.openPager(p, 0, "/tmp") != pager_id);
}
test "compact tag commands stay beside their own prefix across layout changes" {
@@ -1194,6 +1206,73 @@ test "Lspwhy after a Hover asks to explain that hover, in its file at its place,
try std.testing.expect(seen);
}
+test "Def and Refs are a speaking file's tag words; gd, gr and a 2-1 chord all run them" {
+ if (!lsp.supports.contains(.definition)) return error.SkipZigTest;
+ const p = try Pardes.init(std.testing.allocator, .{ .cols = 100, .rows = 24, .tty_only = true });
+ defer p.deinit();
+ const pane = try p.setTestFile("const alpha = 1;\nconst beta = alpha;\n");
+ // A .txt has no server: no Def, no Refs.
+ try std.testing.expect(std.mem.indexOf(u8, tagline.curTail(pane), "Def") == null);
+ const f = &pane.file.?;
+ p.gpa.free(f.path);
+ f.path = try p.gpa.dupe(u8, "/tmp/x.zig");
+ try std.testing.expect(std.mem.endsWith(u8, tagline.curTail(pane), " Def Refs"));
+ p.sync();
+ while (p.nextEffect()) |_| {}
+ const Asked = struct {
+ fn one(q: *Pardes, kind: lsp.Kind) !u32 {
+ var at: ?u32 = null;
+ while (q.nextEffect()) |e| if (e == .lsp) {
+ try std.testing.expectEqual(kind, e.lsp.kind);
+ try std.testing.expectEqualStrings("", e.lsp.arg.slice());
+ try std.testing.expect(at == null);
+ at = e.lsp.offset;
+ };
+ q.lsp_wait = null;
+ return at orelse error.NothingAsked;
+ }
+ };
+ // gd and gr: at the cursor, on `alpha`'s declaration.
+ pane.body.cur_row = 0;
+ pane.body.cur_col = 8;
+ p.update(.{ .key = .{ .cp = 'g' } });
+ p.update(.{ .key = .{ .cp = 'd' } });
+ try std.testing.expectEqual(@as(u32, 8), try Asked.one(p, .definition));
+ p.update(.{ .key = .{ .cp = 'g' } });
+ p.update(.{ .key = .{ .cp = 'r' } });
+ try std.testing.expectEqual(@as(u32, 8), try Asked.one(p, .references));
+
+ const r = p.rects[0];
+ const x0 = r.x + config.GUTTER + panes.File.gutterWidth(pane);
+ const use_y = p.bodyTop(pane, r) + 1;
+ const tag = try tagline.tagText(p, p.scratch.allocator(), pane);
+ for ([_]struct { word: []const u8, kind: lsp.Kind }{ .{ .word = " Def ", .kind = .definition }, .{ .word = " Refs", .kind = .references } }) |w| {
+ // B1 sweeps the use of `alpha` on the second line (bytes 30..35),
+ // leaving the cursor at its far end.
+ p.update(.{ .mouse = .{ .button = config.select_button, .kind = .press, .col = x0 + 13, .row = use_y } });
+ p.update(.{ .mouse = .{ .button = config.select_button, .kind = .drag, .col = x0 + 17, .row = use_y } });
+ p.update(.{ .mouse = .{ .button = config.select_button, .kind = .release, .col = x0 + 17, .row = use_y } });
+ // B2 on the tag word, B1 clicked while it is held: the sweep is its
+ // argument, and it asks at the start of `alpha`, not at the cursor.
+ const wx = r.x + TAG_TEXT_INSET + @as(u16, @intCast(std.mem.indexOf(u8, tag, w.word).? + 1));
+ p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .press, .col = wx, .row = r.y } });
+ p.update(.{ .mouse = .{ .button = config.select_button, .kind = .press, .col = wx, .row = r.y } });
+ p.update(.{ .mouse = .{ .button = config.select_button, .kind = .release, .col = wx, .row = r.y } });
+ p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .release, .col = wx, .row = r.y } });
+ try std.testing.expectEqual(@as(u32, 30), try Asked.one(p, w.kind));
+ // Clicked bare, it asks at the cursor, where the sweep left it.
+ pane.body.cur_row = 0;
+ pane.body.cur_col = 2;
+ p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .press, .col = wx, .row = r.y } });
+ p.update(.{ .mouse = .{ .button = config.exec_button, .kind = .release, .col = wx, .row = r.y } });
+ try std.testing.expectEqual(@as(u32, 2), try Asked.one(p, w.kind));
+ }
+ // A symbol the file does not hold is said, and nothing is asked.
+ exec.runBuiltin(p, .Def, 0, "", "gamma");
+ try std.testing.expectError(error.NothingAsked, Asked.one(p, .definition));
+ try std.testing.expectEqualStrings("Def: no gamma in this file", pane.msg[0..pane.msg_len]);
+}
+
test "the Tutor pane is named +Tutor in the session's directory, never a bare path at the root" {
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true });
defer p.deinit();
@@ -4508,6 +4587,9 @@ pub const Pardes = struct {
chord_hold: bool = false,
/// The look just run found nothing (look.zig missed).
look_missed: bool = false,
+ /// The look being run opens a .diff or .patch as text whatever DiffLook
+ /// says: Diff going back from a +Diff, Edit's B (it edits the file).
+ look_text: bool = false,
look_hover_wait: ?look.LookHoverWait = null,
/// The place a look-hover last found nothing to open: the pointer
/// resting there does not ask again every frame (look.noteLookHover).
@@ -4748,6 +4830,8 @@ pub const Pardes = struct {
const named = try std.fs.path.join(gpa, &.{ dir, "+Pager" });
gpa.free(shown.file.?.path);
shown.file.?.path = named;
+ shown.file.?.pager = true;
+ shown.tty_filter = true;
shown.file.?.pager_diff = panes.File.looksLikeDiff(content[0..@min(content.len, 64 * 1024)]);
shown.file.?.pager_spans = page.spans;
p.oneColumn();
@@ -6674,7 +6758,8 @@ pub const Pardes = struct {
pub const SavePath = Effect.Buf(effect_path_cap);
- pub fn lspRequest(p: *Pardes, asked: usize, kind: lsp.Kind, arg: []const u8) void {
+ pub fn lspRequest(p: *Pardes, asked: usize, kind: lsp.Kind, arg_in: []const u8) void {
+ var arg = arg_in;
if (!normal.multiOnce(p)) return; // one question per keystroke, from the primary
// Lspwhy narrates the last query where it was asked -- that pane's
// file, place and argument -- from wherever it is run.
@@ -6697,10 +6782,30 @@ pub const Pardes = struct {
(!zig_buf and std.mem.indexOfAny(u8, arg, " \t\r\n\"\\") != null))
return p.reportFailure(id, std.fmt.bufPrint(&said, "Rename: {s} is no name", .{arg}) catch "Rename: no name");
}
- const off = if (pane.file) |f| modal.offsetAt(f.content, .{
+ var off = if (pane.file) |f| modal.offsetAt(f.content, .{
.row = @intCast(@max(0, pane.body.cur_row)),
.col = @intCast(@max(0, pane.body.cur_col)),
}) else 0;
+ // Def or Refs given a symbol (a 2-1 chord's selection) asks at its
+ // occurrence nearest the cursor, which a sweep leaves at one end of
+ // what it selected; the server is asked at a place, never a name.
+ if ((kind == .definition or kind == .references) and arg.len > 0) {
+ const content = pane.file.?.content;
+ var nearest: ?usize = null;
+ var best: usize = 0;
+ var from: usize = 0;
+ while (std.mem.indexOfPos(u8, content, from, arg)) |at_hit| : (from = at_hit + 1) {
+ const d = if (at_hit > off) at_hit - off else off -| (at_hit + arg.len);
+ if (nearest != null and at_hit > off and d >= best) break;
+ if (nearest == null or d < best) {
+ nearest = at_hit;
+ best = d;
+ }
+ }
+ off = nearest orelse
+ return p.reportFailure(id, std.fmt.bufPrint(&said, "{s}: no {s} in this file", .{ lspWord(kind), arg }) catch "no such symbol in this file");
+ arg = "";
+ }
// Lspwhy asks the last query again, narrated: its kind and argument,
// at its place when asked from its pane. None yet: a definition.
var explained: [160]u8 = undefined;
@@ -6858,6 +6963,8 @@ pub const Pardes = struct {
fn lspWord(kind: lsp.Kind) []const u8 {
return switch (kind) {
.hover => "Hover",
+ .definition => "Def",
+ .references => "Refs",
.explain => "Lspwhy",
.incoming_calls => "Callers",
.outgoing_calls => "Callees",