summaryrefslogtreecommitdiff
path: root/src/pardes.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/pardes.zig')
-rw-r--r--src/pardes.zig81
1 files changed, 65 insertions, 16 deletions
diff --git a/src/pardes.zig b/src/pardes.zig
index 29192c33..5f330712 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -220,7 +220,6 @@ pub const Turn = struct {
while (t.lsp_answers == answers) t.settled.wait(t.io.?, &t.mutex) catch return;
}
-
pub fn awaitRestored(t: *Turn, restores: u64) void {
while (t.restores == restores) t.settled.wait(t.io.?, &t.mutex) catch return;
}
@@ -294,7 +293,7 @@ pub const MAX_JUMPS = 64;
pub const TOPBAR_H: u16 = 1;
pub const COLBAR_H: u16 = 1;
pub const BOX_H: u16 = 1;
-pub const TAG_GAP: u16 = 1;
+pub const TAG_GAP: u16 = 0;
pub const TAG_TEXT_INSET: u16 = config.GUTTER + TAG_GAP;
pub fn taglineBandOffset(row: u16, canvas_h: f32, cell_h: u32, tagline_h: u32) u32 {
@@ -655,25 +654,25 @@ test "topbar hover highlights exactly the executable word" {
defer frame.deinit();
_ = try p.render(frame.allocator());
- p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = 1, .row = 0 } });
+ p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = TAG_TEXT_INSET + 1, .row = 0 } });
_ = frame.reset(.retain_capacity);
const hovered = try p.render(frame.allocator());
for (0.."Newcol".len) |col| {
- const cell = hovered.at(@intCast(col), 0);
+ const cell = hovered.at(TAG_TEXT_INSET + @as(u16, @intCast(col)), 0);
try std.testing.expectEqual(Color{ .rgb = p.theme().sel_bg }, cell.style.bg);
try std.testing.expectEqual(Color{ .rgb = p.theme().sel_fg }, cell.style.fg);
}
- try std.testing.expectEqual(Color{ .rgb = p.chromeTheme().tag_bg }, hovered.at(6, 0).style.bg);
+ try std.testing.expectEqual(Color{ .rgb = p.chromeTheme().tag_bg }, hovered.at(TAG_TEXT_INSET + 6, 0).style.bg);
- p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = 6, .row = 0 } });
+ p.update(.{ .mouse = .{ .button = .none, .kind = .motion, .col = TAG_TEXT_INSET + 6, .row = 0 } });
_ = frame.reset(.retain_capacity);
const whitespace = try p.render(frame.allocator());
- try std.testing.expectEqual(Color{ .rgb = p.chromeTheme().tag_bg }, whitespace.at(1, 0).style.bg);
+ try std.testing.expectEqual(Color{ .rgb = p.chromeTheme().tag_bg }, whitespace.at(TAG_TEXT_INSET + 1, 0).style.bg);
p.update(.pointer_leave);
_ = frame.reset(.retain_capacity);
const left = try p.render(frame.allocator());
- try std.testing.expectEqual(Color{ .rgb = p.chromeTheme().tag_bg }, left.at(1, 0).style.bg);
+ try std.testing.expectEqual(Color{ .rgb = p.chromeTheme().tag_bg }, left.at(TAG_TEXT_INSET + 1, 0).style.bg);
}
test "pane-tag Exec prefers Tty and argument builtins before shell fallback" {
@@ -1216,7 +1215,7 @@ test "Def and Refs are a speaking file's tag words; gd, gr and a 2-1 chord all r
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"));
+ try std.testing.expect(std.mem.endsWith(u8, tagline.curTail(pane), " Def Refs Del"));
p.sync();
while (p.nextEffect()) |_| {}
const Asked = struct {
@@ -1241,6 +1240,9 @@ test "Def and Refs are a speaking file's tag words; gd, gr and a 2-1 chord all r
p.update(.{ .key = .{ .cp = 'g' } });
p.update(.{ .key = .{ .cp = 'r' } });
try std.testing.expectEqual(@as(u32, 8), try Asked.one(p, .references));
+ p.update(.{ .key = .{ .cp = 'g' } });
+ p.update(.{ .key = .{ .cp = 'c' } });
+ try std.testing.expectEqual(@as(u32, 8), try Asked.one(p, .callstack));
const r = p.rects[0];
const x0 = r.x + config.GUTTER + panes.File.gutterWidth(pane);
@@ -1525,7 +1527,6 @@ test "unknown Exec from a document runs as a command pane in its directory, type
try std.testing.expect(spawned);
}
-
const FakeTtyQuery = struct {
taken: [MAX_PANES]bool = @splat(false),
asked: usize = 0,
@@ -2009,7 +2010,6 @@ test "a command pane shows how its command ended, and the next command there run
try std.testing.expectEqual(@as(?usize, null), exec.execute(p, 1, long));
}
-
test "image dump restores source bytes renderer choices and exact custom tail" {
const gpa = std.testing.allocator;
const p = try Pardes.init(gpa, .{ .tty_only = true });
@@ -2062,7 +2062,6 @@ test "image dump restores source bytes renderer choices and exact custom tail" {
try std.testing.expectEqualStrings(" Keep Del", redump.panes[0].tag_tail.?);
}
-
test "a Look on a directory does not type ls into an occupied terminal" {
const gpa = std.testing.allocator;
const p = try Pardes.init(gpa, .{ .cols = 100, .rows = 30 });
@@ -3374,9 +3373,9 @@ test "editable workspace and column tags are typed into and persist" {
p.acknowledgePanelPresentation(&.{});
try std.testing.expectEqual(TOPBAR_H + COLBAR_H, p.rects[0].y);
// a sweep over a header is its selection, the caret where it ended
- p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = 0, .row = 0 } });
- p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = 6, .row = 0 } });
- p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = 6, .row = 0 } });
+ p.update(.{ .mouse = .{ .button = .left, .kind = .press, .col = TAG_TEXT_INSET, .row = 0 } });
+ p.update(.{ .mouse = .{ .button = .left, .kind = .drag, .col = TAG_TEXT_INSET + 6, .row = 0 } });
+ p.update(.{ .mouse = .{ .button = .left, .kind = .release, .col = TAG_TEXT_INSET + 6, .row = 0 } });
try std.testing.expect(p.global_tag.vsel.active and p.global_tag.vsel.col == 0 and p.global_tag.cur_col == 6);
p.update(.{ .key = .{ .cp = 'H', .text = " Help" } });
try std.testing.expect(std.mem.startsWith(u8, p.global_tag.own.?, "Newcol Help Joincol"));
@@ -6966,6 +6965,7 @@ pub const Pardes = struct {
.definition => "Def",
.references => "Refs",
.explain => "Lspwhy",
+ .callstack => "Callstack",
.incoming_calls => "Callers",
.outgoing_calls => "Callees",
.document_symbols => "Symbols",
@@ -7081,6 +7081,18 @@ pub const Pardes = struct {
// (a multi-file Rename's preview, Lspinfo's +Lsp), made or filled
// again, not the pane it was asked from.
p.fs.lsp_result = if (p.next_serial != serial_before) p.next_serial else p.fs.refilled;
+ if (w.kind == .callstack) {
+ for (p.panes, 0..) |slot, result_id| if (slot) |result_pane| {
+ if (result_pane.serial != p.fs.lsp_result) continue;
+ if (p.next_serial != serial_before) {
+ const report_rows = std.mem.count(u8, result_pane.file.?.content, "\n");
+ const wanted: u16 = @intCast(@min(p.screen_h, report_rows + result_pane.tag_rows));
+ layout.givePaneRows(p, result_id, wanted, w.pane);
+ }
+ look.focusPaneLine(p, result_id, .{ .line = 1, .col = 1 }, .keep);
+ break;
+ };
+ }
if (w.kind == .rename) {
var said_buf: [128]u8 = undefined;
// Rows that only name a file the server left alone (lsp_client
@@ -7624,7 +7636,6 @@ pub const Pardes = struct {
return if (frames) |n| p.stepped_ns + n * animation.frame_ns else null;
}
-
/// A render-time animation is moving (a pane's lift): it is sampled at
/// each frame's own `now`, so while it moves the shell draws every loop
/// and its present (vsync) paces it, at the display's rate. `nextWake`
@@ -8514,6 +8525,44 @@ test "the jump list never holds two entries in a row the same, when the one betw
try std.testing.expectEqual(@as(u32, 150), p.jumps[1].line);
}
+test "Callstack always opens and focuses its own pane, reusing it for another symbol" {
+ if (!lsp.supports.contains(.callstack)) return;
+ const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true });
+ defer p.deinit();
+ _ = try p.setTestFile("fn work() {}\n");
+ const source = p.panes[0].?;
+ p.lspRequest(0, .callstack, "");
+ const first = p.lsp_wait orelse return error.NoRequest;
+ p.lspResponse(first.id, "└──┬ /test.txt:1:4-7 work\n@callstack-match └─ /test.txt:1:4-7 fn work() {}\n");
+ const report = p.panes[p.active].?;
+ try std.testing.expect(report != source);
+ try std.testing.expect(std.mem.endsWith(u8, report.file.?.path, "/+Callstack"));
+ try std.testing.expectEqual(@as(i32, 0), source.body.cur_row);
+ const stale_selection = std.mem.indexOfScalar(u8, report.file.?.content, '\n').? + 1;
+ report.body.setRange(report.file.?.content, 0, .{ .anchor = stale_selection, .head = stale_selection + 6 }, true);
+ layout.toggleCollapse(p, 0);
+ var frame = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer frame.deinit();
+ const surface = try p.render(frame.allocator());
+ p.acknowledgePanelPresentation(&.{});
+ const r = p.rects[p.active];
+ const row = r.y + report.tag_rows;
+ const col = r.x + config.GUTTER + panes.File.gutterWidth(report) + 7;
+ try std.testing.expectEqual(.off, surface.at(col, row).style.ul);
+ p.update(.{ .mouse = .{ .button = .right, .kind = .press, .row = row, .col = col } });
+ p.update(.{ .mouse = .{ .button = .right, .kind = .release, .row = row, .col = col } });
+ try std.testing.expect(!source.collapsed);
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ try std.testing.expect(!report.body.vsel.active);
+ try std.testing.expectEqual(@as(usize, 0), report.body.nsel);
+ const serial = report.serial;
+ p.lspRequest(0, .callstack, "");
+ const second = p.lsp_wait orelse return error.NoRequest;
+ p.lspResponse(second.id, "No callers reported\n");
+ try std.testing.expectEqual(serial, p.panes[p.active].?.serial);
+ try std.testing.expectEqualStrings("No callers reported\n", p.panes[p.active].?.file.?.content);
+}
+
test "Callers with one answer jumps to it and says where, in a msg" {
if (!lsp.supports.contains(.incoming_calls)) return;
const p = try Pardes.init(std.testing.allocator, .{ .tty_only = true });