summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CHANGELOG.md15
-rw-r--r--src/File.zig82
-rw-r--r--src/Output.zig79
-rw-r--r--src/body_layer.zig42
-rw-r--r--src/builtins.zig13
-rw-r--r--src/colors.zig10
-rw-r--r--src/config.zig46
-rw-r--r--src/draw.zig18
-rw-r--r--src/dump.zig4
-rw-r--r--src/edit.zig4
-rw-r--r--src/exec.zig16
-rw-r--r--src/host_io.zig12
-rw-r--r--src/layout.zig22
-rw-r--r--src/locations.zig179
-rw-r--r--src/look.zig17
-rw-r--r--src/lsp/lsp.zig10
-rw-r--r--src/lsp/lsp_client.zig263
-rw-r--r--src/modal.zig4
-rw-r--r--src/mouse.zig26
-rw-r--r--src/ninep/ctl.zig22
-rw-r--r--src/normal.zig3
-rw-r--r--src/panes.zig9
-rw-r--r--src/pardes.zig81
-rw-r--r--src/syntax.zig17
-rw-r--r--src/tagline.zig19
25 files changed, 852 insertions, 161 deletions
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index e15faca7..4fe0760c 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -2,6 +2,21 @@
## Unreleased
+- Callstack (gc or Space l b) opens a readable static call hierarchy with
+ outermost callers first, tree-sitter signatures, depth guides and clickable call sites.
+ `gc` replaces the old move-to-viewport-center binding.
+ CallstackDepth sets the caller depth at runtime (1–64, default 8).
+ CallstackLayout stacked is the default, aligning snippets below their
+ locations with rounded tree corners; inline
+ keeps them beside the locations. CallstackCorners square restores sharp
+ tree corners; rounded remains the default.
+ Signatures use syntax colors; only calls to the queried function get
+ background emphasis, and tree guides continue through multiline signatures
+ and wrapped rows. Cross-directory call locations use shorter relative paths.
+- Workspace, column and pane tags share a tighter text inset.
+- A diff paged into a session (`git show | pardes -`) opens its `+Diff`
+ alone; the `+Pager` no longer stays folded under it.
+
- n/N follow Helix search registers, counts, wrapping and select mode.
`*` sets a search from the selection; `Alt-*` omits word boundaries.
The location ring remains as LookNext/LookPrev (Space j n/p).
diff --git a/src/File.zig b/src/File.zig
index 31392ebd..c42e39ec 100644
--- a/src/File.zig
+++ b/src/File.zig
@@ -253,6 +253,8 @@ fn dumpLocationRows(arena: std.mem.Allocator, rows: []const locations.Row) ![]co
for (rows, saved) |row, *out| out.* = .{
.kind = @enumFromInt(@intFromEnum(row.kind)),
.declaration = row.declaration,
+ .mark_occurrence = row.mark_occurrence,
+ .source_column = row.source_column,
.path = row.path,
.line = row.at.line,
.col = row.at.col,
@@ -271,6 +273,10 @@ fn sameSavedLocation(a: dump.LocationRow, b: dump.LocationRow) bool {
}
fn restoreLocationRows(gpa: std.mem.Allocator, content: []const u8, saved: []const dump.LocationRow) ![]locations.Row {
+ return restoreOutputLocationRows(gpa, content, saved, false);
+}
+
+fn restoreOutputLocationRows(gpa: std.mem.Allocator, content: []const u8, saved: []const dump.LocationRow, callstack: bool) ![]locations.Row {
if (saved.len == 0) return &.{};
if (saved.len > std.mem.count(u8, content, "\n") + 1) return error.InvalidLocationRows;
const rows = try gpa.alloc(locations.Row, saved.len);
@@ -286,29 +292,44 @@ fn restoreLocationRows(gpa: std.mem.Allocator, content: []const u8, saved: []con
var previous_line: []const u8 = "";
for (saved, rows, 0..) |row, *out, index| {
const line = lines.next() orelse return error.InvalidLocationRows;
- if (row.path.len == 0 or row.path.len >= 4096 or
+ if ((!callstack and row.path.len == 0) or row.path.len >= 4096 or
row.location_end > row.code_start or row.code_start > line.len or
(row.kind == .match and row.location_end == 0) or
(row.declaration and row.kind != .context) or
row.line > std.math.maxInt(i32) or row.col > std.math.maxInt(i32) or
row.end_line > std.math.maxInt(i32) or row.end_col > std.math.maxInt(i32))
return error.InvalidLocationRows;
- const inline_row = row.code_start > row.location_end and row.code_start > 0 and line[row.code_start - 1] == '\t';
- const address_row = !inline_row and row.location_end > 0 and row.code_start == line.len;
- const source_row = row.location_end == 0 and row.code_start == 0;
- if (!inline_row and !address_row and !source_row) return error.InvalidLocationRows;
- if (row.kind == .preview) {
- if (!source_row or index == 0) return error.InvalidLocationRows;
- const previous = saved[index - 1];
- if (previous.kind != .match or previous.location_end == 0 or previous.code_start != previous_line.len or previous_line[previous_line.len - 1] == '\t' or
- !sameSavedLocation(previous, row)) return error.InvalidLocationRows;
- }
- if (address_row) {
- if (index + 1 >= saved.len) return error.InvalidLocationRows;
- const following = saved[index + 1];
- const expected: @TypeOf(row.kind) = if (row.kind == .match) .preview else .context;
- if (following.kind != expected or following.code_start != 0 or following.location_end != 0 or
- following.declaration != row.declaration or !sameSavedLocation(row, following)) return error.InvalidLocationRows;
+ if (callstack) {
+ if (row.location_end > 0) {
+ const prefix = locations.treePrefix(line);
+ const parsed = locations.parseRaw(line[prefix.end..]);
+ if (row.kind != .match or parsed.at.line == 0 or
+ !std.mem.eql(u8, parsed.path, row.path) or
+ parsed.at.line != row.line or parsed.at.col != row.col or
+ parsed.at.end_line != row.end_line or parsed.at.end_col != row.end_col or
+ prefix.end + parsed.end != row.location_end or
+ prefix.end + parsed.code_start != row.code_start) return error.InvalidLocationRows;
+ } else if (row.kind == .preview) {
+ if (index == 0 or saved[index - 1].kind != .match or !sameSavedLocation(saved[index - 1], row)) return error.InvalidLocationRows;
+ } else if (row.kind != .context or (row.path.len == 0 and (row.line != 0 or row.code_start != line.len))) return error.InvalidLocationRows;
+ } else {
+ const inline_row = row.code_start > row.location_end and row.code_start > 0 and line[row.code_start - 1] == '\t';
+ const address_row = !inline_row and row.location_end > 0 and row.code_start == line.len;
+ const source_row = row.location_end == 0 and row.code_start == 0;
+ if (!inline_row and !address_row and !source_row) return error.InvalidLocationRows;
+ if (row.kind == .preview) {
+ if (!source_row or index == 0) return error.InvalidLocationRows;
+ const previous = saved[index - 1];
+ if (previous.kind != .match or previous.location_end == 0 or previous.code_start != previous_line.len or previous_line[previous_line.len - 1] == '\t' or
+ !sameSavedLocation(previous, row)) return error.InvalidLocationRows;
+ }
+ if (address_row) {
+ if (index + 1 >= saved.len) return error.InvalidLocationRows;
+ const following = saved[index + 1];
+ const expected: @TypeOf(row.kind) = if (row.kind == .match) .preview else .context;
+ if (following.kind != expected or following.code_start != 0 or following.location_end != 0 or
+ following.declaration != row.declaration or !sameSavedLocation(row, following)) return error.InvalidLocationRows;
+ }
}
const code_len = line.len - row.code_start;
if (row.colors_b64.len > std.base64.standard.Encoder.calcSize(code_len)) return error.InvalidLocationRows;
@@ -320,6 +341,8 @@ fn restoreLocationRows(gpa: std.mem.Allocator, content: []const u8, saved: []con
out.* = .{
.kind = @enumFromInt(@intFromEnum(row.kind)),
.declaration = row.declaration,
+ .mark_occurrence = row.mark_occurrence,
+ .source_column = row.source_column,
.path = path,
.at = .{ .line = row.line, .col = row.col, .end_line = row.end_line, .end_col = row.end_col },
.location_end = row.location_end,
@@ -992,7 +1015,8 @@ pub fn restore(p: *Pardes, id: usize, src: dump.Pane) !*Pane {
} else null;
if (saved.location_rows.len != 0 and output == null) return error.InvalidLocationRows;
- const location_rows = try restoreLocationRows(p.gpa, content, saved.location_rows);
+ const is_callstack = if (output) |state| std.meta.eql(state.from, Output.Origin{ .query = .callstack }) else false;
+ const location_rows = try restoreOutputLocationRows(p.gpa, content, saved.location_rows, is_callstack);
errdefer locations.freeRows(p.gpa, location_rows);
var mini: ?Mini.State = null;
@@ -1707,9 +1731,16 @@ fn fillBody(dst: ?[]u8, pane: *Pane, f: *State, width: usize, record_wrap: bool)
const row = if (context) @as(usize, @intCast(pane.wrap_line[i])) else body_line;
const at = if (context) 0 else body_at;
const text = if (row < total) sourceLine(pane, @intCast(row)) else "";
+ var guide_buffer: [1024]u8 = undefined;
+ const guide = if (at > 0 and width > 1 and f.output != null and
+ std.meta.eql(f.output.?.from, Output.Origin{ .query = .callstack }))
+ locations.treeContinuation(text, &guide_buffer, width - 1)
+ else
+ "";
+ const pad = displayWidth(guide);
// Headers use one screen row per source row, preserving signatures
// without allowing a long ancestor to consume the whole viewport.
- const end = if (width == 0 or context) text.len else fitEnd(text, at, width);
+ const end = if (width == 0 or context) text.len else fitEnd(text, at, width - pad);
const cut = if (pane.hscroll > 0 and width == 0)
modal.graphemeStart(text, @min(@as(usize, @intCast(pane.hscroll)), text.len))
else
@@ -1717,6 +1748,7 @@ fn fillBody(dst: ?[]u8, pane: *Pane, f: *State, width: usize, record_wrap: bool)
if ((width > 0 or pane.context_rows > 0) and record_wrap) {
pane.wrap_line[i] = @intCast(row);
pane.wrap_col[i] = @intCast(cut);
+ pane.wrap_pad[i] = @intCast(pad);
pane.wrap_n = @intCast(i + 1);
}
if (row < total) {
@@ -1735,6 +1767,8 @@ fn fillBody(dst: ?[]u8, pane: *Pane, f: *State, width: usize, record_wrap: bool)
}
if (dst) |out| @memcpy(out[written..][0..prefix.len], prefix);
written += prefix.len;
+ if (dst) |out| @memcpy(out[written..][0..guide.len], guide);
+ written += guide.len;
const shown = text[cut..end];
if (dst) |out| @memcpy(out[written..][0..shown.len], shown);
written += shown.len;
@@ -1935,7 +1969,11 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes.
}
}.before);
var c: usize = 0;
- var screen_c: usize = 0;
+ const pad: usize = if (vr < pane.wrap_n) pane.wrap_pad[vr] else 0;
+ for (0..@min(pad, tw -| prefix_width)) |col| {
+ s.at(tx + @as(u16, @intCast(prefix_width + col)), body_y + vr).style.fg = .{ .rgb = p.bodyChrome().diagnostic_info };
+ }
+ var screen_c: usize = pad;
while (hs + c < limit and prefix_width + screen_c < tw) {
const grapheme_end = @min(limit, modal.nextGrapheme(line, hs + c));
const cells = graphemeDisplayWidth(line[hs + c .. grapheme_end]);
@@ -2218,8 +2256,8 @@ pub fn paintWordSelection(
if (next.line == row) hi = @min(hi, next.at);
const lo = @max(word_lo, here.at);
if (hi <= lo) continue;
- const c0 = @as(i32, prefix_width) + displayOffset(pane, row, here.at, lo);
- const c1 = @as(i32, prefix_width) + displayEndOffset(pane, row, here.at, hi - 1);
+ const c0 = @as(i32, prefix_width) + here.pad + displayOffset(pane, row, here.at, lo);
+ const c1 = @as(i32, prefix_width) + here.pad + displayEndOffset(pane, row, here.at, hi - 1);
var col = @max(@as(i32, prefix_width), c0);
while (col <= c1 and col < @as(i32, tw)) : (col += 1) {
const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(vr)));
diff --git a/src/Output.zig b/src/Output.zig
index 9e194615..9ed33ebe 100644
--- a/src/Output.zig
+++ b/src/Output.zig
@@ -53,13 +53,14 @@ const RowDecoration = struct {
location_end: usize = 0,
prefix_end: usize = 0,
declaration: bool = false,
+ guide_end: usize = 0,
mark_start: usize = 0,
mark_end: usize = 0,
severity: enum { none, err, warning, info, hint } = .none,
/// Nothing in the row is decorated: most rows of most files.
pub fn plain(row: RowDecoration) bool {
- return !row.declaration and row.location_end == 0 and row.prefix_end == 0 and row.mark_end <= row.mark_start;
+ return row.guide_end == 0 and !row.declaration and row.location_end == 0 and row.prefix_end == 0 and row.mark_end <= row.mark_start;
}
/// `chrome` is the theme's own (Pardes.bodyChrome): body paper changes
@@ -68,6 +69,7 @@ const RowDecoration = struct {
/// working it out takes the contrast searches' pow calls.
pub fn styleAt(row: RowDecoration, chrome: *const pardes.ChromeTheme, byte: usize) ?pardes.CellStyle {
if (row.plain()) return null;
+ if (byte < row.guide_end) return .{ .fg = .{ .rgb = chrome.diagnostic_info } };
if (row.declaration or byte < @max(row.location_end, row.prefix_end))
return .{ .fg = .{ .rgb = chrome.lineno } };
if (byte < row.mark_start or byte >= row.mark_end) return null;
@@ -91,32 +93,38 @@ fn rowDecoration(output: ?State, line: []const u8) RowDecoration {
pub fn decorateRow(output: ?State, line: []const u8, metadata: ?locations.Row) RowDecoration {
const origin = (output orelse return .{}).from;
+ const callstack = std.meta.eql(origin, Origin{ .query = .callstack });
+ const prefix = locations.treePrefix(if (callstack) line else "");
+ const trimmed = line[prefix.end..];
+ const indent = prefix.end;
if (!traits(origin).locations) return .{};
- const target = locations.parse(line);
+ const target = if (callstack) locations.parseRaw(trimmed) else locations.parse(trimmed);
const spot = if (metadata) |m| m.at else target.at;
if (spot.line == 0) return .{};
var row: RowDecoration = .{
- .location_end = if (metadata) |m| m.location_end else target.end,
- .prefix_end = if (metadata) |m| m.code_start else target.end,
+ .guide_end = indent,
+ .location_end = if (metadata) |m| m.location_end else indent + target.end,
+ .prefix_end = if (metadata) |m| m.code_start else indent + target.end,
.declaration = if (metadata) |m| m.declaration else false,
};
- const source_start = if (metadata) |m| m.code_start else target.code_start;
+ const source_start = if (metadata) |m| m.code_start else indent + target.code_start;
if (source_start >= line.len) return row;
if (metadata) |m| if (m.kind == .context) return row;
const mark_occurrence = switch (origin) {
.search => true,
.cmd => |cmd| cmd == .Grep,
.query => |kind| switch (kind) {
- .definition, .declaration, .type_definition, .implementation, .references => true,
+ .definition, .declaration, .type_definition, .implementation, .references, .callstack => true,
else => false,
},
else => false,
};
- if (mark_occurrence and spot.col > 0 and spot.end_line == spot.line and
+ if (mark_occurrence and (if (metadata) |m| m.mark_occurrence else !prefix.branch) and spot.col > 0 and spot.end_line == spot.line and
spot.end_col >= spot.col)
{
- row.mark_start = source_start +| (spot.col - 1);
- row.mark_end = @min(line.len, source_start +| spot.end_col);
+ const source_column = if (metadata) |m| m.source_column else 0;
+ row.mark_start = source_start +| ((spot.col - 1) -| source_column);
+ row.mark_end = @min(line.len, source_start +| (spot.end_col -| source_column));
}
const is_diagnostic = switch (origin) {
.query => |kind| kind == .diagnostics or kind == .workspace_diagnostics,
@@ -135,6 +143,25 @@ pub fn decorateRow(output: ?State, line: []const u8, metadata: ?locations.Row) R
return row;
}
+test "callstack guides and Look locations share result decoration" {
+ const from: State = .{ .from = .{ .query = .callstack } };
+ const loc = rowDecoration(from, "└──┬ lib.rs:2:8-10 fn add() {");
+ try std.testing.expectEqual(@as(usize, "└──┬ lib.rs:2:8-10".len), loc.location_end);
+ try std.testing.expect(!loc.declaration);
+ try std.testing.expect(!usesLocationsConfig(from.from));
+ try std.testing.expect(!traits(from.from).jumps);
+ const call_line = " lib.rs:12:12-20 return calculate(value);";
+ const call = rowDecoration(from, call_line);
+ try std.testing.expectEqualStrings("calculate", call_line[call.mark_start..call.mark_end]);
+ const reference = rowDecoration(.{ .from = .{ .query = .references } }, call_line[4..]);
+ try std.testing.expectEqual(reference.mark_start + 4, call.mark_start);
+ try std.testing.expectEqual(reference.mark_end + 4, call.mark_end);
+ try std.testing.expectEqual(reference.location_end + 4, call.location_end);
+ const tab_line = " tab.zig:4:9-11 \treturn run();";
+ const tab_call = rowDecoration(from, tab_line);
+ try std.testing.expectEqualStrings("run", tab_line[tab_call.mark_start..tab_call.mark_end]);
+}
+
test "result decoration follows source byte ranges and diagnostic provenance" {
const row = rowDecoration(.{ .from = .search }, "src/a.rs:3:5-7 let abc = 1;");
try std.testing.expectEqualStrings("abc", "src/a.rs:3:5-7 let abc = 1;"[row.mark_start..row.mark_end]);
@@ -237,6 +264,7 @@ pub fn traits(o: Origin) Traits {
.cmd => |b| builtins.registry.outputTraits(b) orelse unreachable,
.query => |k| switch (k) {
.hover => .{ .name = config.hover_buffer },
+ .callstack => .{ .name = "+Callstack", .steps = true, .locations = true },
// prose: an action list, a diff, a report about the backend
.code_action, .format, .status, .explain => .{ .name = config.lsp_buffer },
.rename => .{ .name = config.search_buffer, .steps = true, .locations = true },
@@ -267,7 +295,8 @@ pub fn usesLocationsConfig(from: Origin) bool {
const tr = traits(from);
return tr.steps and !tr.commands and from != .pdf_links and
!std.meta.eql(from, Origin{ .cmd = .Find }) and
- !std.meta.eql(from, Origin{ .query = .completion });
+ !std.meta.eql(from, Origin{ .query = .completion }) and
+ !std.meta.eql(from, Origin{ .query = .callstack });
}
pub fn fileTraits(out: ?State) Traits {
@@ -533,8 +562,11 @@ pub fn fillResults(p: *Pardes, id: usize, dir: []const u8, from: Origin, arg: []
return;
}
}
- if (usesLocationsConfig(from)) {
- const formatted = try locations.format(p, dir, content, anchor, true);
+ if (usesLocationsConfig(from) or std.meta.eql(from, Origin{ .query = .callstack })) {
+ const formatted = if (std.meta.eql(from, Origin{ .query = .callstack }))
+ try locations.formatCallstack(p, dir, content)
+ else
+ try locations.format(p, dir, content, anchor, true);
p.gpa.free(result_content);
result_content = formatted.content;
result_rows = formatted.rows;
@@ -863,7 +895,7 @@ pub fn openThemes(p: *Pardes, id: usize) !void {
pub fn isWalkRow(file: *const File.State, row: usize, line: []const u8) bool {
const state = file.output orelse return true;
- if (usesLocationsConfig(state.from)) return isResultRow(file, row);
+ if (usesLocationsConfig(state.from) or std.meta.eql(state.from, Origin{ .query = .callstack })) return isResultRow(file, row);
if (!std.meta.eql(state.from, Origin{ .cmd = .Themes })) return true;
// Section labels are for reading, not stops in the command walk.
return std.mem.startsWith(u8, std.mem.trimStart(u8, line, " \t"), comptime config.Runtime.findAction(.theme).?.word ++ " ");
@@ -901,11 +933,14 @@ fn openStepped(p: *Pardes, id: usize, from: Origin, content: []u8) !void {
fn helpContent(gpa: std.mem.Allocator, prefix: []const u8) ![]u8 {
const full_header = "pardes builtins, and how to run each:\nSPC and its keys, a chord, a button, the\ntopbar - or the name, executed anywhere.\n\n";
const group_header = "pardes builtins under SPC";
+ const calls_help = "\nCallstack: static caller chains,\nwith signatures and clickable call sites.\nCallers / Callees: one direction at a time.\n";
+ const show_calls_help = prefix.len == 0 or std.mem.eql(u8, prefix, "l");
const language_footer =
"\nlanguage keys (motions, not words):\n" ++
"gd gD gy gi gr goto: definition,\n" ++
" declaration, type-def,\n" ++
" implementation, refs\n" ++
+ "gc Callstack\n" ++
"]d [d ]D [D diagnostics: next,\n" ++
" prev, last, first\n" ++
"= format (applies, one\n" ++
@@ -918,6 +953,7 @@ fn helpContent(gpa: std.mem.Allocator, prefix: []const u8) ![]u8 {
full_header.len + language_footer.len
else
group_header.len + prefix.len * 2 + 2;
+ if (show_calls_help) len += calls_help.len;
for (pardes.builtin_rows) |row| {
// a path-less builtin filters as the empty path: in the full listing
// (which starts with nothing) and out of every group
@@ -948,6 +984,10 @@ fn helpContent(gpa: std.mem.Allocator, prefix: []const u8) ![]u8 {
content[at] = '\n';
at += 1;
}
+ if (show_calls_help) {
+ @memcpy(content[at..][0..calls_help.len], calls_help);
+ at += calls_help.len;
+ }
if (prefix.len == 0) {
@memcpy(content[at..][0..language_footer.len], language_footer);
at += language_footer.len;
@@ -963,7 +1003,7 @@ pub fn openHelp(p: *Pardes, id: usize, prefix: []const u8) !void {
return openRead(p, id, .{ .cmd = .Help }, prefix, content);
}
-test "full Help renders every builtin row, then the language keys" {
+test "full Help renders builtin rows, a call hierarchy guide, then language keys" {
const content = try helpContent(std.testing.allocator, "");
defer std.testing.allocator.free(content);
@@ -974,17 +1014,22 @@ test "full Help renders every builtin row, then the language keys" {
for (pardes.builtin_rows) |row|
try std.testing.expectEqualStrings(row.line, lines.next() orelse
return error.MissingBuiltinHelpRow);
- // ...and after the last row, the language-keys section: the one part of
- // the keymap no builtin row can carry, closing the page.
+ // The short call guide disambiguates the three related commands.
+ try std.testing.expectEqualStrings("", lines.next() orelse return error.MissingCallHelp);
+ try std.testing.expectEqualStrings("Callstack: static caller chains,", lines.next() orelse return error.MissingCallHelp);
+ try std.testing.expectEqualStrings("with signatures and clickable call sites.", lines.next() orelse return error.MissingCallHelp);
+ try std.testing.expectEqualStrings("Callers / Callees: one direction at a time.", lines.next() orelse return error.MissingCallHelp);
+ // The language keys close the page.
try std.testing.expectEqualStrings("", lines.next() orelse
return error.MissingLanguageKeys);
try std.testing.expectEqualStrings("language keys (motions, not words):", lines.next() orelse
return error.MissingLanguageKeys);
try std.testing.expect(std.mem.indexOf(u8, body, "\ngd gD gy gi gr goto: definition,\n") != null);
- // the group view stays a pure filter: no footer under a prefix
+ // The language group also explains call commands, without the motion footer.
const group = try helpContent(std.testing.allocator, "l");
defer std.testing.allocator.free(group);
try std.testing.expect(std.mem.indexOf(u8, group, "language keys") == null);
+ try std.testing.expect(std.mem.indexOf(u8, group, "Callstack: static caller chains") != null);
}
pub fn openConfig(p: *Pardes, id: usize) !void {
diff --git a/src/body_layer.zig b/src/body_layer.zig
index b24bd6ed..2aa8e5f8 100644
--- a/src/body_layer.zig
+++ b/src/body_layer.zig
@@ -113,8 +113,8 @@ fn paintSourceSelection(p: *Pardes, s: *Surface, pane: *Pane, r: Rect, rows: []c
const lo = @max(start, row.lo);
const hi = @min(end, row.hi);
if (lo >= hi) continue;
- var col = prefix + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], lo - start)));
- const last = if (row.to_edge and hi == end) @as(i32, width) else prefix + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], hi - start)));
+ var col = prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], lo - start)));
+ const last = if (row.to_edge and hi == end) @as(i32, width) else prefix + source.pad + @as(i32, @intCast(panes.File.rawDisplayCol(line[start..], hi - start)));
while (col < last and col < width) : (col += 1) {
const cell = s.at(tx + @as(u16, @intCast(col)), body_y + @as(u16, @intCast(visible)));
cell.default = false;
@@ -399,14 +399,14 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
(if (pane.file != null)
panes.File.displayOffset(pane, w.line, w.at, bnd.lo_col)
else
- panes.File.lineDisplayOffset(visible_line, @intCast(@max(0, w.at)), @intCast(@max(0, bnd.lo_col)))) + vpfx
+ panes.File.lineDisplayOffset(visible_line, @intCast(@max(0, w.at)), @intCast(@max(0, bnd.lo_col)))) + vpfx + w.pad
else
- vpfx;
+ vpfx + w.pad;
const cend: i32 = if (w.line == bnd.hi_row and @as(usize, @intCast(@max(0, bnd.hi_col))) < past_view)
(if (pane.file != null)
panes.File.displayEndOffset(pane, w.line, w.at, bnd.hi_col)
else
- panes.File.lineDisplayEndOffset(visible_line, @intCast(@max(0, w.at)), @intCast(@max(0, bnd.hi_col)))) + vpfx
+ panes.File.lineDisplayEndOffset(visible_line, @intCast(@max(0, w.at)), @intCast(@max(0, bnd.hi_col)))) + vpfx + w.pad
else
@as(i32, tw) - 1;
var col: i32 = @max(cstart, vpfx);
@@ -432,7 +432,7 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
modal.lineSlice(body, @intCast(@max(0, cw.row))),
@intCast(@max(0, cw.at)),
@intCast(@max(0, sr.col)),
- )) + vpfx;
+ )) + vpfx + cw.pad;
if (crow >= pane.tag_rows and crow < @as(i32, body_bottom) and ccol >= vpfx and ccol < tw) {
const cell = s.at(tx + @as(u16, @intCast(ccol)), body_y + @as(u16, @intCast(crow - pane.tag_rows)));
cell.default = false;
@@ -455,7 +455,7 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
const row: i32 = @intCast(pos.row);
const wp = pane.wrapRow(row, @intCast(pos.col));
const cx = if (pane.file != null)
- @as(i32, panes.File.gutterWidth(pane)) + panes.File.displayOffset(pane, row, wp.at, @intCast(pos.col))
+ @as(i32, panes.File.gutterWidth(pane)) + wp.pad + panes.File.displayOffset(pane, row, wp.at, @intCast(pos.col))
else
panes.File.lineDisplayOffset(modal.lineSlice(flat, pos.row), @intCast(@max(0, wp.at)), pos.col);
if (wp.row >= 0 and wp.row < body_h and cx >= 0 and cx < tw)
@@ -478,20 +478,20 @@ pub fn renderBody(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane
// Off the view, the cursor is not measured (its column may be
// millions of bytes along a line whose start is shown).
if (cwp.row >= 0 and prow < body_bottom and !pastView(pane, body, crow, cwp.row, cwp.at, ccol, tw)) {
- // Files store source-byte columns; the Surface stores display
- // cells, so account for every expanded tab before the cursor.
- const cx = if (pane.file != null)
- @as(i32, panes.File.gutterWidth(pane)) + panes.File.displayOffset(pane, crow, cwp.at, ccol)
- else if (pane.body.cur_pinned)
- panes.File.lineDisplayOffset(
- modal.lineSlice(body, @intCast(@max(0, cwp.row))),
- @intCast(@max(0, cwp.at)),
- @intCast(@max(0, ccol)),
- )
- else
- ccol;
- if (prow >= pane.tag_rows and cx >= 0 and prow < body_bottom and cx < tw)
- s.cursor = .{ .x = tx + @as(u16, @intCast(cx)), .y = body_y + @as(u16, @intCast(prow - pane.tag_rows)), .bar = pane.body.mode == .insert };
+ // Files store source-byte columns; the Surface stores display
+ // cells, so account for every expanded tab before the cursor.
+ const cx = if (pane.file != null)
+ @as(i32, panes.File.gutterWidth(pane)) + cwp.pad + panes.File.displayOffset(pane, crow, cwp.at, ccol)
+ else if (pane.body.cur_pinned)
+ panes.File.lineDisplayOffset(
+ modal.lineSlice(body, @intCast(@max(0, cwp.row))),
+ @intCast(@max(0, cwp.at)),
+ @intCast(@max(0, ccol)),
+ )
+ else
+ ccol;
+ if (prow >= pane.tag_rows and cx >= 0 and prow < body_bottom and cx < tw)
+ s.cursor = .{ .x = tx + @as(u16, @intCast(cx)), .y = body_y + @as(u16, @intCast(prow - pane.tag_rows)), .bar = pane.body.mode == .insert };
}
} else if (panes.terminal.visibleCursor(pane)) |cur| {
if (cur.y + pane.tag_rows < body_bottom and cur.x < tw)
diff --git a/src/builtins.zig b/src/builtins.zig
index ef769b48..f73c5982 100644
--- a/src/builtins.zig
+++ b/src/builtins.zig
@@ -236,8 +236,8 @@ pub const registry = struct {
// are the default
.toggle, .transition, .scene, .dump_dir, .choice, .lift, .shader_animation, .motion, .shell => false,
.theme, .font, .tagline_size, .window_opacity, .window_blur, .message_ms, .shader, .inactive_dim, .grip_width => true,
- // bare, it says the width (exec.applySettingBuiltin)
- .tab => false,
+ // bare, it says the current value (exec.applySettingBuiltin)
+ .tab, .callstack_depth => false,
};
unreachable;
}
@@ -1839,6 +1839,7 @@ pub const Forward = struct {
/// Select the next Look location across panes; Enter opens it.
pub const LookNext = struct {
+ pub const quiet = true;
pub fn run(c: Ctx) void {
look.lookWalk(c.p, 1);
}
@@ -1846,6 +1847,7 @@ pub const LookNext = struct {
/// Select the previous Look location across panes; Enter opens it.
pub const LookPrev = struct {
+ pub const quiet = true;
pub fn run(c: Ctx) void {
look.lookWalk(c.p, -1);
}
@@ -1952,6 +1954,13 @@ pub const WsDiagnostics = struct {
}
};
+/// Show outermost callers first, with signatures and call sites (gc).
+pub const Callstack = struct {
+ pub fn run(c: Ctx) void {
+ c.p.lspRequest(c.id, .callstack, "");
+ }
+};
+
/// List the callers of the function under the cursor.
pub const Callers = struct {
pub fn run(c: Ctx) void {
diff --git a/src/colors.zig b/src/colors.zig
index 2dcb906a..379d1301 100644
--- a/src/colors.zig
+++ b/src/colors.zig
@@ -126,9 +126,11 @@ test "every faithful port meets pardes's chrome floors in its own colours, with
}
test "a derived separator or tint keeps the theme's own when it already stands off" {
- const forge = &themes[for (themes[0..native_count], 0..) |t, i| {
- if (std.mem.eql(u8, t.name, "forge")) break i;
- } else unreachable];
+ const forge = &themes[
+ for (themes[0..native_count], 0..) |t, i| {
+ if (std.mem.eql(u8, t.name, "forge")) break i;
+ } else unreachable
+ ];
const chrome = ChromeTheme.fromTheme(forge);
try std.testing.expectEqual(forge.border.?, chrome.border);
// forge's own tint is 1.23:1 off its tag: pushed on the way it leans.
@@ -1075,7 +1077,7 @@ test "render uses target content colors while chrome is in flight" {
Color{ .rgb = source_chrome.tag_bg },
surface.at(0, 0).style.bg,
);
- const topbar_cell = surface.at(0, 0);
+ const topbar_cell = surface.at(@import("pardes.zig").TAG_TEXT_INSET, 0);
try std.testing.expect(!std.mem.eql(u8, topbar_cell.grapheme(), " "));
try std.testing.expectEqual(FontRole.tagline, topbar_cell.style.font_role);
const r = p.rects[0];
diff --git a/src/config.zig b/src/config.zig
index fb34b746..50009660 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -43,6 +43,7 @@ pub const leader_path = paths: {
.WsDiagnostics = "lD",
.Lspinfo = "li",
.Lspwhy = "lw",
+ .Callstack = "lb",
.Callers = "lc",
.Callees = "lC",
.Supertypes = "lt",
@@ -67,6 +68,9 @@ pub const leader_path = paths: {
.Putall = null,
.Incl = null,
.Tab = null,
+ .CallstackDepth = null,
+ .CallstackLayout = null,
+ .CallstackCorners = null,
.Zerox = null,
.ClipYank = "y",
.ClipYankMain = "Y",
@@ -580,7 +584,8 @@ pub const goto_line_down: []const Chord = &.{.{ .cp = 'j' }};
pub const goto_line_up: []const Chord = &.{.{ .cp = 'k' }};
pub const goto_column: []const Chord = &.{.{ .cp = '|' }};
pub const goto_view_top: []const Chord = &.{.{ .cp = 't' }};
-pub const goto_view_center: []const Chord = &.{.{ .cp = 'c' }};
+// gc opens Callstack; it no longer moves the cursor to the viewport center.
+pub const goto_view_center: []const Chord = &.{};
pub const goto_view_bottom: []const Chord = &.{.{ .cp = 'b' }};
pub const goto_last_modification: []const Chord = &.{.{ .cp = '.' }};
pub const goto_word: []const Chord = &.{.{ .cp = 'w' }};
@@ -591,6 +596,7 @@ pub const goto_declaration: []const Chord = &.{.{ .cp = 'D' }};
pub const goto_type_definition: []const Chord = &.{.{ .cp = 'y' }};
pub const goto_implementation: []const Chord = &.{.{ .cp = 'i' }};
pub const goto_references: []const Chord = &.{.{ .cp = 'r' }};
+pub const goto_callstack: []const Chord = &.{.{ .cp = 'c' }};
pub const match_bracket: []const Chord = &.{.{ .cp = 'm' }};
pub const match_inside = 'i';
@@ -835,6 +841,9 @@ pub const Runtime = struct {
/// acme's Tab: a tab's width in cells, in every pane (config.tab_now
/// is what the drawing and the column arithmetic read).
tab: u16 = tab_width,
+ callstack_layout: CallstackLayout = .stacked,
+ callstack_corners: CallstackCorners = .rounded,
+ callstack_depth: u8 = @import("lsp/lsp.zig").callstack_default_depth,
pub const ShaderAnimation = enum { off, on, always };
pub const Placement = enum { acme, pardes };
@@ -845,8 +854,10 @@ pub const Runtime = struct {
pub const Pager = enum { pardes, off };
pub const TermImages = enum { real, petscii };
pub const JumpScope = enum { file, all };
+ pub const CallstackLayout = enum { @"inline", stacked };
+ pub const CallstackCorners = @import("lsp/lsp.zig").CallstackCorners;
/// A setting that is one of a few words, each an enum field of Runtime.
- pub const Choice = enum { placement, boot_shell, look_word, dir_look, diff_look, pager, term_images, jump_scope };
+ pub const Choice = enum { placement, boot_shell, look_word, dir_look, diff_look, pager, term_images, jump_scope, callstack_layout, callstack_corners };
/// shadow: a soft drop shadow. rim: a light hairline along the top of
/// the focused pane's tag rows. auto: a shadow on a light page; on a
@@ -1034,6 +1045,7 @@ pub const Runtime = struct {
inactive_dim,
grip_width,
tab,
+ callstack_depth,
transition: animation.Transition,
scene: Scene,
/// A Shadertoy file into the post chain or out of it; `off` empties
@@ -1118,6 +1130,9 @@ pub const Runtime = struct {
.{ .word = "PagerColor", .action = .{ .toggle = .pager_color }, .doc = "A +Pager keeps its program's colours, on or off; for the next text paged." },
.{ .word = "TermImages", .action = .{ .choice = .term_images }, .doc = "How a new terminal draws its program's kitty graphics: real, as pixels where it can, or petscii, as glyph art." },
.{ .word = "JumpScope", .action = .{ .choice = .jump_scope }, .doc = "What Back and Forward keep to: file, the focused pane's file until it runs out that way, or all, every place in order." },
+ .{ .word = "CallstackLayout", .action = .{ .choice = .callstack_layout }, .doc = "Callstack snippets below their locations (stacked, the default) or beside them (inline); bare, it switches layouts. Applies to the next Callstack query." },
+ .{ .word = "CallstackCorners", .action = .{ .choice = .callstack_corners }, .doc = "Callstack tree corners: rounded (the default) or square; bare, it switches styles. Applies to the next Callstack query." },
+ .{ .word = "CallstackDepth", .action = .callstack_depth, .doc = "Caller levels collected by Callstack, 1 through 64; default 8. Bare, it says the current limit." },
.{ .word = "Tab", .action = .tab, .doc = "A tab's width in cells, 1 through 16, in every pane; bare, it says the width." },
};
@@ -1319,6 +1334,12 @@ pub const Runtime = struct {
if (percent < 50 or percent > 300) return false;
state.grip_width = percent;
},
+ .callstack_depth => {
+ const text = std.mem.trim(u8, argument orelse return false, " \t\r\n");
+ const depth = std.fmt.parseInt(u8, text, 10) catch return false;
+ if (depth < 1 or depth > @import("lsp/lsp.zig").callstack_max_depth) return false;
+ state.callstack_depth = depth;
+ },
.tab => {
const text = std.mem.trim(u8, argument orelse return false, " \t\r\n");
const width = std.fmt.parseInt(u16, text, 10) catch return false;
@@ -1361,6 +1382,7 @@ pub const Runtime = struct {
.inactive_dim, .window_opacity, .window_blur => "0-100 (a percentage)",
.grip_width => "50-300 (a percentage)",
.tab => "1-16 (cells)",
+ .callstack_depth => "1-64 (levels)",
.tagline_size => std.fmt.comptimePrint("{d}-{d} (a percentage)", .{ tagline_percent_min, tagline_percent_max }),
.message_ms => std.fmt.comptimePrint("0-{d} (milliseconds)", .{message_ms_max}),
.shell => "a path of at most 255 bytes; bare, $SHELL, else /bin/sh",
@@ -1523,6 +1545,7 @@ pub const Runtime = struct {
try out.print("# {s} unsupported\n", .{setting.word}),
.motion => try out.print("{s} {s}\n", .{ setting.word, @tagName(state.motion) }),
.inactive_dim => try out.print("{s} {d}\n", .{ setting.word, state.inactive_dim }),
+ .callstack_depth => try out.print("{s} {d}\n", .{ setting.word, state.callstack_depth }),
.tab => try out.print("{s} {d}\n", .{ setting.word, state.tab }),
.grip_width => if (setting.enabled(context.capabilities))
try out.print("{s} {d}\n", .{ setting.word, state.grip_width })
@@ -1816,11 +1839,14 @@ pub const Runtime = struct {
.pager => "off",
.term_images => "petscii",
.jump_scope => "all",
+ .callstack_layout => "inline",
+ .callstack_corners => "square",
},
.lift => "rim",
.motion => "playful",
.inactive_dim => "35",
.grip_width => "200",
+ .callstack_depth => "16",
.tab => "8",
else => null,
};
@@ -1892,11 +1918,14 @@ pub const Runtime = struct {
.pager => "Pager off\n",
.term_images => "TermImages petscii\n",
.jump_scope => "JumpScope all\n",
+ .callstack_layout => "CallstackLayout inline\n",
+ .callstack_corners => "CallstackCorners square\n",
},
.lift => "Lift rim\n",
.motion => "Motion playful\n",
.inactive_dim => "InactiveDim 35\n",
.grip_width => "GripWidth 200\n",
+ .callstack_depth => "CallstackDepth 16\n",
.tab => "Tab 8\n",
.theme, .font => unreachable,
};
@@ -2474,3 +2503,16 @@ test "reference.typ's #fstree is the tree the session serves, file for file" {
};
if (drift) return error.FsTreeDrift;
}
+
+test "CallstackDepth is bounded and keeps the last valid runtime limit" {
+ var state: Runtime = .{};
+ try std.testing.expectEqual(@as(u8, 8), state.callstack_depth);
+ for ([_][]const u8{ "1", "8", "16", "64" }) |value| {
+ try std.testing.expect(Runtime.apply(&state, Runtime.find("CallstackDepth").?, value));
+ try std.testing.expectEqual(try std.fmt.parseInt(u8, value, 10), state.callstack_depth);
+ }
+ for ([_][]const u8{ "0", "65", "256", "-1", "eight", "" }) |value| {
+ try std.testing.expect(!Runtime.apply(&state, Runtime.find("CallstackDepth").?, value));
+ try std.testing.expectEqual(@as(u8, 64), state.callstack_depth);
+ }
+}
diff --git a/src/draw.zig b/src/draw.zig
index 9fcbb15f..b35d55e8 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -412,15 +412,15 @@ fn recede(p: *Pardes, s: *Surface, id: usize, amount: f32, focused: bool) void {
}
}
const body = &s.body_layers[id];
- if (body.rows != 0) for (body.cells[0..@as(usize, body.cols) * body.rows]) |*cell| {
+ if (body.rows != 0) for (body.cells[0 .. @as(usize, body.cols) * body.rows]) |*cell| {
if (!(focused and selected(cell, th.sel_bg))) fadeStyle(&cell.style, th.fg, th.bg, palette, amount, &memo);
};
if (focused) return;
const tag = &s.tag_layers[id];
- if (tag.rows != 0) for (tag.cells[0..@as(usize, tag.cols) * tag.rows]) |*cell| fadeStyle(&cell.style, chrome.tag_fg, tag.bg, palette, amount, &memo);
+ if (tag.rows != 0) for (tag.cells[0 .. @as(usize, tag.cols) * tag.rows]) |*cell| fadeStyle(&cell.style, chrome.tag_fg, tag.bg, palette, amount, &memo);
for (0..Pane.Notices.max) |i| {
const notice = &s.tag_layers[NOTICE_LAYER_BASE + id * Pane.Notices.max + i];
- if (notice.rows != 0) for (notice.cells[0..@as(usize, notice.cols) * notice.rows]) |*cell| fadeStyle(&cell.style, chrome.tag_fg, notice.bg, palette, amount, &memo);
+ if (notice.rows != 0) for (notice.cells[0 .. @as(usize, notice.cols) * notice.rows]) |*cell| fadeStyle(&cell.style, chrome.tag_fg, notice.bg, palette, amount, &memo);
}
}
@@ -978,7 +978,12 @@ pub fn paintHeaders(p: *Pardes, s: *Surface, arena: std.mem.Allocator) !void {
if (s.region(.workspace_tag, Region.none)) |region| {
const top = if (p.header_focus and p.header_column == null) p.header_top else 0;
const layer = &s.tag_layers[MAX_PANES + MAX_COLS];
- try renderHeaderLayer(p, arena, layer, .workspace, 0, region.rect, tagline.topbar(p), top, chrome.tag_bg, chrome.tag_fg);
+ var viewport = region.rect;
+ const inset = @min(TAG_TEXT_INSET, viewport.w);
+ s.fill(viewport.x, viewport.y, inset, viewport.h, .{ .bg = .{ .rgb = chrome.tag_bg }, .fg = .{ .rgb = chrome.tag_fg }, .font_role = .tagline });
+ viewport.x += inset;
+ viewport.w -= inset;
+ try renderHeaderLayer(p, arena, layer, .workspace, 0, viewport, tagline.topbar(p), top, chrome.tag_bg, chrome.tag_fg);
joinHeaderRows(s, layer, chrome.tag_fg);
}
const column_rows = p.columnBarHeight();
@@ -1348,8 +1353,7 @@ pub fn paintPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pa
const at = modal.positionAt(shown.text, shown.fromReal(@intCast(@max(0, pane.input.cur_col))));
if (at.row < top or at.row >= top + rows) break :caret null;
break :caret .{ .row = at.row - top, .at = @min(lines[at.row - top].len, at.col) };
- }
- else if (pane.focus == .tag and pane.prompt == .none) caret: {
+ } else if (pane.focus == .tag and pane.prompt == .none) caret: {
const real = modal.offsetAt(whole, .{ .row = @intCast(@max(0, pane.tag.cur_row)), .col = @intCast(@max(0, pane.tag.cur_col)) });
const at = modal.positionAt(shown.text, shown.fromReal(real));
if (at.row < top or at.row >= top + rows) break :caret null;
@@ -2392,7 +2396,7 @@ test "a pane focus reaches brightens on the same spring the one it leaves dims o
// The file's first glyph's ink, in whichever form its body has.
fn of(s: *const Surface) [3]u8 {
const body = &s.body_layers[0];
- const cells = if (body.rows != 0) body.cells[0..@as(usize, body.cols) * body.rows] else s.cells;
+ const cells = if (body.rows != 0) body.cells[0 .. @as(usize, body.cols) * body.rows] else s.cells;
for (cells) |cell| if (!cell.default and cell.len == 1 and cell.text[0] == 's' and cell.style.font_role == .body) return switch (cell.style.fg) {
.rgb => |rgb| rgb,
else => .{ 0, 0, 0 },
diff --git a/src/dump.zig b/src/dump.zig
index 201f5bf2..402918c4 100644
--- a/src/dump.zig
+++ b/src/dump.zig
@@ -56,7 +56,7 @@ pub fn outPath(buf: *[1024:0]u8, dir_setting: []const u8) ?[:0]const u8 {
const ds = es.getDaySeconds();
var stamp: [32]u8 = undefined;
const base = std.fmt.bufPrint(&stamp, "pardes-{d:0>4}{d:0>2}{d:0>2}-{d:0>2}{d:0>2}{d:0>2}", .{
- yd.year, md.month.numeric(), @as(u8, md.day_index) + 1,
+ yd.year, md.month.numeric(), @as(u8, md.day_index) + 1,
ds.getHoursIntoDay(), ds.getMinutesIntoHour(), ds.getSecondsIntoMinute(),
}) catch return null;
return uniqueIn(buf, dir, base);
@@ -194,6 +194,8 @@ pub const Terminal = struct {
};
pub const LocationRow = struct {
+ mark_occurrence: bool = true,
+ source_column: usize = 0,
kind: enum { match, context, preview },
declaration: bool = false,
path: []const u8,
diff --git a/src/edit.zig b/src/edit.zig
index b2909d87..5dbce0bf 100644
--- a/src/edit.zig
+++ b/src/edit.zig
@@ -241,8 +241,8 @@ pub fn capturePointerSelection(p: *Pardes, pane: *Pane, slot: usize) !void {
if (raw) next = .{ .line = source.line + 1, .at = 0 };
const end = if (next.line == source.line) @min(line.len, @as(usize, @intCast(@max(0, next.at)))) else line.len;
const start: usize = @intCast(@max(0, source.at));
- const lo = @min(end, panes.File.byteAtDisplayFrom(line, start, @intCast(@max(0, left - prefix))));
- const at = @min(end, panes.File.byteAtDisplayFrom(line, start, @intCast(@max(0, right - prefix))));
+ const lo = @min(end, panes.File.byteAtDisplayFrom(line, start, @intCast(@max(0, left - prefix - source.pad))));
+ const at = @min(end, panes.File.byteAtDisplayFrom(line, start, @intCast(@max(0, right - prefix - source.pad))));
row.* = .{
.row = source.line,
.lo = lo,
diff --git a/src/exec.zig b/src/exec.zig
index 2a6bd55c..d03a4a48 100644
--- a/src/exec.zig
+++ b/src/exec.zig
@@ -140,7 +140,7 @@ pub fn operandAt(p: *Pardes, pane: *Pane, clicked: Pane.Sel, borrow: bool, for_l
&pane.body,
wrapped.line,
wrapped.at,
- clicked.c0 - (if (pane.file != null) @as(i32, panes.File.gutterWidth(pane)) else 0),
+ clicked.c0 - wrapped.pad - (if (pane.file != null) @as(i32, panes.File.gutterWidth(pane)) else 0),
)
else
clicked.c0;
@@ -214,9 +214,9 @@ pub fn operandAt(p: *Pardes, pane: *Pane, clicked: Pane.Sel, borrow: bool, for_l
const last = pane.wrapRow(row, hi - 1);
if (first.row < 0 or last.row < 0) return result;
expanded.r0 = first.row + @as(i32, pane.tag_rows);
- expanded.c0 = @as(i32, panes.File.gutterWidth(pane)) + panes.File.displayOffset(pane, row, first.at, 0);
+ expanded.c0 = @as(i32, panes.File.gutterWidth(pane)) + first.pad + panes.File.displayOffset(pane, row, first.at, 0);
expanded.r1 = last.row + @as(i32, pane.tag_rows);
- expanded.c1 = @as(i32, panes.File.gutterWidth(pane)) + panes.File.displayEndOffset(pane, row, last.at, hi - 1);
+ expanded.c1 = @as(i32, panes.File.gutterWidth(pane)) + last.pad + panes.File.displayEndOffset(pane, row, last.at, hi - 1);
} else {
const shown = if (raw) raw_line else line;
expanded.c0 = 0;
@@ -242,9 +242,9 @@ pub fn operandAt(p: *Pardes, pane: *Pane, clicked: Pane.Sel, borrow: bool, for_l
const last = pane.wrapRow(row, hi - 1);
if (first.row >= 0 and last.row >= 0) {
expanded.r0 = first.row + @as(i32, pane.tag_rows);
- expanded.c0 = @as(i32, panes.File.gutterWidth(pane)) + panes.File.displayOffset(pane, row, first.at, lo);
+ expanded.c0 = @as(i32, panes.File.gutterWidth(pane)) + first.pad + panes.File.displayOffset(pane, row, first.at, lo);
expanded.r1 = last.row + @as(i32, pane.tag_rows);
- expanded.c1 = @as(i32, panes.File.gutterWidth(pane)) + panes.File.displayEndOffset(pane, row, last.at, hi - 1);
+ expanded.c1 = @as(i32, panes.File.gutterWidth(pane)) + last.pad + panes.File.displayEndOffset(pane, row, last.at, hi - 1);
}
result.preview = expanded;
result.expanded = expanded;
@@ -1120,6 +1120,12 @@ pub fn applySettingBuiltin(p: *Pardes, setting: config.Runtime.Setting, arg: ?[]
}
if (!p.settings.apply(setting, want)) p.reportFailure(p.active, "Shell: takes " ++ comptime config.Runtime.takes(.shell).?);
},
+ .callstack_depth => if (arg == null) {
+ var said: [40]u8 = undefined;
+ return p.setMessage(p.active, std.fmt.bufPrint(&said, "CallstackDepth {d}", .{p.settings.callstack_depth}) catch "CallstackDepth");
+ } else if (!p.settings.apply(setting, arg)) {
+ p.reportFailure(p.active, "CallstackDepth: takes " ++ comptime config.Runtime.takes(.callstack_depth).?);
+ },
// Bare, it says the width, as acme's Tab does.
.tab => if (arg == null) {
var said: [32]u8 = undefined;
diff --git a/src/host_io.zig b/src/host_io.zig
index 7314affc..a90c903d 100644
--- a/src/host_io.zig
+++ b/src/host_io.zig
@@ -136,6 +136,8 @@ pub const Lsp = struct {
/// One language query, owned by the worker that runs it.
pub const Job = struct {
+ callstack_depth: u8 = pardes.lsp.callstack_default_depth,
+ callstack_corners: pardes.lsp.CallstackCorners = .rounded,
id: u32,
kind: pardes.lsp.Kind,
offset: u32,
@@ -178,6 +180,8 @@ pub const Lsp = struct {
const root = try gpa.dupe(u8, filesystem.localPath(declared_root) orelse declared_root);
errdefer gpa.free(root);
job.* = .{
+ .callstack_depth = core.settings.callstack_depth,
+ .callstack_corners = core.settings.callstack_corners,
.id = req.id,
.kind = req.kind,
.offset = req.offset,
@@ -234,6 +238,8 @@ pub const Lsp = struct {
.arg = job.arg,
.root = job.root,
.others = job.others,
+ .callstack_depth = job.callstack_depth,
+ .callstack_corners = job.callstack_corners,
}, &out.writer) catch {
deliver(ctx, job.id, null);
return;
@@ -250,6 +256,8 @@ pub const Lsp = struct {
const core = try pardes.Pardes.init(gpa, .{ .tty_only = true });
defer core.deinit();
+ core.settings.callstack_depth = 16;
+ core.settings.callstack_corners = .square;
var needle: [6]u8 = "needle".*;
const job = try snapshot(gpa, core, .{
.id = 7,
@@ -260,6 +268,10 @@ pub const Lsp = struct {
});
defer job.free(gpa);
+ core.settings.callstack_depth = 2;
+ core.settings.callstack_corners = .rounded;
+ try std.testing.expectEqual(pardes.lsp.CallstackCorners.square, job.callstack_corners);
+ try std.testing.expectEqual(@as(u8, 16), job.callstack_depth);
try std.testing.expectEqual(@as(u32, 7), job.id);
try std.testing.expectEqual(pardes.lsp.Kind.status, job.kind);
try std.testing.expectEqualStrings("needle", job.arg);
diff --git a/src/layout.zig b/src/layout.zig
index a2211dfd..40bce75a 100644
--- a/src/layout.zig
+++ b/src/layout.zig
@@ -266,6 +266,28 @@ pub fn setColumnWeights(p: *Pardes, col: usize, heights: *const [MAX_PANES]u16)
}
}
+/// Give a newly opened report enough rows to read, borrowing only space
+/// above the other panes' usable minima. Keep their tags and bodies visible.
+pub fn givePaneRows(p: *Pardes, id: usize, wanted: u16, context: usize) void {
+ const at = findPane(p, id) orelse return;
+ compute(p);
+ var heights: [MAX_PANES]u16 = @splat(0);
+ for (p.col_panes[at.col][0..p.col_n[at.col]]) |other| heights[other] = p.rects[other].h;
+ var missing = wanted -| heights[id];
+ for (p.col_panes[at.col][0..p.col_n[at.col]]) |other| {
+ if (other == id or p.panes[other].?.collapsed) continue;
+ const body_rows: u16 = if (other == context) 6 else 3;
+ const minimum = @max(minRows(p, other), p.panes[other].?.tag_rows + body_rows);
+ const take = @min(missing, heights[other] -| minimum);
+ heights[other] -= take;
+ heights[id] += take;
+ missing -= take;
+ if (missing == 0) break;
+ }
+ setColumnWeights(p, at.col, &heights);
+ p.sync();
+}
+
pub fn applyRowSplit(p: *Pardes, cc: usize, k: usize, cur_y: u16) void {
if (k + 1 >= p.col_n[cc]) return;
const a = p.panes[p.col_panes[cc][k]] orelse return;
diff --git a/src/locations.zig b/src/locations.zig
index 7755f6fd..745393e5 100644
--- a/src/locations.zig
+++ b/src/locations.zig
@@ -16,6 +16,8 @@ pub fn isContextLine(line: []const u8) bool {
pub const Row = struct {
kind: enum { match, context, preview },
declaration: bool = false,
+ mark_occurrence: bool = true,
+ source_column: usize = 0,
path: []u8,
at: look.Spot,
location_end: usize,
@@ -34,7 +36,7 @@ pub fn freeRows(gpa: std.mem.Allocator, rows: []Row) void {
pub fn equalRows(a: []const Row, b: []const Row) bool {
if (a.len != b.len) return false;
for (a, b) |left, right| {
- if (left.kind != right.kind or left.declaration != right.declaration or !std.meta.eql(left.at, right.at) or
+ if (left.kind != right.kind or left.declaration != right.declaration or left.mark_occurrence != right.mark_occurrence or left.source_column != right.source_column or !std.meta.eql(left.at, right.at) or
left.location_end != right.location_end or left.code_start != right.code_start or
!std.mem.eql(u8, left.path, right.path) or !std.mem.eql(u8, left.colors, right.colors)) return false;
}
@@ -119,7 +121,8 @@ pub fn parse(line: []const u8) Parsed {
return parseRaw(line);
}
-fn parseRaw(line: []const u8) Parsed {
+/// Native producer rows have one separator byte before untouched source.
+pub fn parseRaw(line: []const u8) Parsed {
var at: usize = 1;
while (at < line.len) : (at += 1) {
if (line[at] != ':' or at + 1 == line.len or !std.ascii.isDigit(line[at + 1])) continue;
@@ -148,6 +151,8 @@ const Pending = struct {
original: ?usize,
hidden: bool = false,
declaration: bool = false,
+ mark_occurrence: bool = true,
+ source_column: usize = 0,
depth: usize = 0,
colors: []const u8 = &.{},
@@ -174,6 +179,174 @@ pub fn sourceText(p: *pardes.Pardes, arena: std.mem.Allocator, dir: []const u8,
return .{ .path = lexical, .bytes = arena.dupe(u8, bytes) catch return null };
}
+/// Byte boundary after the guides in a call tree, independent of source indentation.
+pub fn treePrefix(line: []const u8) struct { end: usize, branch: bool } {
+ var at: usize = 0;
+ while (at < line.len) {
+ for ([_][]const u8{ "╰──┬ ", "├──╮ ", "╰──╮ ", "├─── ", "╰─── ", "├──┬ ", "└──┬ ", "└─── " }) |branch| {
+ if (std.mem.startsWith(u8, line[at..], branch)) return .{ .end = at + branch.len, .branch = true };
+ }
+ if (std.mem.startsWith(u8, line[at..], "├─ ") or std.mem.startsWith(u8, line[at..], "└─ ") or std.mem.startsWith(u8, line[at..], "╰─ "))
+ return .{ .end = at + "└─ ".len, .branch = false };
+ if (std.mem.startsWith(u8, line[at..], "│")) {
+ at += "│".len;
+ } else if (line[at] == ' ') {
+ at += 1;
+ } else break;
+ }
+ return .{ .end = at, .branch = false };
+}
+
+/// The same tree columns carried across a soft-wrapped display row. This is
+/// presentation only: source bytes and Look addresses remain untouched.
+pub fn treeContinuation(line: []const u8, buffer: []u8, max_cells: usize) []const u8 {
+ const prefix = line[0..treePrefix(line).end];
+ var out: std.Io.Writer = .fixed(buffer);
+ var it = (std.unicode.Utf8View.init(prefix) catch return "").iterator();
+ var cells: usize = 0;
+ var end: usize = 0;
+ while (it.nextCodepoint()) |cp| {
+ if (cells >= max_cells) break;
+ out.writeAll(if (cp == '│' or cp == '├' or cp == '┬' or cp == '╮') "│" else " ") catch break;
+ cells += 1;
+ if (cp != ' ') end = out.buffered().len;
+ }
+ if (end == 0) return "";
+ // Keep one cell between the continuation and the wrapped source text.
+ if (end < out.buffered().len) end += 1;
+ return out.buffered()[0..end];
+}
+
+/// Enrich caller nodes on the UI thread, using the same source/declaration cache
+/// as LocationsContext. The LSP worker only supplies relationships and addresses.
+pub fn formatCallstack(p: *pardes.Pardes, dir: []const u8, input: []const u8) !Result {
+ const arena = p.scratch.allocator();
+ var out: std.Io.Writer.Allocating = .init(p.gpa);
+ errdefer out.deinit();
+ var rows: std.ArrayList(Row) = .empty;
+ errdefer {
+ for (rows.items) |row| {
+ p.gpa.free(row.path);
+ p.gpa.free(row.colors);
+ }
+ rows.deinit(p.gpa);
+ }
+ const stacked = p.settings.callstack_layout == .stacked;
+ var sources: std.StringHashMap(?Source) = .init(arena);
+ var lines = std.mem.splitScalar(u8, std.mem.trimEnd(u8, input, "\n"), '\n');
+ while (lines.next()) |raw| {
+ const mark = @import("lsp/lsp.zig").callstack_match;
+ const focus = std.mem.startsWith(u8, raw, mark);
+ const line = if (focus) raw[mark.len..] else raw;
+ const prefix = treePrefix(line);
+ const target = parseRaw(line[prefix.end..]);
+ if (target.at.line == 0) {
+ try out.writer.print("{s}\n", .{line});
+ try appendMetadata(p.gpa, &rows, .{ .path = "", .at = .{}, .label = "", .code = "", .original = null }, .context, 0, line.len, false);
+ continue;
+ }
+ const entry = try sources.getOrPut(target.path);
+ if (!entry.found_existing) entry.value_ptr.* = sourceText(p, arena, dir, target.path);
+ const source = entry.value_ptr.*;
+ var cached: Cache.Hit = .{ .analysis = .{} };
+ defer cached.deinit(p.tree_sitter_gpa);
+ if (source) |text| cached = p.locations_cache.get(p.tree_sitter_gpa, text.path, text.bytes, true, true) catch .{ .analysis = .{} };
+ var code = line[prefix.end + target.code_start ..];
+ var colors: []const u8 = &.{};
+ var source_row = target.at.line - 1;
+ if (source) |text| {
+ const row = target.at.line - 1;
+ if (prefix.branch) {
+ // Choose the innermost header containing the server's name range.
+ var chosen: ?syntax.ContextDeclaration = null;
+ for (cached.analysis.declarations) |declaration| {
+ if (declaration.start_line <= row and row <= declaration.header_end_line) {
+ if (chosen == null or declaration.end_byte - declaration.start_byte < chosen.?.end_byte - chosen.?.start_byte)
+ chosen = declaration;
+ }
+ }
+ if (chosen) |header| {
+ code = text.bytes[header.start_byte..header.header_end_byte];
+ source_row = header.start_line;
+ } else {
+ const fallback = @import("modal.zig").lineSlice(text.bytes, row);
+ if (fallback.len > 0) code = fallback;
+ }
+ }
+ {
+ const offset = @import("modal.zig").lineStartOffset(text.bytes, source_row);
+ if (offset + code.len <= cached.analysis.colors.len and
+ std.mem.eql(u8, code, text.bytes[offset..][0..code.len]))
+ colors = cached.analysis.colors[offset..][0..code.len];
+ }
+ }
+ const recursion = prefix.branch and std.mem.endsWith(u8, line, " ↻ recursion");
+ const first_line = code[0 .. std.mem.indexOfScalar(u8, code, '\n') orelse code.len];
+ const source_indent = if (stacked) first_line.len - std.mem.trimStart(u8, first_line, " \t").len else 0;
+ if (stacked) {
+ const end = prefix.end + target.end;
+ try out.writer.print("{s}\n", .{line[0..end]});
+ try appendMetadata(p.gpa, &rows, .{ .path = target.path, .at = target.at, .label = "", .code = "", .original = null, .mark_occurrence = false }, .match, end, end, false);
+ }
+ var header_lines = std.mem.splitScalar(u8, code, '\n');
+ var first = true;
+ var color_offset: usize = 0;
+ while (header_lines.next()) |code_line| {
+ const start = out.written().len;
+ if (stacked) {
+ var guide_buf: [1024]u8 = undefined;
+ const guide = treeContinuation(line, &guide_buf, std.math.maxInt(usize));
+ try out.writer.writeAll(guide);
+ const width = pardes.panes.File.displayWidth(line[0..prefix.end]);
+ try out.writer.splatByteAll(' ', width -| pardes.panes.File.displayWidth(guide));
+ } else if (first) {
+ try out.writer.writeAll(line[0 .. prefix.end + target.end]);
+ try out.writer.writeByte(' ');
+ } else {
+ const branch_start = prefix.end - "└──┬ ".len;
+ try out.writer.writeAll(line[0..branch_start]);
+ try out.writer.writeAll(if (std.mem.startsWith(u8, line[branch_start..], "├")) "│ " else " ");
+ try out.writer.writeAll(if (std.mem.endsWith(u8, line[0..prefix.end], "┬ ") or std.mem.endsWith(u8, line[0..prefix.end], "╮ ")) "│ " else " ");
+ try out.writer.splatByteAll(' ', pardes.panes.File.displayWidth(line[prefix.end..][0..target.end]) + 1);
+ }
+ const code_start = out.written().len - start;
+ const trim = @min(source_indent, code_line.len - std.mem.trimStart(u8, code_line, " \t").len);
+ try out.writer.writeAll(code_line[trim..]);
+ const recursion_note = recursion and first and !std.mem.endsWith(u8, code_line, " ↻ recursion");
+ if (recursion_note) try out.writer.writeAll(" ↻ recursion");
+ try out.writer.writeByte('\n');
+ try appendMetadata(p.gpa, &rows, .{
+ .path = target.path,
+ .at = if (first) target.at else .{ .line = source_row + 1 },
+ .label = "",
+ .code = code_line[trim..],
+ .source_column = trim,
+ .original = null,
+ .mark_occurrence = focus and !prefix.branch,
+ .colors = if (colors.len >= color_offset + code_line.len) colors[color_offset + trim ..][0 .. code_line.len - trim] else &.{},
+ }, if (first) (if (stacked) .preview else .match) else .context, if (first and !stacked) prefix.end + target.end else 0, code_start, true);
+ // Recursion notes are prose, outside the source snapshot.
+ if (recursion_note) {
+ const added = " ↻ recursion".len;
+ const row = &rows.items[rows.items.len - 1];
+ if (row.colors.len > 0) {
+ const expanded = try p.gpa.alloc(u8, row.colors.len + added);
+ @memcpy(expanded[0..row.colors.len], row.colors);
+ @memset(expanded[row.colors.len..], 0);
+ p.gpa.free(row.colors);
+ row.colors = expanded;
+ }
+ }
+ color_offset += code_line.len + 1;
+ source_row += 1;
+ first = false;
+ }
+ }
+ const owned_rows = try rows.toOwnedSlice(p.gpa);
+ errdefer freeRows(p.gpa, owned_rows);
+ return .{ .content = try out.toOwnedSlice(), .rows = owned_rows, .anchor = null };
+}
+
/// Inputs are sorted results. Expand each source group, merge context with
/// matches, then align groups of eight matches. All temporary source data
/// stays in the caller's scratch arena; returned text and rows are owned.
@@ -334,7 +507,7 @@ fn appendMetadata(gpa: std.mem.Allocator, rows: *std.ArrayList(Row), pending: Pe
errdefer gpa.free(path);
const colors = try gpa.dupe(u8, if (source) pending.colors else &.{});
errdefer gpa.free(colors);
- try rows.append(gpa, .{ .kind = kind, .declaration = pending.declaration, .path = path, .at = pending.at, .location_end = location_end, .code_start = code_start, .colors = colors });
+ try rows.append(gpa, .{ .kind = kind, .declaration = pending.declaration, .mark_occurrence = pending.mark_occurrence, .source_column = pending.source_column, .path = path, .at = pending.at, .location_end = location_end, .code_start = code_start, .colors = colors });
}
const alignment_entries = 8;
diff --git a/src/look.zig b/src/look.zig
index 5795979f..1065cb02 100644
--- a/src/look.zig
+++ b/src/look.zig
@@ -524,7 +524,7 @@ pub fn cursorWordSel(p: *Pardes, pane: *Pane) Pane.Sel {
const w = pane.wrapRow(pane.body.cur_row, pane.body.cur_col);
const vrow = w.row + @as(i32, pane.tag_rows);
const vcol = if (pane.file != null)
- panes.File.displayOffset(pane, pane.body.cur_row, w.at, pane.body.cur_col) + @as(i32, panes.File.gutterWidth(pane))
+ w.pad + panes.File.displayOffset(pane, pane.body.cur_row, w.at, pane.body.cur_col) + @as(i32, panes.File.gutterWidth(pane))
else blk: {
const lines = edit.paneCursorLines(p, &pane.body) catch break :blk pane.body.cur_col;
const local = pane.body.cur_row;
@@ -892,7 +892,13 @@ fn lookSpanIn(p: *Pardes, pane: *Pane, from: LookFrom, delta: i32, budget: *usiz
if (grain == .whole) break :span wholeRowSpan(ln);
if (pane.file) |f| if (@as(usize, @intCast(r)) < f.location_rows.len) {
const end = f.location_rows[@intCast(r)].location_end;
- if (end > 0) break :span @as(?Span, .{ .start = 0, .end = end });
+ if (end > 0) {
+ const start_byte = if (f.output != null and std.meta.eql(f.output.?.from, panes.Output.Origin{ .query = .callstack }))
+ @import("locations.zig").treePrefix(ln).end
+ else
+ 0;
+ break :span @as(?Span, .{ .start = start_byte, .end = end });
+ }
};
break :span lineSpan(p, ln, dir, &realbuf);
} orelse continue;
@@ -1057,6 +1063,7 @@ pub fn focusPaneLine(p: *Pardes, id: usize, at: Spot, landing: enum { center, ke
if (id >= MAX_PANES) return;
const pane = p.panes[id] orelse return;
p.active = id;
+ if (pane.collapsed) layout.toggleCollapse(p, id);
pane.body.normal.clear();
if (pane.hasPdf()) {
if (landing == .keep) return;
@@ -2677,7 +2684,7 @@ test "Incl's directories find a name found nowhere else, <name> too; bare Incl l
try std.testing.expectEqual(@as(usize, 0), p.incl.items.len);
}
-test "n in a command pane walks its own file:line places, whoever walked last" {
+test "LookNext in a command pane walks its own file:line places, whoever walked last" {
if (!platform_has_fs) return;
var tmp = std.testing.tmpDir(.{});
defer tmp.cleanup();
@@ -2706,12 +2713,12 @@ test "n in a command pane walks its own file:line places, whoever walked last" {
cmd.focus = .body;
cmd.body.mode = .normal;
for ([_]u21{ 'g', 'g' }) |cp| p.update(.{ .key = .{ .cp = cp } });
- p.update(.{ .key = .{ .cp = 'n' } });
+ exec.runBuiltin(p, .LookNext, p.active, "", null);
try std.testing.expectEqual(dst, p.active);
const first = cmd.look_at orelse return error.NoSpot;
const lines = try edit.paneCursorLines(p, &cmd.body);
try std.testing.expect(std.mem.startsWith(u8, lines[@intCast(first.row)][@intCast(first.col0)..], "x.c:3:1"));
- p.update(.{ .key = .{ .cp = 'n' } });
+ exec.runBuiltin(p, .LookNext, p.active, "", null);
try std.testing.expectEqual(dst, p.active);
const second = cmd.look_at orelse return error.NoSpot;
try std.testing.expect(std.mem.startsWith(u8, lines[@intCast(second.row)][@intCast(second.col0)..], "y.c:2:1"));
diff --git a/src/lsp/lsp.zig b/src/lsp/lsp.zig
index 8dc4da4f..96d42bbd 100644
--- a/src/lsp/lsp.zig
+++ b/src/lsp/lsp.zig
@@ -16,6 +16,7 @@ pub const Kind = enum {
format,
select_refs,
completion,
+ callstack,
incoming_calls,
outgoing_calls,
supertypes,
@@ -24,7 +25,14 @@ pub const Kind = enum {
explain,
};
+pub const callstack_match = "@callstack-match ";
+pub const CallstackCorners = enum { rounded, square };
+pub const callstack_default_depth: u8 = 8;
+pub const callstack_max_depth: u8 = 64;
+
pub const Req = struct {
+ callstack_depth: u8 = callstack_default_depth,
+ callstack_corners: CallstackCorners = .rounded,
kind: Kind,
path: []const u8,
source: [:0]const u8,
@@ -46,7 +54,7 @@ pub const Doc = struct { path: []const u8, source: [:0]const u8 };
/// file of the server's language is synced before it is asked.
pub fn reachesOtherFiles(kind: Kind) bool {
return switch (kind) {
- .rename, .references, .implementation, .workspace_symbols, .incoming_calls, .outgoing_calls, .supertypes, .subtypes => true,
+ .rename, .references, .implementation, .workspace_symbols, .callstack, .incoming_calls, .outgoing_calls, .supertypes, .subtypes => true,
else => false,
};
}
diff --git a/src/lsp/lsp_client.zig b/src/lsp/lsp_client.zig
index 561195fe..54bbaa79 100644
--- a/src/lsp/lsp_client.zig
+++ b/src/lsp/lsp_client.zig
@@ -521,7 +521,8 @@ fn run(c: *Conn, si: usize, arena: std.mem.Allocator, req: lsp.Req, out: *std.Io
};
const pos = posOf(req.source, req.offset, c.caps.enc);
- var cx: Cx = .{ .arena = arena, .base = req.root, .cur_path = req.path, .cur_src = req.source, .out = out };
+ var cx: Cx = .{ .arena = arena, .base = req.root, .cur_path = req.path, .cur_src = req.source, .out = out, .relative_parents = req.kind == .callstack, .callstack_corners = req.callstack_corners };
+ for (req.others) |doc| try cx.files.append(arena, .{ .path = doc.path, .text = doc.source });
tr.note("server {s} (pid {d}), root {s}, {s} columns", .{
@tagName(c.state), c.pid, c.root, @tagName(c.caps.enc),
});
@@ -642,6 +643,7 @@ fn run(c: *Conn, si: usize, arena: std.mem.Allocator, req: lsp.Req, out: *std.Io
n += 1;
}
},
+ .callstack => try callstack(c, si, arena, &cx, uri.items, pos, deadline, tr, req.callstack_depth),
.incoming_calls => try hierarchy(c, si, arena, &cx, uri.items, pos, deadline, .incoming, tr),
.outgoing_calls => try hierarchy(c, si, arena, &cx, uri.items, pos, deadline, .outgoing, tr),
.supertypes => try hierarchy(c, si, arena, &cx, uri.items, pos, deadline, .supers, tr),
@@ -869,6 +871,184 @@ fn sortEdits(edits: []PutEdit) void {
}.lt);
}
+/// A bounded static hierarchy. Reuse the prepared item verbatim (including
+/// server data), and retain every call-site range rather than just a declaration.
+fn hierarchyResult(c: *Conn, arena: std.mem.Allocator, item: std.json.Value, method: []const u8, deadline: i64) Err!?std.json.Value {
+ if (jsonDepth(item, 0) > 96) return null;
+ var body: std.ArrayList(u8) = .empty;
+ try app(&body, arena, "\"item\":");
+ try app(&body, arena, std.json.Stringify.valueAlloc(arena, item, .{}) catch return error.OutOfMemory);
+ return call(c, arena, method, body.items, deadline);
+}
+
+const CallTree = struct {
+ const Site = struct { range: std.json.Value, focus: bool };
+ const Node = struct {
+ item: std.json.Value,
+ ranges: std.ArrayList(Site) = .empty,
+ children: std.ArrayList(usize) = .empty,
+ cycle: bool = false,
+ };
+ nodes: std.ArrayList(Node) = .empty,
+ roots: std.ArrayList(usize) = .empty,
+ path: [lsp.callstack_max_depth]std.json.Value = undefined,
+ depth_limit: usize = lsp.callstack_default_depth,
+ visited: usize = 0,
+ limited: bool = false,
+ siblings: [lsp.callstack_max_depth]bool = @splat(false),
+ rendered: usize = 0,
+
+ /// Incoming paths arrive nearest-first. Insert them outermost-first,
+ /// sharing common caller prefixes and retaining all their call sites.
+ fn addPath(tree: *CallTree, arena: std.mem.Allocator, path: []const std.json.Value, cycle: bool) Err!void {
+ var parent: ?usize = null;
+ var at = path.len;
+ while (at > 0) {
+ at -= 1;
+ const entry = path[at];
+ const item = get(entry, "from").?;
+ const children = if (parent) |id| tree.nodes.items[id].children.items else tree.roots.items;
+ const found = for (children) |id| {
+ if (sameCall(tree.nodes.items[id].item, item)) break id;
+ } else null;
+ const id = found orelse blk: {
+ const id = tree.nodes.items.len;
+ try tree.nodes.append(arena, .{ .item = item });
+ if (parent) |pid| {
+ try tree.nodes.items[pid].children.append(arena, id);
+ } else try tree.roots.append(arena, id);
+ break :blk id;
+ };
+ const node = &tree.nodes.items[id];
+ node.cycle = node.cycle or (cycle and at == 0);
+ for (items(get(entry, "fromRanges"))) |range| {
+ const parsed = rangeOf(range) orelse continue;
+ for (node.ranges.items) |*other| {
+ if (std.meta.eql(parsed, rangeOf(other.range).?)) {
+ other.focus = other.focus or at == 0;
+ break;
+ }
+ } else try node.ranges.append(arena, .{ .range = range, .focus = at == 0 });
+ }
+ parent = id;
+ }
+ }
+};
+
+fn sameCall(a: std.json.Value, b: std.json.Value) bool {
+ const au = str(get(a, "uri")) orelse return false;
+ const bu = str(get(b, "uri")) orelse return false;
+ const ar = rangeOf(get(a, "selectionRange") orelse get(a, "range")) orelse return false;
+ const br = rangeOf(get(b, "selectionRange") orelse get(b, "range")) orelse return false;
+ return std.mem.eql(u8, au, bu) and std.meta.eql(ar, br);
+}
+
+fn callPrefix(out: *std.Io.Writer, tree: *const CallTree, depth: usize) Err!void {
+ for (tree.siblings[0..depth]) |more| try out.writeAll(if (more) "│ " else " ");
+}
+
+fn validCaller(entry: std.json.Value) bool {
+ const from = get(entry, "from") orelse return false;
+ const uri = str(get(from, "uri")) orelse return false;
+ return std.mem.startsWith(u8, uri, "file:") and
+ rangeOf(get(from, "selectionRange") orelse get(from, "range")) != null;
+}
+
+fn callstack(c: *Conn, si: usize, arena: std.mem.Allocator, cx: *Cx, uri: []const u8, pos: Pos, deadline: i64, tr: *Trace, max_depth: u8) Err!void {
+ if (!c.caps.call_hier) return lsp.none(cx.out, "{s} does not answer call hierarchy (no callHierarchyProvider)", .{specs[si].name});
+ const b = try atPos(arena, uri, pos);
+ const prepared = (try call(c, arena, "textDocument/prepareCallHierarchy", b.items, deadline)) orelse return;
+ if (items(prepared).len == 0) return lsp.none(cx.out, "no function at this position", .{});
+ for (items(prepared)) |item| {
+ var tree: CallTree = .{ .depth_limit = std.math.clamp(max_depth, 1, lsp.callstack_max_depth) };
+ const incoming = try hierarchyResult(c, arena, item, "callHierarchy/incomingCalls", deadline);
+ const count = try collectCallers(c, arena, item, incoming, deadline, &tree, 0);
+ if (count == 0) try cx.out.writeAll("No callers reported\n");
+ try renderCallers(cx, c.caps.enc, &tree, tree.roots.items, 0);
+ if (tree.limited) try cx.out.writeAll("… continue from a function above with Callstack\n");
+ tr.note("callstack: {d} callers", .{tree.rendered});
+ }
+}
+
+fn collectCallers(c: *Conn, arena: std.mem.Allocator, focus: std.json.Value, incoming: ?std.json.Value, deadline: i64, tree: *CallTree, depth: usize) Err!usize {
+ var count: usize = 0;
+ for (items(incoming)) |entry| {
+ if (tree.visited >= 64) {
+ tree.limited = true;
+ break;
+ }
+ if (!validCaller(entry)) continue;
+ const from = get(entry, "from").?;
+ const cycle = sameCall(focus, from) or for (tree.path[0..depth]) |ancestor| {
+ if (sameCall(get(ancestor, "from").?, from)) break true;
+ } else false;
+ tree.path[depth] = entry;
+ tree.visited += 1;
+ count += 1;
+ var children: usize = 0;
+ if (!cycle) {
+ if (depth + 1 == tree.depth_limit or tree.visited >= 64) {
+ tree.limited = true;
+ } else {
+ const ancestors = try hierarchyResult(c, arena, from, "callHierarchy/incomingCalls", deadline);
+ children = try collectCallers(c, arena, focus, ancestors, deadline, tree, depth + 1);
+ }
+ }
+ if (children == 0) try tree.addPath(arena, tree.path[0 .. depth + 1], cycle);
+ }
+ return count;
+}
+
+fn callerLess(tree: *const CallTree, a: usize, b: usize) bool {
+ const left = tree.nodes.items[a].item;
+ const right = tree.nodes.items[b].item;
+ const uri_order = std.mem.order(u8, str(get(left, "uri")).?, str(get(right, "uri")).?);
+ if (uri_order != .eq) return uri_order == .lt;
+ return callRangeLess({}, get(left, "selectionRange") orelse get(left, "range").?, get(right, "selectionRange") orelse get(right, "range").?);
+}
+
+fn callRangeLess(_: void, a: std.json.Value, b: std.json.Value) bool {
+ const left = rangeOf(a).?;
+ const right = rangeOf(b).?;
+ return left.sl < right.sl or (left.sl == right.sl and left.sc < right.sc);
+}
+
+fn renderCallers(cx: *Cx, enc: Enc, tree: *CallTree, children: []usize, depth: usize) Err!void {
+ std.mem.sort(usize, children, @as(*const CallTree, tree), callerLess);
+ for (children, 0..) |id, index| {
+ if (tree.rendered >= 64) {
+ tree.limited = true;
+ return;
+ }
+ const node = &tree.nodes.items[id];
+ const item = node.item;
+ const uri = str(get(item, "uri")).?;
+ const more = index + 1 < children.len;
+ try callPrefix(cx.out, tree, depth);
+ const has_children = node.children.items.len > 0 or node.ranges.items.len > 0;
+ const rounded = cx.callstack_corners == .rounded;
+ try cx.out.writeAll(if (more) "├" else if (rounded) "╰" else "└");
+ try cx.out.writeAll(if (has_children) "──┬ " else "─── ");
+ const name = flat(cx.arena, str(get(item, "name")) orelse "(unnamed)");
+ const label = if (node.cycle) try std.fmt.allocPrint(cx.arena, "{s} ↻ recursion", .{name}) else name;
+ try emitRange(cx, enc, uri, get(item, "selectionRange") orelse get(item, "range"), label);
+ tree.rendered += 1;
+ tree.siblings[depth] = more;
+ std.mem.sort(CallTree.Site, node.ranges.items, {}, struct {
+ fn less(_: void, a: CallTree.Site, b: CallTree.Site) bool {
+ return callRangeLess({}, a.range, b.range);
+ }
+ }.less);
+ for (node.ranges.items, 0..) |site, site_index| {
+ if (site.focus) try cx.out.writeAll(lsp.callstack_match);
+ try callPrefix(cx.out, tree, depth + 1);
+ try cx.out.writeAll(if (node.children.items.len > 0 or site_index + 1 < node.ranges.items.len) "├─ " else if (rounded) "╰─ " else "└─ ");
+ try emitRange(cx, enc, uri, site.range, "");
+ }
+ try renderCallers(cx, enc, tree, node.children.items, depth + 1);
+ }
+}
+
const Hier = enum { incoming, outgoing, supers, subs };
/// The two-step hierarchy kinds: prepare at the cursor, then follow every
@@ -894,17 +1074,7 @@ fn hierarchy(c: *Conn, si: usize, arena: std.mem.Allocator, cx: *Cx, uri: []cons
const b = try atPos(arena, uri, pos);
const prepared = (try call(c, arena, prepare, b.items, deadline)) orelse return;
for (items(prepared)) |item| {
- // the item goes back VERBATIM — servers hide resolution state in
- // `data` and a re-serialized subset would come back unresolvable.
- // But only if it can round-trip: Stringify panics past its nesting
- // limit, so a server that nests a bomb in `data` gets no rows for
- // that item, not a dead editor.
- if (jsonDepth(item, 0) > 96) continue;
- var body: std.ArrayList(u8) = .empty;
- try app(&body, arena, "\"item\":");
- const item_json = std.json.Stringify.valueAlloc(arena, item, .{}) catch return error.OutOfMemory;
- try app(&body, arena, item_json);
- const result = (try call(c, arena, follow, body.items, deadline)) orelse return;
+ const result = (try hierarchyResult(c, arena, item, follow, deadline)) orelse return;
for (items(result)) |entry| switch (h) {
.incoming => {
// one row per CALL SITE, under the caller's name — that is
@@ -965,6 +1135,8 @@ const Cx = struct {
cur_src: []const u8,
out: *std.Io.Writer,
rows: usize = 0,
+ relative_parents: bool = false,
+ callstack_corners: lsp.CallstackCorners = .rounded,
files: std.ArrayList(struct { path: []const u8, text: []const u8 }) = .empty,
fn text(cx: *Cx, path: []const u8) ?[]const u8 {
@@ -1018,7 +1190,10 @@ fn emitRange(cx: *Cx, enc: Enc, uri: []const u8, range: ?std.json.Value, note: [
const lntext: []const u8 = if (src) |t| t[@min(bol, t.len)..@min(eol, t.len)] else "";
const col = colBytes(lntext, r.sc, enc);
- const shown = lsp.rel(cx.base, path);
+ const shown = if (cx.relative_parents) blk: {
+ const relative = std.fs.path.relativePosix(cx.arena, "/", cx.base, path) catch break :blk path;
+ break :blk if (relative.len < path.len) relative else path;
+ } else lsp.rel(cx.base, path);
// A same-line exclusive end byte offset is also the displayed inclusive
// one-based column. Multi-line ranges display only their starting address.
const end_col = if (r.el == r.sl and r.ec > r.sc) colBytes(lntext, r.ec, enc) else col;
@@ -2131,6 +2306,68 @@ fn coord(v: ?std.json.Value) ?u32 {
// ----------------------------------------------------------------- tests
+test "caller trees reverse incoming paths and merge shared callers and sites" {
+ var arena_state = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena_state.deinit();
+ const arena = arena_state.allocator();
+ const fixture = try std.json.parseFromSliceLeaky(std.json.Value, arena, "[{\"from\":{\"name\":\"left\",\"uri\":\"file:///test.c\",\"selectionRange\":{\"start\":{\"line\":3,\"character\":0},\"end\":{\"line\":3,\"character\":4}}},\"fromRanges\":[{\"start\":{\"line\":3,\"character\":0},\"end\":{\"line\":3,\"character\":4}}]},{\"from\":{\"name\":\"right\",\"uri\":\"file:///test.c\",\"selectionRange\":{\"start\":{\"line\":4,\"character\":0},\"end\":{\"line\":4,\"character\":4}}},\"fromRanges\":[{\"start\":{\"line\":4,\"character\":0},\"end\":{\"line\":4,\"character\":4}}]},{\"from\":{\"name\":\"page\",\"uri\":\"file:///test.c\",\"selectionRange\":{\"start\":{\"line\":1,\"character\":0},\"end\":{\"line\":1,\"character\":4}}},\"fromRanges\":[{\"start\":{\"line\":1,\"character\":0},\"end\":{\"line\":1,\"character\":4}}]},{\"from\":{\"name\":\"page\",\"uri\":\"file:///test.c\",\"selectionRange\":{\"start\":{\"line\":1,\"character\":0},\"end\":{\"line\":1,\"character\":4}}},\"fromRanges\":[{\"start\":{\"line\":2,\"character\":0},\"end\":{\"line\":2,\"character\":4}}]},{\"from\":{\"name\":\"main\",\"uri\":\"file:///test.c\",\"selectionRange\":{\"start\":{\"line\":0,\"character\":0},\"end\":{\"line\":0,\"character\":4}}},\"fromRanges\":[{\"start\":{\"line\":0,\"character\":0},\"end\":{\"line\":0,\"character\":4}}]}]", .{});
+ const entries = items(fixture);
+ var tree: CallTree = .{};
+ try tree.addPath(arena, &.{ entries[0], entries[2], entries[4] }, false);
+ try tree.addPath(arena, &.{ entries[1], entries[3], entries[4] }, false);
+ try std.testing.expectEqual(@as(usize, 1), tree.roots.items.len);
+ try std.testing.expectEqual(@as(usize, 4), tree.nodes.items.len);
+ const root = tree.nodes.items[tree.roots.items[0]];
+ try std.testing.expectEqualStrings("main", str(get(root.item, "name")).?);
+ try std.testing.expectEqual(@as(usize, 1), root.ranges.items.len);
+ const page = tree.nodes.items[root.children.items[0]];
+ try std.testing.expectEqual(@as(usize, 2), page.children.items.len);
+ try std.testing.expectEqual(@as(usize, 2), page.ranges.items.len);
+ try std.testing.expect(!root.ranges.items[0].focus);
+ for (page.ranges.items) |site| try std.testing.expect(!site.focus);
+ for (page.children.items) |id| try std.testing.expect(tree.nodes.items[id].ranges.items[0].focus);
+ var out: std.Io.Writer.Allocating = .init(arena);
+ var cx: Cx = .{ .arena = arena, .base = "/", .cur_path = "/test.c", .cur_src = "main_call();\npage_left();\npage_right();\nleft_call();\nright_call();\n", .out = &out.writer };
+ try renderCallers(&cx, .utf8, &tree, tree.roots.items, 0);
+ const text = out.written();
+ try std.testing.expectEqual(@as(usize, 2), std.mem.count(u8, text, lsp.callstack_match));
+ const main_at = std.mem.indexOf(u8, text, " main\n").?;
+ const page_at = std.mem.indexOf(u8, text, " page\n").?;
+ const left_at = std.mem.indexOf(u8, text, " left\n").?;
+ const right_at = std.mem.indexOf(u8, text, " right\n").?;
+ try std.testing.expect(main_at < page_at and page_at < left_at and left_at < right_at);
+ try std.testing.expectEqual(@as(usize, 1), std.mem.count(u8, text, "main_call();"));
+ try std.testing.expect(std.mem.indexOf(u8, text, "page_left();").? < std.mem.indexOf(u8, text, "page_right();").?);
+ try std.testing.expect(std.mem.indexOf(u8, text, "├──┬ test.c:4:") != null);
+ try std.testing.expect(std.mem.indexOf(u8, text, "╰──┬ test.c:1:") != null);
+ cx.callstack_corners = .square;
+ tree.rendered = 0;
+ const square_start = out.written().len;
+ try renderCallers(&cx, .utf8, &tree, tree.roots.items, 0);
+ const square = out.written()[square_start..];
+ try std.testing.expect(std.mem.indexOf(u8, square, "├──┬ test.c:4:") != null);
+ try std.testing.expect(std.mem.indexOf(u8, square, "└──┬ test.c:1:") != null);
+ try std.testing.expect(std.mem.indexOf(u8, square, "╰") == null);
+ try std.testing.expect(std.mem.indexOf(u8, square, "╮") == null);
+ var recursive: CallTree = .{};
+ try recursive.addPath(arena, &.{ entries[0], entries[0] }, true);
+ try std.testing.expect(!recursive.nodes.items[recursive.roots.items[0]].cycle);
+ try std.testing.expect(recursive.nodes.items[1].cycle);
+}
+
+test "callstack cross-crate paths remain resolvable without absolute path clutter" {
+ var arena_state = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena_state.deinit();
+ const arena = arena_state.allocator();
+ const range = try std.json.parseFromSliceLeaky(std.json.Value, arena,
+ \\{"start":{"line":1,"character":3},"end":{"line":1,"character":6}}
+ , .{});
+ var out: std.Io.Writer.Allocating = .init(arena);
+ var cx: Cx = .{ .arena = arena, .base = "/workspace/merkle-tree/src", .cur_path = "", .cur_src = "", .out = &out.writer, .relative_parents = true };
+ try emitRange(&cx, .utf8, "file:///workspace/entry/src/entry.rs", range, "fn run()");
+ try std.testing.expectEqualStrings("../../entry/src/entry.rs:2:4-6 fn run()\n", out.written());
+}
+
test "LSP client rename and format propagate incomplete edit encoding" {
const gpa = std.testing.allocator;
const uri = "file:///file.c";
diff --git a/src/modal.zig b/src/modal.zig
index 548524ae..50e0ddf4 100644
--- a/src/modal.zig
+++ b/src/modal.zig
@@ -36,6 +36,7 @@ pub const Normal = struct {
goto_type_definition,
goto_implementation,
goto_references,
+ goto_callstack,
view_top,
view_center,
@@ -320,7 +321,7 @@ pub const Normal = struct {
undo,
redo,
};
- pub const Lsp = enum { definition, declaration, type_definition, implementation, references, format };
+ pub const Lsp = enum { definition, declaration, type_definition, implementation, references, callstack, format };
pub const Counted = struct {
count: u32,
@@ -471,6 +472,7 @@ pub const Normal = struct {
if (key.has(.goto_type_definition)) return resultAction(.{ .lsp = .type_definition });
if (key.has(.goto_implementation)) return resultAction(.{ .lsp = .implementation });
if (key.has(.goto_references)) return resultAction(.{ .lsp = .references });
+ if (key.has(.goto_callstack)) return resultAction(.{ .lsp = .callstack });
return .ignored;
},
.view => {
diff --git a/src/mouse.zig b/src/mouse.zig
index 733479dd..536a4fdb 100644
--- a/src/mouse.zig
+++ b/src/mouse.zig
@@ -100,7 +100,7 @@ pub const HeaderSweep = struct {
/// as a pane tag's sweep stays on its tag.
fn headerPoint(p: *Pardes, column: ?usize, mcol: u16, mrow: u16, clamp: bool) ?struct { t: *panes.Text, text: []const u8, line: u16, at: usize } {
const t = if (column) |c| &p.col_tags[c] else &p.global_tag;
- const x = if (column) |c| p.col_x[c] + TAG_TEXT_INSET else 0;
+ const x = if (column) |c| p.col_x[c] + TAG_TEXT_INSET else TAG_TEXT_INSET;
const focused = p.header_focus and p.header_column == column;
const text = edit.flatSurface(p, t) catch return null;
const base = if (column != null) p.topBarHeight() else 0;
@@ -588,7 +588,7 @@ pub fn handleMouse(p: *Pardes, event: Mouse) void {
p.header_drag = false;
return;
};
- const x = if (p.header_column) |c| p.col_x[c] + TAG_TEXT_INSET else 0;
+ const x = if (p.header_column) |c| p.col_x[c] + TAG_TEXT_INSET else TAG_TEXT_INSET;
const text = edit.flatSurface(p, t) catch return;
// `row` is the header's row on screen, `line` the line of its text
// shown there.
@@ -612,7 +612,8 @@ pub fn handleMouse(p: *Pardes, event: Mouse) void {
pane.closePrompt();
};
var column: ?usize = null;
- var x: u16 = 0;
+ var x: u16 = TAG_TEXT_INSET;
+ if (mcol < x) return;
if (mrow >= p.topBarHeight()) {
for (0..p.ncol) |c| if (mcol >= p.col_x[c] and mcol < p.col_x[c] + p.col_w[c]) {
column = c;
@@ -1047,7 +1048,7 @@ fn gestureRange(p: *Pardes, id: usize, text: []const u8, on_tag: bool, operand:
const top = lead[0] - @as(i32, pane.tag_rows);
if (top < 0) break :lead null;
const w = pane.wrapAt(top);
- const col = edit.paneByteAtDisplay(p, &pane.body, w.line, w.at, lead[1] - panes.File.gutterWidth(pane));
+ const col = edit.paneByteAtDisplay(p, &pane.body, w.line, w.at, lead[1] - panes.File.gutterWidth(pane) - w.pad);
break :lead .{
.row = @intCast(@max(0, w.line)),
.col = @intCast(@max(0, col)),
@@ -1154,7 +1155,7 @@ fn sweepPoint(p: *Pardes, pane: *panes.Pane, r: i32, c: i32) ?modal.Cursor {
if (visible < 0) return null;
const w = pane.wrapAt(visible);
if (w.line < 0) return null;
- const col = edit.paneByteAtDisplay(p, &pane.body, w.line, w.at, c - (if (pane.file != null) @as(i32, panes.File.gutterWidth(pane)) else 0));
+ const col = edit.paneByteAtDisplay(p, &pane.body, w.line, w.at, c - w.pad - (if (pane.file != null) @as(i32, panes.File.gutterWidth(pane)) else 0));
return .{ .row = @intCast(w.line), .col = @intCast(@max(0, col)) };
}
@@ -1268,7 +1269,7 @@ fn dragRelease(p: *Pardes, button: Mouse.Button) void {
&pane.body,
w.line,
w.at,
- sl.c1 - (if (pane.file != null) @as(i32, panes.File.gutterWidth(pane)) else 0),
+ sl.c1 - w.pad - (if (pane.file != null) @as(i32, panes.File.gutterWidth(pane)) else 0),
);
pane.body.cur_pinned = true;
if (edit.clampFileCursor(&pane.body)) pane.ensureCursorVisible();
@@ -1312,7 +1313,14 @@ fn dragRelease(p: *Pardes, button: Mouse.Button) void {
pane.sel[b] = expanded
else if (operand.text == null)
pane.sel[b].state = .none;
- if (s.button == config.look_button and clk.r0 >= pane.tag_rows and pane.body.mode != .tty) {
+ if (s.button == config.look_button and clk.r0 >= pane.tag_rows and pane.body.mode != .tty and operand.expanded != null) {
+ // This click chose a new word. An old keyboard anchor
+ // must not stretch to it; borrowed selections retain
+ // their original cursor and extent.
+ pane.body.vsel.active = false;
+ pane.body.msel.active = false;
+ pane.body.nsel = 0;
+ pane.body.select = false;
pane.body.cur_row = operand.row;
pane.body.cur_col = operand.col;
if (edit.clampFileCursor(&pane.body)) pane.ensureCursorVisible();
@@ -1431,8 +1439,8 @@ fn chordCutPaste(p: *Pardes, cut: bool) void {
const w1 = pane.wrapAt(@max(0, sl.r1 - @as(i32, pane.tag_rows)));
const row0 = w0.line;
const row1 = w1.line;
- const col0 = edit.paneByteAtDisplay(p, &pane.body, w0.line, w0.at, sl.c0 - pfx);
- const col1 = edit.paneByteAtDisplay(p, &pane.body, w1.line, w1.at, sl.c1 - pfx);
+ const col0 = edit.paneByteAtDisplay(p, &pane.body, w0.line, w0.at, sl.c0 - pfx - w0.pad);
+ const col1 = edit.paneByteAtDisplay(p, &pane.body, w1.line, w1.at, sl.c1 - pfx - w1.pad);
pane.body.cur_row = row1;
pane.body.cur_col = col1;
pane.body.cur_pinned = true;
diff --git a/src/ninep/ctl.zig b/src/ninep/ctl.zig
index e6e738a5..f6457b83 100644
--- a/src/ninep/ctl.zig
+++ b/src/ninep/ctl.zig
@@ -554,6 +554,7 @@ fn checkBuiltin(p: *Pardes, req: Req, line: []const u8, scope: builtins.Scope) ?
.font => config.Runtime.FontSpec.parse(arg) != null,
// Bare, it says the width, as from a pane's exec.
.tab => arg.len == 0 or (std.fmt.parseInt(u16, arg, 10) catch 0) -% 1 < 16,
+ .callstack_depth => arg.len == 0 or (std.fmt.parseInt(u8, arg, 10) catch 0) -% 1 < pardes.lsp.callstack_max_depth,
else => probe: {
var probe = p.settings;
break :probe probe.apply(setting, if (arg.len > 0) arg else null);
@@ -662,6 +663,7 @@ pub fn writeSettingsOf(p: *Pardes, s: *const config.Runtime, w: *std.Io.Writer)
.motion => try w.print("{s} {s}\n", .{ word, @tagName(s.motion) }),
.inactive_dim => try w.print("{s} {d}\n", .{ word, s.inactive_dim }),
.grip_width => try w.print("{s} {d}\n", .{ word, s.grip_width }),
+ .callstack_depth => try w.print("{s} {d}\n", .{ word, s.callstack_depth }),
.tab => try w.print("{s} {d}\n", .{ word, s.tab }),
}
}
@@ -743,12 +745,13 @@ pub fn fillPager(p: *Pardes, serial: u32, held: *std.ArrayList(u8)) error{OutOfM
f.pager_spans = page.spans;
f.saved_revision = f.revision;
// A diff paged (`git show`, difftui's patches): its hunks stacked in a
- // +Diff (DiffLook hunks), the +Pager folded to its tag under it for
- // Diff to bring back. The keyboard stays where it was, as a page's.
+ // +Diff (DiffLook hunks) in the +Pager's place, the +Pager closed. The
+ // keyboard stays where it was, as a page's.
if (f.pager_diff and p.settings.diff_look == .hunks) {
const keyboard = p.active;
- if (panes.Output.openDiff(p, id, f.path, f.content)) |_| {
- if (!pane.collapsed) pardes.layout.toggleCollapse(p, id);
+ if (panes.Output.openDiff(p, id, f.path, f.content)) |hid| {
+ // ponytail: the text is gone with it; Diff on the +Diff says no such file.
+ p.removePane(id, hid) catch {};
} else |_| {}
if (p.panes[keyboard] != null) p.active = keyboard;
}
@@ -1452,6 +1455,8 @@ test "the root ctl reads the settings as a write takes them, and takes the sessi
try testing.expectEqual(@as(u64, settings.len), call(p, .{ .tag = 1, .op = .getattr, .node = root_ctl }).reply.attr.size);
try testing.expect(std.mem.indexOf(u8, settings, "Verbose on\n") != null);
try testing.expect(std.mem.indexOf(u8, settings, "LocationsConfig ") != null);
+ try testing.expect(std.mem.indexOf(u8, settings, "CallstackDepth 8\n") != null);
+ try testing.expectEqual(Status.ok, wr(p, root_ctl, "CallstackDepth").reply.status);
// Settings only: nothing /status or the DumpConfig window says.
try testing.expect(std.mem.indexOf(u8, settings, "Platform") == null);
try testing.expect(std.mem.indexOf(u8, settings, "requested") == null);
@@ -1494,7 +1499,6 @@ test "the root ctl reads the settings as a write takes them, and takes the sessi
try testing.expectEqual(Status.ok, wr(p, root_ctl, "Verbose off").reply.status);
}
-
test "a second lock is refused until the holder unlocks or closes, and binds nobody else" {
const p = try withFile(testing.allocator, "one\ntwo\n");
defer p.deinit();
@@ -3920,7 +3924,7 @@ test "a closed file is found again: Recent and /recent list it closed, a look at
try testing.expectEqual(Status.ok, wr(p, root_exec, "Recent\n").reply.status);
const rows = p.panes[p.paneBySerial(try std.fmt.parseInt(u32, std.mem.trimEnd(u8, rd(p, root_exec, 0, 64).bytes, "\n"), 10)).?].?;
const at = std.mem.indexOf(u8, rows.file.?.content, try std.fmt.bufPrint(&want, "{s}:3:", .{a})).?;
- const row = rows.file.?.content[at .. std.mem.indexOfScalarPos(u8, rows.file.?.content, at, '\n').?];
+ const row = rows.file.?.content[at..std.mem.indexOfScalarPos(u8, rows.file.?.content, at, '\n').?];
try testing.expect(std.mem.endsWith(u8, row, " (closed)"));
try testing.expectEqual(Status.ok, wr(p, Node.of(rows.serial, .look), try std.fmt.bufPrint(&line, "{s}\n", .{row[0 .. row.len - " (closed)".len]})).reply.status);
p.sync();
@@ -4159,11 +4163,11 @@ test "a remembered place is clamped to the file as it is now, its selection's tw
_ = wr(p, root_exec, "Recent\n");
const rows = p.panes[p.paneBySerial(try std.fmt.parseInt(u32, std.mem.trimEnd(u8, rd(p, root_exec, 0, 64).bytes, "\n"), 10)).?].?;
const at = std.mem.indexOf(u8, rows.file.?.content, "c.txt:").?;
- const row = rows.file.?.content[at .. std.mem.indexOfScalarPos(u8, rows.file.?.content, at, '\n').?];
+ const row = rows.file.?.content[at..std.mem.indexOfScalarPos(u8, rows.file.?.content, at, '\n').?];
// Both ends are in the row, a range.
try testing.expect(std.mem.indexOfScalar(u8, row, '-') != null);
var full: [4400]u8 = undefined;
- const loc = try std.fmt.bufPrint(&full, "{s}/{s}\n", .{ dir, row[0 .. std.mem.indexOfScalar(u8, row, ' ').?] });
+ const loc = try std.fmt.bufPrint(&full, "{s}/{s}\n", .{ dir, row[0..std.mem.indexOfScalar(u8, row, ' ').?] });
// A look at it opens the file, never a miss, clamped to its last line.
try testing.expectEqual(Status.ok, wr(p, Node.of(rows.serial, .look), loc).reply.status);
p.sync();
@@ -4350,7 +4354,7 @@ test "every word's /commands description is its own doc comment's first sentence
undescribed += 1;
continue;
};
- const word = line[0 .. std.mem.indexOfScalar(u8, line, ' ').?];
+ const word = line[0..std.mem.indexOfScalar(u8, line, ' ').?];
if (config.Runtime.find(word)) |setting| {
try testing.expect(std.mem.endsWith(u8, line, setting.doc));
continue;
diff --git a/src/normal.zig b/src/normal.zig
index fad1836b..77feb7cf 100644
--- a/src/normal.zig
+++ b/src/normal.zig
@@ -905,10 +905,11 @@ fn executeNormalAction(p: *Pardes, t: *Text, semantic: modal.Normal.Action) void
.undo => return edit.doUndo(p, t),
.redo => return edit.doRedo(p, t),
},
- // gd and gr are the Def and Refs a tag shows, run as a click runs them.
+ // Language shortcuts run the same builtins as tags and leader commands.
.lsp => |request| return switch (request) {
.definition => exec.runBuiltin(p, .Def, p.active, "", null),
.references => exec.runBuiltin(p, .Refs, p.active, "", null),
+ .callstack => exec.runBuiltin(p, .Callstack, p.active, "", null),
.declaration => p.lspRequest(p.active, .declaration, ""),
.type_definition => p.lspRequest(p.active, .type_definition, ""),
.implementation => p.lspRequest(p.active, .implementation, ""),
diff --git a/src/panes.zig b/src/panes.zig
index 89362996..ba1dedb5 100644
--- a/src/panes.zig
+++ b/src/panes.zig
@@ -219,6 +219,7 @@ pub const Pane = struct {
// Visible rows map to source lines and raw/display column origins.
wrap_line: [limits.wrap_rows]i32 = undefined,
wrap_col: [limits.wrap_rows]i32 = undefined,
+ wrap_pad: [limits.wrap_rows]u16 = @splat(0),
wrap_n: u16 = 0,
/// A row map also exists for sticky headers when soft wrapping is off.
body_wrapped: bool = false,
@@ -493,15 +494,15 @@ pub const Pane = struct {
return pane.surfRow(terminal.gridOffset(pane));
}
- pub fn wrapAt(pane: *Pane, vr: i32) struct { line: i32, at: i32 } {
+ pub fn wrapAt(pane: *Pane, vr: i32) struct { line: i32, at: i32, pad: i32 = 0 } {
if (pane.wrap_n > 0 and vr >= 0 and vr < @as(i32, pane.wrap_n))
- return .{ .line = pane.wrap_line[@intCast(vr)], .at = pane.wrap_col[@intCast(vr)] };
+ return .{ .line = pane.wrap_line[@intCast(vr)], .at = pane.wrap_col[@intCast(vr)], .pad = pane.wrap_pad[@intCast(vr)] };
// unwrapped: rows ARE lines, and the byte column a row starts at is the
// horizontal scroll (always 0 on a terminal, which never has one)
return .{ .line = pane.scroll() + vr, .at = pane.hscroll };
}
- pub fn wrapRow(pane: *Pane, line: i32, col: i32) struct { row: i32, at: i32 } {
+ pub fn wrapRow(pane: *Pane, line: i32, col: i32) struct { row: i32, at: i32, pad: i32 = 0 } {
if (pane.wrap_n == 0) return .{ .row = line - pane.scroll(), .at = pane.hscroll };
var i: u16 = 0;
while (i < pane.wrap_n) : (i += 1) {
@@ -509,7 +510,7 @@ pub const Pane = struct {
// the LAST row of a line owns every column past its start, so a
// cursor parked on the trailing newline still has somewhere to draw
if (i + 1 < pane.wrap_n and pane.wrap_line[i + 1] == line and col >= pane.wrap_col[i + 1]) continue;
- return .{ .row = @intCast(i), .at = pane.wrap_col[i] };
+ return .{ .row = @intCast(i), .at = pane.wrap_col[i], .pad = pane.wrap_pad[i] };
}
return .{ .row = -1, .at = 0 };
}
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 });
diff --git a/src/syntax.zig b/src/syntax.zig
index 89d96239..b2f5ea99 100644
--- a/src/syntax.zig
+++ b/src/syntax.zig
@@ -414,7 +414,6 @@ pub fn walkNodes(tree_ptr: *anyopaque, walk: NodeWalk, from: usize, to: usize, a
return 1;
}
-
/// helix's textobjects, which its `]f`, `mif` and kin select: the name a
/// query's captures begin with (`function.around`, `test.inside`).
pub const Object = @import("modal.zig").Normal.Object;
@@ -940,13 +939,10 @@ pub fn highlightLocationRows(gpa: std.mem.Allocator, content: []const u8, rows:
}
fn codeAfterLocation(line: []const u8) ?struct { path: []const u8, at: usize, text: []const u8 } {
- const token_end = std.mem.indexOfAny(u8, line, " \t") orelse return null;
- if (token_end == 0) return null;
- const token = line[0..token_end];
- const target = look.parsePathLine(token);
- if (target.end != token.len) return null;
+ const trimmed = std.mem.trimStart(u8, line, " \t");
+ const target = @import("locations.zig").parseRaw(trimmed);
if (target.at.line == 0) return null;
- const at = token_end + 1;
+ const at = line.len - trimmed.len + target.code_start;
if (at >= line.len) return null;
return .{ .path = target.path, .at = at, .text = line[at..] };
}
@@ -1355,6 +1351,11 @@ test "syntax codeAfterLocation takes whole-token locations and nothing else" {
try std.testing.expect(codeAfterLocation("src/x.zig:7:2") == null);
try std.testing.expect(codeAfterLocation("") == null);
try std.testing.expect(codeAfterLocation(" leading space") == null);
+ const indented = " some directory/x.zig:7:2-9 return 42;";
+ const nested = codeAfterLocation(indented) orelse return error.ShouldBeALocation;
+ try std.testing.expectEqualStrings("some directory/x.zig", nested.path);
+ try std.testing.expectEqualStrings(" return 42;", nested.text);
+ try std.testing.expectEqualStrings(nested.text, indented[nested.at..]);
}
test "syntax default full grammar set highlights Typst source" {
@@ -1736,6 +1737,7 @@ test "syntax result fragments preserve source indentation and inline markup" {
defer stop();
const fixtures = [_]struct { path: []const u8, source: []const u8 }{
.{ .path = "a.zig", .source = " const number = 42; // note" },
+ .{ .path = " nested path/a.zig", .source = " return call(42, \"hello\"); // note" },
.{ .path = "a.md", .source = "# Heading *slant*" },
.{ .path = "a.md", .source = "**bold** and `code`" },
.{ .path = "a.md", .source = " # this is indented code" },
@@ -1961,4 +1963,3 @@ test "syntax source analysis preserves declarations and injected colors" {
try std.testing.expectEqual(@as(usize, 0), unsupported.declarations.len);
try std.testing.expectEqual(@as(usize, 0), unsupported.colors.len);
}
-
diff --git a/src/tagline.zig b/src/tagline.zig
index cf0b17fd..b6601d61 100644
--- a/src/tagline.zig
+++ b/src/tagline.zig
@@ -19,15 +19,19 @@ const Pardes = pardes.Pardes;
pub const pane_tail = " " ++ config.pane_builtins_str;
pub const pdf_pane_tail = " " ++ config.pdf_pane_builtins_str;
pub const file_pane_tail = " " ++ config.file_pane_builtins_str;
-pub const context_pane_tail = file_pane_tail ++ " TreeContext";
-pub const locations_pane_tail = file_pane_tail ++ " LocationsConfig";
-/// A file a language server speaks for (by its extension): its jumps too.
-pub const lsp_pane_tail = file_pane_tail ++ " " ++ config.lsp_pane_builtins_str;
-pub const lsp_context_pane_tail = context_pane_tail ++ " " ++ config.lsp_pane_builtins_str;
+fn withFileCommands(comptime tail: []const u8, comptime words: []const u8) []const u8 {
+ std.debug.assert(std.mem.endsWith(u8, tail, " Del"));
+ return tail[0 .. tail.len - " Del".len] ++ " " ++ words ++ " Del";
+}
+pub const context_pane_tail = withFileCommands(file_pane_tail, "TreeContext");
+pub const locations_pane_tail = withFileCommands(file_pane_tail, "LocationsConfig");
+/// Language commands precede the final Del, like other file-pane commands.
+pub const lsp_pane_tail = withFileCommands(file_pane_tail, config.lsp_pane_builtins_str);
+pub const lsp_context_pane_tail = withFileCommands(context_pane_tail, config.lsp_pane_builtins_str);
pub const pager_pane_tail = " " ++ config.pager_pane_builtins_str;
pub const diff_pane_tail = " " ++ config.diff_pane_builtins_str;
pub const pager_diff_pane_tail = " " ++ config.pager_diff_pane_builtins_str;
-pub const diff_view_tail = " " ++ config.diff_view_builtins_str ++ " LocationsConfig";
+pub const diff_view_tail = withFileCommands(" " ++ config.diff_view_builtins_str, "LocationsConfig");
pub const terminal_pane_tail = " " ++ config.terminal_pane_builtins_str;
pub const command_pane_tail = " " ++ config.command_pane_builtins_str;
pub const dir_pane_tail = " " ++ config.dir_pane_builtins_str;
@@ -76,7 +80,7 @@ pub fn revealHeader(p: *Pardes) void {
if (cur < p.header_top) p.header_top = cur;
if (rows > 0 and cur >= p.header_top + rows) p.header_top = cur + 1 - rows;
const line = modal.lineSlice(text, cur);
- const width = p.tagCapacity(if (p.header_column) |c| p.col_w[c] -| TAG_TEXT_INSET else p.screen_w);
+ const width = p.tagCapacity(if (p.header_column) |c| p.col_w[c] -| TAG_TEXT_INSET else p.screen_w -| TAG_TEXT_INSET);
const col = panes.File.rawDisplayCol(line, @min(@as(usize, @intCast(@max(0, t.cur_col))), line.len));
if (col < p.header_scroll) p.header_scroll = col;
if (col >= p.header_scroll + width) p.header_scroll = col -| (width -| 1);
@@ -480,4 +484,3 @@ test "a pane tag wraps a long line onto rows, and offsets map both ways" {
try std.testing.expectEqual(@as(usize, 10), shown.toReal(11)); // the 'e' of Del
try std.testing.expectEqual(@as(usize, 11), shown.fromReal(10));
}
-