summaryrefslogtreecommitdiff
path: root/src/File.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/File.zig')
-rw-r--r--src/File.zig163
1 files changed, 122 insertions, 41 deletions
diff --git a/src/File.zig b/src/File.zig
index 875d0f46..59b04e3f 100644
--- a/src/File.zig
+++ b/src/File.zig
@@ -154,8 +154,11 @@ pub const State = struct {
/// Its file was deleted on disk: said once (`deleted`) until it is
/// written or found again.
disk_gone: bool = false,
- /// A +Pager pane (`pardes -`) whose text is a diff (`git diff`, `show`,
- /// `log -p`): drawn and looked at as a diff (Pane.colorAlgo).
+ /// A +Pager pane (`pardes -`): no line numbers, its program's colours
+ /// through Filter until it is toggled off.
+ pager: bool = false,
+ /// A +Pager whose text is a diff (`git diff`, `show`, `log -p`): drawn
+ /// and looked at as a diff (Pane.colorAlgo).
pager_diff: bool = false,
/// A +Pager's colours, as its program printed them (pager.zig): drawn
/// over its text by recolorSyntax, never read over 9P. ponytail: any
@@ -248,8 +251,10 @@ pub fn dumpPane(
fn dumpLocationRows(arena: std.mem.Allocator, rows: []const locations.Row) ![]const dump.LocationRow {
const saved = try arena.alloc(dump.LocationRow, rows.len);
for (rows, saved) |row, *out| out.* = .{
- .kind = @enumFromInt(@intFromEnum(row.kind)),
+ .kind = @fromBackingInt(@intCast(@backingInt(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,
@@ -268,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);
@@ -283,40 +292,57 @@ 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;
const colors = try dump.decodeBytes(gpa, row.colors_b64);
errdefer gpa.free(colors);
if (colors.len != 0 and colors.len != code_len) return error.InvalidLocationRows;
- for (colors) |color| if (color > @intFromEnum(syntax.Syn.comment)) return error.InvalidLocationRows;
+ for (colors) |color| if (color > @backingInt(syntax.Syn.comment)) return error.InvalidLocationRows;
const path = try gpa.dupe(u8, row.path);
out.* = .{
- .kind = @enumFromInt(@intFromEnum(row.kind)),
+ .kind = @fromBackingInt(@intCast(@backingInt(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,
@@ -562,6 +588,10 @@ pub fn byteAtRowDisplay(pane: *const Pane, row: i32, from_raw: i32, display_col:
pub fn gutterWidth(pane: *const Pane) u16 {
if (pane.file == null) return 0;
const file = &pane.file.?;
+ // A +Pager, and a +Diff (hunks.zig), show no line numbers, as a
+ // pager and delta show none.
+ if (file.pager) return 0;
+ if (file.output) |o| if (std.meta.eql(o.from, Output.Origin{ .cmd = .Diff })) return 0;
var lines = if (file.line_starts.len > 0) file.line_starts.len else lineCount(file.content);
var digits: u16 = 1;
while (lines >= 10) : (lines /= 10) digits += 1;
@@ -985,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;
@@ -997,7 +1028,7 @@ pub fn restore(p: *Pardes, id: usize, src: dump.Pane) !*Pane {
const colors = try dump.decodeBytes(p.gpa, saved.mini_colors_b64);
errdefer p.gpa.free(colors);
if (colors.len != content.len or colors.len > Mini.max_output_bytes) return error.InvalidMini;
- for (colors) |color| if (color > @intFromEnum(syntax.Syn.comment)) return error.InvalidMini;
+ for (colors) |color| if (color > @backingInt(syntax.Syn.comment)) return error.InvalidMini;
mini = .{ .source = source, .colors = colors };
} else if (saved.mini_colors_b64.len > 0) return error.InvalidMini;
@@ -1164,7 +1195,7 @@ pub fn setContentSpan(p: *Pardes, f: *State, new: []u8, span_in: ?Span) void {
f.highlights = &.{};
f.highlight_start = 0;
f.syntax_dirty = true;
- if (std.mem.endsWith(u8, f.path, "/+Pager")) f.pager_diff = looksLikeDiff(new[0..@min(new.len, 64 * 1024)]);
+ if (f.pager) f.pager_diff = looksLikeDiff(new[0..@min(new.len, 64 * 1024)]);
for (twins[0..ntwins], 0..) |id, i| {
const t = p.panes[id].?;
const tf = &t.file.?;
@@ -1434,6 +1465,7 @@ test "a +Pager pane holding a diff is drawn and looked at as one; holding other
const f = &pane.file.?;
p.gpa.free(f.path);
f.path = try p.gpa.dupe(u8, "/tmp/+Pager");
+ f.pager = true;
setContent(p, f, try p.gpa.dupe(u8, "commit abc\n\ndiff --git a/x b/x\n--- a/x\n+++ b/x\n@@ -1 +1 @@\n-a\n+b\n"));
try std.testing.expect(pane.colorAlgo() == .diff);
try std.testing.expect(pardes.look.diffLines(p, pane) != null);
@@ -1699,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
@@ -1709,13 +1748,14 @@ 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) {
var lbuf: [@max(config.PREFIX_W, 32)]u8 = undefined;
const prefix = lbuf[0..prefix_width];
@memset(prefix, ' ');
- if (at == 0) {
+ if (at == 0 and prefix.len > 0) {
var lineno = row + 1;
var digit: usize = prefix.len - 1;
while (true) {
@@ -1727,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;
@@ -1790,6 +1832,12 @@ const SynStyle = struct { fg: [3]u8, bold: bool };
pub const DiffTints = struct {
added_bg: [3]u8,
removed_bg: [3]u8,
+ /// The words a changed line changed (hunks.zig), on a stronger ground.
+ added_emph_bg: [3]u8,
+ removed_emph_bg: [3]u8,
+ /// A +Diff line added or removed whole: a faint ground.
+ added_line_bg: [3]u8,
+ removed_line_bg: [3]u8,
added_fg: [3]u8,
removed_fg: [3]u8,
@@ -1804,6 +1852,10 @@ pub const DiffTints = struct {
return .{
.added_bg = added_bg,
.removed_bg = removed_bg,
+ .added_emph_bg = Colors.mixOklab(page, green, 0.28),
+ .removed_emph_bg = Colors.mixOklab(page, red, 0.28),
+ .added_line_bg = Colors.mixOklab(page, green, 0.07),
+ .removed_line_bg = Colors.mixOklab(page, red, 0.07),
.added_fg = legible(green, ink, added_bg),
.removed_fg = legible(red, ink, removed_bg),
};
@@ -1818,9 +1870,9 @@ pub const DiffTints = struct {
/// The row ground and prefix ink for a line's style byte, if it is an
/// added or removed line.
- pub fn forStyle(t: *const DiffTints, style: u8) ?struct { bg: [3]u8, fg: [3]u8 } {
- if (style & syntax.diff_added != 0) return .{ .bg = t.added_bg, .fg = t.added_fg };
- if (style & syntax.diff_removed != 0) return .{ .bg = t.removed_bg, .fg = t.removed_fg };
+ pub fn forStyle(t: *const DiffTints, style: u8) ?struct { bg: [3]u8, fg: [3]u8, emph_bg: [3]u8, line_bg: [3]u8 } {
+ if (style & syntax.diff_added != 0) return .{ .bg = t.added_bg, .fg = t.added_fg, .emph_bg = t.added_emph_bg, .line_bg = t.added_line_bg };
+ if (style & syntax.diff_removed != 0) return .{ .bg = t.removed_bg, .fg = t.removed_fg, .emph_bg = t.removed_emph_bg, .line_bg = t.removed_line_bg };
return null;
}
};
@@ -1855,7 +1907,17 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes.
const prefix_width = gutterWidth(pane);
const tz_recolor = tracy.zone(@src(), "synRecolor");
defer tz_recolor.end();
- const tints: ?DiffTints = if (pane.colorAlgo() == .diff and highlights.len > 0) DiffTints.of(p) else null;
+ // A diff's rows, and a +Diff's (hunks.zig): their markers coloured.
+ // A diff's whole row is tinted; a +Diff tints only the words a
+ // changed line changed.
+ const algo = pane.colorAlgo();
+ const tints: ?DiffTints = if ((algo == .diff or algo == .locations) and highlights.len > 0) DiffTints.of(p) else null;
+ const row_tint = algo == .diff;
+ var filtered_storage: terminal.FilteredColors = undefined;
+ const filtered: ?*terminal.FilteredColors = if (comptime terminal.enabled) (if (pane.tty_filter and spans.len > 0) blk: {
+ filtered_storage = .init(p, null);
+ break :blk &filtered_storage;
+ } else null) else null;
// indexed start, same as bodyText — an empty tail simply paints nothing
var flines = std.mem.splitScalar(u8, f.content[lineStart(p.gpa, f, f.scroll)..], '\n');
const total = nlines(p.gpa, f);
@@ -1893,7 +1955,11 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes.
t.forStyle(highlights[base - highlight_start])
else
null else null;
- if (tint) |t| if (prefix_width < tw) tintRow(s, tx + @as(u16, @intCast(prefix_width)), body_y + vr, tx + tw, t.bg);
+ if (tint) |t| if (prefix_width < tw) {
+ // A +Diff line added or removed whole: faintly (hunks.zig).
+ const whole = highlights[base - highlight_start] & syntax.diff_whole != 0;
+ if (row_tint or whole) tintRow(s, tx + @as(u16, @intCast(prefix_width)), body_y + vr, tx + tw, if (row_tint) t.bg else t.line_bg);
+ };
// A +Pager's own colours (pager.zig) on every row but one the diff
// look tints: an added or removed line is drawn as pardes draws a
// diff, and git's red and green on it would only fight the tint.
@@ -1903,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]);
@@ -1914,7 +1984,7 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes.
if (if (tint != null and hs + c == 0)
SynStyle{ .fg = tint.?.fg, .bold = true }
else
- synStyle(p, @enumFromInt(highlights[hidx] & syntax.syn_bits))) |ss|
+ synStyle(p, @fromBackingInt(@intCast(highlights[hidx] & syntax.syn_bits)))) |ss|
{
var fill: usize = 0;
while (fill < cells and prefix_width + screen_c + fill < tw) : (fill += 1) {
@@ -1924,6 +1994,11 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes.
cell.style.bold = ss.bold;
}
}
+ if (tint) |t| if (highlights[hidx] & syntax.diff_emph != 0) {
+ var fill: usize = 0;
+ while (fill < cells and prefix_width + screen_c + fill < tw) : (fill += 1)
+ s.at(tx + @as(u16, @intCast(prefix_width + screen_c + fill)), body_y + vr).style.bg = .{ .rgb = t.emph_bg };
+ };
}
}
// Results keep their exact live text. Only the location,
@@ -1945,10 +2020,16 @@ pub fn recolorSyntax(p: *Pardes, s: *Surface, pane: *Pane, f: *State, r: pardes.
while (fill < cells and prefix_width + screen_c + fill < tw) : (fill += 1) {
const cell = s.at(tx + @as(u16, @intCast(prefix_width + screen_c + fill)), body_y + vr);
if (cell.default) continue;
- // A palette colour through the theme's sixteen, as a
- // terminal pane's cell; truecolor as it is.
- if (st.fg != .default) cell.style.fg = if (st.fg == .index) terminal.palColor(p, st.fg.index) else st.fg;
- if (st.bg != .default) cell.style.bg = if (st.bg == .index) terminal.palColor(p, st.bg.index) else st.bg;
+ // As a terminal pane's cell: through Filter, or a
+ // palette colour through the theme's sixteen and
+ // truecolor as it is.
+ if (filtered) |colors| {
+ if (st.fg != .default) cell.style.fg = colors.spanColor(st.fg, false);
+ if (st.bg != .default) cell.style.bg = colors.spanColor(st.bg, true);
+ } else {
+ if (st.fg != .default) cell.style.fg = if (st.fg == .index) terminal.palColor(p, st.fg.index) else st.fg;
+ if (st.bg != .default) cell.style.bg = if (st.bg == .index) terminal.palColor(p, st.bg.index) else st.bg;
+ }
cell.style.bold = cell.style.bold or st.bold;
cell.style.dim = st.dim;
cell.style.italic = st.italic;
@@ -2108,7 +2189,7 @@ pub fn recolorDiffOutput(p: *Pardes, s: *Surface, pane: *Pane, r: pardes.Rect, t
// green is the tint's to say now: its code takes the page's ink.
const paint: ?SynStyle = if (tint != null and prefix)
.{ .fg = tint.?.fg, .bold = true }
- else if (synStyle(p, @enumFromInt(style & syntax.syn_bits))) |ss|
+ else if (synStyle(p, @fromBackingInt(@intCast(style & syntax.syn_bits)))) |ss|
ss
else if (tint != null)
.{ .fg = ink, .bold = false }
@@ -2175,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)));