diff options
126 files changed, 818 insertions, 591 deletions
diff --git a/docs/typ/builtins-gui.json b/docs/typ/builtins-gui.json index 09517de3..a8f682a6 100644 --- a/docs/typ/builtins-gui.json +++ b/docs/typ/builtins-gui.json @@ -39,12 +39,13 @@ {"name": "Find", "leader": "SPC f f", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "List the files below this pane's directory whose names hold its argument, in a +Search."}, {"name": "Follow", "leader": "SPC c f", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Emacs's follow-mode: one text across a chain of panes as consecutive pages, each going on where the one before ends, scrolled as one."}, {"name": "Font", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The body font, by name or path, and its size."}, - {"name": "Fonts", "leader": "SPC t f", "also": [], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the fonts in a pane, each a word to click."}, + {"name": "Fonts", "leader": "SPC t f", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the fonts in a pane, each a word to click."}, {"name": "Forward", "leader": "SPC j i", "also": ["C-i"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Ctrl-i: one step forward again, up to wherever Back started."}, {"name": "Get", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Get: the pane's file read again, its unsaved edits refused once as Del refuses them."}, {"name": "Grep", "leader": "SPC f g", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Find's sibling: Find matches file NAMES under this pane's directory, Grep matches the LINES of those files, on the disk engine's worker."}, {"name": "GripWidth", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "The grip and scrollbar width, as a percent of the theme's rail."}, {"name": "Help", "leader": "SPC ?", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the help: every key and every builtin."}, + {"name": "History", "leader": "SPC f h", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the state file's dumps, those Dump made and those every session's end left (dump.dumpExit), the newest first: a row each, its label, date, size, pane count and the panes' names; a look at a row is a Restore of its label."}, {"name": "Hover", "leader": "SPC l k", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Ask the language server about the symbol under the cursor."}, {"name": "InactiveDim", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Fade the unfocused panes' text by a percentage, 0 through 100, 0 off."}, {"name": "Incl", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "acme's Incl, for the session: `Incl dir ...` adds directories a look at a name found nowhere else is tried in (`stdio.h`, `<foo.h>`), bare lists them, `Incl -` empties the list."}, diff --git a/docs/typ/builtins-tui.json b/docs/typ/builtins-tui.json index edc401f6..c5533c63 100644 --- a/docs/typ/builtins-tui.json +++ b/docs/typ/builtins-tui.json @@ -41,6 +41,7 @@ {"name": "Get", "leader": null, "also": [], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "acme's Get: the pane's file read again, its unsaved edits refused once as Del refuses them."}, {"name": "Grep", "leader": "SPC f g", "also": ["topbar"], "arg": true, "scope": "pane", "setting": false, "choices": null, "doc": "Find's sibling: Find matches file NAMES under this pane's directory, Grep matches the LINES of those files, on the disk engine's worker."}, {"name": "Help", "leader": "SPC ?", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "Open the help: every key and every builtin."}, + {"name": "History", "leader": "SPC f h", "also": ["topbar"], "arg": false, "scope": "root", "setting": false, "choices": null, "doc": "List the state file's dumps, those Dump made and those every session's end left (dump.dumpExit), the newest first: a row each, its label, date, size, pane count and the panes' names; a look at a row is a Restore of its label."}, {"name": "Hover", "leader": "SPC l k", "also": [], "arg": false, "scope": "pane", "setting": false, "choices": null, "doc": "Ask the language server about the symbol under the cursor."}, {"name": "InactiveDim", "leader": null, "also": [], "arg": true, "scope": "root", "setting": true, "choices": null, "doc": "Fade the unfocused panes' text by a percentage, 0 through 100, 0 off."}, {"name": "Incl", "leader": null, "also": [], "arg": true, "scope": "root", "setting": false, "choices": null, "doc": "acme's Incl, for the session: `Incl dir ...` adds directories a look at a name found nowhere else is tried in (`stdio.h`, `<foo.h>`), bare lists them, `Incl -` empties the list."}, diff --git a/docs/typ/cheatsheet.typ b/docs/typ/cheatsheet.typ index 25a9294f..5e373fac 100644 --- a/docs/typ/cheatsheet.typ +++ b/docs/typ/cheatsheet.typ @@ -24,9 +24,9 @@ Over a program that takes the mouse, Shift swaps: #btn("B1", shift: true) select One button: Alt/Option-click is #btn("B2"), Cmd/Super-click #btn("B3"), sweeps too (a terminal passes only Alt); Ctrl-click is a definition; a program that takes the mouse gets the plain click. == Tags -#tag("Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit") +#tag("Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Fonts Config History Debug Exit") #tag("New Term Find Grep Joincol Delcol") -#tag("Save Term Collapse Del", path: "/home/me/notes.txt") +#tag("Save Term Collapse Follow Del", path: "/home/me/notes.txt") #tag("Term+bash Save Mode Filter Collapse Del", path: "/home/me/src") #tag("Term PdfSections PdfTint PdfFit Collapse Del", path: "[1/12] … manual.pdf") - #word("Del") over unsaved text refuses once; again discards. #word("Del") `j`: rows below. #key("SPC d") between two panes takes #key("k") (rows above) or #key("j") (below), asking only if you pause. @@ -87,6 +87,7 @@ Helix-style: motions *select*, then an edit acts on the selection. Mode box: bla key("SPC f f"), word("Find"), key("SPC f g"), word("Grep"), key("SPC f r"), word("Recent"), + key("SPC f h"), word("History"), key("SPC b b"), word("Panes"), key("SPC s s"), [declarations], key("SPC f c"), word("Config"), diff --git a/docs/typ/guide.typ b/docs/typ/guide.typ index 51f29fb8..41d59e53 100644 --- a/docs/typ/guide.typ +++ b/docs/typ/guide.typ @@ -92,9 +92,9 @@ the registers. #key("SPC y") and #key("SPC p") use the system clipboard. = Tags <tags> -#tag("Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit") +#tag("Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Fonts Config History Debug Exit") #tag("New Term Find Grep Joincol Delcol") -#tag("Save Term Collapse Del", path: "/home/me/notes.txt") +#tag("Save Term Collapse Follow Del", path: "/home/me/notes.txt") A tag is text with undo. Type `make` into one and #word("Exec") it, or delete the words you never use. Any word runs from any tag: #word("Exit") diff --git a/docs/typ/reference.typ b/docs/typ/reference.typ index 48bdfdbe..e1c9e263 100644 --- a/docs/typ/reference.typ +++ b/docs/typ/reference.typ @@ -396,7 +396,15 @@ Writes take settings and session builtins (`scope = .session` in #word("Restore") `<label>` word naming it to the workspace tag (the last dump's, replacing an earlier one's). The state file keeps the newest 32 dumps, and a text unchanged since an earlier one once; #file("/dumps") - lists them. `Dump export <path>` writes the dump to a file of its own + lists them. A session's end (#word("Exit"), the last pane's #word("Del"), + its terminal or window gone) leaves a dump there too, slim: its panes + with their files, directories and places, not a clean file's text (its + file's, read again), an undo history or a terminal's screen (a new shell + starts in the directory); a session of shells alone leaves none. + #word("History") (`SPC f h`) lists the state file's dumps in a `+History` + pane, the newest first, a row each: its label, date, size, pane count and + what its panes showed, a word each; a look at a row is a + #word("Restore") of its label. `Dump export <path>` writes the dump to a file of its own instead (`~` the home directory; the tag's word then names the path), which `-l <path>` and #word("Restore") `<path>` read: the way to carry a session to another machine. diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index 2dca1ac0..0d45f0b0 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -2,6 +2,16 @@ ## Unreleased +- A session's end (`Exit`, the last pane's `Del`, its terminal or window + gone) leaves a slim dump in the state file: its panes with their files, + directories and places, not a clean file's text, an undo history or a + terminal's screen. `History` (`SPC f h`) lists the state file's dumps in a + `+History` pane, a row each with the panes' names; a look at a row is a + `Restore` of it. `/dumps` rows end with the names too. The workspace row + has `History` before `Debug`, and a window's `Fonts` after `Themes`. + +- `Follow` is in a text pane's tag by default, after `Collapse`. + - `Follow` (`SPC c f`), Emacs's follow-mode: one text across a chain of panes as consecutive pages, each a Zerox twin in the column to the right (a new column when there is none). The pages scroll as one, and the diff --git a/src/Core.zig b/src/Core.zig index 6c5f5470..2e17b495 100644 --- a/src/Core.zig +++ b/src/Core.zig @@ -177,7 +177,6 @@ pub const View = struct { clip_pending: ?edit.ClipRequest = null, }; - gpa: std.mem.Allocator, image_gpa: std.mem.Allocator, /// Its kinds of pane (Kind.zig): the compiled-in ones, then what addons @@ -402,18 +401,19 @@ diff_output: pardes.panes.File.DiffOutput = .{}, pub const replica = .{ .local = .{ // A frame, and the timings that make it. - "surface", "frames", "chrome", - "frame_arena", "scratch", - "needs_frame", "present_skipped", - "echo", + "surface", "frames", "chrome", + "frame_arena", "scratch", "needs_frame", + "present_skipped", "echo", // Drained by every pump before its digest; a replica's queues // are its own. - "effects", "effects_head", "effects_len", "in_q", "in_head", "in_len", + "effects", + "effects_head", "effects_len", "in_q", + "in_head", "in_len", // The views no frontend here draws (views.zig). - "undrawn", + "undrawn", // How this process was started, and the last dump it made for // its host to write: a session loaded elsewhere has its own. - "opts", "dump_out", "dump_export", + "opts", "dump_out", "dump_export", }, .derived = .{ "shell_rows", "diff_output", "locations_cache", "retired_panes", "tty_filter_palette", "body_chrome" }, // The host's handles, the 9P server's fids and log, the state file @@ -801,6 +801,15 @@ pub fn deinit(p: *Pardes) void { gpa.destroy(p); } +/// The session ends: what it was goes to the state file (dump.dumpExit), +/// then the host's loop sees `quit`. Every way out comes here: Exit, the +/// last pane's Del, the host's own end (its terminal hung up, its window +/// closed). A dump that fails is said as Exit's, in the log. +pub fn endSession(p: *Pardes) void { + pardes.dump.dumpExit(p) catch |err| p.reportError(p.view().active, "Exit", err); + p.quit = true; +} + /// shell feedback after write_dump: remember where the dump landed (the /// topbar grows a `Restore <path>` word pointing at it) pub fn setLastDump(p: *Pardes, path: []const u8) void { @@ -418,7 +418,7 @@ const session_tag = "db".*; /// keeps beside it and its pane count) in a database in memory, `last` /// naming it, `gpa`'s. Of the same session, the same bytes: its ids are /// std.Io.failing's zeros, never random ones. -pub fn image(gpa: std.mem.Allocator, label: []const u8, session: []const u8, blobs: []const pardes.walk.Blob, panes: u64) ![]u8 { +pub fn image(gpa: std.mem.Allocator, label: []const u8, session: []const u8, blobs: []const pardes.walk.Blob, panes: u64, names: []const u8) ![]u8 { var buf: std.Io.Writer.Allocating = .init(gpa); errdefer buf.deinit(); var db = try Memory.init(std.Io.failing, .{ .buffer = &buf, .hash_id = hash_id, .file_id = 0 }); @@ -427,6 +427,7 @@ pub fn image(gpa: std.mem.Allocator, label: []const u8, session: []const u8, blo session: []const u8, blobs: []const pardes.walk.Blob, panes: u64, + names: []const u8, pub fn run(ctx: @This(), cursor: *Memory.Cursor(.read_write)) !void { const root = try Memory.HashMap(.read_write).init(cursor.*); try root.put(key("last"), .{ .bytes = ctx.label }); @@ -435,6 +436,7 @@ pub fn image(gpa: std.mem.Allocator, label: []const u8, session: []const u8, blo const entry = try Memory.HashMap(.read_write).init(try dumps.putCursor(key(ctx.label))); try entry.put(key("session"), .{ .bytes_object = .{ .value = ctx.session, .format_tag = session_tag } }); try entry.put(key("panes"), .{ .uint = ctx.panes }); + try entry.put(key("names"), .{ .bytes = ctx.names }); const hashes = try Memory.ArrayList(.read_write).init(try entry.putCursor(key("blobs"))); const texts = try Memory.HashMap(.read_write).init(try root.putCursor(key("blobs"))); for (ctx.blobs) |*b| { @@ -442,7 +444,7 @@ pub fn image(gpa: std.mem.Allocator, label: []const u8, session: []const u8, blo try texts.put(blobKey(&b.hash), .{ .bytes = b.bytes }); } } - }{ .label = label, .session = session, .blobs = blobs, .panes = panes }); + }{ .label = label, .session = session, .blobs = blobs, .panes = panes, .names = names }); return buf.toOwnedSlice(); } @@ -462,6 +464,8 @@ pub const Read = struct { session: Memory, label: []u8, panes: u64, + /// What its panes show, a word each (dump.image); "" in an old image. + names: []u8, /// The image `bytes` at its dump `label`, else its last one. pub fn open(gpa: std.mem.Allocator, bytes: []const u8, label: ?[]const u8) !*Read { @@ -470,7 +474,7 @@ pub const Read = struct { errdefer gpa.destroy(r); // Read, never written: the bytes are borrowed, never freed here. var borrowed: std.ArrayList(u8) = .fromOwnedSlice(@constCast(bytes)); - r.* = .{ .gpa = gpa, .image_buf = .fromArrayList(gpa, &borrowed), .image = undefined, .session_buf = undefined, .session = undefined, .label = &.{}, .panes = 0 }; + r.* = .{ .gpa = gpa, .image_buf = .fromArrayList(gpa, &borrowed), .image = undefined, .session_buf = undefined, .session = undefined, .label = &.{}, .panes = 0, .names = &.{} }; r.image = Memory.init(std.Io.failing, .{ .buffer = &r.image_buf }) catch return error.NotADump; const top = Memory.HashMap(.read_only).init(r.image.rootCursor().readOnly()) catch return error.NotADump; r.label = if (label) |l| try gpa.dupe(u8, l) else last: { @@ -480,6 +484,8 @@ pub const Read = struct { errdefer gpa.free(r.label); const entry = try entryOf(Memory, top, r.label) orelse return error.NoDump; r.panes = if (entry.getCursor(key("panes")) catch null) |c| c.readUint() catch 0 else 0; + r.names = if (entry.getCursor(key("names")) catch null) |c| @constCast(c.readBytesAlloc(gpa, 4096) catch &.{}) else &.{}; + errdefer if (r.names.len > 0) gpa.free(r.names); const at = (entry.getCursor(key("session")) catch return error.NotADump) orelse return error.NotADump; const session: []u8 = @constCast(at.readBytesAlloc(gpa, null) catch |err| return if (err == error.OutOfMemory) error.OutOfMemory else error.NotADump); var owned: std.ArrayList(u8) = .fromOwnedSlice(session); @@ -491,6 +497,7 @@ pub const Read = struct { pub fn close(r: *Read) void { r.session_buf.deinit(); + if (r.names.len > 0) r.gpa.free(r.names); r.gpa.free(r.label); r.gpa.destroy(r); } @@ -543,7 +550,7 @@ fn imageOf(o: *Open, gpa: std.mem.Allocator, label: []const u8) !?[]u8 { try blobs.append(gpa, .{ .hash = hash, .bytes = text }); } } - return try image(gpa, label, session, blobs.items, panes); + return try image(gpa, label, session, blobs.items, panes, ""); }, } } @@ -655,6 +662,7 @@ fn putLocked(o: *Open, r: *Read, label: []const u8, buf: []u8) ![]const u8 { try entry.put(key("seq"), .{ .uint = seq }); try entry.put(key("date"), .{ .uint = ctx.date }); try entry.put(key("panes"), .{ .uint = ctx.r.panes }); + try entry.put(key("names"), .{ .bytes = ctx.r.names }); var session_at = (try from.getCursor(key("session"))) orelse return error.NoDump; var size = try session_at.count(); try copyBytes(DB, &session_at, try entry.putCursor(key("session")), session_tag); @@ -738,16 +746,20 @@ fn trim(comptime DB: type, gpa: std.mem.Allocator, dumps: DB.HashMap(.read_write } /// The dumps the state file keeps, a line each, the newest first: its -/// label, its date (UTC), its size in bytes and its pane count. +/// label, its date (UTC), its size in bytes, its pane count and what its +/// panes showed, a word each. pub fn listDumps(db: *Db, p: *Pardes, w: *std.Io.Writer) !void { const o = db.opened(p) orelse return; pardes.turn.yield(); defer pardes.turn.back(); const gpa = p.recentGpa(); - const Row = struct { seq: u64, date: u64, size: u64, panes: u64, label: []u8 }; + const Row = struct { seq: u64, date: u64, size: u64, panes: u64, label: []u8, names: []u8 }; var rows: std.ArrayList(Row) = .empty; defer { - for (rows.items) |r| gpa.free(r.label); + for (rows.items) |r| { + gpa.free(r.label); + gpa.free(r.names); + } rows.deinit(gpa); } switch (o.where) { @@ -759,14 +771,14 @@ pub fn listDumps(db: *Db, p: *Pardes, w: *std.Io.Writer) !void { while (try it.next()) |kv_at| { const kv = try kv_at.readKeyValuePair(); const entry = try DB.HashMap(.read_only).init(kv.value_cursor); - var row: Row = .{ .seq = 0, .date = 0, .size = 0, .panes = 0, .label = @constCast(try kv.key_cursor.readBytesAlloc(gpa, 4096)) }; + var row: Row = .{ .seq = 0, .date = 0, .size = 0, .panes = 0, .label = @constCast(try kv.key_cursor.readBytesAlloc(gpa, 4096)), .names = &.{} }; + errdefer gpa.free(row.label); inline for (.{ "seq", "date", "size", "panes" }) |field| if (try entry.getCursor(key(field))) |c| { @field(row, field) = c.readUint() catch 0; }; - rows.append(gpa, row) catch |err| { - gpa.free(row.label); - return err; - }; + row.names = if (try entry.getCursor(key("names"))) |c| @constCast(try c.readBytesAlloc(gpa, 4096)) else try gpa.dupe(u8, ""); + errdefer gpa.free(row.names); + try rows.append(gpa, row); } }, } @@ -780,10 +792,10 @@ pub fn listDumps(db: *Db, p: *Pardes, w: *std.Io.Writer) !void { const yd = es.getEpochDay().calculateYearDay(); const md = yd.calculateMonthDay(); const ds = es.getDaySeconds(); - try w.print("{s} {d:0>4}-{d:0>2}-{d:0>2}T{d:0>2}:{d:0>2}:{d:0>2}Z {d} {d}\n", .{ - r.label, yd.year, md.month.numeric(), @as(u8, md.day_index) + 1, - ds.getHoursIntoDay(), ds.getMinutesIntoHour(), ds.getSecondsIntoMinute(), r.size, - r.panes, + try w.print("{s} {d:0>4}-{d:0>2}-{d:0>2}T{d:0>2}:{d:0>2}:{d:0>2}Z {d} {d}{s}{s}\n", .{ + r.label, yd.year, md.month.numeric(), @as(u8, md.day_index) + 1, + ds.getHoursIntoDay(), ds.getMinutesIntoHour(), ds.getSecondsIntoMinute(), r.size, + r.panes, if (r.names.len > 0) " " else "", r.names, }); } } diff --git a/src/Effect.zig b/src/Effect.zig index a97a280c..2af28dd7 100644 --- a/src/Effect.zig +++ b/src/Effect.zig @@ -244,7 +244,7 @@ pub fn perform(p: *Pardes, e: Effect) void { .addon => |a| if (!tape.replaying()) @import("Addon.zig").perform(p, a.op, a.pane, a.arg.slice()), .job => |j| if (v.job) |f| f(p.host.ctx, j.pane, j.serial, j.token) else if (!tape.replaying()) host_io.KindJob.runHere(p, j.pane, j.serial, j.token), // the loop's own condition; a host tears down after its own loop - .quit => p.quit = true, + .quit => p.endSession(), } } @@ -610,7 +610,7 @@ test "Save reaches every tagline with text behind it and no other" { // A scratch is an output buffer that wears the FILE tails. out.file.?.output = .{ .from = .{ .cmd = std.meta.stringToEnum(pardes.Builtin, "New").? } }; - try std.testing.expectEqualStrings(" Save Term Collapse Del", tagline.curTail(out)); + try std.testing.expectEqualStrings(" Save Term Collapse Follow Del", tagline.curTail(out)); // An image's bytes on disk already are what they are: nothing of the // pane's own is unwritten, so the word is absent and inert. diff --git a/src/Handover.zig b/src/Handover.zig index cf672ba4..2f5689f2 100644 --- a/src/Handover.zig +++ b/src/Handover.zig @@ -218,7 +218,7 @@ fn dumpCarried(p: *Pardes, kind: Kind, at: usize, ids: []const usize, seq: u32) } }{ .w = &w, .value = &value }); var name: [32]u8 = undefined; - return pardes.Db.image(p.gpa, std.fmt.bufPrint(&name, "handover-{d}", .{seq}) catch unreachable, buf.written(), w.blobs.items, ids.len); // a u32 fits 32 + return pardes.Db.image(p.gpa, std.fmt.bufPrint(&name, "handover-{d}", .{seq}) catch unreachable, buf.written(), w.blobs.items, ids.len, ""); // a u32 fits 32 } /// Whether `bytes` are a handover's dump (`dumpCarried`'s, or an older diff --git a/src/Output.zig b/src/Output.zig index 0161878e..a38245c7 100644 --- a/src/Output.zig +++ b/src/Output.zig @@ -570,6 +570,23 @@ pub fn openJumps(p: *Pardes, id: usize) !void { try refillOrOpen(p, id, .{ .cmd = .Jumplist }, try out.toOwnedSlice()); } +/// The state file's dumps as rows (Db.listDumps: label, date, size, pane +/// count, the panes' names), the newest first; a look at a row is a +/// Restore of its label (look.zig). Asked of the authority: the state file +/// is its host's. +pub fn openHistory(p: *Pardes, id: usize) !void { + const text = pardes.tape.authority(dumpsText, .{p}) orelse return error.NoStateFile; + if (text.len == 0) return error.NoDumps; + try refillOrOpen(p, id, .{ .cmd = .History }, try p.gpa.dupe(u8, text)); +} + +/// Db.listDumps's text, the step's (scratch); null for no state file. +fn dumpsText(p: *Pardes) ?[]const u8 { + var out: std.Io.Writer.Allocating = .init(p.scratch.allocator()); + p.db.listDumps(p, &out.writer) catch return null; + return out.written(); +} + /// The recent list as rows: `<path>:<line>:<col> open|closed`, most recent /// first; a look at a row opens the file there, as a +Jumps row does. pub fn recentText(p: *Pardes, w: *std.Io.Writer, look_rows: bool) !void { diff --git a/src/builtins.zig b/src/builtins.zig index e021dd6b..1356874a 100644 --- a/src/builtins.zig +++ b/src/builtins.zig @@ -405,7 +405,7 @@ pub const Exit = struct { pub const scope: Scope = .session; pub fn run(c: Ctx) void { if (warnModifiedIn(c, .Exit, .all)) return; - c.p.quit = true; + c.p.endSession(); c.p.emit(.quit); } }; @@ -1700,6 +1700,22 @@ pub const Recent = struct { } }; +/// List the state file's dumps, those Dump made and those every session's +/// end left (dump.dumpExit), the newest first: a row each, its label, +/// date, size, pane count and the panes' names; a look at a row is a +/// Restore of its label. +pub const History = struct { + pub const scope: Scope = .session; + pub const output: OutputTraits = .{ .name = config.history_buffer }; + pub fn run(c: Ctx) void { + panes.Output.openHistory(c.p, c.id) catch |err| switch (err) { + error.NoStateFile => c.p.reportFailure(c.id, "History: no state file to list (DumpDir)"), + error.NoDumps => c.p.reportFailure(c.id, "History: no dumps yet"), + else => c.p.reportError(c.id, "History", err), + }; + } +}; + /// List the places jumped from, each a place to go. pub const Jumplist = struct { pub const scope: Scope = .session; diff --git a/src/config.zig b/src/config.zig index 96a5f557..3a846206 100644 --- a/src/config.zig +++ b/src/config.zig @@ -141,6 +141,7 @@ pub const leader_path = paths: { .Forward = "ji", .Last = "jj", .Jumplist = "jl", + .History = "fh", .Look = null, .Mini = null, .Exec = null, @@ -230,14 +231,18 @@ pub const child_term = "xterm-256color"; pub const child_colorterm = "truecolor"; pub const child_term_program = "pardes"; -pub const topbar_str = "Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit"; +// Fonts is the window's word alone (the font picker), so a terminal build's +// row has no such builtin to name: the window's row and the terminal's. +pub const topbar_window_str = "Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Fonts Config History Debug Exit"; +pub const topbar_terminal_str = "Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit"; +pub const topbar_str = if (@import("builtins.zig").capabilities.font_picker) topbar_window_str else topbar_terminal_str; -pub const pane_builtins_str = "Term Collapse Del"; -pub const file_pane_builtins_str = "Save Term Collapse Del"; +pub const pane_builtins_str = "Term Collapse Follow Del"; +pub const file_pane_builtins_str = "Save Term Collapse Follow Del"; /// After a file's, on one a language server speaks for. pub const lsp_pane_builtins_str = "Def Refs"; /// A diff's (a .diff, a .patch, a +Pager holding one): Diff. -pub const diff_pane_builtins_str = "Save Term Diff Collapse Del"; +pub const diff_pane_builtins_str = "Save Term Diff Collapse Follow Del"; /// A +Pager's (`pardes -`): Filter, as a terminal's. pub const pager_pane_builtins_str = "Save Term Filter Collapse Del"; /// A +Pager holding a diff (`git show`): Diff too. @@ -431,6 +436,7 @@ pub const search_buffer = "+Search"; pub const help_buffer = "+Help"; pub const dump_config_buffer = "+DumpConfig"; pub const jumps_buffer = "+Jumps"; +pub const history_buffer = "+History"; pub const preview_buffer = "+Preview"; pub const unsaved_buffer = "+Unsaved"; pub const themes_buffer = "+Themes"; @@ -1544,7 +1550,8 @@ const doc_typ = struct { if (w.end > 0) w.writeByte(' ') catch return false; w.writeAll(x[0 .. std.mem.indexOfScalar(u8, x, '+') orelse x.len]) catch return false; } - const tags = [_][]const u8{ topbar_str, @import("tagline.zig").column_tag_default, pane_builtins_str, file_pane_builtins_str, diff_pane_builtins_str, pager_pane_builtins_str, pager_diff_pane_builtins_str, diff_view_builtins_str, terminal_pane_builtins_str, command_pane_builtins_str, dir_pane_builtins_str }; + // Both rows: the docs and the tutor show the window's and the terminal's. + const tags = [_][]const u8{ topbar_window_str, topbar_terminal_str, @import("tagline.zig").column_tag_default, pane_builtins_str, file_pane_builtins_str, diff_pane_builtins_str, pager_pane_builtins_str, pager_diff_pane_builtins_str, diff_view_builtins_str, terminal_pane_builtins_str, command_pane_builtins_str, dir_pane_builtins_str }; for (tags) |d| if (std.mem.eql(u8, d, w.buffered())) return true; // A kind's pane's: Term, its addon's words, Collapse Del (Kind.zig). const shown = w.buffered(); diff --git a/src/dump.zig b/src/dump.zig index 82b55ae6..517544fa 100644 --- a/src/dump.zig +++ b/src/dump.zig @@ -112,6 +112,55 @@ pub fn dumpState(p: *Pardes) !void { p.emit(.write_dump); } +/// A session's end leaves what it was in the state file under the usual +/// label (Pardes.endSession): its panes with their files, directories and +/// places, slim: not a clean file's text (its file's), an undo history or +/// a terminal's screen (the session's), so History brings a day's panes +/// back by name. A session of shells alone leaves nothing. +pub fn dumpExit(p: *Pardes) !void { + var worth = false; + for (p.panes) |slot| if (slot) |pane| { + if (pane.addon != null or (pane.file != null and pane.file.?.output == null)) worth = true; + }; + if (!worth) return; + // The state file's, whatever the last `Dump export` named. + if (p.dump_export) |old| p.gpa.free(old); + p.dump_export = null; + slim_terminals = true; + defer slim_terminals = false; + var slims: [MAX_PANES]Slim = undefined; + var n: usize = 0; + defer for (slims[0..n]) |*s| s.put(); + for (p.panes) |slot| if (slot) |pane| if (pane.file) |*f| { + slims[n] = Slim.take(f); + n += 1; + }; + try dumpState(p); +} + +/// A file kept slim in a dump (`dumpExit`, a closed pane's past its bound, +/// Store.zig): without its undo, and a clean file on disk without its +/// text, which `revivePane` reads from its file again. +const Slim = struct { + f: *pardes.panes.File.State, + history: *pardes.panes.File.History, + content: []u8, + + var empty: pardes.panes.File.History = .{}; + + fn take(f: *pardes.panes.File.State) Slim { + const s: Slim = .{ .f = f, .history = f.history, .content = f.content }; + f.history = ∅ + if (f.output == null and f.revision == f.saved_revision and filesystem.localPath(f.path) != null) f.content = &.{}; + return s; + } + + fn put(s: *Slim) void { + s.f.history = s.history; + s.f.content = s.content; + } +}; + /// A Dump: into the state file, or (`Dump export`) a file of its own at /// `to` (`~` the home directory). pub fn dumpTo(p: *Pardes, to: ?[]const u8) !void { @@ -168,9 +217,17 @@ pub fn image(p: *Pardes, name: []const u8) ![]u8 { const mounts: []const filesystem.Mount = p.fs.mounts.items; var on_disk: OnDisk = @splat(false); var panes: u64 = 0; + // What the panes show, a word each (History's row): a file's or a + // kind's path, a terminal's directory. + var names: std.Io.Writer.Allocating = .init(gpa); + defer names.deinit(); for (p.panes, &on_disk) |slot, *on| if (slot) |pane| { on.* = onDisk(pane); panes += 1; + const shown: []const u8 = if (pane.addon) |k| k.path else if (pane.file) |f| (if (f.output == null) f.path else "") else pane.cwdSlice(); + if (shown.len == 0 or names.written().len + shown.len > 4096) continue; + if (names.written().len > 0) try names.writer.writeByte(' '); + try names.writer.writeAll(shown); }; const theme: []const u8 = colors.themes[@min(p.settings.theme, colors.themes.len - 1)].name; const others = try views.dumped(p, gpa); @@ -195,7 +252,7 @@ pub fn image(p: *Pardes, name: []const u8) ![]u8 { try ctx.w.member(root, "shares", []const views.Shares, ctx.others); } }{ .w = &w, .p = p, .mounts = &mounts, .on_disk = &on_disk, .theme = &theme, .others = &kept }); - return pardes.Db.image(gpa, name, buf.written(), w.blobs.items, panes); + return pardes.Db.image(gpa, name, buf.written(), w.blobs.items, panes, names.written()); } /// A dump for a screen-state replica's join (src/replica.zig): its blobs' @@ -209,7 +266,7 @@ pub fn dumpJoin(p: *Pardes, deferred: *std.ArrayListUnmanaged(walk.Deferred)) ![ return dumpWith(p, deferred); } -/// `dumpJoin`'s: a terminal dumps its size, not its emulator. +/// `dumpJoin`'s and `dumpExit`'s: a terminal dumps its size, not its emulator. pub var slim_terminals = false; fn dumpWith(p: *Pardes, deferred: ?*std.ArrayListUnmanaged(walk.Deferred)) ![]u8 { @@ -610,6 +667,13 @@ fn revivePane(p: *Pardes, id: usize, pane: *pardes.panes.Pane, was_on_disk: bool if (pane.pdf) |old| return revivePdf(p, id, pane, old); const f = if (pane.file) |*file| file else return; if (f.output != null or filesystem.localPath(f.path) == null) return; + // A clean file kept slim (`Slim`): its text is its file's. One gone + // since is said deleted below, its text nowhere now. + if (f.content.len == 0 and (f.saved_len orelse 0) > 0) { + if (filesystem.read(p, f.path)) |text| { + f.content = text; + } else |_| {} + } p.emit(.{ .watch = .{ .pane = @intCast(id), .on = true } }); // Its file gone from disk since the dump: its text is nowhere else, so // it is said deleted, and Del, Exit and Restore ask first. One never on @@ -644,15 +708,8 @@ pub fn savePane(gpa: std.mem.Allocator, pane: *pardes.panes.Pane, slim: bool) ![ if (!slim) return walk.save(pardes.panes.Pane, gpa, pane); pane.terminal = null; const f = if (pane.file) |*file| file else return walk.save(pardes.panes.Pane, gpa, pane); - const history = f.history; - const content = f.content; - defer { - f.history = history; - f.content = content; - } - var empty: pardes.panes.File.History = .{}; - f.history = ∅ - if (f.output == null and f.revision == f.saved_revision and filesystem.localPath(f.path) != null) f.content = &.{}; + var slimmed = Slim.take(f); + defer slimmed.put(); return walk.save(pardes.panes.Pane, gpa, pane); } @@ -676,12 +733,6 @@ pub fn loadPane(p: *Pardes, id: usize, bytes: []const u8) !*pardes.panes.Pane { pane.places.from = 0; pane.collapsed = false; pane.prompt_view = p.live; - if (pane.file) |*f| if (f.content.len == 0 and (f.saved_len orelse 0) > 0) { - // A clean file kept slim: its text is its file's. - if (filesystem.read(p, f.path)) |text| { - f.content = text; - } else |_| {} - }; try ensureKind(p, pane); p.installPane(id, pane); revivePane(p, id, pane, false); diff --git a/src/look.zig b/src/look.zig index bde63bf3..be102339 100644 --- a/src/look.zig +++ b/src/look.zig @@ -1359,6 +1359,13 @@ fn isRecentList(pane: *const Pane) bool { return std.meta.eql(o.from, panes.Output.Origin{ .cmd = .Jumplist }); } +/// Whether `pane` is the History list, whose rows name dumps. +fn isHistoryList(pane: *const Pane) bool { + const f = pane.file orelse return false; + const o = f.output orelse return false; + return std.meta.eql(o.from, panes.Output.Origin{ .cmd = .History }); +} + // ---- a look on a diff line ---- /// The lines of a pane showing a diff, a .diff or .patch file or a @@ -1493,6 +1500,14 @@ pub fn lookAt(p: *Pardes, id: usize, operand_raw: []const u8) void { var home_buf: [4096]u8 = undefined; const stripped = std.mem.trim(u8, operand_raw, " \t\r\n"); const operand = if (stripped.len > 0 and stripped[0] == '~') filesystem.expandHome(stripped, &home_buf) else std.mem.trimEnd(u8, operand_raw, "\r\n"); + // A +History row names a dump of the state file's (its label, first): + // a look at it is a Restore of that dump; its other words are looked + // as any (a path in it opens). + if (isHistoryList(pane)) { + const row = std.mem.trim(u8, operand, " \t\r\n"); + const label = row[0 .. std.mem.indexOfAny(u8, row, " \t") orelse row.len]; + if (std.mem.startsWith(u8, label, "pardes-")) return exec.runBuiltin(p, .Restore, id, "Restore", label); + } // A +Recent row is a remembered place: reopened and clamped to the file // as it is now, never a miss for a line the file no longer has. if (isRecentList(pane)) { diff --git a/src/mouse.zig b/src/mouse.zig index c3cf64af..783b12b7 100644 --- a/src/mouse.zig +++ b/src/mouse.zig @@ -1521,7 +1521,8 @@ test "a press near chrome takes it: the tag rows, a column's handle or a seam on test "plain left click clears explicit modal selection" { const gpa = std.testing.allocator; - const p = try Pardes.init(gpa, .{ .cols = 40, .rows = 10 }); + // Wide enough for the tag on one row: the body starts under it. + const p = try Pardes.init(gpa, .{ .cols = 60, .rows = 10 }); defer p.deinit(); const pane = try p.setTestFile("abcdef\n"); pane.body.cur_row = 0; diff --git a/src/panes.zig b/src/panes.zig index f1bb46c8..02d5024a 100644 --- a/src/panes.zig +++ b/src/panes.zig @@ -999,7 +999,7 @@ pub fn removePane(p: *Pardes, id: usize, to: ?usize) error{OutOfMemory}!void { if (v.active != id) return; // No pane left: the session is over. v.active = gainer orelse beside orelse anyPane(p) orelse { - p.quit = true; + p.endSession(); return p.emit(.quit); }; if (emptied) |c| if (v.header == null) tagline.enterHeader(p, c); diff --git a/src/tagline.zig b/src/tagline.zig index a7438be3..fa5246c4 100644 --- a/src/tagline.zig +++ b/src/tagline.zig @@ -52,8 +52,17 @@ pub const column_tag_default = "New Term Find Grep Joincol Delcol"; /// fixed builtins, plus `Restore <path>` once a dump exists. pub fn headerDefault(p: *Pardes, what: Text.What) []const u8 { if (what == .column) return column_tag_default; - const d = p.last_dump orelse return config.topbar_str; - return std.fmt.allocPrint(p.scratch.allocator(), config.topbar_str ++ " Restore {s}", .{d}) catch config.topbar_str; + const row = topbarDefault(p); + const d = p.last_dump orelse return row; + return std.fmt.allocPrint(p.scratch.allocator(), "{s} Restore {s}", .{ row, d }) catch row; +} + +/// The workspace row's words for this view: the window's row, with Fonts, +/// in a window's view alone; a terminal's view (a terminal's build, or a +/// terminal's replica of a window's session) has the row without it. +fn topbarDefault(p: *Pardes) []const u8 { + if (comptime @import("builtins.zig").capabilities.font_picker) if (@import("builtins.zig").registry.here(p, .Fonts)) return config.topbar_window_str; + return config.topbar_terminal_str; } /// the topbar line -- render and click dispatch must agree on this exact diff --git a/src/tutor.txt b/src/tutor.txt index 1de2a4e6..5b0fd23d 100644 --- a/src/tutor.txt +++ b/src/tutor.txt @@ -59,12 +59,12 @@ The workspace tag, a column's, and a file's, a terminal's, a PDF's and an image's: -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| Save Term Collapse Del +| Save Term Collapse Follow Del | Term Save Mode Filter Collapse Del | Term PdfSections PdfTint PdfFit Collapse Del -| Term Collapse Del +| Term Collapse Follow Del 1. Press : here: the keyboard goes to this pane's tag, on `Save`. Press A, type a space and Help, press Esc, then Tab: `Help` diff --git a/test/behaviour/mouse.zig b/test/behaviour/mouse.zig index e64e3ef9..951ab493 100644 --- a/test/behaviour/mouse.zig +++ b/test/behaviour/mouse.zig @@ -26,8 +26,8 @@ test "mouse: a double-click selects a word, a line, a bracketed or quoted text, try s.expect(sel, ""); } // In the tag too: what it selected is what a yank takes. - try s.click("Collapse Del", "Collapse D".len, 1); - try s.click("Collapse Del", "Collapse D".len, 1); + try s.click("Follow Del", "Follow D".len, 1); + try s.click("Follow Del", "Follow D".len, 1); try s.keys("\x1by:ggP"); try s.expect(s.at("/pane/{d}/body", .{n}), "Delcall foo_bar(a, b)\nsay \"hi there\"\n"); } @@ -157,7 +157,7 @@ test "mouse: a click on either half of a wide character lands before it, in the // Typed past the tag's words, a two-byte λ goes in and one backspace // takes it out whole. const tag = try s.read(s.at("/pane/{d}/tag", .{n})); - try s.click("Collapse Del", "Collapse Del".len + 1, 1); + try s.click("Follow Del", "Follow Del".len + 1, 1); const caret = (try s.cursor()).?; // A clicked tag is in normal mode: `i` types at the caret. try s.keys("iλ"); diff --git a/test/behaviour/panes.zig b/test/behaviour/panes.zig index 12be354a..b42cab76 100644 --- a/test/behaviour/panes.zig +++ b/test/behaviour/panes.zig @@ -238,8 +238,8 @@ test "panes: Collapse keeps the text and folds the pane to its tag, and again re for ([_][]const u8{ try s.read(s.at("/pane/{d}/tag", .{n})), try s.read(s.at("/pane/{d}/tag", .{try s.newPane()})), - try t.read(t.at("/pane/{d}/tag", .{try t.focused()})), - }) |tag| try std.testing.expect(std.mem.endsWith(u8, tag, " Collapse Del")); + }) |tag| try std.testing.expect(std.mem.endsWith(u8, tag, " Collapse Follow Del")); + try std.testing.expect(std.mem.endsWith(u8, try t.read(t.at("/pane/{d}/tag", .{try t.focused()})), " Collapse Del")); try s.write(s.at("/pane/{d}/ctl", .{try s.focused()}), "Del\n"); const ctl = s.at("/pane/{d}/ctl", .{n}); try s.write(ctl, "Collapse\n"); diff --git a/test/behaviour/root_ctl.zig b/test/behaviour/root_ctl.zig index c1dad7e1..1fa67206 100644 --- a/test/behaviour/root_ctl.zig +++ b/test/behaviour/root_ctl.zig @@ -263,3 +263,41 @@ test "root-ctl: a Dump killed in the middle leaves the one before it whole, and try s.write("/ctl", "Dump\n"); try std.testing.expectEqual(@as(usize, 2), (try labels(&s)).len); } + +test "root-ctl: a session's end leaves a slim dump the next session's History lists with the panes' names, a look at its row restores the file pane, and a session of shells alone leaves none" { + var tmp = std.testing.tmpDir(.{}); + defer tmp.cleanup(); + var dir_buf: [std.fs.max_path_bytes]u8 = undefined; + const dir = dir_buf[0..try tmp.dir.realPath(std.testing.io, &dir_buf)]; + try tmp.dir.writeFile(std.testing.io, .{ .sub_path = "a.txt", .data = "kept on disk\n" }); + // A session of a shell alone: nothing to come back to. + { + var s = try Session.initShared(std.testing.allocator, dir); + defer s.deinit(); + try s.write("/ctl", "Exit\n"); + } + { + var s = try Session.initShared(std.testing.allocator, dir); + defer s.deinit(); + try std.testing.expectEqualStrings("", try s.read("/dumps")); + _ = try s.lookFile(s.at("{s}/a.txt", .{dir})); + try s.write("/ctl", "Exit\n"); + } + var s = try Session.initShared(std.testing.allocator, dir); + defer s.deinit(); + // One dump, its row ending with the file's name; slim: a clean file's + // text is not in it (the session's own maps are a few hundred KB, so + // the size says nothing: Restore reads the file again below). + const listed = try labels(&s); + try std.testing.expectEqual(@as(usize, 1), listed.len); + try std.testing.expect(std.mem.endsWith(u8, std.mem.trimEnd(u8, try s.read("/dumps"), "\n"), s.at(" {s}/a.txt", .{dir}))); + try s.write("/exec", "History\n"); + const hist = std.mem.trimEnd(u8, try s.read("/exec"), "\n"); + const body = try s.read(s.at("/pane/{s}/body", .{hist})); + try std.testing.expect(std.mem.startsWith(u8, body, listed[0])); + try std.testing.expect(has(body, "a.txt")); + // A look at the row: the dump restored, the file pane back with its text. + try s.write(s.at("/pane/{s}/look", .{hist}), body[0..std.mem.indexOfScalar(u8, body, '\n').?]); + try std.testing.expect(has(try s.read("/log"), s.at("restore {s}\n", .{listed[0]}))); + try s.expect(s.at("/pane/{d}/body", .{try s.lookFile(s.at("{s}/a.txt", .{dir}))}), "kept on disk\n"); +} diff --git a/test/behaviour/tags.zig b/test/behaviour/tags.zig index 8d04f8ad..395b63c8 100644 --- a/test/behaviour/tags.zig +++ b/test/behaviour/tags.zig @@ -1,5 +1,3 @@ - - const std = @import("std"); const Session = @import("session").Session; @@ -41,9 +39,9 @@ test "tags: ms and md edit a tag's own text, and the text the edit made is read defer s.deinit(); const n = try s.focused(); try s.keys(":miwms("); - try std.testing.expectEqualStrings("/test.txt (Save) Term Collapse Del", try tag(&s, n)); + try std.testing.expectEqualStrings("/test.txt (Save) Term Collapse Follow Del", try tag(&s, n)); try s.keys("md("); - try std.testing.expectEqualStrings("/test.txt Save Term Collapse Del", try tag(&s, n)); + try std.testing.expectEqualStrings("/test.txt Save Term Collapse Follow Del", try tag(&s, n)); } test "tags: the keyboard reaches a tag's path, which it can select and yank but not edit" { @@ -66,7 +64,7 @@ test "tags: the keyboard reaches a tag's path, which it can select and yank but try s.expect(s.at("/pane/{d}/name", .{n}), "/test.txt\n"); // After the path, the text is the tag's own to edit. try s.keys(":A!\x1b"); - try std.testing.expectEqualStrings("/test.txt Save Term Collapse Del!", try tag(&s, n)); + try std.testing.expectEqualStrings("/test.txt Save Term Collapse Follow Del!", try tag(&s, n)); // What it yanked was the path. try s.keys(":P"); try s.expect(s.at("/pane/{d}/body", .{n}), "/test.txtbody\n"); @@ -182,7 +180,7 @@ test "tags: a tag's normal mode is the body's: motions stay in the tag and inser try s.keys(window ++ "h\n"); try std.testing.expectEqual(first, try s.focused()); try s.keys(":i\u{F018}hjklHJKL:"); - try std.testing.expectEqualStrings("/test.txt Save Term Collapse DelhjklHJKL:", try tag(&s, first)); + try std.testing.expectEqualStrings("/test.txt Save Term Collapse Follow DelhjklHJKL:", try tag(&s, first)); try std.testing.expect(std.mem.endsWith(u8, try s.read(s.at("/pane/{d}/ctl", .{first})), " mode:normal ")); try s.expect(s.at("/pane/{d}/body", .{first}), "body\n"); try std.testing.expectEqual(first, try s.focused()); @@ -194,7 +192,7 @@ test "tags: a tag with a newline in it is as tall as its lines, and each line is const n = try s.focused(); // Insert mode in a tag is a body's: Enter is a new line. try s.keys(":A\nSecond"); - try std.testing.expectEqualStrings("/test.txt Save Term Collapse Del\nSecond", try tag(&s, n)); + try std.testing.expectEqualStrings("/test.txt Save Term Collapse Follow Del\nSecond", try tag(&s, n)); const x, const y = try s.where("/test.txt"); try std.testing.expectEqual(.{ x, y + 1 }, try s.where("Second")); // The caret is on the second line, after what was typed. @@ -208,7 +206,7 @@ test "tags: a tag with a newline in it is as tall as its lines, and each line is try std.testing.expectEqual(.{ x + 2, y + 1 }, (try s.cursor()).?); // A clicked tag is in normal mode: `i` types where it was clicked. try s.keys("iX"); - try std.testing.expectEqualStrings("/test.txt Save Term Collapse Del\nSeXcond", try tag(&s, n)); + try std.testing.expectEqualStrings("/test.txt Save Term Collapse Follow Del\nSeXcond", try tag(&s, n)); try s.expect(s.at("/pane/{d}/body", .{n}), "body\n"); } @@ -302,12 +300,12 @@ test "tags: a name drafted in the tag commits with Enter, cancels with two Escs, try clickPathEnd(&s, path); try s.keys("\x15/new name.zig"); try s.expect(name, s.at("{s}\n", .{path})); - _ = try s.where("/new name.zig Save Term Collapse Del JumpTrail"); + _ = try s.where("/new name.zig Save Term Collapse Follow Del JumpTrail"); try s.expect(s.at("/pane/{d}/body", .{n}), "original body\n"); // Esc keeps the draft pending; a second drops it. try s.keys(if (commit) "\n" else "\x1b\x1b"); try s.expect(name, if (commit) "/new name.zig\n" else "/test.txt\n"); - try std.testing.expectEqualStrings(s.at("{s} Save Term Collapse Del JumpTrail", .{if (commit) "/new name.zig" else "/test.txt"}), try tag(&s, n)); + try std.testing.expectEqualStrings(s.at("{s} Save Term Collapse Follow Del JumpTrail", .{if (commit) "/new name.zig" else "/test.txt"}), try tag(&s, n)); // The keyboard is the body's again. try std.testing.expect((try s.cursor()).?[1] != (try s.where("Save Term"))[1]); } @@ -358,7 +356,7 @@ test "tags: middle clicking Save commits the drafted name before saving" { try s.keys("\x15/renamed.txt"); try s.click("Save Term", 0, 2); try s.expect(s.at("/pane/{d}/name", .{n}), "/renamed.txt\n"); - try std.testing.expectEqualStrings("/renamed.txt Save Term Collapse Del", try tag(&s, n)); + try std.testing.expectEqualStrings("/renamed.txt Save Term Collapse Follow Del", try tag(&s, n)); try s.expect(s.at("/pane/{d}/body", .{n}), "untouched\n"); try std.testing.expectEqual(@as(usize, 1), s.saved); } diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden index c86dac08..a9354fd0 100644 --- a/test/snapshots/argv.golden +++ b/test/snapshots/argv.golden @@ -1,5 +1,5 @@ == snap noargs grid=100x31 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/argv/cwd Term+bash Save Mode Filter Collapse Del | $ echo ARGV''TTY @@ -20,12 +20,12 @@ | | | -| /tmp/pardes-snap/argv/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/argv/cwd/+New Save Term Collapse Follow Del | 1 == snap filearg grid=100x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/argv/cwd/notes.txt Save Term Collapse Del +| /tmp/pardes-snap/argv/cwd/notes.txt Save Term Collapse Follow Del | 3 line 3 | 4 line 4 | 5 line 5 @@ -34,9 +34,9 @@ | 8 line 8 | 9 == snap filearg-n3 grid=100x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/argv/cwd/notes.txt Save Term Collapse Del +| /tmp/pardes-snap/argv/cwd/notes.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -47,7 +47,7 @@ | 8 line 8 | 9 == snap dirarg grid=100x31 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/argv/cwd/sub Term+bash Save Mode Filter Collapse Del | ls diff --git a/test/snapshots/badutf.golden b/test/snapshots/badutf.golden index 707cbc3a..95b9d754 100644 --- a/test/snapshots/badutf.golden +++ b/test/snapshots/badutf.golden @@ -1,7 +1,7 @@ == snap badbytes grid=100x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/badutf/cwd/bad.txt Save Term Collapse Del +| /tmp/pardes-snap/badutf/cwd/bad.txt Save Term Collapse Follow Del | 1 hello �� world | 2 latin-1 caf� tail | 3 truncated �� here @@ -11,7 +11,7 @@ | Newcol Joincol Find Grep Help Changelog Tutor Du | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/badutf/cwd/wide.txt Save Term C -| ollapse Del +| ollapse Follow Del | 1 日本語 日本語 日本語 日本語 日本語 tail | 2 | 3 diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden index a6851913..1b10e36b 100644 --- a/test/snapshots/boot.golden +++ b/test/snapshots/boot.golden @@ -1,5 +1,5 @@ == snap boot grid=100x31 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/boot/cwd Term+bash Save Mode Filter Collapse Del | ls diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index 7230f9b8..8bd54096 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -1,7 +1,7 @@ == snap boot grid=120x67 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/builtins/cwd/notes.txt Save Term Collapse Del +| /tmp/pardes-snap/builtins/cwd/notes.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -10,7 +10,7 @@ | 6 line 6 | 7 == snap column-group grid=120x67 cursor=7,10 -|9: /tmp/pardes-snap/builtins/cwd/+Help Save Term Collapse Del +|9: /tmp/pardes-snap/builtins/cwd/+Help Save Term Collapse Follow Del |10: 1 pardes builtins under SPC c |11: 2 |12: 3 SPC c d Delcol @@ -26,7 +26,7 @@ |15: 6 SPC h t Tutor topbar == snap tutor-from-index grid=120x67 cursor=7,17 |10: 1 pardes builtins under SPC h Tutor -|16: /tmp/pardes-snap/builtins/cwd/+Tutor Save Term Collapse Del +|16: /tmp/pardes-snap/builtins/cwd/+Tutor Save Term Collapse Follow Del |17: 1 |18: 2 PARDES TUTOR |19: 3 diff --git a/test/snapshots/callstack.golden b/test/snapshots/callstack.golden index bac5a127..bcad1582 100644 --- a/test/snapshots/callstack.golden +++ b/test/snapshots/callstack.golden @@ -1,7 +1,7 @@ == snap hierarchy grid=110x40 cursor=7,11 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/callstack/cwd/main.rs Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/callstack/cwd/main.rs Save Term Collapse Follow TreeContext Def Refs Del | 1 mod lib; --:--:-- lsp rust-analyzer: ready | 2 | 3 fn main() { @@ -9,7 +9,7 @@ | 5 let y = add(3, 4); | 6 let _ = x + y; | 7 } -| /tmp/pardes-snap/callstack/cwd/+Callstack Save Term Collapse Del +| /tmp/pardes-snap/callstack/cwd/+Callstack Save Term Collapse Follow Del | 1 ╰──┬ main.rs:3:4-7 | 2 │ fn main() { | 3 ├─ main.rs:4:13-15 diff --git a/test/snapshots/chordcut.golden b/test/snapshots/chordcut.golden index 2817f074..78e1fd68 100644 --- a/test/snapshots/chordcut.golden +++ b/test/snapshots/chordcut.golden @@ -1,12 +1,13 @@ -== snap opened grid=120x31 cursor=7,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +== snap opened grid=120x31 cursor=7,9 +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/chordcut/cwd Term+bash Save Mode Filter C /tmp/pardes-snap/chordcut/cwd Term+bash Save Mode Filter C | ollapse Del ollapse Del | ls ls | f.txt g.txt f.txt g.txt | -| /tmp/pardes-snap/chordcut/cwd/f.txt Save Term Collapse Del +| /tmp/pardes-snap/chordcut/cwd/f.txt Save Term Collapse Fol +| low Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -15,35 +16,35 @@ | 6 | | -| | /tmp/pardes-snap/chordcut/cwd Term+bash Save Mode Filter C | ollapse Del | ls | f.txt g.txt == snap cut grid=120x31 cursor=7,9 -|7: */tmp/pardes-snap/chordcut/cwd/f.txt Save Term Collapse Del -|9: 2 2 +|7: */tmp/pardes-snap/chordcut/cwd/f.txt Save Term Collapse Fol +|9: 1 1 == snap copied grid=120x31 cursor=10,10 == snap pointpaste grid=120x31 cursor=16,11 -|11: 4 line 4line +|11: 3 line 3line == snap replaced grid=120x31 cursor=11,12 -|12: 5 lline 5 +|12: 4 lline 4 == snap cancelexec grid=120x31 cursor=25,9 -|9: 2 2echo B''OO g.txt +|9: 1 1echo B''OO g.txt == snap execafter grid=120x31 cursor=25,9 -|8: 1 line 1 Exec +|9: 1 1echo B''OO g.txt Exec |17: /tmp/pardes-snap/chordcut/cwd Term+bash Save Mode Filter C /tmp/pardes-snap/chordcut/cwd (echo B''OO) exit 0 Kill Sav |18: ollapse Del e Collapse Del |19: ls % echo B''OO |20: f.txt g.txt BOO |21: exit 0 == snap cancellook grid=120x31 cursor=25,9 -|8: 1 line 1 -== snap lookafter grid=120x31 cursor=7,23 -|22: /tmp/pardes-snap/chordcut/cwd/g.txt Save Term Collapse Del -|23: 1 line 1 -|24: 2 line 2 -|25: 3 +|9: 1 1echo B''OO g.txt +== snap lookafter grid=120x31 cursor=7,24 +|22: /tmp/pardes-snap/chordcut/cwd/g.txt Save Term Collapse Fol +|23: low Del +|24: 1 line 1 +|25: 2 line 2 +|26: 3 == style chordsel grid=120x31 |0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824, |1: 0-1 d,#887455, 2-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-119 #b2c3b8,#1d2824, @@ -53,13 +54,13 @@ |5: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, |6: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |7: 0-0 d,#496656, 1-1 #000000,#f9cb70,b 2-31 #b2c3b8,#1d2824, 32-37 #d3b0d9,#1d2824, 38-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410, -|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, +|8: 0-1 d,#1d2824, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410, |9: 0-0 d,#608269, 1-4 d,#0d1410, 5-7 #59675c,#0d1410, 8-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, |10: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, |11: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, |12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, -|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-59 #59675c,#0d1410, 60-60 #59675c,#608269, 61-119 #59675c,#0d1410, -|14: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, +|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, +|14: 0-0 d,#608269, 1-4 d,#0d1410, 5-59 #59675c,#0d1410, 60-60 #59675c,#608269, 61-119 #59675c,#0d1410, |15: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |16: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |17: 0-1 d,#496656, 2-31 #b2c3b8,#1d2824, 32-41 #d3b0d9,#1d2824, 42-59 #b2c3b8,#1d2824, 60-61 #b2c3b8,#496656, 62-119 #b2c3b8,#1d2824, @@ -68,25 +69,24 @@ |20: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, |21: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-61 d,#0d1410, 62-119 #e5eee5,#0d1410, |22: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-37 #dfbce5,#314738, 38-59 #becfc4,#314738, 60-60 #becfc4,#608269, 61-119 #becfc4,#0d1410, -|23: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #f5f7ee,#3c614a, 11-11 #f5f7ee,#0d1410, 12-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, +|23: 0-1 d,#314738, 2-6 #becfc4,#314738, 7-8 #f5f7ee,#3c614a, 9-59 #f5f7ee,#314738, 60-60 #f5f7ee,#608269, 61-119 #f5f7ee,#0d1410, |24: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, -|25: 0-0 d,#608269, 1-4 d,#0d1410, 5-59 #59675c,#0d1410, 60-60 #59675c,#608269, 61-119 #59675c,#0d1410, -|26: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, +|25: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, +|26: 0-0 d,#608269, 1-4 d,#0d1410, 5-59 #59675c,#0d1410, 60-60 #59675c,#608269, 61-119 #59675c,#0d1410, |27: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |28: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |29: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |30: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, == style clickdismiss grid=120x31 -|23: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, +|23: 0-1 d,#314738, 2-59 #becfc4,#314738, 60-60 #becfc4,#608269, 61-119 #becfc4,#0d1410, |24: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, -== snap ttyprobe grid=120x31 cursor=42,23 -|17: $ /tmp/pardes-snap/chordcut/cwd Term+bash Save Mode Filter C /tmp/pardes-snap/chordcut/cwd (echo B''OO) exit 0 Kill Sav -|19: $ ls % echo B''OO -|21: $ stty -icanon -echo; printf '\x1b[?2004h\x1b[?1000h\x1b[? exit 0 -|22: 1006h'; cat -v -|23: ^[[<0;38;6M^[[<0;38;6m^[[200~line^[[201~ -|24: -|25: -== snap ttyprompt grid=120x31 cursor=8,25 -|24: $ -|25: $ line +== snap ttyprobe grid=120x31 cursor=22,24 +|22: /tmp/pardes-snap/chordcut/cwd/g.stty -icanon -echo; printf +|23: '\x1b[?2004h\x1b[?1000h\x1b[?1006h'; cat -vtxt Save Term +|24: Collapse Follow Delel +|25: 1 line 1 /tmp/pardes-snap/chordcut/cwd/g.stty -icanon -echo; printf +|26: 2 line 2 '\x1b[?2004h\x1b[?1000h\x1b[?1006h'; cat -vtxt Save Term +|27: 3 Collapse Follow Del Unfollow +|28: 3 +== snap ttyprompt grid=120x31 cursor=24,24 +|24: Collapse Follow Delelel diff --git a/test/snapshots/cmdexit.golden b/test/snapshots/cmdexit.golden index e0de13c9..f32588c9 100644 --- a/test/snapshots/cmdexit.golden +++ b/test/snapshots/cmdexit.golden @@ -1,7 +1,7 @@ == snap opened grid=120x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/cmdexit/cwd/cmds.txt Save Term Collapse Del +| /tmp/pardes-snap/cmdexit/cwd/cmds.txt Save Term Collapse Follow Del | 1 sleep 30 & echo BG''STARTED | 2 exec </dev/null >/dev/null 2>&1; sleep 1; false == snap background grid=120x31 cursor=7,3 diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden index a25711ee..2a08bb35 100644 --- a/test/snapshots/cmdword.golden +++ b/test/snapshots/cmdword.golden @@ -1,7 +1,7 @@ == snap opened grid=120x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Term Collapse Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Term Collapse Follow Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` == snap atexec grid=120x31 cursor=7,3 |17: /tmp/pardes-snap/cmdword/cwd (echo ZZ''E) exit 0 Kill Save Collapse Del @@ -14,7 +14,7 @@ |22: ZZL |23: exit 0 == snap lookword grid=120x31 cursor=7,6 -|5: /tmp/pardes-snap/cmdword/cwd/p.txt Save Term Collapse Del +|5: /tmp/pardes-snap/cmdword/cwd/p.txt Save Term Collapse Follow Del |6: 1 just text == snap nested grid=120x31 cursor=7,9 |8: /tmp/pardes-snap/cmdword/cwd/ Get Term Collapse Del diff --git a/test/snapshots/colgrip.golden b/test/snapshots/colgrip.golden index da4b5ee2..a76642b1 100644 --- a/test/snapshots/colgrip.golden +++ b/test/snapshots/colgrip.golden @@ -26,10 +26,10 @@ == style held grid=100x24 |1: 0-1 d,#887455, 2-49 #b2c3b8,#1d2824, 50-51 #b2c3b8,#f4c086, 52-99 #becfc4,#314738, == snap resize-drag grid=100x24 cursor=54,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol ╎ New Term Find Grep Joincol Delcol | /tmp/pardes-snap/colgrip/cwd/w.txt Sa╎e Term Col /tmp/pardes-snap/colgrip/cwd Term+bash Save Mode -| lapse Del ╎ Filter Collapse Del +| lapse Follow Del ╎ Filter Collapse Del | 1 x ╎ ls | ╎ w.txt | ╎ @@ -77,7 +77,7 @@ == snap resize-done grid=100x24 cursor=44,6 |1: New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |2: /tmp/pardes-snap/colgrip/cwd/w.txt Sav /tmp/pardes-snap/colgrip/cwd Term+bash Save Mode Filter Co -|3: e Term Collapse Del llapse Del +|3: e Term Collapse Follow Del llapse Del |4: 1 x ls |5: w.txt |6: @@ -146,7 +146,7 @@ == snap reorder-done grid=100x24 cursor=4,6 |1: New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |2: /tmp/pardes-snap/colgrip/cwd Term+bash Save Mode Filter Co /tmp/pardes-snap/colgrip/cwd/w.txt Sav -|3: llapse Del e Term Collapse Del +|3: llapse Del e Term Collapse Follow Del |4: ls 1 x |5: w.txt |6: diff --git a/test/snapshots/collapse.golden b/test/snapshots/collapse.golden index 5878cbcf..241bc057 100644 --- a/test/snapshots/collapse.golden +++ b/test/snapshots/collapse.golden @@ -1,7 +1,7 @@ == snap before grid=160x25 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/collapse/cwd/kept.txt Save Term Collapse Del +| /tmp/pardes-snap/collapse/cwd/kept.txt Save Term Collapse Follow Del | 1 KEEP-FIRST | 2 KEEP-SECOND | 3 KEEP-THIRD @@ -10,12 +10,12 @@ |4: |5: == 9p middle-collapsed-cursor grid=160x25 cursor=none -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -@0: 0-76 #b2c3b8,#1d2824,,tagline 77-159 d,#1d2824,,tagline +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit +@0: 0-84 #b2c3b8,#1d2824,,tagline 85-159 d,#1d2824,,tagline |1: New Term Find Grep Joincol Delcol @1: 0-1 #ffffff,#887455,,tagline 2-34 #becfc4,#314738,,tagline 35-159 d,#314738,,tagline -|2: /tmp/pardes-snap/collapse/cwd/kept.txt Save Term Collapse Del -@2: 0-1 #000000,#add38a,,tagline 2-31 #becfc4,#314738,,tagline 32-39 #dfbce5,#314738,,tagline 40-62 #becfc4,#314738,,tagline 63-159 d,#314738,,tagline +|2: /tmp/pardes-snap/collapse/cwd/kept.txt Save Term Collapse Follow Del +@2: 0-1 #000000,#add38a,,tagline 2-31 #becfc4,#314738,,tagline 32-39 #dfbce5,#314738,,tagline 40-69 #becfc4,#314738,,tagline 70-159 d,#314738,,tagline |3: @3: 0-159 d,#486152,,body |4: diff --git a/test/snapshots/cornerdrag-left.golden b/test/snapshots/cornerdrag-left.golden index 349b1c92..d5c7b7fd 100644 --- a/test/snapshots/cornerdrag-left.golden +++ b/test/snapshots/cornerdrag-left.golden @@ -1,5 +1,5 @@ == snap right-split grid=100x31 cursor=54,11 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/cornerdrag-left/cwd Term+bash S /tmp/pardes-snap/cornerdrag-left/cwd Term+bash S | ave Mode Filter Collapse Del ave Mode Filter Collapse Del diff --git a/test/snapshots/cornerdrag.golden b/test/snapshots/cornerdrag.golden index 405c5227..bd552949 100644 --- a/test/snapshots/cornerdrag.golden +++ b/test/snapshots/cornerdrag.golden @@ -1,5 +1,5 @@ == snap hover-corner grid=100x31 cursor=4,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/cornerdrag/cwd Term+bash Save M /tmp/pardes-snap/cornerdrag/cwd Term+bash Save M | ode Filter Collapse Del ode Filter Collapse Del diff --git a/test/snapshots/cursorline.golden b/test/snapshots/cursorline.golden index d726cde5..c12df520 100644 --- a/test/snapshots/cursorline.golden +++ b/test/snapshots/cursorline.golden @@ -1,11 +1,11 @@ == snap top grid=150x31 cursor=7,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/cursorline/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/cursorline/cwd Term+bash Save Mode Filter Collapse Del | ls ls | cur.txt cur.txt | -| /tmp/pardes-snap/cursorline/cwd/cur.txt Save Term Collapse Del +| /tmp/pardes-snap/cursorline/cwd/cur.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 diff --git a/test/snapshots/delask.golden b/test/snapshots/delask.golden index 1c3cbdf2..f0cd6978 100644 --- a/test/snapshots/delask.golden +++ b/test/snapshots/delask.golden @@ -1,7 +1,7 @@ == snap three grid=100x36 cursor=18,20 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/delask/cwd/top.txt Save Term Collapse Del +| /tmp/pardes-snap/delask/cwd/top.txt Save Term Collapse Follow Del | 1 top-marker | | @@ -18,7 +18,7 @@ | | | -| */tmp/pardes-snap/delask/cwd/+New Save Term Collapse Del +| */tmp/pardes-snap/delask/cwd/+New Save Term Collapse Follow Del | 1 middle-pane | | @@ -27,7 +27,7 @@ | | | -| */tmp/pardes-snap/delask/cwd/+New Save Term Collapse Del +| */tmp/pardes-snap/delask/cwd/+New Save Term Collapse Follow Del | 1 bottom-pane == snap asked grid=100x36 cursor=18,20 |20: 1 middle-pane Del: give space to k above j below @@ -39,7 +39,7 @@ |29: == snap typed grid=100x36 cursor=27,20 |20: 1 bottom-pane DelBelow -|28: */tmp/pardes-snap/delask/cwd/+New Save Term Collapse Del +|28: */tmp/pardes-snap/delask/cwd/+New Save Term Collapse Follow Del |29: 1 third-pane == snap below-took-click grid=100x36 cursor=17,20 |20: 1 third-pane @@ -47,7 +47,7 @@ |29: == snap four grid=100x36 cursor=7,29 |3: 1 top-marker New -|28: /tmp/pardes-snap/delask/cwd/+New Save Term Collapse Del +|28: /tmp/pardes-snap/delask/cwd/+New Save Term Collapse Follow Del |29: 1 == snap mouse-del grid=100x36 cursor=7,29 |3: 1 top-marker diff --git a/test/snapshots/diffview.golden b/test/snapshots/diffview.golden index b62f22d0..929c65b2 100644 --- a/test/snapshots/diffview.golden +++ b/test/snapshots/diffview.golden @@ -1,7 +1,7 @@ == snap diff-pane grid=100x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/diffview/cwd/change.diff Save Term Diff Collapse Del +| /tmp/pardes-snap/diffview/cwd/change.diff Save Term Diff Collapse Follow Del | 1 diff --git a/src/shape.zig b/src/shape.zig | 2 index 1111111..2222222 100644 | 3 --- a/src/shape.zig @@ -55,7 +55,7 @@ |29: 0-0 d,#608269, 1-99 d,#0d1410, |30: 0-0 d,#608269, 1-99 d,#0d1410, == snap look-added-line grid=100x31 cursor=55,22 -|16: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Term Collapse TreeContext Def Refs Del +|16: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Term Collapse Follow TreeContext Def Refs Del |17: 1 const std = @import("std"); |18: 2 |19: 3 pub const Shape = union(enum) { @@ -70,9 +70,9 @@ |28: 12 }; |29: 13 == snap command-pane grid=100x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/diffview/cwd/cmds.txt Save Term Collapse Del +| /tmp/pardes-snap/diffview/cwd/cmds.txt Save Term Collapse Follow Del | 1 cat change.diff Exec | 2 | @@ -134,7 +134,7 @@ |30: 0-0 d,#152019, 1-99 d,#0d1410, == snap command-look grid=100x31 cursor=23,10 |3: 1 cat change.diff -|5: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Term Collapse TreeContext Def Refs Del +|5: /tmp/pardes-snap/diffview/cwd/src/shape.zig Save Term Collapse Follow TreeContext Def Refs Del |6: 1 const std = @import("std"); |7: 2 |8: 3 pub const Shape = union(enum) { diff --git a/test/snapshots/dirpane.golden b/test/snapshots/dirpane.golden index 8770d5d0..dd7ff9ae 100644 --- a/test/snapshots/dirpane.golden +++ b/test/snapshots/dirpane.golden @@ -1,7 +1,7 @@ == snap dir-open grid=80x24 cursor=7,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/dirpane/cwd/top.txt Save Term Collapse Del +| /tmp/pardes-snap/dirpane/cwd/top.txt Save Term Collapse Follow Del | 1 sub | | /tmp/pardes-snap/dirpane/cwd/sub/ Get Term Collapse Del @@ -9,5 +9,5 @@ | 2 alpha.txt deeper/ zeta | 3 == snap entry-open grid=80x24 cursor=7,9 -|8: /tmp/pardes-snap/dirpane/cwd/sub/inner.txt Save Term Collapse Del +|8: /tmp/pardes-snap/dirpane/cwd/sub/inner.txt Save Term Collapse Follow Del |9: 1 inner-marker diff --git a/test/snapshots/dump.golden b/test/snapshots/dump.golden index a7be52fc..222c9720 100644 --- a/test/snapshots/dump.golden +++ b/test/snapshots/dump.golden @@ -1,5 +1,5 @@ == snap loaded grid=100x31 cursor=16,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/dump/cwd Term+bash Save Mode Fi /tmp/pardes-snap/dump/cwd Term+bash Save Mode Fi | lter Collapse Del lter Collapse Del diff --git a/test/snapshots/edit.golden b/test/snapshots/edit.golden index 7356e51f..8dcdcc36 100644 --- a/test/snapshots/edit.golden +++ b/test/snapshots/edit.golden @@ -1,5 +1,5 @@ == snap inserted grid=100x31 cursor=16,10 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/edit/cwd Term+bash Save Mode Fi /tmp/pardes-snap/edit/cwd Term+bash Save Mode Fi | lter Collapse Del lter Collapse Del diff --git a/test/snapshots/emptycol.golden b/test/snapshots/emptycol.golden index 35ed5d7c..505b2bbc 100644 --- a/test/snapshots/emptycol.golden +++ b/test/snapshots/emptycol.golden @@ -1,17 +1,17 @@ == snap newcol grid=100x24 cursor=52,1 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/emptycol/cwd/notes.txt Save Ter -| m Collapse Del +| m Collapse Follow Del | 1 one | 2 two == snap filled grid=100x24 cursor=54,6 |2: /tmp/pardes-snap/emptycol/cwd/notes.txt Save Ter /tmp/pardes-snap/emptycol/cwd Term+bash Save Mod -|3: m Collapse Del e Filter Collapse Del +|3: m Collapse Follow Del e Filter Collapse Del |4: 1 one ls |5: 2 two notes.txt == snap emptied grid=100x24 cursor=52,1 |2: /tmp/pardes-snap/emptycol/cwd/notes.txt Save Ter -|3: m Collapse Del +|3: m Collapse Follow Del |4: 1 one |5: 2 two diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden index 7489b5e8..6290882a 100644 --- a/test/snapshots/exec-bigdrag.golden +++ b/test/snapshots/exec-bigdrag.golden @@ -1,5 +1,5 @@ == snap alive grid=200x61 cursor=119,38 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/exec-bigdrag/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/exec-bigdrag/cwd Term+bash Save Mode Filter Collapse Del | ls 2 diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden index da226885..736dfe4f 100644 --- a/test/snapshots/exec.golden +++ b/test/snapshots/exec.golden @@ -1,5 +1,5 @@ == snap exec grid=140x31 cursor=16,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/exec/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/exec/cwd Term+bash Save Mode Filter Collapse Del | ls Exec ls diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden index 55afc8f1..44ee25df 100644 --- a/test/snapshots/fileedit.golden +++ b/test/snapshots/fileedit.golden @@ -1,11 +1,11 @@ == snap edited grid=150x31 cursor=17,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/fileedit/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/fileedit/cwd Term+bash Save Mode Filter Collapse Del | ls ls | f.txt f.txt | -| */tmp/pardes-snap/fileedit/cwd/f.txt Save Term Collapse Del +| */tmp/pardes-snap/fileedit/cwd/f.txt Save Term Collapse Follow Del | 1 liEDIT''MEne 1 | 2 line 2 | 3 line 3 diff --git a/test/snapshots/filewatch.golden b/test/snapshots/filewatch.golden index 15690737..0561a070 100644 --- a/test/snapshots/filewatch.golden +++ b/test/snapshots/filewatch.golden @@ -1,11 +1,11 @@ == snap edited grid=210x31 cursor=15,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/filewatch/cwd Term+bash Save Mode Filter Collapse Del | ls | sub w.txt | -| */tmp/pardes-snap/filewatch/cwd/w.txt Save Term Collapse Del +| */tmp/pardes-snap/filewatch/cwd/w.txt Save Term Collapse Follow Del | 1 liMYEDITne 1 | 2 line 2 | 3 /tmp/pardes-snap/filewatch/cwd/sub/s.txt @@ -18,7 +18,7 @@ | 10 line 10 | 11 line 11 | 12 line 12 -| /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Term Collapse Del +| /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden index 283d2653..6c3bc950 100644 --- a/test/snapshots/find.golden +++ b/test/snapshots/find.golden @@ -1,7 +1,7 @@ == snap group grid=120x41 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/find/cwd/here.txt Save Term Collapse Del +| /tmp/pardes-snap/find/cwd/here.txt Save Term Collapse Follow Del | 1 Find zqm SPC f == snap armed grid=120x41 cursor=7,23 |3: 1 Find zqm Find @@ -31,7 +31,7 @@ |33: 1 beta body == snap promoted grid=120x41 cursor=7,33 |22: +Search 2/3 Save Unattach Del -|32: /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Term Collapse Del +|32: /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Term Collapse Follow Del == snap nomatch grid=120x41 cursor=11,14 |13: ^ +Search 0 Del |14: Find zzqq diff --git a/test/snapshots/follow.golden b/test/snapshots/follow.golden index 99ef20b9..c02ea08f 100644 --- a/test/snapshots/follow.golden +++ b/test/snapshots/follow.golden @@ -1,61 +1,61 @@ == snap three-pages grid=150x30 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/follow/cwd/big.txt Save Term Collapse Del /tmp/pardes-snap/follow/cwd/big.txt /tmp/pardes-snap/follow/cwd/big.txt -| 1 line 1 Follow Save Term Collapse Del Unfollow Save Term Collapse Del Unfollow -| 2 line 2 28 line 28 54 line 54 -| 3 line 3 29 line 29 55 line 55 -| 4 line 4 30 line 30 56 line 56 -| 5 line 5 31 line 31 57 line 57 -| 6 line 6 32 line 32 58 line 58 -| 7 line 7 33 line 33 59 line 59 -| 8 line 8 34 line 34 60 line 60 -| 9 line 9 35 line 35 61 line 61 -| 10 line 10 36 line 36 62 line 62 -| 11 line 11 37 line 37 63 line 63 -| 12 line 12 38 line 38 64 line 64 -| 13 line 13 39 line 39 65 line 65 -| 14 line 14 40 line 40 66 line 66 -| 15 line 15 41 line 41 67 line 67 -| 16 line 16 42 line 42 68 line 68 -| 17 line 17 43 line 43 69 line 69 -| 18 line 18 44 line 44 70 line 70 -| 19 line 19 45 line 45 71 line 71 -| 20 line 20 46 line 46 72 line 72 -| 21 line 21 47 line 47 73 line 73 -| 22 line 22 48 line 48 74 line 74 -| 23 line 23 49 line 49 75 line 75 -| 24 line 24 50 line 50 76 line 76 -| 25 line 25 51 line 51 77 line 77 -| 26 line 26 52 line 52 78 line 78 -| 27 line 27 53 line 53 79 line 79 -== snap hop grid=150x30 cursor=82,4 -|3: 1 line 1 Save Term Collapse Del Unfollow Save Term Collapse Del Unfollow -== snap wheel grid=150x30 cursor=82,4 -|3: 2 line 2 Save Term Collapse Del Unfollow Save Term Collapse Del Unfollow -|4: 3 line 3 29 line 29 55 line 55 -|5: 4 line 4 30 line 30 56 line 56 -|6: 5 line 5 31 line 31 57 line 57 -|7: 6 line 6 32 line 32 58 line 58 -|8: 7 line 7 33 line 33 59 line 59 -|9: 8 line 8 34 line 34 60 line 60 -|10: 9 line 9 35 line 35 61 line 61 -|11: 10 line 10 36 line 36 62 line 62 -|12: 11 line 11 37 line 37 63 line 63 -|13: 12 line 12 38 line 38 64 line 64 -|14: 13 line 13 39 line 39 65 line 65 -|15: 14 line 14 40 line 40 66 line 66 -|16: 15 line 15 41 line 41 67 line 67 -|17: 16 line 16 42 line 42 68 line 68 -|18: 17 line 17 43 line 43 69 line 69 -|19: 18 line 18 44 line 44 70 line 70 -|20: 19 line 19 45 line 45 71 line 71 -|21: 20 line 20 46 line 46 72 line 72 -|22: 21 line 21 47 line 47 73 line 73 -|23: 22 line 22 48 line 48 74 line 74 -|24: 23 line 23 49 line 49 75 line 75 -|25: 24 line 24 50 line 50 76 line 76 -|26: 25 line 25 51 line 51 77 line 77 -|27: 26 line 26 52 line 52 78 line 78 -|28: 27 line 27 53 line 53 79 line 79 -|29: 28 line 28 54 line 54 80 line 80 +| /tmp/pardes-snap/follow/cwd/big.txt Save Term Collapse Follow Del /tmp/pardes-snap/follow/cwd/big.txt /tmp/pardes-snap/follow/cwd/big.txt +| 1 line 1 Follow Save Term Collapse Follow Del Unfoll Save Term Collapse Follow Del Unfo +| 2 line 2 ow llow +| 3 line 3 28 line 28 53 line 53 +| 4 line 4 29 line 29 54 line 54 +| 5 line 5 30 line 30 55 line 55 +| 6 line 6 31 line 31 56 line 56 +| 7 line 7 32 line 32 57 line 57 +| 8 line 8 33 line 33 58 line 58 +| 9 line 9 34 line 34 59 line 59 +| 10 line 10 35 line 35 60 line 60 +| 11 line 11 36 line 36 61 line 61 +| 12 line 12 37 line 37 62 line 62 +| 13 line 13 38 line 38 63 line 63 +| 14 line 14 39 line 39 64 line 64 +| 15 line 15 40 line 40 65 line 65 +| 16 line 16 41 line 41 66 line 66 +| 17 line 17 42 line 42 67 line 67 +| 18 line 18 43 line 43 68 line 68 +| 19 line 19 44 line 44 69 line 69 +| 20 line 20 45 line 45 70 line 70 +| 21 line 21 46 line 46 71 line 71 +| 22 line 22 47 line 47 72 line 72 +| 23 line 23 48 line 48 73 line 73 +| 24 line 24 49 line 49 74 line 74 +| 25 line 25 50 line 50 75 line 75 +| 26 line 26 51 line 51 76 line 76 +| 27 line 27 52 line 52 77 line 77 +== snap hop grid=150x30 cursor=82,5 +|3: 1 line 1 Save Term Collapse Follow Del Unfoll Save Term Collapse Follow Del Unfo +== snap wheel grid=150x30 cursor=82,5 +|3: 2 line 2 Save Term Collapse Follow Del Unfoll Save Term Collapse Follow Del Unfo +|4: 3 line 3 ow llow +|5: 4 line 4 29 line 29 54 line 54 +|6: 5 line 5 30 line 30 55 line 55 +|7: 6 line 6 31 line 31 56 line 56 +|8: 7 line 7 32 line 32 57 line 57 +|9: 8 line 8 33 line 33 58 line 58 +|10: 9 line 9 34 line 34 59 line 59 +|11: 10 line 10 35 line 35 60 line 60 +|12: 11 line 11 36 line 36 61 line 61 +|13: 12 line 12 37 line 37 62 line 62 +|14: 13 line 13 38 line 38 63 line 63 +|15: 14 line 14 39 line 39 64 line 64 +|16: 15 line 15 40 line 40 65 line 65 +|17: 16 line 16 41 line 41 66 line 66 +|18: 17 line 17 42 line 42 67 line 67 +|19: 18 line 18 43 line 43 68 line 68 +|20: 19 line 19 44 line 44 69 line 69 +|21: 20 line 20 45 line 45 70 line 70 +|22: 21 line 21 46 line 46 71 line 71 +|23: 22 line 22 47 line 47 72 line 72 +|24: 23 line 23 48 line 48 73 line 73 +|25: 24 line 24 49 line 49 74 line 74 +|26: 25 line 25 50 line 50 75 line 75 +|27: 26 line 26 51 line 51 76 line 76 +|28: 27 line 27 52 line 52 77 line 77 +|29: 28 line 28 53 line 53 78 line 78 diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden index 71a6800c..e923cb58 100644 --- a/test/snapshots/fsearch.golden +++ b/test/snapshots/fsearch.golden @@ -1,11 +1,11 @@ == snap opened grid=180x31 cursor=7,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/fsearch/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/fsearch/cwd Term+bash Save Mode Filter Collapse Del | ls ls | g.txt g.txt | -| /tmp/pardes-snap/fsearch/cwd/g.txt Save Term Collapse Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save Term Collapse Follow Del | 1 l1 | 2 MARK a | 3 l3 diff --git a/test/snapshots/ghostty-mid.golden b/test/snapshots/ghostty-mid.golden index ec92cafd..02658b3d 100644 --- a/test/snapshots/ghostty-mid.golden +++ b/test/snapshots/ghostty-mid.golden @@ -1,5 +1,5 @@ == snap ghostty-mid grid=100x31 cursor=4,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/ghostty-mid/cwd Term+bash Save /tmp/pardes-snap/ghostty-mid/cwd Term+bash Save | Mode Filter Collapse Del Mode Filter Collapse Del diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden index fed2c86c..30c8612c 100644 --- a/test/snapshots/grep.golden +++ b/test/snapshots/grep.golden @@ -1,11 +1,11 @@ == snap opened grid=180x31 cursor=7,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/grep/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/grep/cwd Term+bash Save Mode Filter Collapse Del | ls ls | a.txt noise.txt sub a.txt noise.txt sub | -| /tmp/pardes-snap/grep/cwd/a.txt Save Term Collapse Del +| /tmp/pardes-snap/grep/cwd/a.txt Save Term Collapse Follow Del | 1 hello TARGET one | 2 nothing here | 3 last TARGET line @@ -37,9 +37,9 @@ |15: 2 TARGET inside sub == snap opened-hit grid=180x31 cursor=12,15 |9: +Search 3/3 Save Unattach Del -|13: /tmp/pardes-snap/grep/cwd/sub/b.txt Save Term Collapse Del +|13: /tmp/pardes-snap/grep/cwd/sub/b.txt Save Term Collapse Follow Del == snap nomatch grid=180x31 cursor=11,15 -|14: ^ +Search 0 Del +|14: ^ +Search 0+ Del |15: Grep zzqq == snap esc grid=180x31 cursor=12,15 |14: 1 deep diff --git a/test/snapshots/headersweep-restored.golden b/test/snapshots/headersweep-restored.golden index 027675b0..d730585f 100644 --- a/test/snapshots/headersweep-restored.golden +++ b/test/snapshots/headersweep-restored.golden @@ -21,7 +21,7 @@ |19: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |20: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, == snap col-swept grid=120x21 cursor=4,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap/headersweep-resto +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit Restore /tmp/pardes-snap/headerswe | New Term Find Grep Joincol Delcol echo RE''STORED-COL New Term Find Grep Joincol Delcol | /tmp/pardes-snap/headersweep-restored/cwd Term+bash Save M /tmp/pardes-snap/headersweep-restored/cwd Term+bash Save M | ode Filter Collapse Del ode Filter Collapse Del @@ -51,5 +51,5 @@ |18: 0-1 d,#1d2824, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410, |19: 0-0 d,#152019, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, == snap ws-swept grid=120x21 cursor=4,7 -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap/headersweep-re ec +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit Restore /tmp/pardes-snap/header ec |18: -WS) exit 0 Kill Save Collapse Del diff --git a/test/snapshots/headersweep.golden b/test/snapshots/headersweep.golden index 7f46c437..ef6bc786 100644 --- a/test/snapshots/headersweep.golden +++ b/test/snapshots/headersweep.golden @@ -21,7 +21,7 @@ |19: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, |20: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, == snap col-swept grid=120x21 cursor=4,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol echo SW''EPT-COL New Term Find Grep Joincol Delcol | /tmp/pardes-snap/headersweep/cwd Term+bash Save Mode Filte /tmp/pardes-snap/headersweep/cwd Term+bash Save Mode Filte | r Collapse Del r Collapse Del @@ -42,13 +42,13 @@ | Kill Save Collapse Del | exit 0 == snap ws-swept grid=120x21 cursor=4,6 -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit echo SW''EPT-WS +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit echo SW''EPT-WS |17: /tmp/pardes-snap/headersweep/cwd (echo SW''EPT-WS) exit 0 |18: Kill Save Collapse Del == snap ws-looked grid=120x21 cursor=7,9 -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit echo SW''EPT-WS xxhay.txtxx +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit echo SW''EPT-WS xxhay.txtxx |7: /tmp/pardes-snap/headersweep/cwd/hay.txt Save Term Collaps -|8: e Del +|8: e Follow Del |9: 1 ZQNEEDLE == snap cancelled grid=120x21 cursor=7,9 == style selected grid=120x21 diff --git a/test/snapshots/hscroll.golden b/test/snapshots/hscroll.golden index e8f1f790..5f930ddf 100644 --- a/test/snapshots/hscroll.golden +++ b/test/snapshots/hscroll.golden @@ -1,5 +1,5 @@ == snap opened grid=90x31 cursor=7,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/hscroll/cwd Term+bash Save /tmp/pardes-snap/hscroll/cwd Term+bash Save | Mode Filter Collapse Del Mode Filter Collapse Del @@ -7,7 +7,7 @@ | wide.txt wide.txt | | /tmp/pardes-snap/hscroll/cwd/wide.txt Save -| Term Collapse Del +| Term Collapse Follow Del | 1 short1 END_A_MARKER_WAY_OUT_RIGHT_padp | | diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden index 8e429b07..6a06f55b 100644 --- a/test/snapshots/images.golden +++ b/test/snapshots/images.golden @@ -1,5 +1,5 @@ == snap img-open grid=150x31 cursor=11,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/images/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/images/cwd Term+bash Save Mode Filter Collapse Del | ls ls @@ -75,7 +75,7 @@ |15: │█🬝▄ |16: 🬝🬹 == snap tag-edit grid=400x31 cursor=85,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/images/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/images/cwd Term+bash Save Mode Filter Collapse Del | ls ls diff --git a/test/snapshots/jumps.golden b/test/snapshots/jumps.golden index d87094dd..8ea6b8b7 100644 --- a/test/snapshots/jumps.golden +++ b/test/snapshots/jumps.golden @@ -1,7 +1,7 @@ == snap start grid=150x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/jumps/cwd/big.txt Save Term Collapse Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -32,7 +32,7 @@ | 28 line 28 == snap to-shell grid=150x31 cursor=79,5 |1: New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -|2: /tmp/pardes-snap/jumps/cwd/big.txt Save Term Collapse Del /tmp/pardes-snap/jumps/cwd Term+bash Save Mode Filter Collapse Del +|2: /tmp/pardes-snap/jumps/cwd/big.txt Save Term Collapse Follow Del /tmp/pardes-snap/jumps/cwd Term+bash Save Mode Filter Collapse Del |3: 1 line 1 ls |4: 2 line 2 big.txt == snap to-file grid=150x31 cursor=7,3 @@ -132,13 +132,13 @@ |3: 86 line 86 ls Last == snap jumplist grid=150x31 cursor=7,17 |3: 86 line 86 Jumplist ls -|16: /tmp/pardes-snap/jumps/cwd/+Jumps Save Term Collapse LocationsConfig Del -|17: 1 @p2:3:3 /tmp/pardes-snap/jumps/cwd -|18: 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 -|19: 3 @p2:3:3 /tmp/pardes-snap/jumps/cwd -|20: 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -|21: 5 -|22: +|16: /tmp/pardes-snap/jumps/cwd/+Jumps Save Term Collapse Follow LocationsConf +|17: ig Del +|18: 1 @p2:3:3 /tmp/pardes-snap/jumps/cwd +|19: 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +|20: 3 @p2:3:3 /tmp/pardes-snap/jumps/cwd +|21: 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 +|22: 5 |23: |24: |25: @@ -167,12 +167,12 @@ |14: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, |15: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, |16: 0-1 d,#496656, 2-28 #b2c3b8,#1d2824, 29-35 #d3b0d9,#1d2824, 36-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410, -|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-14 #59675c,#0d1410, 15-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, -|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-45 #59675c,#0d1410, 46-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, -|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-14 #59675c,#0d1410, 15-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, -|20: 0-0 d,#608269, 1-4 d,#0d1410, 5-47 #59675c,#0d1410, 48-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, -|21: 0-0 d,#608269, 1-4 d,#0d1410, 5-74 #59675c,#0d1410, 75-75 #59675c,#608269, 76-149 #59675c,#0d1410, -|22: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410, +|17: 0-1 d,#1d2824, 2-74 #b2c3b8,#1d2824, 75-75 #b2c3b8,#608269, 76-149 #b2c3b8,#0d1410, +|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-14 #59675c,#0d1410, 15-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, +|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-45 #59675c,#0d1410, 46-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, +|20: 0-0 d,#608269, 1-4 d,#0d1410, 5-14 #59675c,#0d1410, 15-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, +|21: 0-0 d,#608269, 1-4 d,#0d1410, 5-47 #59675c,#0d1410, 48-74 #e5eee5,#0d1410, 75-75 #e5eee5,#608269, 76-149 #e5eee5,#0d1410, +|22: 0-0 d,#608269, 1-4 d,#0d1410, 5-74 #59675c,#0d1410, 75-75 #59675c,#608269, 76-149 #59675c,#0d1410, |23: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410, |24: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410, |25: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410, @@ -210,4 +210,7 @@ |14: 105 line 105 |15: 106 line 106 == snap step-back grid=150x31 cursor=79,5 -== snap look-row grid=150x31 cursor=7,9 +== snap look-row grid=150x31 cursor=7,23 +|22: /tmp/pardes-snap/jumps/cwd/ Get Term Collapse Del +|23: 1 big.txt +|24: 2 diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden index 085a06ff..d91402a7 100644 --- a/test/snapshots/layout-close.golden +++ b/test/snapshots/layout-close.golden @@ -1,5 +1,5 @@ == snap built grid=140x41 cursor=4,16 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/layout-close/cwd Term+bash Save Mode Filter Collaps /tmp/pardes-snap/layout-close/cwd Term+bash Save Mode Filter Collaps | e Del e Del diff --git a/test/snapshots/layout-open.golden b/test/snapshots/layout-open.golden index efee7a78..92423b64 100644 --- a/test/snapshots/layout-open.golden +++ b/test/snapshots/layout-open.golden @@ -1,5 +1,5 @@ == snap before grid=100x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/layout-open/cwd Term+bash Save /tmp/pardes-snap/layout-open/cwd Term+bash Save | Mode Filter Collapse Del Mode Filter Collapse Del @@ -32,11 +32,11 @@ |10: sub sub == snap file-open grid=100x31 cursor=7,24 |22: /tmp/pardes-snap/layout-open/cwd/sub/f.txt Save -|23: Term Collapse Del +|23: Term Collapse Follow Del |24: 1 echo 'TTY'OK == snap ttydir grid=100x31 cursor=7,24 |20: sub /tmp/pardes-snap/layout-open/cwd/sub (echo 'TTY' |21: OK) exit 0 Kill Save Collapse Del |22: /tmp/pardes-snap/layout-open/cwd/sub/f.txt Save % echo 'TTY'OK -|23: Term Collapse Del TTYOK +|23: Term Collapse Follow Del TTYOK |24: 1 echo 'TTY'OK exit 0 diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index 1895a833..2d6bdf3c 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -1,7 +1,7 @@ == snap spc grid=100x41 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/leader/cwd/cmds.txt Save Term Collapse Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save Term Collapse Follow Del | 1 Help SPC == snap spc-h grid=100x41 cursor=7,3 |3: 1 Help SPC h @@ -9,7 +9,7 @@ |3: 1 Help == snap unmapped grid=100x41 cursor=7,3 == snap help-group grid=100x41 cursor=7,6 -|5: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Del +|5: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Follow Del |6: 1 pardes builtins under SPC h |7: 2 |8: 3 SPC h b Build @@ -19,7 +19,7 @@ |12: 7 == snap tutor grid=100x41 cursor=7,13 |6: 1 pardes builtins under SPC h Tutor -|12: /tmp/pardes-snap/leader/cwd/+Tutor Save Term Collapse Del +|12: /tmp/pardes-snap/leader/cwd/+Tutor Save Term Collapse Follow Del |13: 1 |14: 2 PARDES TUTOR |15: 3 @@ -78,7 +78,7 @@ |31: |32: |33: -|34: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Del +|34: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Follow Del |35: 1 pardes builtins under SPC h |36: 2 |37: 3 SPC h b Build @@ -86,7 +86,7 @@ |39: 5 SPC h m Messages |40: 6 SPC h t Tutor topbar == snap help-column grid=100x41 cursor=7,6 -|5: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Del +|5: /tmp/pardes-snap/leader/cwd/+Help Save Term Collapse Follow Del |6: 1 pardes builtins under SPC c |7: 2 |8: 3 SPC c d Delcol diff --git a/test/snapshots/load.golden b/test/snapshots/load.golden index cdc6fb8f..cb0cce1f 100644 --- a/test/snapshots/load.golden +++ b/test/snapshots/load.golden @@ -1,5 +1,5 @@ == snap loaded grid=100x31 cursor=4,16 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/load/cwd Term+bash Save Mode Fi /tmp/pardes-snap/load/cwd Term+bash Save Mode Fi | lter Collapse Del lter Collapse Del diff --git a/test/snapshots/logquiet.golden b/test/snapshots/logquiet.golden index 81a00d8f..b002b71b 100644 --- a/test/snapshots/logquiet.golden +++ b/test/snapshots/logquiet.golden @@ -1,5 +1,5 @@ == snap quiet grid=100x31 cursor=62,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/logquiet/cwd Term+bash Save Mode Filter Collapse Del | $ ls diff --git a/test/snapshots/look-center.golden b/test/snapshots/look-center.golden index 89a115b9..8463f103 100644 --- a/test/snapshots/look-center.golden +++ b/test/snapshots/look-center.golden @@ -1,11 +1,11 @@ == snap center-open grid=150x31 cursor=15,12 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/look-center/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/look-center/cwd Term+bash Save Mode Filter Collapse Del | ls ls | big.txt big.txt | -| /tmp/pardes-snap/look-center/cwd/big.txt Save Term Collapse Del +| /tmp/pardes-snap/look-center/cwd/big.txt Save Term Collapse Follow Del | 95 line 95 | 96 line 96 | 97 line 97 diff --git a/test/snapshots/look-fd-deep.golden b/test/snapshots/look-fd-deep.golden index a81f4b29..b71de0c8 100644 --- a/test/snapshots/look-fd-deep.golden +++ b/test/snapshots/look-fd-deep.golden @@ -1,5 +1,5 @@ == snap listed grid=100x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/look-fd-deep/cwd/a Term+bash Save Mode Filter Collapse Del | $ exec timeout --foreground 600 bash -i @@ -20,11 +20,11 @@ | | | -| /tmp/pardes-snap/look-fd-deep/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/look-fd-deep/cwd/+New Save Term Collapse Follow Del | 1 == snap fd-path-looked grid=100x31 cursor=7,11 -|10: /tmp/pardes-snap/look-fd-deep/cwd/a/b/c.txt Save Term Collapse Del +|10: /tmp/pardes-snap/look-fd-deep/cwd/a/b/c.txt Save Term Collapse Follow Del |11: 1 deep-marker == snap ls-name-looked grid=100x31 cursor=7,14 -|13: /tmp/pardes-snap/look-fd-deep/cwd/a/top.txt Save Term Collapse Del +|13: /tmp/pardes-snap/look-fd-deep/cwd/a/top.txt Save Term Collapse Follow Del |14: 1 top-marker diff --git a/test/snapshots/look-file-1col.golden b/test/snapshots/look-file-1col.golden index edf9ebd9..12484893 100644 --- a/test/snapshots/look-file-1col.golden +++ b/test/snapshots/look-file-1col.golden @@ -1,11 +1,11 @@ == snap file-open-1col grid=100x31 cursor=14,19 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/look-file-1col/cwd Term+bash Save Mode Filter Collapse Del | ls | big.txt | -| /tmp/pardes-snap/look-file-1col/cwd/big.txt Save Term Collapse Del +| /tmp/pardes-snap/look-file-1col/cwd/big.txt Save Term Collapse Follow Del | 28 line 28 | 29 line 29 | 30 line 30 diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden index 855a9c4a..992fa1cc 100644 --- a/test/snapshots/look-file.golden +++ b/test/snapshots/look-file.golden @@ -1,11 +1,11 @@ == snap file-open grid=150x31 cursor=14,12 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/look-file/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/look-file/cwd Term+bash Save Mode Filter Collapse Del | ls ls | big.txt big.txt | -| /tmp/pardes-snap/look-file/cwd/big.txt Save Term Collapse Del +| /tmp/pardes-snap/look-file/cwd/big.txt Save Term Collapse Follow Del | 35 line 35 | 36 line 36 | 37 line 37 diff --git a/test/snapshots/lookloaded.golden b/test/snapshots/lookloaded.golden index 424117a6..d32b1463 100644 --- a/test/snapshots/lookloaded.golden +++ b/test/snapshots/lookloaded.golden @@ -1,5 +1,5 @@ == snap file-open grid=100x31 cursor=14,13 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/lookloaded/cwd Term+bash Save M /tmp/pardes-snap/lookloaded/cwd Term+bash Save M | ode Filter Collapse Del ode Filter Collapse Del @@ -7,7 +7,7 @@ | big.txt big.txt | | /tmp/pardes-snap/lookloaded/cwd/big.txt Save Ter -| m Collapse Del +| m Collapse Follow Del | 36 line 36 | 37 line 37 | 38 line 38 @@ -24,7 +24,7 @@ |6: rm big.txt; echo GO''NE |7: */tmp/pardes-snap/lookloaded/cwd/big.txt Save Ter GONE == snap look-noFS grid=100x31 cursor=14,13 -|8: m Collapse Del big.txt:10 +|8: m Collapse Follow Del big.txt:10 |9: 6 line 6 |10: 7 line 7 |11: 8 line 8 diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden index f3cf71ac..716e7193 100644 --- a/test/snapshots/lookpanes.golden +++ b/test/snapshots/lookpanes.golden @@ -1,8 +1,8 @@ == snap shells grid=130x51 cursor=122,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Term Collaps /tmp/pardes-snap/lookpanes/cwd Term+bash Save Mode Filter Colla -| e Del pse Del +| e Follow Del pse Del | 1 both.txt ls zqonly.txt pick.txt twin.txt | 2 b-marker alpha beta zzboot.txt | @@ -12,19 +12,19 @@ | 3 == snap other-dir grid=130x51 cursor=7,8 |6: /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Term Colla -|7: pse Del /tmp/pardes-snap/lookpanes/cwd/alpha/ Get Term Collapse Del +|7: pse Follow Del /tmp/pardes-snap/lookpanes/cwd/alpha/ Get Term Collapse Del |8: 1 ONLY-IN-ALPHA 1 amark.txt pick.txt zqonly.txt == snap clicked-wins grid=130x51 cursor=7,12 |10: /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Term Collapse 3 -|11: Del +|11: Follow Del |12: 1 BOTH-FROM-BETA == snap mru-alpha grid=130x51 cursor=72,12 |10: /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Term Collapse /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Term Collaps -|11: Del e Del +|11: Follow Del e Follow Del |12: 1 BOTH-FROM-BETA 1 PICK-FROM-ALPHA == snap mru-beta grid=130x51 cursor=7,16 |14: /tmp/pardes-snap/lookpanes/cwd/beta/twin.txt Save Term Collapse -|15: Del +|15: Follow Del |16: 1 TWIN-FROM-BETA == style mru-beta grid=130x51 |0: 0-1 d,#1d2824, 2-129 #b2c3b8,#1d2824, diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden index 7d7e77cf..92b619e4 100644 --- a/test/snapshots/lookrange.golden +++ b/test/snapshots/lookrange.golden @@ -1,13 +1,13 @@ == snap opened grid=150x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lookrange/cwd/look.txt Save Term Collapse Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save Term Collapse Follow Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 | 4 r.txt:8:6-99:9 == snap wholelines grid=150x31 cursor=11,12 -|7: /tmp/pardes-snap/lookrange/cwd/r.txt Save Term Collapse Del +|7: /tmp/pardes-snap/lookrange/cwd/r.txt Save Term Collapse Follow Del |8: 1 aaaa |9: 2 bbbb |10: 3 cccc dccc diff --git a/test/snapshots/lsp-client-edit.golden b/test/snapshots/lsp-client-edit.golden index 76c9b5de..d502209d 100644 --- a/test/snapshots/lsp-client-edit.golden +++ b/test/snapshots/lsp-client-edit.golden @@ -1,7 +1,7 @@ == snap formatted grid=100x25 cursor=7,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| */tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse TreeContext Def Refs Del +| */tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse Follow TreeContext Def Refs Del | 1 // formatted by mock formatted 1 range(s) | 2 mod lib; | 3 @@ -12,7 +12,7 @@ | 8 } | 9 == snap unformatted grid=100x25 cursor=7,3 -|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse TreeContext Def Refs Del +|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse Follow TreeContext Def Refs Del |3: 1 mod lib; |4: 2 |5: 3 fn main() { @@ -23,12 +23,12 @@ |10: 8 |11: == snap renamed grid=100x25 cursor=12,5 -|2: */tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse TreeContext Def Refs Del +|2: */tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse Follow TreeContext Def Refs Del |3: 1 mod lib; renamed 2 range(s) |6: 4 let x = sum(1, 2); |7: 5 let y = sum(3, 4); == snap unrenamed grid=100x25 cursor=12,5 -|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse TreeContext Def Refs Del +|2: /tmp/pardes-snap/lsp-client-edit/cwd/main.rs Save Term Collapse Follow TreeContext Def Refs Del |3: 1 mod lib; |6: 4 let x = add(1, 2); |7: 5 let y = add(3, 4); diff --git a/test/snapshots/lsp-client.golden b/test/snapshots/lsp-client.golden index 8f11838c..f6a5da3c 100644 --- a/test/snapshots/lsp-client.golden +++ b/test/snapshots/lsp-client.golden @@ -1,7 +1,7 @@ == snap gd-jumped grid=100x25 cursor=16,12 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lsp-client/cwd/main.rs Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lsp-client/cwd/main.rs Save Term Collapse Follow TreeContext Def Refs Del | 1 mod lib; --:--:-- lsp rust-analyzer: ready | 2 | 3 fn main() { @@ -9,7 +9,7 @@ | 5 let y = add(3, 4); | 6 let _ = x + y; | 7 } -| /tmp/pardes-snap/lsp-client/cwd/lib.rs Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lsp-client/cwd/lib.rs Save Term Collapse Follow TreeContext Def Refs Del | 1 // mock fixture | 2 pub fn add(a: i32, b: i32) -> i32 { | 3 a + b diff --git a/test/snapshots/lsp-rename-files.golden b/test/snapshots/lsp-rename-files.golden index bfc128d3..3658cc4c 100644 --- a/test/snapshots/lsp-rename-files.golden +++ b/test/snapshots/lsp-rename-files.golden @@ -1,12 +1,12 @@ == snap opened grid=100x25 cursor=7,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lsp-rename-files/cwd/lib.rs Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lsp-rename-files/cwd/lib.rs Save Term Collapse Follow TreeContext Def Refs Del | 1 // main.rs | 2 pub fn add(a: i32, b: i32) -> i32 { | 3 a + b | 4 } -| /tmp/pardes-snap/lsp-rename-files/cwd/main.rs Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lsp-rename-files/cwd/main.rs Save Term Collapse Follow TreeContext Def Refs Del | 1 mod lib; | 2 | 3 fn main() { @@ -17,7 +17,7 @@ | 8 == snap previewed grid=100x25 cursor=14,4 |3: 1 // main.rs Rename: 3 edit(s) across files, previewed, not applied -|15: /tmp/pardes-snap/lsp-rename-files/cwd/+Search Save Term Collapse LocationsConfig Del +|15: /tmp/pardes-snap/lsp-rename-files/cwd/+Search Save Term Collapse Follow LocationsConfig Del |16: 1 lib.rs:2:8-10 |17: 2 sum |18: 3 main.rs:4:13-15 diff --git a/test/snapshots/lsp-rename.golden b/test/snapshots/lsp-rename.golden index 7b8565cc..308ac9bf 100644 --- a/test/snapshots/lsp-rename.golden +++ b/test/snapshots/lsp-rename.golden @@ -1,7 +1,7 @@ == snap renamed grid=110x25 cursor=17,10 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| */tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Term Collapse TreeContext Def Refs Del +| */tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const std = @import("std"); renamed 2 range(s) | 2 | 3 fn renamed_helper(x: u32) u32 { @@ -18,11 +18,11 @@ | 14 } | 15 == snap undone grid=110x25 cursor=17,10 -|2: /tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Term Collapse TreeContext Def Refs Del +|2: /tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Term Collapse Follow TreeContext Def Refs Del |3: 1 const std = @import("std"); |5: 3 fn helper(x: u32) u32 { |10: 8 _ = helper(41); == snap redone grid=110x25 cursor=17,10 -|2: */tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Term Collapse TreeContext Def Refs Del +|2: */tmp/pardes-snap/lsp-rename/cwd/rename.zig Save Term Collapse Follow TreeContext Def Refs Del |5: 3 fn renamed_helper(x: u32) u32 { |10: 8 _ = renamed_helper(41); diff --git a/test/snapshots/lsp.golden b/test/snapshots/lsp.golden index 460f91fa..9b8994b0 100644 --- a/test/snapshots/lsp.golden +++ b/test/snapshots/lsp.golden @@ -1,7 +1,7 @@ == snap opened grid=120x41 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lsp/cwd/a.zig Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -17,13 +17,13 @@ |3: 1 const std = @import("std"); --:--:-- lsp zls ready — /tmp/pardes-snap/lsp/cwd == snap hover grid=120x41 cursor=15,5 |3: 1 const std = @import("std"); Hover -|12: /tmp/pardes-snap/lsp/cwd/+Hover Save Term Collapse Del +|12: /tmp/pardes-snap/lsp/cwd/+Hover Save Term Collapse Follow Del |13: 1 fn helper(x: u32) u32 |14: 2 (fn (u32) u32) |15: 3 == snap symbols grid=120x41 cursor=15,5 |3: 1 const std = @import("std"); Symbols -|15: /tmp/pardes-snap/lsp/cwd/+Search Save Term Collapse LocationsConfig Del +|15: /tmp/pardes-snap/lsp/cwd/+Search Save Term Collapse Follow LocationsConfig Del |16: 1 a.zig:1:7-9 |17: 2 std |18: 3 a.zig:3:4-9 diff --git a/test/snapshots/lspcomplete.golden b/test/snapshots/lspcomplete.golden index 3a0df951..cd8592fb 100644 --- a/test/snapshots/lspcomplete.golden +++ b/test/snapshots/lspcomplete.golden @@ -1,7 +1,7 @@ == snap opened grid=120x41 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lspcomplete/cwd/a.zig Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lspcomplete/cwd/a.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const Shade = enum { | 2 verdigris, | 3 cinnabar, @@ -16,7 +16,7 @@ | 12 // note. see below | 13 == snap indent grid=120x41 cursor=11,12 -|2: ^*/tmp/pardes-snap/lspcomplete/cwd/a.zig Save Term Collapse TreeContext Def Refs Del +|2: ^*/tmp/pardes-snap/lspcomplete/cwd/a.zig Save Term Collapse Follow TreeContext Def Refs Del |12: 10 } == snap commentindent grid=120x41 cursor=19,14 |3: 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcomplete/cwd @@ -25,23 +25,23 @@ |3: 1 const Shade = enum { |10: 8 . == snap completion grid=120x41 cursor=16,10 -|15: /tmp/pardes-snap/lspcomplete/cwd/+Search Save Term Collapse Del +|15: /tmp/pardes-snap/lspcomplete/cwd/+Search Save Term Collapse Follow Del |16: 1 a.zig:8:10 verdigris |17: 2 a.zig:8:10 cinnabar |18: 3 == snap refill grid=120x41 cursor=16,10 == snap step grid=120x41 cursor=16,10 -|2: */tmp/pardes-snap/lspcomplete/cwd/a.zig Save Term Collapse TreeContext Def Refs Del +|2: */tmp/pardes-snap/lspcomplete/cwd/a.zig Save Term Collapse Follow TreeContext Def Refs Del == snap txtindent grid=120x41 cursor=15,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -|^*/tmp/pardes-snap/lspcomplete/cwd/notes.txt Save Term Collapse Del +|^*/tmp/pardes-snap/lspcomplete/cwd/notes.txt Save Term Collapse Follow Del | 1 abc. def ghi | 2 == snap nosemi grid=100x19 cursor=29,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -|^*/tmp/pardes-snap/lspcomplete/cwd/c.zig Save Term Collapse TreeContext Def Refs Del +|^*/tmp/pardes-snap/lspcomplete/cwd/c.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcomplete/cwd | 2 verdigris, | 3 cinnabar, @@ -50,14 +50,14 @@ | 6 pub fn nosemi() void { | 7 const z: Shade = . | 8 } -| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Term Collapse Del +| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Term Collapse Follow Del | 1 c.zig:7:23 verdigris Shade | 2 c.zig:7:23 cinnabar Shade | 3 == snap nobrace grid=100x19 cursor=16,10 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -|^*/tmp/pardes-snap/lspcomplete/cwd/d.zig Save Term Collapse TreeContext Def Refs Del +|^*/tmp/pardes-snap/lspcomplete/cwd/d.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcomplete/cwd | 2 verdigris, | 3 cinnabar, @@ -65,7 +65,7 @@ | 5 | 6 pub fn nobrace(s: Shade) void { | 7 switch (s) { -| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Term Collapse Del +| /tmp/pardes-snap/lspcomplete/cwd/+Search Save Term Collapse Follow Del | 1 d.zig:8:10 verdigris | 2 d.zig:8:10 cinnabar | 3 diff --git a/test/snapshots/lspcompletemoved.golden b/test/snapshots/lspcompletemoved.golden index 91385dd1..3ff6ddc6 100644 --- a/test/snapshots/lspcompletemoved.golden +++ b/test/snapshots/lspcompletemoved.golden @@ -1,7 +1,7 @@ == snap typedthrough grid=120x21 cursor=16,14 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -|^*/tmp/pardes-snap/lspcompletemoved/cwd/a.zig Save Term Collapse TreeContext Def Refs Del +|^*/tmp/pardes-snap/lspcompletemoved/cwd/a.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const Shade = enum { --:--:-- lsp zls ready — /tmp/pardes-snap/lspcompletemoved/cwd | 2 verdigris, | 3 cinnabar, diff --git a/test/snapshots/lspdebug.golden b/test/snapshots/lspdebug.golden index 08545737..703d4dbe 100644 --- a/test/snapshots/lspdebug.golden +++ b/test/snapshots/lspdebug.golden @@ -1,7 +1,7 @@ == snap opened grid=120x45 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lspdebug/cwd/z.zig Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lspdebug/cwd/z.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const std = @import("std"); | 2 | 3 fn helper() u32 { diff --git a/test/snapshots/lsprelpath.golden b/test/snapshots/lsprelpath.golden index 1a1e05ac..0deb8531 100644 --- a/test/snapshots/lsprelpath.golden +++ b/test/snapshots/lsprelpath.golden @@ -1,7 +1,7 @@ == snap absrow grid=100x35 cursor=2,21 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lsprelpath/cwd/sub/parent.zig Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lsprelpath/cwd/sub/parent.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const shade = @import("../shad --:--:-- lsp zls ready — /tmp/pardes-snap/lsprelpath/cwd/sub | 2 | 3 pub fn pick(s: shade.Shade) u8 { @@ -30,7 +30,7 @@ == snap abslook grid=100x35 cursor=21,27 |3: 1 const shade = @import("../shade.zig"); |16: +Search 1/2 Save Unattach Del -|26: /tmp/pardes-snap/lsprelpath/cwd/shade.zig Save Term Collapse TreeContext Def Refs Del +|26: /tmp/pardes-snap/lsprelpath/cwd/shade.zig Save Term Collapse Follow TreeContext Def Refs Del |27: 1 pub const Shade = enum { |28: 2 verdigris, |29: 3 cinnabar, @@ -73,9 +73,9 @@ |33: 0-0 d,#608269, 1-99 d,#0d1410, |34: 0-0 d,#608269, 1-99 d,#0d1410, == snap subrow grid=100x35 cursor=2,21 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lsprelpath/cwd/sub/subdir.zig Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/lsprelpath/cwd/sub/subdir.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const tint = @import("inner/ti --:--:-- lsp zls ready — /tmp/pardes-snap/lsprelpath/cwd/sub | 2 | 3 pub fn hue(t: tint.Tint) u8 { @@ -101,15 +101,16 @@ | | /tmp/pardes-snap/lsprelpath/cwd/sub/+Preview Del | 1 -== snap sublook grid=100x35 cursor=20,27 +== snap sublook grid=100x35 cursor=20,28 |3: 1 const tint = @import("inner/tint.zig"); |16: +Search 1/2 Save Unattach Del -|26: /tmp/pardes-snap/lsprelpath/cwd/sub/inner/tint.zig Save Term Collapse TreeContext Def Refs Del -|27: 1 pub const Tint = enum { -|28: 2 ochre, -|29: 3 indigo, -|30: 4 }; -|31: 5 +|26: /tmp/pardes-snap/lsprelpath/cwd/sub/inner/tint.zig Save Term Collapse Follow TreeContext Def Refs +|27: Del +|28: 1 pub const Tint = enum { +|29: 2 ochre, +|30: 3 indigo, +|31: 4 }; +|32: 5 == style sublook grid=100x35 |0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824, |1: 0-1 d,#887455, 2-99 #becfc4,#314738, @@ -138,12 +139,12 @@ |24: 0-0 d,#608269, 1-99 d,#0d1410, |25: 0-0 d,#608269, 1-99 d,#0d1410, |26: 0-1 d,#add38a, 2-43 #becfc4,#314738, 44-52 #dfbce5,#314738, 53-99 #becfc4,#314738, -|27: 0-0 d,#e5eee5, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-16 #e5eee5,#0d1410, 17-20 #f5f7ee,#3c614a, 21-21 #f5f7ee,#0d1410, 22-23 #e5eee5,#0d1410, 24-28 #c9a7ed,#0d1410, 29-99 #e5eee5,#0d1410, -|28: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410, +|27: 0-1 d,#314738, 2-99 #becfc4,#314738, +|28: 0-0 d,#e5eee5, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-16 #e5eee5,#0d1410, 17-20 #f5f7ee,#3c614a, 21-21 #f5f7ee,#0d1410, 22-23 #e5eee5,#0d1410, 24-28 #c9a7ed,#0d1410, 29-99 #e5eee5,#0d1410, |29: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410, -|30: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410, -|31: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410, -|32: 0-0 d,#608269, 1-99 d,#0d1410, +|30: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410, +|31: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410, +|32: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410, |33: 0-0 d,#608269, 1-99 d,#0d1410, |34: 0-0 d,#608269, 1-99 d,#0d1410, == snap clicked grid=100x35 cursor=29,5 diff --git a/test/snapshots/markup.golden b/test/snapshots/markup.golden index 95ec8c0f..f9976bcf 100644 --- a/test/snapshots/markup.golden +++ b/test/snapshots/markup.golden @@ -1,7 +1,7 @@ == snap typst grid=92x25 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/markup/cwd/paper.typ Save Term Collapse TreeContext Del +| /tmp/pardes-snap/markup/cwd/paper.typ Save Term Collapse Follow TreeContext Del | 1 = Typst heading | 2 | 3 Prose with *bold* and _italic_ words, a `raw` span, @@ -38,9 +38,9 @@ |23: 0-0 d,#608269, 1-91 d,#0d1410, |24: 0-0 d,#608269, 1-91 d,#0d1410, == snap markdown grid=92x25 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/markup/cwd/notes.md Save Term Collapse TreeContext Del +| /tmp/pardes-snap/markup/cwd/notes.md Save Term Collapse Follow TreeContext Del | 1 # Markdown heading with *italic* | 2 | 3 Prose with **bold**, *italic* and an `inline` span. diff --git a/test/snapshots/mini.golden b/test/snapshots/mini.golden index 886ac08c..c32397d5 100644 --- a/test/snapshots/mini.golden +++ b/test/snapshots/mini.golden @@ -1,10 +1,10 @@ == snap opened grid=90x23 cursor=7,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Del +| /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Follow Del | 1 @`Mini demo.zig` Mini | -| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Del +| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Follow Del | 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ | 2 ⣂⢀⣉⣉⢉⣈⢁⣀⣀⢀⣀⣀⣀⢀⣀⣀⣀⣀⣀ | 3 ⠉⠉⠁⠉⠉⠉⠈⠈⠉⠉⠉⠉⠉⠉ @@ -34,18 +34,18 @@ |21: 0-0 d,#608269, 1-89 d,#0d1410, |22: 0-0 d,#608269, 1-89 d,#0d1410, == 9p opened grid=90x23 cursor=7,6,block -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -@0: 0-76 #b2c3b8,#1d2824,,tagline 77-89 d,#1d2824,,tagline +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit +@0: 0-84 #b2c3b8,#1d2824,,tagline 85-89 d,#1d2824,,tagline |1: New Term Find Grep Joincol Delcol @1: 0-1 #ffffff,#887455,,tagline 2-34 #becfc4,#314738,,tagline 35-89 d,#314738,,tagline -|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Del -@2: 0-1 #ffffff,#496656,,tagline 2-27 #b2c3b8,#1d2824,,tagline 28-39 #d3b0d9,#1d2824,,tagline 40-62 #b2c3b8,#1d2824,,tagline 63-89 d,#1d2824,,tagline +|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Follow Del +@2: 0-1 #ffffff,#496656,,tagline 2-27 #b2c3b8,#1d2824,,tagline 28-39 #d3b0d9,#1d2824,,tagline 40-69 #b2c3b8,#1d2824,,tagline 70-89 d,#1d2824,,tagline |3: 1 @`Mini demo.zig` Mini @3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-22 #e5eee5,#0d1410,,body 23-83 d,#0d1410,,body 84-84 d,#1d2824,,tagline 85-88 #b2c3b8,#1d2824,,tagline 89-89 d,#1d2824,,tagline |4: @4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body -|5: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Del -@5: 0-1 #000000,#add38a,,tagline 2-27 #becfc4,#314738,,tagline 28-40 #dfbce5,#314738,,tagline 41-63 #becfc4,#314738,,tagline 64-89 d,#314738,,tagline +|5: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Follow Del +@5: 0-1 #000000,#add38a,,tagline 2-27 #becfc4,#314738,,tagline 28-40 #dfbce5,#314738,,tagline 41-70 #becfc4,#314738,,tagline 71-89 d,#314738,,tagline |6: 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ +6: 7="⠭" 8="⠍" 9="⣥" 10="⢩" 11="⣭" 12="⡭" 13="⣭" 14="⣬" 15="⣌" 16="⢭" 17="⣭" 18="⠌" 19="⠬" 20="⠅" 21="⠍" 22="⠁" @6: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-8 #e5eee5,#0d1410,,body 9-9 #c9a7ed,#0d1410,,body 10-12 #e5eee5,#0d1410,,body 13-15 #c9a7ed,#0d1410,,body 16-21 #b8d88a,#0d1410,,body 22-22 #e5eee5,#0d1410,,body 23-89 d,#0d1410,,body @@ -84,32 +84,32 @@ |22: @22: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body == snap resized grid=105x27 cursor=7,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Del +| /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Follow Del | 1 @`Mini demo.zig` Mini | | -| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Del +| /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Follow Del | 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ | 2 ⣂⢀⣉⣉⢉⣈⢁⣀⣀⢀⣀⣀⣀⢀⣀⣀⣀⣀⣀ | 3 ⠉⠉⠁⠉⠉⠉⠈⠈⠉⠉⠉⠉⠉⠉ | 4 == 9p resized grid=105x27 cursor=7,7,block -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -@0: 0-76 #b2c3b8,#1d2824,,tagline 77-104 d,#1d2824,,tagline +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit +@0: 0-84 #b2c3b8,#1d2824,,tagline 85-104 d,#1d2824,,tagline |1: New Term Find Grep Joincol Delcol @1: 0-1 #ffffff,#887455,,tagline 2-34 #becfc4,#314738,,tagline 35-104 d,#314738,,tagline -|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Del -@2: 0-1 #ffffff,#496656,,tagline 2-27 #b2c3b8,#1d2824,,tagline 28-39 #d3b0d9,#1d2824,,tagline 40-62 #b2c3b8,#1d2824,,tagline 63-104 d,#1d2824,,tagline +|2: /tmp/pardes-snap/mini/cwd/commands.txt Save Term Collapse Follow Del +@2: 0-1 #ffffff,#496656,,tagline 2-27 #b2c3b8,#1d2824,,tagline 28-39 #d3b0d9,#1d2824,,tagline 40-69 #b2c3b8,#1d2824,,tagline 70-104 d,#1d2824,,tagline |3: 1 @`Mini demo.zig` Mini @3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-22 #e5eee5,#0d1410,,body 23-98 d,#0d1410,,body 99-99 d,#1d2824,,tagline 100-103 #b2c3b8,#1d2824,,tagline 104-104 d,#1d2824,,tagline |4: @4: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body |5: @5: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body -|6: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Del -@6: 0-1 #000000,#add38a,,tagline 2-27 #becfc4,#314738,,tagline 28-40 #dfbce5,#314738,,tagline 41-63 #becfc4,#314738,,tagline 64-104 d,#314738,,tagline +|6: /tmp/pardes-snap/mini/cwd/Mini demo.zig Save Term Collapse Follow Del +@6: 0-1 #000000,#add38a,,tagline 2-27 #becfc4,#314738,,tagline 28-40 #dfbce5,#314738,,tagline 41-70 #becfc4,#314738,,tagline 71-104 d,#314738,,tagline |7: 1 ⠭⠍⣥⢩⣭⡭⣭⣬⣌⢭⣭⠌⠬⠅⠍⠁ +7: 7="⠭" 8="⠍" 9="⣥" 10="⢩" 11="⣭" 12="⡭" 13="⣭" 14="⣬" 15="⣌" 16="⢭" 17="⣭" 18="⠌" 19="⠬" 20="⠅" 21="⠍" 22="⠁" @7: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-8 #e5eee5,#0d1410,,body 9-9 #c9a7ed,#0d1410,,body 10-12 #e5eee5,#0d1410,,body 13-15 #c9a7ed,#0d1410,,body 16-21 #b8d88a,#0d1410,,body 22-22 #e5eee5,#0d1410,,body 23-104 d,#0d1410,,body diff --git a/test/snapshots/modal.golden b/test/snapshots/modal.golden index 96ee0516..ef146f1e 100644 --- a/test/snapshots/modal.golden +++ b/test/snapshots/modal.golden @@ -1,5 +1,5 @@ == snap top grid=100x31 cursor=2,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/modal/cwd Term+bash Save Mode F /tmp/pardes-snap/modal/cwd Term+bash Save Mode F | ilter Collapse Del ilter Collapse Del diff --git a/test/snapshots/msg.golden b/test/snapshots/msg.golden index 33cd5190..6b91bbcb 100644 --- a/test/snapshots/msg.golden +++ b/test/snapshots/msg.golden @@ -1,7 +1,7 @@ == snap opened grid=70x15 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config His | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/msg/cwd/a.txt Save Term Collapse Del +| /tmp/pardes-snap/msg/cwd/a.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -12,9 +12,9 @@ == snap saved grid=70x15 cursor=7,3 |3: 1 line 1 --:--:-- saved /tmp/pardes-snap/msg/cwd/a.txt == snap repainted grid=70x17 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config His | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/msg/cwd/a.txt Save Term Collapse Del +| /tmp/pardes-snap/msg/cwd/a.txt Save Term Collapse Follow Del | 1 line 1 --:--:-- saved /tmp/pardes-snap/msg/cwd/a.txt | 2 line 2 | 3 line 3 @@ -45,7 +45,7 @@ |3: 1 AGAIN |4: 2 == snap msgbuiltin grid=70x17 cursor=29,5 -|2: */tmp/pardes-snap/msg/cwd/a.txt Save Term Collapse Del +|2: */tmp/pardes-snap/msg/cwd/a.txt Save Term Collapse Follow Del |3: 1 AGAIN hand-written report |5: 3 Msg hand-written report == snap msgtail grid=70x17 cursor=32,7 diff --git a/test/snapshots/multicursor.golden b/test/snapshots/multicursor.golden index 9cc05693..b73f9c4e 100644 --- a/test/snapshots/multicursor.golden +++ b/test/snapshots/multicursor.golden @@ -1,11 +1,11 @@ == snap three-cursors grid=150x31 cursor=7,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/multicursor/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/multicursor/cwd Term+bash Save Mode Filter Collapse Del | ls ls | f.txt f.txt | -| /tmp/pardes-snap/multicursor/cwd/f.txt Save Term Collapse Del +| /tmp/pardes-snap/multicursor/cwd/f.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -52,7 +52,7 @@ |29: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410, |30: 0-0 d,#608269, 1-74 d,#0d1410, 75-75 d,#608269, 76-149 d,#0d1410, == snap edited-at-three grid=150x31 cursor=9,9 -|6: */tmp/pardes-snap/multicursor/cwd/f.txt Save Term Collapse Del +|6: */tmp/pardes-snap/multicursor/cwd/f.txt Save Term Collapse Follow Del |7: 1 >>line 1 |8: 2 >>line 2 |9: 3 >>line 3 diff --git a/test/snapshots/nested-optout.golden b/test/snapshots/nested-optout.golden index a3dfd29a..f1da7d69 100644 --- a/test/snapshots/nested-optout.golden +++ b/test/snapshots/nested-optout.golden @@ -1,10 +1,10 @@ == snap optout-file grid=100x31 cursor=9,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/nested-optout/cwd Term+bash Save Mode Filter Collapse Del -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/nested-optout/cwd/nested.txt Save Term Collapse Del +| /tmp/pardes-snap/nested-optout/cwd/nested.txt Save Term Collapse Follow Del | 1 optout-marker | 2 second-optout-line | 3 @@ -20,13 +20,13 @@ | | | -| /tmp/pardes-snap/nested-optout/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/nested-optout/cwd/+New Save Term Collapse Follow Del | 1 == snap inner-shell grid=100x31 cursor=6,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/nested-optout/cwd Term+bash Save Mode Filter Collapse Del -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | $ /tmp/pardes-snap/nested-optout/cwd/innerdir Term+bash Save Mode Filter Collapse Del | $ @@ -39,16 +39,16 @@ | | | -| /tmp/pardes-snap/nested-optout/cwd/innerdir/+New Save Term Collapse Del +| /tmp/pardes-snap/nested-optout/cwd/innerdir/+New Save Term Collapse Follow Del | 1 | | | -| /tmp/pardes-snap/nested-optout/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/nested-optout/cwd/+New Save Term Collapse Follow Del | 1 == snap inner-launch grid=100x31 cursor=11,9 -|6: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +|6: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit |7: New Term Find Grep Joincol Delcol -|8: /tmp/pardes-snap/nested-optout/cwd/innerdir/deeper.txt Save Term Collapse Del +|8: /tmp/pardes-snap/nested-optout/cwd/innerdir/deeper.txt Save Term Collapse Follow Del |9: 1 deepest-marker |10: 2 diff --git a/test/snapshots/nested.golden b/test/snapshots/nested.golden index 6852870a..d80a1585 100644 --- a/test/snapshots/nested.golden +++ b/test/snapshots/nested.golden @@ -1,10 +1,10 @@ == snap file-arg grid=100x31 cursor=7,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/nested/cwd Term+bash Save Mode Filter Collapse Del | $ $(readlink /proc/$PPID/exe) nested.txt | $ -| /tmp/pardes-snap/nested/cwd/nested.txt Save Term Collapse Del +| /tmp/pardes-snap/nested/cwd/nested.txt Save Term Collapse Follow Del | 1 hello-from-nested | 2 second-nested-line | 3 @@ -20,10 +20,10 @@ | | | -| /tmp/pardes-snap/nested/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/nested/cwd/+New Save Term Collapse Follow Del | 1 == snap no-arg grid=100x31 cursor=4,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/nested/cwd Term+bash Save Mode Filter Collapse Del | $ $(readlink /proc/$PPID/exe) @@ -44,10 +44,10 @@ | | | -| /tmp/pardes-snap/nested/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/nested/cwd/+New Save Term Collapse Follow Del | 1 == snap dir-arg grid=100x31 cursor=7,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/nested/cwd Term+bash Save Mode Filter Collapse Del | $ $(readlink /proc/$PPID/exe) nestdir @@ -68,5 +68,5 @@ | | | -| /tmp/pardes-snap/nested/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/nested/cwd/+New Save Term Collapse Follow Del | 1 diff --git a/test/snapshots/ninep.golden b/test/snapshots/ninep.golden index a92cc6fc..c1406ecd 100644 --- a/test/snapshots/ninep.golden +++ b/test/snapshots/ninep.golden @@ -1,7 +1,7 @@ == snap opened grid=90x15 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const greeting = "café λ 界 é"; | 2 | 3 pub fn choose(ok: bool) u32 { @@ -26,12 +26,12 @@ |13: 0-0 d,#608269, 1-89 d,#0d1410, |14: 0-0 d,#608269, 1-89 d,#0d1410, == 9p opened grid=90x15 cursor=7,3,block -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -@0: 0-76 #b2c3b8,#1d2824,,tagline 77-89 d,#1d2824,,tagline +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit +@0: 0-84 #b2c3b8,#1d2824,,tagline 85-89 d,#1d2824,,tagline |1: New Term Find Grep Joincol Delcol @1: 0-1 #ffffff,#887455,,tagline 2-34 #becfc4,#314738,,tagline 35-89 d,#314738,,tagline -|2: /tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del -@2: 0-1 #000000,#add38a,,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-80 #becfc4,#314738,,tagline 81-89 d,#314738,,tagline +|2: /tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse Follow TreeContext Def Refs Del +@2: 0-1 #000000,#add38a,,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-87 #becfc4,#314738,,tagline 88-89 d,#314738,,tagline |3: 1 const greeting = "café λ 界 é"; +3: 28="é" 30="λ" 32="界" 33="" 35="é" @3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #616f64,#0d1410,b,body 7-23 #e5eee5,#0d1410,,body 24-36 #b8d88a,#0d1410,,body 37-37 #e5eee5,#0d1410,,body 38-89 d,#0d1410,,body @@ -58,7 +58,7 @@ |14: @14: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-89 d,#0d1410,,body == snap edited grid=90x15 cursor=7,4 -|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del +|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse Follow TreeContext Def Refs Del |3: 1 // café λ 界 |4: 2 const greeting = "café λ 界 é"; |5: 3 @@ -68,8 +68,8 @@ |9: 7 } |10: 8 == 9p edited grid=90x15 cursor=7,4,block -|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del -@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-80 #becfc4,#314738,,tagline 81-89 d,#314738,,tagline +|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse Follow TreeContext Def Refs Del +@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-87 #becfc4,#314738,,tagline 88-89 d,#314738,,tagline |3: 1 // café λ 界 +3: 13="é" 15="λ" 17="界" 18="" @3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #b9f480,#0d1410,,body 19-89 d,#0d1410,,body @@ -120,12 +120,12 @@ |18: 0-0 d,#608269, 1-104 d,#0d1410, |19: 0-0 d,#608269, 1-104 d,#0d1410, == 9p resized grid=105x20 cursor=7,4,block -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -@0: 0-76 #b2c3b8,#1d2824,,tagline 77-104 d,#1d2824,,tagline +|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit +@0: 0-84 #b2c3b8,#1d2824,,tagline 85-104 d,#1d2824,,tagline |1: New Term Find Grep Joincol Delcol @1: 0-1 #ffffff,#887455,,tagline 2-34 #becfc4,#314738,,tagline 35-104 d,#314738,,tagline -|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del -@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-80 #becfc4,#314738,,tagline 81-104 d,#314738,,tagline +|2: */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse Follow TreeContext Def Refs Del +@2: 0-0 #000000,#add38a,,tagline 1-1 #000000,#f9cb70,b,tagline 2-28 #becfc4,#314738,,tagline 29-36 #dfbce5,#314738,,tagline 37-87 #becfc4,#314738,,tagline 88-104 d,#314738,,tagline |3: 1 // café λ 界 +3: 13="é" 15="λ" 17="界" 18="" @3: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-18 #b9f480,#0d1410,,body 19-104 d,#0d1410,,body @@ -163,9 +163,9 @@ |19: @19: 0-0 d,#608269,,body 1-1 d,#0d1410,,body 2-6 #59675c,#0d1410,,body 7-104 d,#0d1410,,body == snap resized grid=105x20 cursor=7,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse TreeContext Def Refs Del +| */tmp/pardes-snap/ninep/cwd/demo.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 // café λ 界 | 2 const greeting = "café λ 界 é"; | 3 diff --git a/test/snapshots/pagercolor.golden b/test/snapshots/pagercolor.golden index 8b2d634f..9f7f0738 100644 --- a/test/snapshots/pagercolor.golden +++ b/test/snapshots/pagercolor.golden @@ -1,5 +1,5 @@ == snap pager grid=100x50 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/pagercolor/cwd Term+bash Save Mode Filter Collapse Del | $ printf '\033]0;title\007\033[31mred\033[m \033[1;32mbold green\033[m \033[38;2;200;100;0mrgb\033 @@ -33,7 +33,7 @@ | | | -| /tmp/pardes-snap/pagercolor/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/pagercolor/cwd/+New Save Term Collapse Follow Del | 1 | | @@ -106,7 +106,7 @@ |13: +new |34: |35: -|38: /tmp/pardes-snap/pagercolor/cwd/+New Save Term Collapse Del +|38: /tmp/pardes-snap/pagercolor/cwd/+New Save Term Collapse Follow Del |39: 1 |42: |43: diff --git a/test/snapshots/pipe.golden b/test/snapshots/pipe.golden index ca5f3f84..618a3019 100644 --- a/test/snapshots/pipe.golden +++ b/test/snapshots/pipe.golden @@ -1,12 +1,12 @@ == snap prompt grid=180x13 cursor=179,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/pipe/cwd/pipe.txt Save Term Collapse Del +| /tmp/pardes-snap/pipe/cwd/pipe.txt Save Term Collapse Follow Del | 1 alpha beta |tr a-z A-Z | 2 gamma delta == snap filtered grid=180x13 cursor=17,3 -|2: */tmp/pardes-snap/pipe/cwd/pipe.txt Save Term Collapse Del +|2: */tmp/pardes-snap/pipe/cwd/pipe.txt Save Term Collapse Follow Del |3: 1 ALPHA BETA == snap undone grid=180x13 cursor=17,3 -|2: /tmp/pardes-snap/pipe/cwd/pipe.txt Save Term Collapse Del +|2: /tmp/pardes-snap/pipe/cwd/pipe.txt Save Term Collapse Follow Del |3: 1 alpha beta diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden index cac46747..8321acbf 100644 --- a/test/snapshots/psearch.golden +++ b/test/snapshots/psearch.golden @@ -1,5 +1,5 @@ == snap output grid=140x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/psearch/cwd Term+bash Save Mode Filter Collapse Del | printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' @@ -20,13 +20,13 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/psearch/cwd/+New Save Term Collapse Follow Del | 1 == snap typing grid=140x31 cursor=139,3 |3: printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' /MARK == snap results grid=140x31 cursor=7,4 |3: printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' -|10: /tmp/pardes-snap/psearch/cwd/+Search Save Term Collapse LocationsConfig Del +|10: /tmp/pardes-snap/psearch/cwd/+Search Save Term Collapse Follow LocationsConfig Del |11: 1 @p1:2:3-6 |12: 2 x MARK a |13: 3 @p1:4:3-6 @@ -69,7 +69,7 @@ == snap second grid=140x31 cursor=7,6 == snap back grid=140x31 cursor=7,4 == snap nomatch grid=140x31 cursor=7,13 -|24: /tmp/pardes-snap/psearch/cwd/+Search Save Term Collapse LocationsConfig Del +|24: /tmp/pardes-snap/psearch/cwd/+Search Save Term Collapse Follow LocationsConfig Del |25: 1 == snap ttyinert grid=140x31 cursor=4,9 |2: $ /tmp/pardes-snap/psearch/cwd Term+bash Save Mode Filter Collapse Del diff --git a/test/snapshots/reflow.golden b/test/snapshots/reflow.golden index f740f488..869ee73c 100644 --- a/test/snapshots/reflow.golden +++ b/test/snapshots/reflow.golden @@ -1,5 +1,5 @@ == snap widened grid=200x25 cursor=4,16 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/reflow/cwd Term+bash Save Mode Filter Collapse Del | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy @@ -16,5 +16,5 @@ | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyydone | $ -| /tmp/pardes-snap/reflow/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/reflow/cwd/+New Save Term Collapse Follow Del | 1 diff --git a/test/snapshots/respawn.golden b/test/snapshots/respawn.golden index c9a10efa..c693fcbd 100644 --- a/test/snapshots/respawn.golden +++ b/test/snapshots/respawn.golden @@ -1,5 +1,5 @@ == snap respawn grid=140x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/respawn/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/respawn/cwd Term+bash Save Mode Filter Collapse Del | ls ls diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden index 60d074d1..9623edf8 100644 --- a/test/snapshots/restore.golden +++ b/test/snapshots/restore.golden @@ -1,5 +1,5 @@ == snap dumped grid=100x31 cursor=4,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-sn +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit Restore /tmp/p | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/restore/cwd Term+bash Save Mode Filter Collapse Del | $ ls Dump diff --git a/test/snapshots/savepane.golden b/test/snapshots/savepane.golden index 7ac27f8b..bb9df3a9 100644 --- a/test/snapshots/savepane.golden +++ b/test/snapshots/savepane.golden @@ -1,5 +1,5 @@ == snap scratch grid=100x31 cursor=20,18 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/savepane/cwd Term+bash Save Mode Filter Collapse Del | ls @@ -16,13 +16,13 @@ | | | -| */tmp/pardes-snap/savepane/cwd/+New Save Term Collapse Del +| */tmp/pardes-snap/savepane/cwd/+New Save Term Collapse Follow Del | 1 scratch bytes == snap prompt grid=100x31 cursor=99,19 |18: 1 scratch bytes Save |19: Save /tmp/pardes-snap/savepane/cwd/ == snap saved grid=100x31 cursor=20,18 -|17: /tmp/pardes-snap/savepane/cwd/saved.txt Save Term Collapse Del +|17: /tmp/pardes-snap/savepane/cwd/saved.txt Save Term Collapse Follow Del |18: 1 scratch bytes --:--:-- saved /tmp/pardes-snap/savepane/cwd/saved.txt |19: == file bytes diff --git a/test/snapshots/scroll.golden b/test/snapshots/scroll.golden index 8faa8a82..242c7fc4 100644 --- a/test/snapshots/scroll.golden +++ b/test/snapshots/scroll.golden @@ -1,5 +1,5 @@ == snap bottom grid=100x31 cursor=4,16 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/scroll/cwd Term+bash Save Mode /tmp/pardes-snap/scroll/cwd Term+bash Save Mode | Filter Collapse Del Filter Collapse Del diff --git a/test/snapshots/scrolloff.golden b/test/snapshots/scrolloff.golden index f2f23585..3b756d44 100644 --- a/test/snapshots/scrolloff.golden +++ b/test/snapshots/scrolloff.golden @@ -1,11 +1,11 @@ == snap top grid=210x16 cursor=7,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/scrolloff/cwd Term+bash Save Mode Filter Collapse Del | ls | g.txt | -| /tmp/pardes-snap/scrolloff/cwd/g.txt Save Term Collapse Del +| /tmp/pardes-snap/scrolloff/cwd/g.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 diff --git a/test/snapshots/selarg.golden b/test/snapshots/selarg.golden index 96f3a65b..54e363ba 100644 --- a/test/snapshots/selarg.golden +++ b/test/snapshots/selarg.golden @@ -1,5 +1,5 @@ == snap kept grid=100x31 cursor=6,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/selarg/cwd Term+bash Save Mode /tmp/pardes-snap/selarg/cwd Term+bash Save Mode | Filter Collapse Del Filter Collapse Del diff --git a/test/snapshots/selregex.golden b/test/snapshots/selregex.golden index c0c1147d..e4cb7dfa 100644 --- a/test/snapshots/selregex.golden +++ b/test/snapshots/selregex.golden @@ -1,7 +1,7 @@ == snap prompt-armed grid=160x25 cursor=159,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/selregex/cwd/m.zig Save Term Collapse TreeContext Def Refs Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save Term Collapse Follow TreeContext Def Refs Del | 1 const one = 1; Select / | 2 const two = 2; | 3 const three = 3; @@ -51,12 +51,12 @@ |4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#243a2d, 11-11 #3c614a,#f5f7ee, 12-12 #3c614a,#0d1410, 13-18 #e5eee5,#0d1410, 19-19 #f8c082,#0d1410, 20-159 #e5eee5,#0d1410, |5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#243a2d, 11-11 #3c614a,#f5f7ee, 12-12 #3c614a,#0d1410, 13-20 #e5eee5,#0d1410, 21-21 #f8c082,#0d1410, 22-159 #e5eee5,#0d1410, == snap commented grid=160x25 cursor=14,3 -|2: */tmp/pardes-snap/selregex/cwd/m.zig Save Term Collapse TreeContext Def Refs Del +|2: */tmp/pardes-snap/selregex/cwd/m.zig Save Term Collapse Follow TreeContext Def Refs Del |3: 1 // const one = 1; |4: 2 // const two = 2; |5: 3 // const three = 3; == snap uncommented grid=160x25 cursor=11,3 -|2: /tmp/pardes-snap/selregex/cwd/m.zig Save Term Collapse TreeContext Def Refs Del +|2: /tmp/pardes-snap/selregex/cwd/m.zig Save Term Collapse Follow TreeContext Def Refs Del |3: 1 const one = 1; |4: 2 const two = 2; |5: 3 const three = 3; diff --git a/test/snapshots/shellset.golden b/test/snapshots/shellset.golden index b06f0b78..e4b233a5 100644 --- a/test/snapshots/shellset.golden +++ b/test/snapshots/shellset.golden @@ -1,13 +1,13 @@ == snap boot grid=90x21 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/shellset/cwd/cmd.txt Save Term Collapse Del +| /tmp/pardes-snap/shellset/cwd/cmd.txt Save Term Collapse Follow Del | 1 Shell zznosuchshell == snap builtin-ran grid=90x21 cursor=25,3 |3: Shell: shell "zznosuchshell" not found (a name on the usual paths, or a path to one) == snap fallback-shell grid=90x21 cursor=49,6 |1: New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |2: /tmp/pardes-snap/shellset/cwd/cmd.txt Save /tmp/pardes-snap/shellset/cwd Term+bash Sav -|3: Term Collapse Del e Mode Filter Collapse Del +|3: Term Collapse Follow Del e Mode Filter Collapse Del |4: 1 Shell zznosuchshell ls |5: cmd.txt zmarkfile.txt diff --git a/test/snapshots/shrinktag.golden b/test/snapshots/shrinktag.golden index 65c068ca..d2167e86 100644 --- a/test/snapshots/shrinktag.golden +++ b/test/snapshots/shrinktag.golden @@ -1,5 +1,5 @@ == snap before grid=100x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/shrinktag/cwd Term+bash Save Mo /tmp/pardes-snap/shrinktag/cwd Term+bash Save Mo | de Filter Collapse Del de Filter Collapse Del diff --git a/test/snapshots/stepgrain.golden b/test/snapshots/stepgrain.golden index e1066807..1b7d3245 100644 --- a/test/snapshots/stepgrain.golden +++ b/test/snapshots/stepgrain.golden @@ -1,7 +1,7 @@ == snap results grid=150x31 cursor=13,13 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/stepgrain/cwd/a.txt Save Term Collapse Del +| /tmp/pardes-snap/stepgrain/cwd/a.txt Save Term Collapse Follow Del | 1 hello ZQMARK one | 2 see also sub/b.txt for ZQMARK two | @@ -85,4 +85,4 @@ |22: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-46 #d3b0d9,#1d2824, 47-149 #b2c3b8,#1d2824, == snap blank-opened grid=150x31 cursor=7,23 |12: +Search 1/1 Save Unattach Del -|22: /tmp/pardes-snap/stepgrain/cwd/two words.txt Save Term Collapse Del +|22: /tmp/pardes-snap/stepgrain/cwd/two words.txt Save Term Collapse Follow Del diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden index e6fd1ad7..2cdda6d4 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -1,12 +1,12 @@ == snap zig-open grid=150x31 cursor=7,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/syntax/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/syntax/cwd Term+bash Save Mode Filter Collapse Del | ls ls | demo.zig demo.zig | -| /tmp/pardes-snap/syntax/cwd/demo.zig Save Term Collapse TreeContext Def R -| efs Del +| /tmp/pardes-snap/syntax/cwd/demo.zig Save Term Collapse Follow TreeContex +| t Def Refs Del | 1 const std = @import("std"); // greet | 2 pub fn main() void { | 3 var x: u32 = 42; diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden index 851b238d..c14c41b0 100644 --- a/test/snapshots/tag.golden +++ b/test/snapshots/tag.golden @@ -1,5 +1,5 @@ == snap tag-focus grid=150x31 cursor=36,2 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/tag/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Term+bash Save Mode Filter Collapse Del | ls ls @@ -26,5 +26,5 @@ == snap tag-exit grid=150x31 cursor=4,5 |2: /tmp/pardes-snap/tag/cwd Term+bash t.txt Save Mode Filter Collapse Del /tmp/pardes-snap/tag/cwd Term+bash Save Mode Filter Collapse Del == snap tag-look grid=150x31 cursor=7,7 -|6: /tmp/pardes-snap/tag/cwd/t.txt Save Term Collapse Del +|6: /tmp/pardes-snap/tag/cwd/t.txt Save Term Collapse Follow Del |7: 1 ZZLOOKED diff --git a/test/snapshots/tagalign.golden b/test/snapshots/tagalign.golden index 00b49731..b4353a14 100644 --- a/test/snapshots/tagalign.golden +++ b/test/snapshots/tagalign.golden @@ -1,50 +1,55 @@ -== snap aligned grid=100x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +== snap aligned grid=100x31 cursor=4,10 +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Term Collapse Del +| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Term Collapse Follow +| Del | 1 alpha | 2 beta | 3 gamma | /tmp/pardes-snap/tagalign/cwd Term+bash Save Mode Filter Collapse Del | ls | deep -== snap fits grid=87x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +== snap fits grid=87x31 cursor=4,10 +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Term Co -| llapse Del +| llapse Follow Del | 1 alpha | 2 beta +| 3 gamma | /tmp/pardes-snap/tagalign/cwd Term+bash Save Mode Filter Collapse Del | ls | deep -== snap overby1 grid=86x31 cursor=4,9 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +== snap overby1 grid=86x31 cursor=4,10 +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Term C -| ollapse Del +| ollapse Follow Del | 1 alpha | 2 beta +| 3 gamma | /tmp/pardes-snap/tagalign/cwd Term+bash Save Mode Filter Collapse Del | ls | deep == snap clicked grid=100x31 cursor=11,2 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Term Collapse Del +| /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document.txt Save Term Collapse Follow +| Del | 1 alpha | 2 beta | 3 gamma | /tmp/pardes-snap/tagalign/cwd Term+bash Save Mode Filter Collapse Del | ls | deep -== snap revealed grid=70x31 cursor=29,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb +== snap revealed grid=70x31 cursor=36,3 +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config His | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/tagalign/cwd/deep/nested-project-directory/document -| .txt Save Term Collapse Del +| .txt Save Term Collapse Follow Del | 1 alpha | 2 beta +| 3 gamma | /tmp/pardes-snap/tagalign/cwd Term+bash Save Mode Filter Collapse De | l | ls @@ -58,3 +63,4 @@ |7: |8: |9: +|10: diff --git a/test/snapshots/tagalign2col.golden b/test/snapshots/tagalign2col.golden index 97d7af7f..7492797a 100644 --- a/test/snapshots/tagalign2col.golden +++ b/test/snapshots/tagalign2col.golden @@ -1,8 +1,8 @@ == snap onecol grid=160x31 cursor=7,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Term Collapse De /tmp/pardes-snap/tagalign2col/cwd Term+bash Save Mode Filter Collapse Del -| l ls +| /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Term Collapse Fo /tmp/pardes-snap/tagalign2col/cwd Term+bash Save Mode Filter Collapse Del +| llow Del ls | 1 alpha deep | 2 beta | 3 gamma @@ -12,7 +12,7 @@ |9: deep == snap widened grid=160x31 cursor=4,10 |1: New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -|2: /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Term Collapse Del /tmp/pardes-snap/tagalign2col/cwd Term+bash Save Mode Filt +|2: /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save Term Collapse Follow Del /tmp/pardes-snap/tagalign2col/cwd Term+bash Save Mode Filt |3: 1 alpha er Collapse Del |4: 2 beta ls |5: 3 gamma deep diff --git a/test/snapshots/tagcmd.golden b/test/snapshots/tagcmd.golden index a643a894..7ab9d4ce 100644 --- a/test/snapshots/tagcmd.golden +++ b/test/snapshots/tagcmd.golden @@ -1,7 +1,7 @@ == snap edited grid=100x31 cursor=13,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| */tmp/pardes-snap/tagcmd/cwd/c.txt Save Term Collapse Del +| */tmp/pardes-snap/tagcmd/cwd/c.txt Save Term Collapse Follow Del | 1 ZZEDITline 1 | 2 line 2 | 3 line 3 @@ -12,7 +12,7 @@ == snap colon grid=100x31 cursor=36,2 == snap word grid=100x31 cursor=40,2 == snap saved grid=100x31 cursor=13,3 -|2: /tmp/pardes-snap/tagcmd/cwd/c.txt Save Term Collapse Del +|2: /tmp/pardes-snap/tagcmd/cwd/c.txt Save Term Collapse Follow Del |3: 1 ZZEDITline 1 --:--:-- saved /tmp/pardes-snap/tagcmd/cwd/c.txt == file written ZZEDITline 1 diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden index dc6386c1..748330fd 100644 --- a/test/snapshots/tagnav.golden +++ b/test/snapshots/tagnav.golden @@ -1,8 +1,8 @@ == snap start grid=100x31 cursor=7,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/tagnav/cwd/w.txt Save Term Coll /tmp/pardes-snap/tagnav/cwd Term+bash Save Mode -| apse Del Filter Collapse Del +| apse Follow Del Filter Collapse Del | 1 alpha ls | 2 beta w.txt | 3 gamma @@ -31,17 +31,43 @@ |4: 1 alpha ls == snap workspace-tag grid=100x31 cursor=2,0 |4: 1 alpha Up ls -== snap topbar-dollar grid=100x31 cursor=76,0 +== snap topbar-dollar grid=100x31 cursor=84,0 |4: 1 alpha ls -== snap topbar-dump-word grid=100x31 cursor=48,0 +== snap topbar-dump-word grid=100x31 cursor=53,0 == snap topbar-exec grid=100x31 cursor=7,4 -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-sn -|4: 1 alpha Dump ls -== snap topbar-restore-word grid=100x31 cursor=60,0 -|0: d Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-snap/tagnav/dump.zon +|4: 1 alpha Themes ls +|12: /tmp/pardes-snap/tagnav/cwd/+Themes Save Term Co +|13: llapse Follow Del +|14: 1 # Pardes themes +|15: 2 Theme orchard +|16: 3 Theme dusk +|17: 4 Theme ink +|18: 5 Theme paper +|19: 6 Theme daybreak +|20: 7 Theme atelier +|21: 8 Theme forge +|22: 9 Theme lagoon +|23: 10 Theme solarium +|24: 11 Theme spectrum +|25: 12 Theme harvest +|26: 13 Theme clay +|27: 14 Theme forge_black +|28: 15 Theme forge_soft +|29: 16 Theme orchard_black +|30: 17 Theme acme +== snap topbar-restore-word grid=100x31 cursor=75,0 |4: 1 alpha ls == snap topbar-restored grid=100x31 cursor=7,4 -|0: Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit Restore /tmp/pardes-sn -|4: 1 alpha Dump ls -|7: /tmp/pardes-snap/tagnav/cwd Term+bash Save Mode ── restored history ── -|12: ── restored history ── +|1: New Term Find Grep Joincol Delcol New Term F╭────────────────────────────────────╮ +|2: /tmp/pardes-snap/tagnav/cwd/w.txt Save Term Coll /tmp/parde│pardes resizes=1 │ +|3: apse Follow Del Filter Col│theme orchard │ +|4: 1 alpha Debug ls │font default │ +|5: 2 beta w.txt │terms 4 cols 2 │ +|6: 3 gamma │active #0 48x3 │ +|7: /tmp/pardes-snap/tagnav/cwd Term+bash Save Mode │scroll 0/3 │ +|8: Filter Collapse Del │frame virtual clock │ +|9: ls │ │ +|10: w.txt │ │ +|11: │ │ +|12: /tmp/pardes-snap/tagnav/cwd/+Themes Save Term Co │ │ +|13: llapse Follow Del ╰────────────────────────────────────╯ diff --git a/test/snapshots/tagpath.golden b/test/snapshots/tagpath.golden index 629f4e9c..0732718f 100644 --- a/test/snapshots/tagpath.golden +++ b/test/snapshots/tagpath.golden @@ -1,7 +1,7 @@ == snap start grid=100x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -43,15 +43,15 @@ |29: 0-0 d,#608269, 1-99 d,#0d1410, |30: 0-0 d,#608269, 1-99 d,#0d1410, == snap yanked-path grid=100x31 cursor=41,3 -|2: */tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Del +|2: */tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Follow Del |3: 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1 == snap drag-cross grid=100x31 cursor=41,2 == style drag-cross grid=100x31 |2: 0-0 d,#add38a, 1-1 #000000,#f9cb70,b 2-10 #becfc4,#314738, 11-41 #f5f7ee,#3c614a, 42-99 #becfc4,#314738, |3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-7 #e5eee5,#0d1410, 8-41 #f5f7ee,#3c614a, 42-99 #e5eee5,#0d1410, == snap name-draft grid=100x31 cursor=10,2 -|2: */renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Del +|2: */renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Follow Del == snap name-cancelled grid=100x31 cursor=41,3 -|2: */tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Del +|2: */tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Follow Del == snap name-committed grid=100x31 cursor=41,3 -|2: */renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Del +|2: */renamed/tmp/pardes-snap/tagpath/cwd/c.txt Save Term Collapse Follow Del diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden index c6e384c5..e293dc19 100644 --- a/test/snapshots/theme.golden +++ b/test/snapshots/theme.golden @@ -1,5 +1,5 @@ -== snap orchard grid=100x31 cursor=87,0 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit NextColor +== snap orchard grid=100x31 cursor=95,0 +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit NextColor | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/theme/cwd Term+bash Save Mode F /tmp/pardes-snap/theme/cwd Term+bash Save Mode F | ilter Collapse Del ilter Collapse Del @@ -55,7 +55,7 @@ == snap dusk grid=100x31 cursor=4,6 |4: ls NextColor ls == style dusk grid=100x31 -|0: 0-1 d,#2c2630, 2-77 #c6b6c5,#2c2630, 78-86 #fff0eb,#654053, 87-99 #fff0eb,#2c2630, +|0: 0-1 d,#2c2630, 2-85 #c6b6c5,#2c2630, 86-94 #fff0eb,#654053, 95-99 #fff0eb,#2c2630, |1: 0-1 d,#757a5f, 2-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#757a5f, 52-99 #c6b6c5,#2c2630, |2: 0-1 d,#edb092, 2-28 #d2c2d1,#533d4d, 29-38 #a1d5c4,#533d4d, 39-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#745469, 52-78 #c6b6c5,#2c2630, 79-88 #96c9b8,#2c2630, 89-99 #c6b6c5,#2c2630, |3: 0-1 d,#533d4d, 2-49 #d2c2d1,#533d4d, 50-51 #d2c2d1,#2c2630, 52-99 #c6b6c5,#2c2630, @@ -88,7 +88,7 @@ |30: 0-0 d,#8e667c, 1-49 d,#39323b, 50-50 d,#8e667c, 51-99 d,#39323b, == snap ink grid=100x31 cursor=4,6 == style ink grid=100x31 -|0: 0-1 d,#15212c, 2-77 #d5e4f1,#15212c, 78-86 #ffffff,#1b547c, 87-99 #ffffff,#15212c, +|0: 0-1 d,#15212c, 2-85 #d5e4f1,#15212c, 86-94 #ffffff,#1b547c, 95-99 #ffffff,#15212c, |1: 0-1 d,#8f7d5b, 2-49 #e1eef9,#2b4051, 50-51 #e1eef9,#8f7d5b, 52-99 #d5e4f1,#15212c, |2: 0-1 d,#86d8ff, 2-28 #e1eef9,#2b4051, 29-38 #ffeab8,#2b4051, 39-49 #e1eef9,#2b4051, 50-51 #e1eef9,#5f7990, 52-78 #d5e4f1,#15212c, 79-88 #f5e0ac,#15212c, 89-99 #d5e4f1,#15212c, |3: 0-1 d,#2b4051, 2-49 #e1eef9,#2b4051, 50-51 #e1eef9,#15212c, 52-99 #d5e4f1,#15212c, @@ -121,7 +121,7 @@ |30: 0-0 d,#86a8c2, 1-49 d,#000000, 50-50 d,#86a8c2, 51-99 d,#000000, == snap paper grid=100x31 cursor=4,6 == style paper grid=100x31 -|0: 0-1 d,#e8eae3, 2-77 #52625a,#e8eae3, 78-86 #203e31,#c5e2d0, 87-99 #203e31,#e8eae3, +|0: 0-1 d,#e8eae3, 2-85 #52625a,#e8eae3, 86-94 #203e31,#c5e2d0, 95-99 #203e31,#e8eae3, |1: 0-1 d,#bda27e, 2-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#bda27e, 52-99 #52625a,#e8eae3, |2: 0-1 d,#367157, 2-28 #4a5a52,#bdd8ca, 29-38 #69447a,#bdd8ca, 39-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#8fa594, 52-78 #52625a,#e8eae3, 79-88 #724c83,#e8eae3, 89-99 #52625a,#e8eae3, |3: 0-1 d,#bdd8ca, 2-49 #4a5a52,#bdd8ca, 50-51 #4a5a52,#e8eae3, 52-99 #52625a,#e8eae3, @@ -154,7 +154,7 @@ |30: 0-0 d,#869d8a, 1-49 d,#f5f3ed, 50-50 d,#869d8a, 51-99 d,#f5f3ed, == snap daybreak grid=100x31 cursor=4,6 == style daybreak grid=100x31 -|0: 0-1 d,#edf2f7, 2-77 #29465e,#edf2f7, 78-86 #10364f,#b9dffb, 87-99 #10364f,#edf2f7, +|0: 0-1 d,#edf2f7, 2-85 #29465e,#edf2f7, 86-94 #10364f,#b9dffb, 95-99 #10364f,#edf2f7, |1: 0-1 d,#b79a7a, 2-49 #213e56,#c7dcec, 50-51 #213e56,#b79a7a, 52-99 #29465e,#edf2f7, |2: 0-1 d,#006198, 2-28 #213e56,#c7dcec, 29-38 #52255f,#c7dcec, 39-49 #213e56,#c7dcec, 50-51 #213e56,#7b9eb7, 52-78 #29465e,#edf2f7, 79-88 #5a2d67,#edf2f7, 89-99 #29465e,#edf2f7, |3: 0-1 d,#c7dcec, 2-49 #213e56,#c7dcec, 50-51 #213e56,#edf2f7, 52-99 #29465e,#edf2f7, @@ -187,7 +187,7 @@ |30: 0-0 d,#6685a0, 1-49 d,#ffffff, 50-50 d,#6685a0, 51-99 d,#ffffff, == snap atelier grid=100x31 cursor=4,6 == style atelier grid=100x31 -|0: 0-1 d,#e4f0ed, 2-77 #3d6055,#e4f0ed, 78-86 #35492d,#edf2a5, 87-99 #35492d,#e4f0ed, +|0: 0-1 d,#e4f0ed, 2-85 #3d6055,#e4f0ed, 86-94 #35492d,#edf2a5, 95-99 #35492d,#e4f0ed, |1: 0-1 d,#bca481, 2-49 #35584d,#bfdcce, 50-51 #35584d,#bca481, 52-99 #3d6055,#e4f0ed, |2: 0-1 d,#36826b, 2-28 #35584d,#bfdcce, 29-38 #653f6b,#bfdcce, 39-49 #35584d,#bfdcce, 50-51 #35584d,#95baa2, 52-78 #3d6055,#e4f0ed, 79-88 #6e4774,#e4f0ed, 89-99 #3d6055,#e4f0ed, |3: 0-1 d,#bfdcce, 2-49 #35584d,#bfdcce, 50-51 #35584d,#e4f0ed, 52-99 #3d6055,#e4f0ed, @@ -220,7 +220,7 @@ |30: 0-0 d,#9fae76, 1-49 d,#fffdeb, 50-50 d,#9fae76, 51-99 d,#fffdeb, == snap forge grid=100x31 cursor=4,6 == style forge grid=100x31 -|0: 0-1 d,#22252b, 2-77 #c5c9d2,#22252b, 78-86 #e2eef4,#1c5172, 87-99 #e2eef4,#22252b, +|0: 0-1 d,#22252b, 2-85 #c5c9d2,#22252b, 86-94 #e2eef4,#1c5172, 95-99 #e2eef4,#22252b, |1: 0-1 d,#6a7b67, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#6a7b67, 52-99 #c5c9d2,#22252b, |2: 0-1 d,#9cc3f7, 2-28 #d1d5de,#374253, 29-38 #f8cba7,#374253, 39-49 #d1d5de,#374253, 50-51 #d1d5de,#55647b, 52-78 #c5c9d2,#22252b, 79-88 #ecbf9b,#22252b, 89-99 #c5c9d2,#22252b, |3: 0-1 d,#374253, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#22252b, 52-99 #c5c9d2,#22252b, @@ -253,7 +253,7 @@ |30: 0-0 d,#708095, 1-49 d,#0c0c0e, 50-50 d,#708095, 51-99 d,#0c0c0e, == snap lagoon grid=100x31 cursor=4,6 == style lagoon grid=100x31 -|0: 0-1 d,#29443f, 2-77 #bbd7cb,#29443f, 78-86 #e6f2f3,#325f6c, 87-99 #e6f2f3,#29443f, +|0: 0-1 d,#29443f, 2-85 #bbd7cb,#29443f, 86-94 #e6f2f3,#325f6c, 95-99 #e6f2f3,#29443f, |1: 0-1 d,#9a7662, 2-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#9a7662, 52-99 #bbd7cb,#29443f, |2: 0-1 d,#81cfb7, 2-28 #c7e3d7,#3a6154, 29-38 #f0cef8,#3a6154, 39-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#548372, 52-78 #bbd7cb,#29443f, 79-88 #e4c2ec,#29443f, 89-99 #bbd7cb,#29443f, |3: 0-1 d,#3a6154, 2-49 #c7e3d7,#3a6154, 50-51 #c7e3d7,#29443f, 52-99 #bbd7cb,#29443f, @@ -286,7 +286,7 @@ |30: 0-0 d,#6e9b8b, 1-49 d,#34464c, 50-50 d,#6e9b8b, 51-99 d,#34464c, == snap solarium grid=100x31 cursor=4,6 == style solarium grid=100x31 -|0: 0-1 d,#123f43, 2-77 #c7d4bd,#123f43, 78-86 #eee8d5,#1f5c64, 87-99 #eee8d5,#123f43, +|0: 0-1 d,#123f43, 2-85 #c7d4bd,#123f43, 86-94 #eee8d5,#1f5c64, 95-99 #eee8d5,#123f43, |1: 0-1 d,#347a9a, 2-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#347a9a, 52-99 #c7d4bd,#123f43, |2: 0-1 d,#e1c266, 2-28 #d3e0c9,#2f5c5c, 29-38 #f5cdec,#2f5c5c, 39-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#467f76, 52-78 #c7d4bd,#123f43, 79-88 #e9c1e0,#123f43, 89-99 #c7d4bd,#123f43, |3: 0-1 d,#2f5c5c, 2-49 #d3e0c9,#2f5c5c, 50-51 #d3e0c9,#123f43, 52-99 #c7d4bd,#123f43, @@ -319,7 +319,7 @@ |30: 0-0 d,#65978c, 1-49 d,#173e45, 50-50 d,#65978c, 51-99 d,#173e45, == snap spectrum grid=100x31 cursor=4,6 == style spectrum grid=100x31 -|0: 0-1 d,#3b3830, 2-77 #ddd8bb,#3b3830, 78-86 #fcfcfa,#513f60, 87-99 #fcfcfa,#3b3830, +|0: 0-1 d,#3b3830, 2-85 #ddd8bb,#3b3830, 86-94 #fcfcfa,#513f60, 95-99 #fcfcfa,#3b3830, |1: 0-1 d,#706596, 2-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#706596, 52-99 #ddd8bb,#3b3830, |2: 0-1 d,#ffd866, 2-28 #e9e4c7,#5a523a, 29-38 #d7e3ff,#5a523a, 39-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#92844f, 52-78 #ddd8bb,#3b3830, 79-88 #c5d7ff,#3b3830, 89-99 #ddd8bb,#3b3830, |3: 0-1 d,#5a523a, 2-49 #e9e4c7,#5a523a, 50-51 #e9e4c7,#3b3830, 52-99 #ddd8bb,#3b3830, @@ -352,7 +352,7 @@ |30: 0-0 d,#948d6f, 1-49 d,#100e11, 50-50 d,#948d6f, 51-99 d,#100e11, == snap harvest grid=100x31 cursor=4,6 == style harvest grid=100x31 -|0: 0-1 d,#343b2e, 2-77 #d5d8b8,#343b2e, 78-86 #f3f2cc,#4f5834, 87-99 #f3f2cc,#343b2e, +|0: 0-1 d,#343b2e, 2-85 #d5d8b8,#343b2e, 86-94 #f3f2cc,#4f5834, 95-99 #f3f2cc,#343b2e, |1: 0-1 d,#9b583f, 2-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#9b583f, 52-99 #d5d8b8,#343b2e, |2: 0-1 d,#d8bd83, 2-28 #e1e4c4,#4a583e, 29-38 #c5e7f7,#4a583e, 39-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#7b7e4e, 52-78 #d5d8b8,#343b2e, 79-88 #badbeb,#343b2e, 89-99 #d5d8b8,#343b2e, |3: 0-1 d,#4a583e, 2-49 #e1e4c4,#4a583e, 50-51 #e1e4c4,#343b2e, 52-99 #d5d8b8,#343b2e, @@ -385,7 +385,7 @@ |30: 0-0 d,#888e5e, 1-49 d,#100e0b, 50-50 d,#888e5e, 51-99 d,#100e0b, == snap clay grid=100x31 cursor=4,6 == style clay grid=100x31 -|0: 0-1 d,#343f36, 2-77 #d7d6b6,#343f36, 78-86 #fbf1c7,#505c38, 87-99 #fbf1c7,#343f36, +|0: 0-1 d,#343f36, 2-85 #d7d6b6,#343f36, 86-94 #fbf1c7,#505c38, 95-99 #fbf1c7,#343f36, |1: 0-1 d,#875e65, 2-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#875e65, 52-99 #d7d6b6,#343f36, |2: 0-1 d,#8ac874, 2-28 #e3e2c2,#4d5c48, 29-38 #b5ecec,#4d5c48, 39-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#687c4d, 52-78 #d7d6b6,#343f36, 79-88 #aae0e0,#343f36, 89-99 #d7d6b6,#343f36, |3: 0-1 d,#4d5c48, 2-49 #e3e2c2,#4d5c48, 50-51 #e3e2c2,#343f36, 52-99 #d7d6b6,#343f36, @@ -418,7 +418,7 @@ |30: 0-0 d,#8c9467, 1-49 d,#10100e, 50-50 d,#8c9467, 51-99 d,#10100e, == snap forge-black grid=100x31 cursor=4,6 == style forge-black grid=100x31 -|0: 0-1 d,#22252b, 2-77 #c5c9d2,#22252b, 78-86 #e2eef4,#1c5172, 87-99 #e2eef4,#22252b, +|0: 0-1 d,#22252b, 2-85 #c5c9d2,#22252b, 86-94 #e2eef4,#1c5172, 95-99 #e2eef4,#22252b, |1: 0-1 d,#6a7b67, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#6a7b67, 52-99 #c5c9d2,#22252b, |2: 0-1 d,#9cc3f7, 2-28 #d1d5de,#374253, 29-38 #f8cba7,#374253, 39-49 #d1d5de,#374253, 50-51 #d1d5de,#55647b, 52-78 #c5c9d2,#22252b, 79-88 #ecbf9b,#22252b, 89-99 #c5c9d2,#22252b, |3: 0-1 d,#374253, 2-49 #d1d5de,#374253, 50-51 #d1d5de,#22252b, 52-99 #c5c9d2,#22252b, @@ -451,7 +451,7 @@ |30: 0-0 d,#708095, 1-49 d,#000000, 50-50 d,#708095, 51-99 d,#000000, == snap forge-soft grid=100x31 cursor=4,6 == style forge-soft grid=100x31 -|0: 0-1 d,#2a2d34, 2-77 #c5c9d2,#2a2d34, 78-86 #e2eef4,#1c5172, 87-99 #e2eef4,#2a2d34, +|0: 0-1 d,#2a2d34, 2-85 #c5c9d2,#2a2d34, 86-94 #e2eef4,#1c5172, 95-99 #e2eef4,#2a2d34, |1: 0-1 d,#6d7f6c, 2-49 #d1d5de,#404a58, 50-51 #d1d5de,#6d7f6c, 52-99 #c5c9d2,#2a2d34, |2: 0-1 d,#9cc3f7, 2-28 #d1d5de,#404a58, 29-38 #f8cba7,#404a58, 39-49 #d1d5de,#404a58, 50-51 #d1d5de,#55647b, 52-78 #c5c9d2,#2a2d34, 79-88 #ecbf9b,#2a2d34, 89-99 #c5c9d2,#2a2d34, |3: 0-1 d,#404a58, 2-49 #d1d5de,#404a58, 50-51 #d1d5de,#2a2d34, 52-99 #c5c9d2,#2a2d34, @@ -484,7 +484,7 @@ |30: 0-0 d,#708095, 1-49 d,#35383e, 50-50 d,#708095, 51-99 d,#35383e, == snap orchard-black grid=100x31 cursor=4,6 == style orchard-black grid=100x31 -|0: 0-1 d,#1d2824, 2-77 #b2c3b8,#1d2824, 78-86 #f5f7ee,#3c614a, 87-99 #f5f7ee,#1d2824, +|0: 0-1 d,#1d2824, 2-85 #b2c3b8,#1d2824, 86-94 #f5f7ee,#3c614a, 95-99 #f5f7ee,#1d2824, |1: 0-1 d,#887455, 2-49 #becfc4,#314738, 50-51 #becfc4,#887455, 52-99 #b2c3b8,#1d2824, |2: 0-1 d,#add38a, 2-28 #becfc4,#314738, 29-38 #dfbce5,#314738, 39-49 #becfc4,#314738, 50-51 #becfc4,#496656, 52-78 #b2c3b8,#1d2824, 79-88 #d3b0d9,#1d2824, 89-99 #b2c3b8,#1d2824, |3: 0-1 d,#314738, 2-49 #becfc4,#314738, 50-51 #becfc4,#1d2824, 52-99 #b2c3b8,#1d2824, @@ -517,7 +517,7 @@ |30: 0-0 d,#608269, 1-49 d,#000000, 50-50 d,#608269, 51-99 d,#000000, == snap acme grid=100x31 cursor=4,6 == style acme grid=100x31 -|0: 0-1 d,#eaffff, 2-77 #000000,#eaffff, 78-86 #000000,#9eeeee, 87-99 #000000,#eaffff, +|0: 0-1 d,#eaffff, 2-85 #000000,#eaffff, 86-94 #000000,#9eeeee, 95-99 #000000,#eaffff, |1: 0-1 d,#8888cc, 2-49 #000000,#eaffff, 50-51 #000000,#8888cc, 52-99 #000000,#eaffff, |2: 0-1 d,#8888cc, 2-28 #000000,#eaffff, 29-38 #000099,#eaffff, 39-49 #000000,#eaffff, 50-51 #000000,#b9c3e5, 52-78 #000000,#eaffff, 79-88 #000099,#eaffff, 89-99 #000000,#eaffff, |3: 0-1 d,#eaffff, 2-99 #000000,#eaffff, @@ -550,7 +550,7 @@ |30: 0-99 d,#ffffea, == snap lapis grid=100x31 cursor=4,6 == style lapis grid=100x31 -|0: 0-1 d,#0f1a4a, 2-77 #9aa6d9,#0f1a4a, 78-86 #0f1a4a,#e8c46a, 87-99 #0f1a4a,#0f1a4a, +|0: 0-1 d,#0f1a4a, 2-85 #9aa6d9,#0f1a4a, 86-94 #0f1a4a,#e8c46a, 95-99 #0f1a4a,#0f1a4a, |1: 0-1 d,#8a3a3a, 2-49 #eee6d2,#25397d, 50-51 #eee6d2,#8a3a3a, 52-99 #9aa6d9,#0f1a4a, |2: 0-1 d,#e8c46a, 2-28 #eee6d2,#25397d, 29-38 #f2d280,#25397d, 39-49 #eee6d2,#25397d, 50-51 #eee6d2,#6a78b1, 52-78 #9aa6d9,#0f1a4a, 79-88 #e8c46a,#0f1a4a, 89-99 #9aa6d9,#0f1a4a, |3: 0-1 d,#25397d, 2-49 #eee6d2,#25397d, 50-51 #eee6d2,#0f1a4a, 52-99 #9aa6d9,#0f1a4a, @@ -583,7 +583,7 @@ |30: 0-0 d,#e8c46a, 1-49 d,#0a1030, 50-50 d,#e8c46a, 51-99 d,#0a1030, == snap dark-plus grid=100x31 cursor=4,6 == style dark-plus grid=100x31 -|0: 0-1 d,#007acc, 2-77 #ffffff,#007acc, 78-86 #d4d4d4,#264f78, 87-99 #d4d4d4,#007acc, +|0: 0-1 d,#007acc, 2-85 #ffffff,#007acc, 86-94 #d4d4d4,#264f78, 95-99 #d4d4d4,#007acc, |1: 0-1 d,#458276, 2-49 #ffffff,#1e1e1e, 50-51 #ffffff,#458276, 52-99 #a7a7a7,#3c3c3c, |2: 0-1 d,#007fd4, 2-28 #ffffff,#1e1e1e, 29-38 #cbe5fc,#1e1e1e, 39-49 #ffffff,#1e1e1e, 50-51 #ffffff,#1c608e, 52-78 #a7a7a7,#3c3c3c, 79-88 #68aee9,#3c3c3c, 89-99 #a7a7a7,#3c3c3c, |3: 0-1 d,#1e1e1e, 2-49 #ffffff,#1e1e1e, 50-51 #ffffff,#3c3c3c, 52-99 #a7a7a7,#3c3c3c, @@ -616,7 +616,7 @@ |30: 0-0 d,#424242, 1-49 d,#1e1e1e, 50-50 d,#424242, 51-99 d,#1e1e1e, == snap solarized-dark grid=100x31 cursor=4,6 == style solarized-dark grid=100x31 -|0: 0-1 d,#657b83, 2-77 #01090b,#657b83, 78-86 #002b36,#586e75, 87-99 #002b36,#657b83, +|0: 0-1 d,#657b83, 2-85 #01090b,#657b83, 86-94 #002b36,#586e75, 95-99 #002b36,#657b83, |1: 0-1 d,#758a41, 2-49 #073642,#93a1a1, 50-51 #073642,#758a41, 52-99 #01090b,#657b83, |2: 0-1 d,#2483c5, 2-28 #073642,#93a1a1, 29-38 #2d3502,#93a1a1, 39-49 #073642,#93a1a1, 50-51 #073642,#185986, 52-78 #01090b,#657b83, 79-88 #121600,#657b83, 89-99 #01090b,#657b83, |3: 0-1 d,#93a1a1, 2-49 #073642,#93a1a1, 50-51 #073642,#657b83, 52-99 #01090b,#657b83, diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden index b614a33e..6c16537b 100644 --- a/test/snapshots/themesel.golden +++ b/test/snapshots/themesel.golden @@ -1,7 +1,7 @@ == snap boot grid=100x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/themesel/cwd/t.txt Save Term Collapse Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -32,7 +32,7 @@ | 28 line 28 == snap list grid=100x31 cursor=7,3 |3: 1 line 1 Themes -|16: /tmp/pardes-snap/themesel/cwd/+Themes Save Term Collapse Del +|16: /tmp/pardes-snap/themesel/cwd/+Themes Save Term Collapse Follow Del |17: 1 # Pardes themes |18: 2 Theme orchard |19: 3 Theme dusk diff --git a/test/snapshots/topbarexec.golden b/test/snapshots/topbarexec.golden index b4235a70..971761d8 100644 --- a/test/snapshots/topbarexec.golden +++ b/test/snapshots/topbarexec.golden @@ -1,5 +1,5 @@ == snap selected grid=90x21 cursor=14,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/topbarexec/cwd Term+bash S /tmp/pardes-snap/topbarexec/cwd Term+bash S | ave Mode Filter Collapse Del ave Mode Filter Collapse Del diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden index 1c108edc..a715c990 100644 --- a/test/snapshots/tty.golden +++ b/test/snapshots/tty.golden @@ -1,5 +1,5 @@ == snap tty-on grid=100x31 cursor=4,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/tty/cwd Term+bash Save Mode Fil /tmp/pardes-snap/tty/cwd Term+bash Save Mode Fil | ter Collapse Del ter Collapse Del diff --git a/test/snapshots/ttyclick.golden b/test/snapshots/ttyclick.golden index 95b29823..a65efdd1 100644 --- a/test/snapshots/ttyclick.golden +++ b/test/snapshots/ttyclick.golden @@ -1,5 +1,5 @@ == snap tty-bodyclick grid=100x31 cursor=4,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/ttyclick/cwd Term+bash Save Mod /tmp/pardes-snap/ttyclick/cwd Term+bash Save Mod | e Filter Collapse Del e Filter Collapse Del diff --git a/test/snapshots/ttyedit.golden b/test/snapshots/ttyedit.golden index 9eff6a9e..e39ed6bb 100644 --- a/test/snapshots/ttyedit.golden +++ b/test/snapshots/ttyedit.golden @@ -1,5 +1,5 @@ == snap before grid=100x31 cursor=7,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/ttyedit/cwd Term+bash Save Mode /tmp/pardes-snap/ttyedit/cwd Term+bash Save Mode | Filter Collapse Del Filter Collapse Del diff --git a/test/snapshots/ttyfollow.golden b/test/snapshots/ttyfollow.golden index b5336f13..2c0ca230 100644 --- a/test/snapshots/ttyfollow.golden +++ b/test/snapshots/ttyfollow.golden @@ -1,5 +1,5 @@ == snap held-pre grid=100x31 cursor=4,16 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/ttyfollow/cwd Term+bash Save Mo /tmp/pardes-snap/ttyfollow/cwd Term+bash Save Mo | de Filter Collapse Del de Filter Collapse Del diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden index c3b4d57e..561f34ab 100644 --- a/test/snapshots/ttyhelp.golden +++ b/test/snapshots/ttyhelp.golden @@ -1,5 +1,5 @@ == snap boot grid=100x31 cursor=4,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/ttyhelp/cwd Term+bash Save Mode Filter Collapse Del | $ @@ -20,11 +20,11 @@ | | | -| /tmp/pardes-snap/ttyhelp/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/ttyhelp/cwd/+New Save Term Collapse Follow Del | 1 == snap helped grid=100x31 cursor=7,6 |3: $ Help -|5: /tmp/pardes-snap/ttyhelp/cwd/+Help Save Term Collapse Del +|5: /tmp/pardes-snap/ttyhelp/cwd/+Help Save Term Collapse Follow Del |6: 1 pardes builtins, and how to run each: |7: 2 SPC and its keys, a chord, a button, the |8: 3 topbar - or the name, executed anywhere. diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden index f70d9287..915688f9 100644 --- a/test/snapshots/ttylook.golden +++ b/test/snapshots/ttylook.golden @@ -1,5 +1,5 @@ == snap tok1 grid=120x31 cursor=2,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/ttylook/cwd Term+bash Save Mode Filter Co /tmp/pardes-snap/ttylook/cwd Term+bash Save Mode Filter Co | llapse Del llapse Del @@ -63,8 +63,8 @@ |8: 1 == snap noop grid=120x31 cursor=2,5 == snap cursorword grid=120x31 cursor=3,4 -|22: /tmp/pardes-snap/ttylook/cwd/+Search Save Term Collapse Lo -|23: cationsConfig Del +|22: /tmp/pardes-snap/ttylook/cwd/+Search Save Term Collapse Fo +|23: llow LocationsConfig Del |24: 1 @p1:1:1-2 |25: 2 ls |26: 3 diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden index 7c750fcd..ef0a5385 100644 --- a/test/snapshots/ttyonly.golden +++ b/test/snapshots/ttyonly.golden @@ -1,5 +1,5 @@ == snap ttyonly grid=100x31 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/ttyonly/cwd Term+bash Save Mode Filter Collapse Del | $ echo TTY''ONLY @@ -20,7 +20,7 @@ | | | -| /tmp/pardes-snap/ttyonly/cwd/+New Save Term Collapse Del +| /tmp/pardes-snap/ttyonly/cwd/+New Save Term Collapse Follow Del | 1 == style ttyonly grid=100x31 |0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824, diff --git a/test/snapshots/ttypaste.golden b/test/snapshots/ttypaste.golden index 7f8192ec..b02c97d4 100644 --- a/test/snapshots/ttypaste.golden +++ b/test/snapshots/ttypaste.golden @@ -1,5 +1,5 @@ == snap bracketed-paste-reached-the-shell grid=100x31 cursor=18,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/ttypaste/cwd Term+bash Save Mod /tmp/pardes-snap/ttypaste/cwd Term+bash Save Mod | e Filter Collapse Del e Filter Collapse Del diff --git a/test/snapshots/ttyprompt.golden b/test/snapshots/ttyprompt.golden index 0bc2d382..ef3c5cea 100644 --- a/test/snapshots/ttyprompt.golden +++ b/test/snapshots/ttyprompt.golden @@ -1,5 +1,5 @@ == snap greeted grid=100x31 cursor=4,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/ttyprompt/cwd Term+bash Save Mo /tmp/pardes-snap/ttyprompt/cwd Term+bash Save Mo | de Filter Collapse Del de Filter Collapse Del diff --git a/test/snapshots/ttytaken.golden b/test/snapshots/ttytaken.golden index 7ad65d63..765dc734 100644 --- a/test/snapshots/ttytaken.golden +++ b/test/snapshots/ttytaken.golden @@ -1,5 +1,5 @@ == snap opened grid=210x31 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/ttytaken/cwd Term+bash Save Mode Filter Collapse Del | ls diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index ebd31832..7d285c18 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -1,10 +1,10 @@ == snap tutor grid=150x31 cursor=7,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/tutor/cwd Term+bash Save Mode Filter Collapse Del /tmp/pardes-snap/tutor/cwd Term+bash Save Mode Filter Collapse Del | ls Tutor ls | -| /tmp/pardes-snap/tutor/cwd/+Tutor Save Term Collapse Del +| /tmp/pardes-snap/tutor/cwd/+Tutor Save Term Collapse Follow Del | 1 | 2 PARDES TUTOR | 3 diff --git a/test/snapshots/wheeldrift.golden b/test/snapshots/wheeldrift.golden index c3e412f4..2474411c 100644 --- a/test/snapshots/wheeldrift.golden +++ b/test/snapshots/wheeldrift.golden @@ -1,7 +1,8 @@ -== snap home grid=70x17 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Deb +== snap home grid=70x17 cursor=7,4 +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config His | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/wheeldrift/cwd/drift.txt Save Term Collapse Del +| /tmp/pardes-snap/wheeldrift/cwd/drift.txt Save Term Collapse Follow +| Del | 1 line 1_0123456789_abcdefghij_ZEND Wrap | 2 line 2_0123456789_abcdefghij_ZEND | 3 line 3_0123456789_abcdefghij_ZEND @@ -15,40 +16,22 @@ | 11 line 11_0123456789_abcdefghij_ZEND | 12 line 12_0123456789_abcdefghij_ZEND | 13 line 13_0123456789_abcdefghij_ZEND -| 14 line 14_0123456789_abcdefghij_ZEND -== snap drifted grid=70x17 cursor=7,3 -|3: 6 line 6_0123456789_abcdefghij_ZEND -|4: 7 line 7_0123456789_abcdefghij_ZEND -|5: 8 line 8_0123456789_abcdefghij_ZEND -|6: 9 line 9_0123456789_abcdefghij_ZEND -|7: 10 line 10_0123456789_abcdefghij_ZEND -|8: 11 line 11_0123456789_abcdefghij_ZEND -|9: 12 line 12_0123456789_abcdefghij_ZEND -|10: 13 line 13_0123456789_abcdefghij_ZEND -|11: 14 line 14_0123456789_abcdefghij_ZEND -|12: 15 line 15_0123456789_abcdefghij_ZEND -|13: 16 line 16_0123456789_abcdefghij_ZEND -|14: 17 line 17_0123456789_abcdefghij_ZEND -|15: 18 line 18_0123456789_abcdefghij_ZEND -|16: 19 line 19_0123456789_abcdefghij_ZEND -== snap paying grid=70x17 cursor=7,3 -== snap moved grid=70x17 cursor=7,3 -|3: 6 123456789_abcdefghij_ZEND -|4: 7 123456789_abcdefghij_ZEND -|5: 8 123456789_abcdefghij_ZEND -|6: 9 123456789_abcdefghij_ZEND -|7: 10 0123456789_abcdefghij_ZEND -|8: 11 0123456789_abcdefghij_ZEND -|9: 12 0123456789_abcdefghij_ZEND -|10: 13 0123456789_abcdefghij_ZEND -|11: 14 0123456789_abcdefghij_ZEND -|12: 15 0123456789_abcdefghij_ZEND -|13: 16 0123456789_abcdefghij_ZEND -|14: 17 0123456789_abcdefghij_ZEND -|15: 18 0123456789_abcdefghij_ZEND -|16: 19 0123456789_abcdefghij_ZEND -== snap rearmed grid=70x17 cursor=7,3 -|3: 5 123456789_abcdefghij_ZEND +== snap drifted grid=70x17 cursor=7,4 +|4: 6 line 6_0123456789_abcdefghij_ZEND +|5: 7 line 7_0123456789_abcdefghij_ZEND +|6: 8 line 8_0123456789_abcdefghij_ZEND +|7: 9 line 9_0123456789_abcdefghij_ZEND +|8: 10 line 10_0123456789_abcdefghij_ZEND +|9: 11 line 11_0123456789_abcdefghij_ZEND +|10: 12 line 12_0123456789_abcdefghij_ZEND +|11: 13 line 13_0123456789_abcdefghij_ZEND +|12: 14 line 14_0123456789_abcdefghij_ZEND +|13: 15 line 15_0123456789_abcdefghij_ZEND +|14: 16 line 16_0123456789_abcdefghij_ZEND +|15: 17 line 17_0123456789_abcdefghij_ZEND +|16: 18 line 18_0123456789_abcdefghij_ZEND +== snap paying grid=70x17 cursor=7,4 +== snap moved grid=70x17 cursor=7,4 |4: 6 123456789_abcdefghij_ZEND |5: 7 123456789_abcdefghij_ZEND |6: 8 123456789_abcdefghij_ZEND @@ -62,3 +45,17 @@ |14: 16 0123456789_abcdefghij_ZEND |15: 17 0123456789_abcdefghij_ZEND |16: 18 0123456789_abcdefghij_ZEND +== snap rearmed grid=70x17 cursor=7,4 +|4: 5 123456789_abcdefghij_ZEND +|5: 6 123456789_abcdefghij_ZEND +|6: 7 123456789_abcdefghij_ZEND +|7: 8 123456789_abcdefghij_ZEND +|8: 9 123456789_abcdefghij_ZEND +|9: 10 0123456789_abcdefghij_ZEND +|10: 11 0123456789_abcdefghij_ZEND +|11: 12 0123456789_abcdefghij_ZEND +|12: 13 0123456789_abcdefghij_ZEND +|13: 14 0123456789_abcdefghij_ZEND +|14: 15 0123456789_abcdefghij_ZEND +|15: 16 0123456789_abcdefghij_ZEND +|16: 17 0123456789_abcdefghij_ZEND diff --git a/test/snapshots/winch.golden b/test/snapshots/winch.golden index 7b367f40..bb994371 100644 --- a/test/snapshots/winch.golden +++ b/test/snapshots/winch.golden @@ -1,5 +1,5 @@ == snap storm grid=100x31 cursor=4,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/winch/cwd Term+bash Save Mode F /tmp/pardes-snap/winch/cwd Term+bash Save Mode F | ilter Collapse Del ilter Collapse Del @@ -20,7 +20,7 @@ | ilter Collapse Del | ls == snap resized grid=106x35 cursor=4,8 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol |$ /tmp/pardes-snap/winch/cwd Term+bash Save Mode Filt /tmp/pardes-snap/winch/cwd Term+bash Save Mode Filt | er Collapse Del er Collapse Del diff --git a/test/snapshots/windownav.golden b/test/snapshots/windownav.golden index 5152db89..9e7db6f6 100644 --- a/test/snapshots/windownav.golden +++ b/test/snapshots/windownav.golden @@ -1,8 +1,8 @@ == snap start grid=100x31 cursor=7,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/windownav/cwd/w.txt Save Term C /tmp/pardes-snap/windownav/cwd Term+bash Save Mo -| ollapse Del de Filter Collapse Del +| ollapse Follow Del de Filter Collapse Del | 1 alpha ls | 2 beta w.txt | 3 gamma diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index 6124dc43..6d27586b 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -1,5 +1,5 @@ == snap hover-v grid=100x31 cursor=4,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol | /tmp/pardes-snap/windowops/cwd Term+bash Save Mo /tmp/pardes-snap/windowops/cwd Term+bash Save Mo | de Filter Collapse Del de Filter Collapse Del @@ -115,7 +115,7 @@ |12: │ │ |13: /tmp/pardes-snap/windowops/cwd Term+ba ╰────────────────────────────────────╯ == style debug-on grid=100x31 -|0: 0-1 d,#1d2824, 2-66 #b2c3b8,#1d2824, 67-71 #f5f7ee,#3c614a, 72-72 #f5f7ee,#1d2824, 73-99 #b2c3b8,#1d2824, +|0: 0-1 d,#1d2824, 2-74 #b2c3b8,#1d2824, 75-79 #f5f7ee,#3c614a, 80-80 #f5f7ee,#1d2824, 81-99 #b2c3b8,#1d2824, |1: 0-1 d,#887455, 2-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#887455, 42-61 #becfc4,#314738, 62-99 d,d, |2: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-39 #d3b0d9,#1d2824, 40-41 #d3b0d9,#add38a, 42-61 #becfc4,#314738, 62-62 d,d, 63-79 #b2c3b8,d, 80-98 #b2c3b8,#152019, 99-99 d,d, |3: 0-1 d,#1d2824, 2-4 #d3b0d9,#1d2824, 5-39 #b2c3b8,#1d2824, 40-41 #b2c3b8,#314738, 42-61 #becfc4,#314738, 62-62 d,d, 63-76 #b2c3b8,d, 77-98 #b2c3b8,#152019, 99-99 d,d, diff --git a/test/snapshots/wrap.golden b/test/snapshots/wrap.golden index 87438ada..996aa1bc 100644 --- a/test/snapshots/wrap.golden +++ b/test/snapshots/wrap.golden @@ -2,7 +2,7 @@ | Newcol Joincol Find Grep Help Changelog Tutor | New Term Find Grep Joincol Delcol | /tmp/pardes-snap/wrap/cwd/long.txt Save Term C -| ollapse Del +| ollapse Follow Del | 1 0---------1---------2---------3---------↩ | 4---------5---------6---------7---------↩ | 8---------9---------A---------B---------↩ @@ -35,9 +35,9 @@ |10: 3 third line |11: 4 == snap on-wide grid=128x15 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/wrap/cwd/long.txt Save Term Collapse Del +| /tmp/pardes-snap/wrap/cwd/long.txt Save Term Collapse Follow Del | 1 0---------1---------2---------3---------4---------5---------6---------7---------8---------9---------A---------B---------↩ | C---------D---------E---------F---------G---------H---------I---------J--------- | 2 second line diff --git a/test/snapshots/yankpaste.golden b/test/snapshots/yankpaste.golden index 616b668c..1a61d3d6 100644 --- a/test/snapshots/yankpaste.golden +++ b/test/snapshots/yankpaste.golden @@ -1,7 +1,7 @@ == snap linewise-below grid=100x31 cursor=13,6 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit +| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config History Debug Exit | New Term Find Grep Joincol Delcol -| */tmp/pardes-snap/yankpaste/cwd/f.txt Save Term Collapse Del +| */tmp/pardes-snap/yankpaste/cwd/f.txt Save Term Collapse Follow Del | 1 line 1 | 2 line 2 | 3 line 3 |
