diff options
| author | Gabriel Schneider <[email protected]> | 2026-07-28 16:49:51 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-08-01 15:02:07 -0300 |
| commit | 65b207c3392c75eac3f2b18a266a6482d8345df1 (patch) | |
| tree | 640f449b6e603d8cd5a01e94e40b12b8551d52d4 | |
| parent | 0b5ad7a30ba9e7c6eedcb426be294bd94219310f (diff) | |
| download | pardes-65b207c3392c75eac3f2b18a266a6482d8345df1.tar.gz pardes-65b207c3392c75eac3f2b18a266a6482d8345df1.zip | |
Builtins (Find, Grep) qol improvements and ui fixes
63 files changed, 1022 insertions, 434 deletions
diff --git a/docs/helix-keys.md b/docs/helix-keys.md index 6f5fe0e7..8583dee0 100644 --- a/docs/helix-keys.md +++ b/docs/helix-keys.md @@ -92,7 +92,7 @@ with a reason in `test/hxcases/waivers.jsonl`. | `Ctrl-w` + `h/j/k/l`/arrows | directional pane focus prefix — normal/tty modes only | pardes' own window handling (helix window mode skipped, section C). Runs the SAME `Left`/`Down`/`Up`/`Right` builtins `SPC w h/j/k/l` runs; kept alongside the leader because a pane in raw **tty** mode never sees `SPC` (the shell owns it), so this is the only keyboard way out of one. Insert mode owns `Ctrl-w` = delete-word-back, so a tag being TYPED into swallows it; from a tag in normal mode (`:`) it moves focus to the neighbour's BODY, while the bare letters `h/j/k/l` there move to its TAGLINE (next row) | pardes-specific | | `Alt-n` | new terminal below (any mode) | shadows helix `Alt-n` TS sibling-select — skipped anyway (tree-sitter) | pardes-specific | | `Alt-c` | move active terminal to a fresh column (any mode) | helix `Alt-c` is change-noyank; the pardes window op wins (do-not-touch contract). `Alt-d` + `i` covers the behavior | waived (`alt-c-window-op`) | -| `Space` (normal, body) | the pardes LEADER: a key path from here runs a BUILTIN with no arguments — the same builtins the topbar and the tags hold. `SPC k` Kill, `SPC d` Del, `SPC f s` Save, `SPC f f` Find (fd over the pane's directory, results into `+Search`), `SPC h t` Tutor, `SPC c n`/`SPC c d` Newcol/Delcol, `SPC t d/c/n/r` Debug/Colors/NextColor/Crt, `SPC t p/l/a` Petscii/Palette/Ascii (an image pane's renderer toggles — the words its tag used to spell out, so the bar stays a bar), `SPC s d`/`SPC s r` Dump/Restore, `SPC w h/j/k/l` Left/Down/Up/Right (directional pane focus — the `Ctrl-w` prefix's four moves as builtins), `SPC w t` Toggleterm (focus hops between the most recently focused document — file, image or `+Search`/`+Help` buffer — and the most recently focused terminal; the same key hops back). `?` at ANY depth opens the Help builtin listing what the prefix can still reach (`SPC ?` = all, `SPC h ?` = the docs group), into a `+Help` output buffer. The pending path shows at the right edge of the active pane's tag; Esc — or any unmapped key — abandons it | helix spends Space on pickers/LSP (section C); pardes has neither, and acme's builtins are what a leader is for. Enum-derived: the paths, the Help lines and the execute dispatch all fold out of one `Builtin` enum at comptime. Normal mode on a BODY only — tags are always insert, tty keys belong to the program | pardes-specific | +| `Space` (normal, body) | the pardes LEADER: a key path from here runs a BUILTIN with no arguments — the same builtins the topbar and the tags hold. `SPC k` Kill, `SPC d` Del, `SPC f s` Save, `SPC f f` Find (fd over the pane's directory, results into `+Search`), `SPC f g` Grep (grep -R over the CONTENTS of every pane's directory, the ones another pane already covers dropped, rows relative to the asking pane's own directory, results into `+Search`; like Find it takes an ARGUMENT — `Grep foo` executed, or a selection chorded onto the word, searches that and skips the input), `SPC h t` Tutor, `SPC c n`/`SPC c d` Newcol/Delcol, `SPC t d/c/n/r` Debug/Colors/NextColor/Crt, `SPC t p/l/a` Petscii/Palette/Ascii (an image pane's renderer toggles — the words its tag used to spell out, so the bar stays a bar), `SPC s d`/`SPC s r` Dump/Restore, `SPC w h/j/k/l` Left/Down/Up/Right (directional pane focus — the `Ctrl-w` prefix's four moves as builtins), `SPC w t` Toggleterm (focus hops between the most recently focused document — file, image or `+Search`/`+Help` buffer — and the most recently focused terminal; the same key hops back). `?` at ANY depth opens the Help builtin listing what the prefix can still reach (`SPC ?` = all, `SPC h ?` = the docs group), into a `+Help` output buffer. The pending path shows at the right edge of the active pane's tag; Esc — or any unmapped key — abandons it | helix spends Space on pickers/LSP (section C); pardes has neither, and acme's builtins are what a leader is for. Enum-derived: the paths, the Help lines and the execute dispatch all fold out of one `Builtin` enum at comptime. Normal mode on a BODY only — tags are always insert, tty keys belong to the program | pardes-specific | | `/` then `n`/`N` (any pane) | pardes' own plain-substring search into a `+Search` output buffer, n/N walk the result rows and look them (EXPLICIT selections) | KEEP, do not touch; not in the corpus (helix `/` is regex search) | pardes-specific | | `n`/`N` (terminal panes, no search armed) | lookable-token motion over scrollback (EXPLICIT selections) | KEEP, do not touch | pardes-specific | | insert: printable text | file: real edit; terminal: typed run splice | | helix-verified (file) | diff --git a/src/look.zig b/src/look.zig index 2b788bde..a3d6ab30 100644 --- a/src/look.zig +++ b/src/look.zig @@ -243,6 +243,123 @@ pub fn find(arena: std.mem.Allocator, dir: []const u8, pat: []const u8, out: *st } } +/// how much of one file Grep reads. The core is synchronous, so a tree with a +/// core dump in it must not stall the keystroke: past this the tail of the file +/// is simply not searched (`grep -R` would read it all). +const grep_max_bytes = 256 * 1024; +const grep_max_files = 20_000; + +/// every line of `text` holding `pat`, as `path:LINE:COL text` rows — the +/// shared half of grep(), and the shape every result row in pardes has: the +/// leading word is a look target, so n/N walk the hits. Returns the rows +/// written, at most `budget`. +fn grepText(arena: std.mem.Allocator, path: []const u8, text: []const u8, pat: []const u8, out: *std.ArrayList(u8), budget: usize) usize { + var n: usize = 0; + var line: usize = 0; + var it = std.mem.splitScalar(u8, text, '\n'); + while (it.next()) |raw| { + line += 1; + if (n >= budget) break; + const at = std.ascii.indexOfIgnoreCase(raw, pat) orelse continue; + // one minified line can be the whole file: cut it, but never mid + // codepoint — a partial UTF-8 sequence reaches the renderer as a hit + // row and there is nothing sane for it to draw. + const ln = std.mem.trimEnd(u8, raw, " \t\r"); + var cut = @min(ln.len, 200); + while (cut > 0 and cut < ln.len and ln[cut] & 0xc0 == 0x80) cut -= 1; + const row = std.fmt.allocPrint(arena, "{s}:{d}:{d} {s}\n", .{ path, line, at + 1, ln[0..cut] }) catch break; + out.appendSlice(arena, row) catch break; + n += 1; + } + return n; +} + +/// `grep -R`, in-core: every LINE of every file under `dir` containing `pat` +/// (plain case-insensitive substring, like every other search here), one row +/// per hit into `out`. A row's path is RELATIVE to `base` — the directory of +/// the pane that asked, which is also the one its results buffer is named in, +/// so a row reads as the short name that pane would have typed and still looks +/// up. A hit `base` does not contain (another pane's tree) keeps its absolute +/// path, which resolves from anywhere. Same walk, same skip list and same three +/// caps as find(), plus grep_max_bytes and a NUL sniff so a binary never lands +/// in the results. +pub fn grep(arena: std.mem.Allocator, gpa: std.mem.Allocator, dir: []const u8, base: []const u8, pat: []const u8, out: *std.ArrayList(u8)) void { + var hits: usize = 0; + if (!platform_has_fs) { + // web: the build-generated source archive IS the filesystem + for (embedded_sources.all) |s| { + if (hits >= find_max_hits) break; + hits += grepText(arena, s.path, s.contents, pat, out, find_max_hits - hits); + } + return; + } + const root_path = std.mem.trimEnd(u8, dir, "/"); + const home = std.mem.trimEnd(u8, base, "/"); + // the walk COLLECTS, then the read scans in sorted order: readdir order is + // undefined, and rows the same tree hands back in a different order twice + // running are rows n/N cannot be trusted to walk (find() sorts for the + // same reason). e.path dies at the next next(), so these are copies. + var files: std.ArrayList([]const u8) = .empty; + { + const io = std.Io.Threaded.global_single_threaded.io(); + var root = std.Io.Dir.cwd().openDir(io, dir, .{ .iterate = true }) catch return; + defer root.close(io); + var w = root.walkSelectively(arena) catch return; + defer w.deinit(); + var steps: usize = 0; + walk: while (steps < find_max_steps and files.items.len < grep_max_files) { + steps += 1; + const e = (w.next(io) catch continue) orelse break; + if (e.kind == .directory) { + if (e.depth() >= find_max_depth) continue; + for (find_skip) |s| if (std.mem.eql(u8, e.basename, s)) continue :walk; + w.enter(io, e) catch {}; + continue; + } + if (e.kind != .file) continue; + const path = std.fmt.allocPrint(arena, "{s}/{s}", .{ root_path, e.path }) catch break; + files.append(arena, path) catch break; + } + } + std.mem.sort([]const u8, files.items, {}, struct { + fn lt(_: void, a: []const u8, b: []const u8) bool { + return std.mem.lessThan(u8, a, b); + } + }.lt); + // ONE buffer for every file: readFile is unbounded, and a synchronous + // search must not swallow a file it cannot afford to hold + const buf = gpa.alloc(u8, grep_max_bytes) catch return; + defer gpa.free(buf); + for (files.items) |path| { + if (hits >= find_max_hits) break; + var pathbuf: [4096]u8 = undefined; + const path_z = std.fmt.bufPrintSentinel(&pathbuf, "{s}", .{path}, 0) catch continue; + const fd = libc.open(path_z, .{ .ACCMODE = .RDONLY, .CLOEXEC = true }); + if (fd < 0) continue; + var len: usize = 0; + while (len < buf.len) { + const n = libc.read(fd, buf[len..].ptr, buf.len - len); + if (n < 0) { + if (libc.errno(n) == .INTR) continue; + break; + } + if (n == 0) break; + len += @intCast(n); + } + _ = libc.close(fd); + const text = buf[0..len]; + if (std.mem.indexOfScalar(u8, text[0..@min(len, 1024)], 0) != null) continue; // binary + // per PATH, not per root: one root can straddle the asking pane's + // directory (a shell at `/a` searching for a file pane at `/a/b`), and + // the rows inside it are the ones worth shortening + const shown = if (path.len > home.len and std.mem.startsWith(u8, path, home) and path[home.len] == '/') + path[home.len + 1 ..] + else + path; + hits += grepText(arena, shown, text, pat, out, find_max_hits - hits); + } +} + /// true if `path` exists and is a directory (open(O_DIRECTORY), no stat needed) fn isDir(path: [*:0]const u8) bool { const fd = libc.open(path, .{ .ACCMODE = .RDONLY, .DIRECTORY = true, .CLOEXEC = true }); diff --git a/src/pardes.zig b/src/pardes.zig index 731dfe0a..e29c3662 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -41,7 +41,11 @@ const scroll_off = 3; /// them for the vim reading. pub const swap_enter_tab = false; -pub const topbar_str = "Kill Newcol Tutor Debug NextColor Dump"; +// The two searches go LAST (before the optional `Restore <path>`), and next to +// each other: they are one pair — Find matches file NAMES, Grep their CONTENTS +// — and every word's start column is what a topbar click dispatches on, so +// appending is the edit that leaves the bar people already know where it was. +pub const topbar_str = "Kill Newcol Tutor Debug NextColor Dump Find Grep"; const pane_builtins_str = "Del"; const file_pane_builtins_str = "Save Del"; const pane_tail = " " ++ pane_builtins_str; @@ -78,6 +82,9 @@ const Builtin = enum { Restore, Save, Find, + // Find's sibling: Find matches file NAMES under this pane's directory, + // Grep matches file CONTENTS under every pane's directory at once. + Grep, Del, Delcol, Help, @@ -107,6 +114,7 @@ const leader_path = std.EnumArray(Builtin, []const u8).init(.{ // which frees `w` for the window group (SPC w h/j/k/l) to move into. .Save = "fs", .Find = "ff", + .Grep = "fg", .Tutor = "ht", .Newcol = "cn", .Delcol = "cd", @@ -198,6 +206,14 @@ fn fileLineCount(content: []const u8) usize { return std.mem.count(u8, content, "\n") + 1; } +/// `a` IS `b` or lives under it — how Grep drops a pane's directory when +/// another pane's directory already covers it +fn pathUnder(a: []const u8, b: []const u8) bool { + const root = std.mem.trimEnd(u8, b, "/"); + if (!std.mem.startsWith(u8, a, root)) return false; + return a.len == root.len or a[root.len] == '/'; +} + const tutor_text = @embedFile("tutor.txt"); const rc_path = "/tmp/pardes-osc133.bash"; pub const bash_rc = @@ -1423,7 +1439,7 @@ pub const Pardes = struct { null; if (dir) |d| { const from = p.active; - p.runBuiltin(d, from, ""); + p.runBuiltin(d, from, "", null); if (p.active == from) { // above the topmost tagline is the TOPBAR — row 0, the global // one. It is not a pane, so focusDir can never reach it; this @@ -1612,6 +1628,32 @@ pub const Pardes = struct { return p.yankRows(pane, @min(pane.msel.r0, pane.msel.r1), @max(pane.msel.r0, pane.msel.r1)); } + /// What an execute takes as its ARGUMENT: text selected ANYWHERE (acme — + /// the chord argument is whatever is selected, in any window), searched + /// `first` (the pane the execute happened in), then the active pane (making + /// a selection focuses its pane, so it holds the most recent one), then + /// slot order. Per pane a kept left selection wins, else an explicit modal + /// (v/x, n/N) one. Scratch-owned: dead at the next arena reset, so a caller + /// that keeps it (the 2-1 chord) copies. + fn heldSelection(p: *Pardes, first: usize) ?[]const u8 { + var k: usize = 0; + while (k < p.panes.len + 2) : (k += 1) { + const i = switch (k) { + 0 => first, + 1 => p.active, + else => k - 2, + }; + if (k > 0 and (i == first or (k > 1 and i == p.active))) continue; + const t = p.panes[i] orelse continue; + if (t.sel[0].state == .done) { + if (p.selectionText(t, t.sel[0]) catch null) |tx| return tx; + } else if ((t.vsel.active and t.vsel.explicit) or t.msel.active) { + if (p.currentSelText(t)) |tx| return tx; + } + } + return null; + } + fn handleKey(p: *Pardes, key: Key) void { // the topbar holds the keyboard (`k` off the topmost tagline): row 0 is // its own one-line normal mode and owns every key until Esc or a chord. @@ -1629,7 +1671,7 @@ pub const Pardes = struct { // so this is the only keyboard way out of one. if (p.ctrl_w_pending) { p.ctrl_w_pending = false; - if (is(key, 'h') or is(key, Key.left)) p.runBuiltin(.Left, p.active, "") else if (is(key, 'l') or is(key, Key.right)) p.runBuiltin(.Right, p.active, "") else if (is(key, 'k') or is(key, Key.up)) p.runBuiltin(.Up, p.active, "") else if (is(key, 'j') or is(key, Key.down)) p.runBuiltin(.Down, p.active, ""); + if (is(key, 'h') or is(key, Key.left)) p.runBuiltin(.Left, p.active, "", null) else if (is(key, 'l') or is(key, Key.right)) p.runBuiltin(.Right, p.active, "", null) else if (is(key, 'k') or is(key, Key.up)) p.runBuiltin(.Up, p.active, "", null) else if (is(key, 'j') or is(key, Key.down)) p.runBuiltin(.Down, p.active, "", null); return; } // insert mode owns Ctrl-w (delete word backward, helix); the focus @@ -1772,7 +1814,7 @@ pub const Pardes = struct { p.leader_n += 1; const pfx = p.leader_keys[0..p.leader_n]; for (leader_rows) |row| { - if (std.mem.eql(u8, row.path, pfx)) return p.runBuiltin(row.cmd, p.active, ""); + if (std.mem.eql(u8, row.path, pfx)) return p.runBuiltin(row.cmd, p.active, "", null); } for (leader_rows) |row| { if (std.mem.startsWith(u8, row.path, pfx)) { @@ -2268,7 +2310,7 @@ pub const Pardes = struct { // file behind the pane and nothing worth keeping, so "never mind" // means dismiss it: Esc IS Del, the same builtin its tag offers. if (is(key, Key.escape)) { - if (pane.file) |f| if (f.output) return p.runBuiltin(.Del, p.active, ""); + if (pane.file) |f| if (f.output) return p.runBuiltin(.Del, p.active, "", null); pane.select = false; pane.pending = 0; pane.pending2 = 0; @@ -2581,6 +2623,8 @@ pub const Pardes = struct { /// differ in nothing but where the rows come from. const search_marker = " /"; const find_marker = " Find /"; + const grep_marker = " Grep /"; + const Search = enum { text, find, grep }; /// `/` (and the Find builtin) on any pane: type the pattern into the tag /// tail after `marker` — the existing modal one-line editor, visible while @@ -2604,14 +2648,21 @@ pub const Pardes = struct { /// Enter on an armed input: the pattern is everything past the marker's /// `/` (so a pattern may itself contain slashes), and the marker names the - /// search — " Find /" walks the filesystem, " /" reads the pane's text. - /// No `/` left means the editor ate the marker: nothing to run. + /// search — " Find /" walks the filesystem for NAMES, " Grep /" for + /// CONTENTS, " /" reads the pane's own text. No `/` left means the editor + /// ate the marker: nothing to run. fn submitSearch(p: *Pardes, id: usize) void { const pane = p.panes[id] orelse return; const tail = pane.tag_tail.items; const armed = tail[@min(pane.search_at, tail.len)..]; const slash = std.mem.indexOfScalar(u8, armed, '/') orelse return; - p.runSearch(id, armed[slash + 1 ..], std.mem.startsWith(u8, armed, find_marker)); + const kind: Search = if (std.mem.startsWith(u8, armed, find_marker)) + .find + else if (std.mem.startsWith(u8, armed, grep_marker)) + .grep + else + .text; + p.runSearch(id, armed[slash + 1 ..], kind); } /// Fill this pane's results buffer with everything matching `pat_raw` @@ -2624,8 +2675,11 @@ pub const Pardes = struct { /// by a SPACE (a trailing `:` would read as part of it): the pane's /// path when it has a real file, else `@pN`. /// find — the pane's DIRECTORY, walked like fd. Rows are bare paths. + /// grep — the CONTENTS of every file under every pane's directory, + /// walked like `grep -R`. Rows are `path:LINE:COL text`, the path + /// relative to THIS pane's directory (absolute for a hit outside it). /// No matches = an empty buffer. - fn runSearch(p: *Pardes, id: usize, pat_raw: []const u8, find: bool) void { + fn runSearch(p: *Pardes, id: usize, pat_raw: []const u8, kind: Search) void { const pane = p.panes[id] orelse return; const pat = std.mem.trim(u8, pat_raw, " \t\r\n"); if (pat.len == 0) return; @@ -2634,7 +2688,37 @@ pub const Pardes = struct { // root, and the directory the results buffer is named in. const dir = if (pane.file) |f| (std.fs.path.dirname(f.path) orelse "/") else pane.cwdSlice(); var out: std.ArrayList(u8) = .empty; - if (find) look.find(arena, dir, pat, &out) else { + if (kind == .grep) { + // One walk per PLACE the session is open on: every pane's + // directory, minus the ones another pane's already contains, so a + // tree two panes sit in is greped once and a pane deep inside + // another's tree adds nothing. Slot order, so the same session + // gives the same buffer twice running. + var roots: [MAX_PANES][]const u8 = undefined; + var nroots: usize = 0; + for (p.panes) |slot| { + const pp = slot orelse continue; + const d = if (pp.file) |f| (std.fs.path.dirname(f.path) orelse "/") else pp.cwdSlice(); + var covered = false; + var k: usize = 0; + while (k < nroots) { + if (pathUnder(d, roots[k])) { + covered = true; + break; + } + if (pathUnder(roots[k], d)) { // this one swallows a root already kept + nroots -= 1; + roots[k] = roots[nroots]; + continue; + } + k += 1; + } + if (covered) continue; + roots[nroots] = d; + nroots += 1; + } + for (roots[0..nroots]) |r| look.grep(arena, p.gpa, r, dir, pat, &out); + } else if (kind == .find) look.find(arena, dir, pat, &out) else { const pl = p.paneCursorLines(pane) catch return; // a real file names itself; a terminal or an output buffer has no path const has_path = if (pane.file) |f| !f.output else false; @@ -2654,31 +2738,11 @@ pub const Pardes = struct { } } const content = p.gpa.dupe(u8, out.items) catch return; - // reuse this pane's own results buffer while it lives, else open one - // next to the docs; focus stays here so n/N keeps stepping. search_pane - // is a raw slot index and a deleted buffer frees its slot, so the NAME - // is the proof the pane found there is still the one we made. - if (pane.search_pane) |sid| if (p.panes[sid]) |sp| if (sp.file) |*sf| if (sf.output and std.mem.endsWith(u8, sf.path, "/+Search")) { - p.setFileContent(sf, content); - sf.scroll = 0; - sp.cur_row = 0; - sp.msel.active = false; - pane.search_row = null; - // a new result count is a new height (splitBelow does this for a - // fresh one): trade rows with the neighbour it was split off, in - // BOTH directions so the pane grows back for a wider search. The - // neighbour keeps a tag + 2 rows whatever the hit count. - if (p.layoutFindTerm(sid)) |loc| if (p.col_n[loc.col] > 1) { - p.snapColWeights(loc.col); - if (p.panes[p.col_terms[loc.col][if (loc.idx > 0) loc.idx - 1 else 1]]) |sib| { - const pair = sp.vweight + sib.vweight; - const hi = @max(@as(f32, BOX_H + 1), pair - @as(f32, BOX_H + 2)); - sp.vweight = @min(hi, @as(f32, @floatFromInt(BOX_H + fileLineCount(std.mem.trimEnd(u8, content, "\n"))))); - sib.vweight = pair - sp.vweight; - } - }; - return; - }; + // every search opens its OWN buffer, even from the same pane: the + // earlier lists stay open at their sizes and the new one stacks + // directly below this pane, taking its rows from here (placeDoc). + // search_pane is the newest, so n/N step the search just run; focus + // stays here. const free = p.freeSlot() orelse { p.gpa.free(content); return; @@ -4081,32 +4145,11 @@ pub const Pardes = struct { .left => switch (m.kind) { .press => { // middle+left chord: a left press during a middle select- - // drag captures a selection as the execute's argument; the - // middle drag keeps running to its release. The drag pane's - // own selection wins; a pane with none borrows from the - // OTHER panes (acme: the chord argument is whatever text is - // selected, in any window) — the ACTIVE pane first (making - // a selection focuses its pane, so it holds the most - // recently made one), then slot order. Per pane a kept left - // selection wins, else an explicit modal (v/x, n/N) one. + // drag captures a selection (heldSelection) as the + // execute's argument; the middle drag keeps running to its + // release, which consumes it. if (p.drag == .select and p.drag.select.button == .middle) { - const did = p.drag.select.id; - var txt: ?[]const u8 = null; - var k: usize = 0; - while (txt == null and k < p.panes.len + 2) : (k += 1) { - const i = switch (k) { - 0 => did, - 1 => p.active, - else => k - 2, - }; - if (k > 0 and (i == did or (k > 1 and i == p.active))) continue; - const t = p.panes[i] orelse continue; - if (t.sel[0].state == .done) - txt = p.selectionText(t, t.sel[0]) catch null - else if ((t.vsel.active and t.vsel.explicit) or t.msel.active) - txt = p.currentSelText(t); - } - if (txt) |tx| { + if (p.heldSelection(p.drag.select.id)) |tx| { if (p.chord_arg) |old| p.gpa.free(old); p.chord_arg = p.gpa.dupe(u8, tx) catch null; } @@ -4198,7 +4241,11 @@ pub const Pardes = struct { if (m.button == .middle) { var tb_buf: [1200]u8 = undefined; const word = wordAtCol(p.topbar(&tb_buf), mcol); - if (word.len > 0) p.actOnSelection(.middle, p.active, word, null); + // a topbar word runs on the PRESS — there is no + // drag to chord into, so the argument is simply + // whatever is selected right now: select a word, + // then click Grep, and it greps that word. + if (word.len > 0) p.actOnSelection(.middle, p.active, word, p.heldSelection(p.active)); } return; } @@ -4586,7 +4633,15 @@ pub const Pardes = struct { const f = p.layoutFindTerm(id) orelse return; if (p.col_n[f.col] <= 1) return; p.snapColWeights(f.col); - const sib = if (f.idx > 0) p.col_terms[f.col][f.idx - 1] else p.col_terms[f.col][f.idx + 1]; + // the pane above, but never a result list: walking past a stack of them + // lands on the pane that spawned it, so those keep their heights and + // only the spawner grows. The topmost pane has only what is below it. + var sib = if (f.idx > 0) p.col_terms[f.col][f.idx - 1] else p.col_terms[f.col][f.idx + 1]; + var k = f.idx; + while (k > 0) : (k -= 1) { + sib = p.col_terms[f.col][k - 1]; + if (p.panes[sib]) |pp| if (if (pp.file) |ff| !ff.output else true) break; + } if (p.panes[sib]) |s| s.vweight += @as(f32, @floatFromInt(@max(1, p.rects[id].h))); } @@ -4900,7 +4955,7 @@ pub const Pardes = struct { // end; an image pane has no text to search either way. .none => { const bmode = if (pane.tag_edit) pane.tag_mode else pane.mode; - if (pane.image == null and bmode != .tty) p.runSearch(id, txt, false); + if (pane.image == null and bmode != .tty) p.runSearch(id, txt, .text); }, // `@p7:10:5`: pane 7, line 10, column 5 — how a search result // points at a terminal or an output buffer, neither of which @@ -4953,12 +5008,24 @@ pub const Pardes = struct { if (button != .middle) return; const cmd = std.mem.trim(u8, txt, " \t\r\n"); if (cmd.len == 0) return; - const bi: ?Builtin = std.meta.stringToEnum(Builtin, cmd) orelse - // Restore is the ONE builtin that takes an argument (`Restore - // <path>`); every other name must match whole, so `Kill foo` is a - // shell command and not the Kill builtin. - if (std.mem.startsWith(u8, cmd, "Restore ") or std.mem.startsWith(u8, cmd, "Restore\t")) .Restore else null; - if (bi) |b| return p.runBuiltin(b, id, cmd); + // three builtins take an ARGUMENT — `Restore <path>`, `Find <pat>`, + // `Grep <pat>` — so their name matches with a tail; every other name + // must match whole, so `Kill foo` is a shell command, not Kill. + const sp = std.mem.indexOfAny(u8, cmd, " \t"); + const bi: ?Builtin = std.meta.stringToEnum(Builtin, cmd) orelse blk: { + const head = std.meta.stringToEnum(Builtin, cmd[0 .. sp orelse break :blk null]) orelse break :blk null; + break :blk switch (head) { + .Restore, .Find, .Grep => head, + else => null, + }; + }; + if (bi) |b| { + // the executed text's own argument if it has one, else the chord's + // kept selection: `Grep foo` and select-foo-then-click-Grep are the + // same command reached two ways + const typed = if (sp) |s| std.mem.trim(u8, cmd[s + 1 ..], " \t") else ""; + return p.runBuiltin(b, id, cmd, if (typed.len > 0) typed else arg); + } // terminal: run in itself. file pane: run in a shell in the file's // directory (found by cwd, else freshly forked). const dst: ?usize = if (pane.file) |f| @@ -4981,12 +5048,15 @@ pub const Pardes = struct { } } - /// Run a builtin on pane `id`. `txt` is the executed text — only Restore - /// reads it (for its optional path argument), so the leader passes "" and - /// every builtin runs with zero arguments. The topbar ones are global; the - /// pane-scoped ones (Save, Del, Delcol, the image toggles, and the window - /// group, which moves focus relative to `id`) act on `id`. - fn runBuiltin(p: *Pardes, b: Builtin, id: usize, txt: []const u8) void { + /// Run a builtin on pane `id`. `txt` is the executed text (Restore reads + /// its path back out of it) and `arg` the execute's ARGUMENT — text typed + /// after the name, or the selection a mouse chord kept, which is why Grep + /// and Find run straight away when there is one instead of asking. The + /// leader passes "" and null: a key path names a builtin, never an + /// argument. The topbar builtins are global; the pane-scoped ones (Save, + /// Del, Delcol, the image toggles, and the window group, which moves focus + /// relative to `id`) act on `id`. + fn runBuiltin(p: *Pardes, b: Builtin, id: usize, txt: []const u8, arg: ?[]const u8) void { const pane = p.panes[id] orelse return; switch (b) { .Debug => p.show_debug = !p.show_debug, @@ -5024,9 +5094,18 @@ pub const Pardes = struct { // an output buffer has no file behind it — nothing to write if (pane.file) |f| if (!f.output) p.emit(.{ .save_file = .{ .pane = @intCast(id) } }); }, - // the one builtin that ASKS for something: it arms the same tag - // input `/` does, and Enter there runs the walk (submitSearch). - .Find => p.startSearch(pane, find_marker), + // The two builtins that ASK for something — Find walks file NAMES + // under this pane's directory, Grep file CONTENTS under every + // pane's. With an argument there is nothing to ask: it IS the + // pattern, so the walk runs now (this is what a `Grep` executed + // with a selection chorded to it means). Without one they arm the + // same tag input `/` does, and Enter runs it (submitSearch). + .Find, .Grep => { + const kind: Search = if (b == .Find) .find else .grep; + const pat = std.mem.trim(u8, arg orelse "", " \t\r\n"); + if (pat.len > 0) return p.runSearch(id, pat, kind); + p.startSearch(pane, if (b == .Find) find_marker else grep_marker); + }, .Newcol => { const free = p.freeSlot() orelse return; if (p.ncol >= MAX_COLS) return; @@ -5157,7 +5236,8 @@ pub const Pardes = struct { /// place a fresh doc pane. An OUTPUT buffer (+Search/+Help) is NOT a /// document: it is the result list belonging to the pane that asked for it, /// so it never claims a column and is never anyone else's split parent — it - /// lands right below `from_id`, be that a shell, a file or another list. + /// lands right below `from_id`, be that a shell, a file or another list, + /// and `from_id` alone pays the rows (several lists just stack there). /// A real doc joins the docs: any doc already open is the split parent (the /// source if it IS one, else the first found) and the newcomer lands right /// below it, so all docs share one column. The FIRST doc of the session @@ -5167,7 +5247,7 @@ pub const Pardes = struct { fn placeDoc(p: *Pardes, from_id: usize, free: usize, nt: *Pane) void { const doc = if (nt.file) |f| !f.output else true; // an image is a doc var src_id: ?usize = null; - if (p.panes[from_id]) |src| if (!doc or (if (src.file) |f| !f.output else src.image != null)) { + if (p.panes[from_id]) |src| if (if (src.file) |f| !f.output else src.image != null) { src_id = from_id; }; if (doc and src_id == null) for (p.panes, 0..) |sl, i| { @@ -5176,6 +5256,16 @@ pub const Pardes = struct { break; }; }; + // A result list belongs to its spawner: it lands directly BELOW it — + // on top of the lists already there — and its rows come out of the + // SPAWNER, never a bystander, so opening another list (or deleting + // one, see absorbVWeight) leaves every other pane's height untouched. + if (!doc) if (p.layoutFindTerm(from_id)) |sf| { + p.layoutInsert(sf.col, sf.idx + 1, free); + p.splitBelow(from_id, nt); // NOT splitParent: no bystander pays + p.active = free; + return; + }; if (src_id) |sid| { const src = p.splitParent(sid); const sf = p.layoutFindTerm(src).?; diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden index 317de76e..812740ac 100644 --- a/test/snapshots/argv.golden +++ b/test/snapshots/argv.golden @@ -1,5 +1,5 @@ == snap noargs grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/argv/cwd Del | $ echo ARGV''TTY | ARGVTTY @@ -30,7 +30,7 @@ | | == snap filearg grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/argv/cwd/notes.txt Save Del NOR /tmp/pardes-snap/argv/cwd Del | 3 line 3 | 4 line 4 notes.txt zmarker.txt @@ -61,7 +61,7 @@ | | == snap dirarg grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/argv/cwd/sub Del | | inside.txt diff --git a/test/snapshots/badutf.golden b/test/snapshots/badutf.golden index 3873f5e8..452ad825 100644 --- a/test/snapshots/badutf.golden +++ b/test/snapshots/badutf.golden @@ -1,5 +1,5 @@ == snap badbytes grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/badutf/cwd/bad.txt Save Del NOR /tmp/pardes-snap/badutf/cwd Del | 1 hello �� world | 2 latin-1 caf� tail bad.txt wide.txt @@ -30,7 +30,7 @@ | | == snap hscroll-midglyph grid=100x30 cursor=46,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/badutf/cwd/wide.txt Save De NOR /tmp/pardes-snap/badutf/cwd Del | 1 ��語 日本語 日本語 日本語 tail | 2 bad.txt wide.txt diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden index 253214c7..d6be06fa 100644 --- a/test/snapshots/boot.golden +++ b/test/snapshots/boot.golden @@ -1,5 +1,5 @@ == snap boot grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/boot/cwd Del | | hello.txt @@ -30,7 +30,7 @@ | | == style boot -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-34 #949494,#121212, 35-99 d,#121212, |2: 0-1 d,#444444, 2-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-99 #bdbdbd,#080808, diff --git a/test/snapshots/chordcut.golden b/test/snapshots/chordcut.golden index 5f5c0376..be00dc57 100644 --- a/test/snapshots/chordcut.golden +++ b/test/snapshots/chordcut.golden @@ -1,5 +1,5 @@ == snap opened grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 line 2 f.txt g.txt f.txt g.txt @@ -30,7 +30,7 @@ | | == snap cut grid=90x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -61,7 +61,7 @@ | | == snap copied grid=90x30 cursor=10,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -92,7 +92,7 @@ | | == snap pointpaste grid=90x30 cursor=16,5 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -123,7 +123,7 @@ | | == snap replaced grid=90x30 cursor=11,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2 f.txt g.txt f.txt g.txt @@ -154,7 +154,7 @@ | | == snap cancelexec grid=90x30 cursor=25,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -185,7 +185,7 @@ | | == snap execafter grid=90x30 cursor=25,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -216,7 +216,7 @@ | | == snap cancellook grid=90x30 cursor=25,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -247,7 +247,7 @@ | | == snap lookafter grid=90x30 cursor=7,17 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -278,7 +278,7 @@ | | == style chordsel -|0: 0-37 #949494,#121212, 38-89 d,#121212, +|0: 0-47 #949494,#121212, 48-89 d,#121212, |1: 0-1 d,#626262, 2-29 #949494,#121212, 30-31 d,#262626, 32-59 #949494,#121212, 60-61 d,#262626, 62-89 #949494,#121212, |2: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, @@ -309,7 +309,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-6 #626262,#080808, 7-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, == style clickdismiss -|0: 0-37 #949494,#121212, 38-89 d,#121212, +|0: 0-47 #949494,#121212, 48-89 d,#121212, |1: 0-1 d,#626262, 2-29 #949494,#121212, 30-31 d,#262626, 32-59 #949494,#121212, 60-61 d,#262626, 62-89 #949494,#121212, |2: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, @@ -340,7 +340,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-6 #626262,#080808, 7-29 d,#080808, 30-31 d,#444444, 32-59 #bdbdbd,#080808, 60-61 d,#444444, 62-89 #bdbdbd,#080808, == snap ttyprobe grid=90x30 cursor=9,11 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt @@ -371,7 +371,7 @@ | | == snap ttyprompt grid=90x30 cursor=9,11 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu NOR /tmp/pardes-snap/chordcu | 1 line 1 | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt diff --git a/test/snapshots/cursorline.golden b/test/snapshots/cursorline.golden index bb8cad63..aa24e77d 100644 --- a/test/snapshots/cursorline.golden +++ b/test/snapshots/cursorline.golden @@ -1,5 +1,5 @@ == snap top grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/cursorline/cwd/cur.txt Save NOR /tmp/pardes-snap/cursorline/cwd Del NOR /tmp/pardes-snap/cursorline/cwd Del | 1 line 1 | 2 line 2 cur.txt cur.txt @@ -30,7 +30,7 @@ | | == style top -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-90 #949494,#121212, 91-99 d,#121212, 100-101 d,#262626, 102-140 #949494,#121212, 141-149 d,#121212, |2: 0-1 d,#444444, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, @@ -61,7 +61,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, == snap down3 grid=150x30 cursor=7,5 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/cursorline/cwd/cur.txt Save NOR /tmp/pardes-snap/cursorline/cwd Del NOR /tmp/pardes-snap/cursorline/cwd Del | 1 line 1 | 2 line 2 cur.txt cur.txt @@ -92,7 +92,7 @@ | | == style down3 -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-90 #949494,#121212, 91-99 d,#121212, 100-101 d,#262626, 102-140 #949494,#121212, 141-149 d,#121212, |2: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, diff --git a/test/snapshots/dump.golden b/test/snapshots/dump.golden index 827d6abe..ce1c221d 100644 --- a/test/snapshots/dump.golden +++ b/test/snapshots/dump.golden @@ -4,7 +4,7 @@ .version = 1, .screen = .{ .cols = 100, .rows = 30 }, .active = 0, - .topbar = "Kill Newcol Tutor Debug NextColor Dump", + .topbar = "Kill Newcol Tutor Debug NextColor Dump Find Grep", .theme = "helix", .columns = .{ .{ .weight = 1, .panes = .{ 0, 1 } }, .{ .weight = 1, .panes = .{2} } }, .panes = .{ diff --git a/test/snapshots/edit.golden b/test/snapshots/edit.golden index 8262a6e7..e3fd56d9 100644 --- a/test/snapshots/edit.golden +++ b/test/snapshots/edit.golden @@ -1,5 +1,5 @@ == snap inserted grid=100x30 cursor=16,9 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/edit/cwd Del NOR /tmp/pardes-snap/edit/cwd Del | | e.txt e.txt @@ -30,7 +30,7 @@ | | == style inserted -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-34 #949494,#121212, 35-49 d,#121212, 50-51 d,#262626, 52-84 #949494,#121212, 85-99 d,#121212, |2: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden index e8fd223f..7b532a37 100644 --- a/test/snapshots/exec-bigdrag.golden +++ b/test/snapshots/exec-bigdrag.golden @@ -1,5 +1,5 @@ == snap alive grid=200x60 cursor=119,37 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/exec-bigdrag/cwd Del NOR /tmp/pardes-snap/exec-bigdrag/cwd Del | bash: line: command not found | big.txt diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden index ef4068be..2b5ca6ff 100644 --- a/test/snapshots/exec.golden +++ b/test/snapshots/exec.golden @@ -1,5 +1,5 @@ == snap exec grid=100x30 cursor=16,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt @@ -30,7 +30,7 @@ | | == snap kept grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt @@ -61,7 +61,7 @@ | | == snap chord grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt @@ -92,7 +92,7 @@ | | == snap deleted grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden index 8d7afb10..ac73e9e5 100644 --- a/test/snapshots/fileedit.golden +++ b/test/snapshots/fileedit.golden @@ -1,5 +1,5 @@ == snap edited grid=150x30 cursor=17,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del NOR /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 2 f.txt f.txt @@ -30,7 +30,7 @@ | | == snap deleted grid=150x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del NOR /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 3 f.txt f.txt @@ -61,7 +61,7 @@ | | == snap undone grid=150x30 cursor=13,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del NOR /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 2 f.txt f.txt diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden index 7e741329..83fb66b7 100644 --- a/test/snapshots/find.golden +++ b/test/snapshots/find.golden @@ -1,5 +1,5 @@ == snap group grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del SPC f NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -40,7 +40,7 @@ | | == snap armed grid=120x40 cursor=56,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/find/cwd/here.txt Save Del Find / NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -81,7 +81,7 @@ | | == snap typing grid=120x40 cursor=59,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/find/cwd/here.txt Save Del Find /zqm NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -122,7 +122,7 @@ | | == snap results grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -163,7 +163,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap first grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -204,7 +204,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == style first -|0: 0-37 #949494,#121212, 38-119 d,#121212, +|0: 0-47 #949494,#121212, 48-119 d,#121212, |1: 0-1 d,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 d,#262626, 62-94 #949494,#121212, 95-119 d,#121212, |2: 0-1 d,#444444, 2-6 #949494,#121212, 7-10 #bdbdbd,#080808, 11-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, @@ -245,7 +245,7 @@ |38: 0-1 d,#444444, 2-6 #626262,#080808, 7-31 #bdbdbd,#080808, 32-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, |39: 0-1 d,#121212, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, == snap second grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -286,7 +286,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap third grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -327,7 +327,7 @@ | 3 zqmark-alpha.txt | 4 == snap back grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -368,7 +368,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap word grid=120x40 cursor=56,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/find/cwd/here.txt Save Del Find / NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -409,7 +409,7 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap cancel grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt @@ -450,12 +450,12 @@ | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap nomatch grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del | 1 Find | here.txt other.txt sub zqmark-alpha.txt -| -| +| NOR /tmp/pardes-snap/find/cwd/+Search Del +| 1 | NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | @@ -486,17 +486,17 @@ | | | -| -| | NOR /tmp/pardes-snap/find/cwd/+Search Del -| 1 +| 1 sub/ZQMARK-beta.txt +| 2 sub/nest/zqmark-gamma.txt +| 3 zqmark-alpha.txt == snap refit grid=120x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del -| 1 Find -| here.txt other.txt sub zqmark-alpha.txt -| -| +|╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ +| NOR /tmp/pardes-snap/find/cwd/+Search Del here.txt other.txt sub zqmark-alpha.txt +| NOR /tmp/pardes-snap/find/cwd/+Search Del +| 1 | NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del | 1 alpha body | @@ -531,3 +531,44 @@ | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt +== snap topbar grid=120x40 cursor=12,7 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del +| 1 Find +| NOR /tmp/pardes-snap/find/cwd/+Search Del here.txt other.txt sub zqmark-alpha.txt +| NOR /tmp/pardes-snap/find/cwd/+Search Del +| 1 +| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del +| 1 alpha body +| NOR /tmp/pardes-snap/find/cwd/+Search Del +| 1 zqmark-alpha.txt +| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa +| 1 gamma body +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del +| 1 beta body +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/find/cwd/+Search Del +| 1 sub/ZQMARK-beta.txt +| 2 sub/nest/zqmark-gamma.txt +| 3 zqmark-alpha.txt diff --git a/test/snapshots/find.snap b/test/snapshots/find.snap index 8be0e511..5a4d6a38 100644 --- a/test/snapshots/find.snap +++ b/test/snapshots/find.snap @@ -66,9 +66,9 @@ key esc settle 100 stable 400 5000 snap cancel -# a no-match walk empties the buffer; n then has nowhere to go. The list is -# also exactly as tall as its results — one blank row plus its tag — because a -# reused +Search refits to the new count. +# a no-match walk opens an empty list; n then has nowhere to go. The list is +# exactly as tall as its results — one blank row plus its tag — and it stacks +# above the earlier one, whose height is untouched. key space key f key f @@ -88,3 +88,15 @@ key enter wait 10000 zqmark-alpha.txt stable 700 15000 snap refit +# Find is a TOPBAR word too (row 1, its own column, next to Grep): the same +# builtin the leader path runs, reached with the mouse. Chorded — a selection +# held when it runs IS the argument — so dragging over `alpha` and clicking +# Find walks for that name with nothing typed and no input armed. +press left 8 8 +drag left 13 8 +release left 13 8 +stable 400 5000 +press middle 40 1 +release middle 40 1 +stable 700 15000 +snap topbar diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden index ab37dbe9..5b1b6574 100644 --- a/test/snapshots/fsearch.golden +++ b/test/snapshots/fsearch.golden @@ -1,5 +1,5 @@ == snap opened grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -30,7 +30,7 @@ | | == snap typing grid=180x30 cursor=55,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/fsearch/cwd/g.txt Save Del /MARK NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -61,7 +61,7 @@ | | == snap results grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -92,7 +92,7 @@ | 2 g.txt:6:1 MARK b | 3 g.txt:10:1 MARK c == snap first grid=180x30 cursor=7,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -123,7 +123,7 @@ | 2 g.txt:6:1 MARK b | 3 g.txt:10:1 MARK c == style first -|0: 0-37 #949494,#121212, 38-179 d,#121212, +|0: 0-47 #949494,#121212, 48-179 d,#121212, |1: 0-1 d,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 d,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-121 d,#262626, 122-157 #949494,#121212, 158-179 d,#121212, |2: 0-1 d,#444444, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808, @@ -154,7 +154,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808, |29: 0-1 d,#121212, 2-6 #626262,#080808, 7-23 #bdbdbd,#080808, 24-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808, == snap second grid=180x30 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -185,7 +185,7 @@ | 2 g.txt:6:1 MARK b | 3 g.txt:10:1 MARK c == snap third grid=180x30 cursor=7,11 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -216,7 +216,7 @@ | 3 g.txt:10:1 MARK c | 4 == snap back grid=180x30 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -247,7 +247,7 @@ | 2 g.txt:6:1 MARK b | 3 g.txt:10:1 MARK c == snap cancel grid=180x30 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -278,7 +278,7 @@ | 2 g.txt:6:1 MARK b | 3 g.txt:10:1 MARK c == snap nomatch grid=180x30 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del | 1 l1 | 2 MARK a g.txt g.txt @@ -302,9 +302,9 @@ | | | -| -| -| -| | NOR /tmp/pardes-snap/fsearch/cwd/+Search Del | 1 +| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del +| 1 g.txt:2:1 MARK a +| 2 g.txt:6:1 MARK b +| 3 g.txt:10:1 MARK c diff --git a/test/snapshots/fsearch.snap b/test/snapshots/fsearch.snap index c4633cda..d27d6f08 100644 --- a/test/snapshots/fsearch.snap +++ b/test/snapshots/fsearch.snap @@ -2,8 +2,9 @@ # Enter searches the buffer in-core and writes `path:NNN: text` into a +Search # OUTPUT BUFFER (a file pane with no file behind it — no Save in its tag); # n/N select the next/prev row there and look it, so the file pane scrolls to -# path:NNN. Esc abandons the input; a no-match search empties the buffer and -# leaves n with nowhere to go. +# path:NNN. Esc abandons the input; a no-match search opens an EMPTY buffer +# (every search gets its own, stacked under the pane) and leaves n with +# nowhere to go. file g.txt l1\nMARK a\nl3\nl4\nl5\nMARK b\nl7\nl8\nl9\nMARK c\nl11\nl12 start 30 180 -n 3 wait 8000 g.txt diff --git a/test/snapshots/ghostty-mid.golden b/test/snapshots/ghostty-mid.golden index 665d52b1..ba757099 100644 --- a/test/snapshots/ghostty-mid.golden +++ b/test/snapshots/ghostty-mid.golden @@ -1,5 +1,5 @@ == snap ghostty-mid grid=100x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ghostty-mid/cwd Del NOR /tmp/pardes-snap/ghostty-mid/cwd Del | ZZPAD | ./g.sh g.txt diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden new file mode 100644 index 00000000..2f32ac4f --- /dev/null +++ b/test/snapshots/grep.golden @@ -0,0 +1,248 @@ +== snap opened grid=180x30 cursor=7,2 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| +| +| a.txt +| +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| +| +| +| +== snap typing grid=180x30 cursor=59,1 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| INS /tmp/pardes-snap/grep/cwd/a.txt Save Del Grep /TARGET NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| +| +| a.txt +| +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| +| +| +| +== snap results grid=180x30 cursor=7,2 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| +| +| a.txt +| +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 a.txt:1:7 hello TARGET one +| 2 a.txt:3:6 last TARGET line +| 3 sub/b.txt:2:1 TARGET inside sub +== snap first grid=180x30 cursor=13,2 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| +| +| a.txt +| +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 a.txt:1:7 hello TARGET one +| 2 a.txt:3:6 last TARGET line +| 3 sub/b.txt:2:1 TARGET inside sub +== snap opened-hit grid=180x30 cursor=12,4 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| +| +| a.txt +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +| 1 deep +| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 2 a.txt:3:6 last TARGET line +| 3 sub/b.txt:2:1 TARGET inside sub +| 4 +== snap nomatch grid=180x30 cursor=13,2 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| +| +| a.txt +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 a.txt:1:7 hello TARGET one +| 2 a.txt:3:6 last TARGET line +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 +| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +| 1 deep +| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 2 a.txt:3:6 last TARGET line +| 3 sub/b.txt:2:1 TARGET inside sub +| 4 +== snap chordsel grid=180x30 cursor=19,2 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| +| +| a.txt +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 a.txt:1:7 hello TARGET one +| 2 a.txt:3:6 last TARGET line +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 +| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +| 1 deep +| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 2 a.txt:3:6 last TARGET line +| 3 sub/b.txt:2:1 TARGET inside sub +| 4 +== snap chord grid=180x30 cursor=19,2 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| NOR /tmp/pardes-snap/grep/cwd/a.txt Save Del NOR /tmp/pardes-snap/grep/cwd Del NOR /tmp/pardes-snap/grep/cwd Del +| 1 hello TARGET one +| 2 nothing here a.txt noise.txt sub a.txt noise.txt sub +| 3 last TARGET line +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 a.txt:1:7 hello TARGET one +| 2 a.txt:3:6 last TARGET line a.txt +| 3 sub/b.txt:2:1 TARGET inside sub +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 a.txt:1:7 hello TARGET one +| 2 a.txt:3:6 last TARGET line +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 1 +| NOR /tmp/pardes-snap/grep/cwd/sub/b.txt Save Del +| 1 deep +| 2 TARGET inside sub NOR /tmp/pardes-snap/grep/cwd Del +| +| a.txt noise.txt sub +| +| +| +| +| +| +| +| NOR /tmp/pardes-snap/grep/cwd/+Search Del +| 2 a.txt:3:6 last TARGET line +| 3 sub/b.txt:2:1 TARGET inside sub +| 4 diff --git a/test/snapshots/grep.snap b/test/snapshots/grep.snap new file mode 100644 index 00000000..12ff2c70 --- /dev/null +++ b/test/snapshots/grep.snap @@ -0,0 +1,79 @@ +# The Grep builtin (topbar word, `SPC f g`): `grep -R`, in-core. It arms the +# SAME tag input `/` and Find use, but the walk reads file CONTENTS under every +# pane's directory at once — minus any directory another pane's already +# contains, so a tree two panes sit in is searched ONCE and every hit appears +# once. A row is `path:LINE:COL text` with the path RELATIVE to the directory +# of the pane that asked — the same directory its results buffer is named in, +# so the short name resolves; only a hit from outside that tree stays absolute. +# n/N walk the rows like any other result list, and a row pointing into a file +# nothing has open yet opens it. +dirmk sub +file a.txt hello TARGET one\nnothing here\nlast TARGET line +file sub/b.txt deep\nTARGET inside sub +file noise.txt nothing to see +start 30 180 -n 3 +wait 8000 a.txt +stable 700 20000 +# open a.txt: a SECOND pane, whose directory the shell's cwd already covers — +# its root is dropped, which is what keeps the hits below un-duplicated +press left 5 8 +release left 5 8 +stable 400 5000 +key i +text a.txt +key esc +settle 100 +stable 400 5000 +press right 6 8 +release right 6 8 +wait 10000 hello TARGET +stable 700 15000 +snap opened +# middle-click Grep on the topbar (row 1, the word's own column): the input +# arms on the ACTIVE pane's tag, exactly where `/` would have typed +press middle 45 1 +release middle 45 1 +stable 400 5000 +text TARGET +stable 400 5000 +snap typing +# Enter walks: two hits in a.txt, one in sub/b.txt, sorted by path — and the +# file that holds none of them contributes no row +key enter +wait 10000 sub/b.txt:2:1 +stable 700 15000 +snap results +# n looks the first row: absolute path, line 1, column 7 (the `T`) +key n +stable 700 15000 +snap first +# ...and stepping on into sub/b.txt opens the file nothing had open +key n +stable 700 15000 +key n +wait 10000 TARGET inside sub +stable 700 15000 +snap opened-hit +# a pattern nothing holds: an empty list of its own, n has nowhere to go +press middle 45 1 +release middle 45 1 +stable 400 5000 +text zzqq +key enter +stable 700 10000 +key n +stable 400 5000 +snap nomatch +# the acme chord: a builtin executed with a SELECTION held takes it as the +# argument, so dragging over `TARGET` in a.txt and then clicking Grep runs the +# walk on that word at once — no tag input, nothing typed +press left 14 3 +drag left 20 3 +release left 20 3 +stable 400 5000 +snap chordsel +press middle 45 1 +release middle 45 1 +wait 10000 sub/b.txt:2:1 +stable 700 15000 +snap chord diff --git a/test/snapshots/hscroll.golden b/test/snapshots/hscroll.golden index a3b47566..4110f555 100644 --- a/test/snapshots/hscroll.golden +++ b/test/snapshots/hscroll.golden @@ -1,5 +1,5 @@ == snap opened grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll | 1 short1 END_A_MARKER_WAY | wide.txt wide.txt @@ -30,7 +30,7 @@ | | == snap wheeled grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll | 1 ND_A_MARKER_WAY_OUT_RIG | wide.txt wide.txt @@ -61,7 +61,7 @@ | | == snap clamped grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll | 1 short1 END_A_MARKER_WAY | wide.txt wide.txt @@ -92,7 +92,7 @@ | | == snap dollar grid=90x30 cursor=26,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll | 1 padpadpadpadpad_TAIL | wide.txt wide.txt @@ -123,7 +123,7 @@ | | == snap zero grid=90x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll NOR /tmp/pardes-snap/hscroll | 1 short1 END_A_MARKER_WAY | wide.txt wide.txt diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden index 0d95ca78..76b40d1b 100644 --- a/test/snapshots/images.golden +++ b/test/snapshots/images.golden @@ -1,5 +1,5 @@ == snap img-open grid=150x30 cursor=11,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | img /tmp/pardes-snap/images/cwd/pic.ppm Del NOR /tmp/pardes-snap/images/cwd Del NOR /tmp/pardes-snap/images/cwd Del | | pic.ppm pic.ppm @@ -30,7 +30,7 @@ | | == style img-open -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-44 #949494,#121212, 45-49 d,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, |2: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |3: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, @@ -61,7 +61,7 @@ |28: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |29: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, == style term-palette -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-44 #949494,#121212, 45-49 d,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, |2: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |3: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, @@ -92,7 +92,7 @@ |28: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |29: 0-1 d,#121212, 2-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, == snap no-ascii grid=150x30 cursor=11,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | img /tmp/pardes-snap/images/cwd/pic.ppm Del NOR /tmp/pardes-snap/images/cwd Del NOR /tmp/pardes-snap/images/cwd Del | | pic.ppm pic.ppm @@ -123,7 +123,7 @@ | | == snap tag-edit grid=150x30 cursor=45,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | img /tmp/pardes-snap/images/cwd/pic.ppmZork Del NOR /tmp/pardes-snap/images/cwd Del NOR /tmp/pardes-snap/images/cwd Del | | pic.ppm pic.ppm diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden index 7785e653..c3893c2d 100644 --- a/test/snapshots/layout-close.golden +++ b/test/snapshots/layout-close.golden @@ -1,5 +1,5 @@ == snap built grid=140x40 cursor=4,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt @@ -40,7 +40,7 @@ | | == snap altc grid=140x40 cursor=98,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt marker.txt @@ -81,7 +81,7 @@ | | == snap del grid=140x40 cursor=98,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt marker.txt @@ -122,7 +122,7 @@ | | == snap exit grid=140x40 cursor=98,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt marker.txt @@ -163,7 +163,7 @@ | | == snap colclose grid=140x40 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-close/cwd Del NOR /tmp/pardes-snap/layout-close/cwd Del | | marker.txt marker.txt diff --git a/test/snapshots/layout-open.golden b/test/snapshots/layout-open.golden index ee053f12..e95cf9cc 100644 --- a/test/snapshots/layout-open.golden +++ b/test/snapshots/layout-open.golden @@ -1,5 +1,5 @@ == snap before grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-open/cwd Del NOR /tmp/pardes-snap/layout-open/cwd Del | | sub sub @@ -30,7 +30,7 @@ | | == snap altn-left grid=100x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-open/cwd Del NOR /tmp/pardes-snap/layout-open/cwd Del | | sub sub @@ -61,7 +61,7 @@ | | == snap altn-right grid=100x30 cursor=54,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-open/cwd Del NOR /tmp/pardes-snap/layout-open/cwd Del | | sub sub @@ -92,7 +92,7 @@ | | == snap file-open grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-open | 1 echo 'TTY'OK | sub sub @@ -123,7 +123,7 @@ | | == snap ttydir grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-ope NOR /tmp/pardes-snap/layout-open | 1 echo 'TTY'OK | sub sub diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index 7ad00456..934573be 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -1,5 +1,5 @@ == snap spc grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Sav SPC NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -40,7 +40,7 @@ | | == snap spc-h grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt S SPC h NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -81,7 +81,7 @@ | | == snap abandoned grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -122,7 +122,7 @@ | | == snap unmapped grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -163,7 +163,7 @@ | | == snap help-word grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -193,18 +193,18 @@ | 6 SPC c n Newcol | 7 SPC d Del | 8 SPC f f Find -| 9 SPC f s Save -| 10 SPC h t Tutor -| 11 SPC k Kill -| 12 SPC s d Dump -| 13 SPC s r Restore -| 14 SPC t a Ascii -| 15 SPC t c Colors -| 16 SPC t d Debug -| 17 SPC t l Palette -| 18 SPC t n NextColor +| 9 SPC f g Grep +| 10 SPC f s Save +| 11 SPC h t Tutor +| 12 SPC k Kill +| 13 SPC s d Dump +| 14 SPC s r Restore +| 15 SPC t a Ascii +| 16 SPC t c Colors +| 17 SPC t d Debug +| 18 SPC t l Palette == snap help-group grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -245,7 +245,7 @@ | | == snap tutor grid=100x40 cursor=7,12 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -286,7 +286,7 @@ | | == snap deleted grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -327,7 +327,7 @@ | | == snap help-all grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -357,18 +357,18 @@ | 6 SPC c n Newcol | 7 SPC d Del | 8 SPC f f Find -| 9 SPC f s Save -| 10 SPC h t Tutor -| 11 SPC k Kill -| 12 SPC s d Dump -| 13 SPC s r Restore -| 14 SPC t a Ascii -| 15 SPC t c Colors -| 16 SPC t d Debug -| 17 SPC t l Palette -| 18 SPC t n NextColor +| 9 SPC f g Grep +| 10 SPC f s Save +| 11 SPC h t Tutor +| 12 SPC k Kill +| 13 SPC s d Dump +| 14 SPC s r Restore +| 15 SPC t a Ascii +| 16 SPC t c Colors +| 17 SPC t d Debug +| 18 SPC t l Palette == snap help-toggles grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -409,7 +409,7 @@ | | == snap help-window grid=100x40 cursor=7,22 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt @@ -450,7 +450,7 @@ | | == snap esc-del grid=100x40 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/leader/cwd/cmds.txt Save De NOR /tmp/pardes-snap/leader/cwd Del | 1 Help | cmds.txt diff --git a/test/snapshots/load.golden b/test/snapshots/load.golden index b5f18b2c..801a1e2b 100644 --- a/test/snapshots/load.golden +++ b/test/snapshots/load.golden @@ -1,5 +1,5 @@ == snap loaded grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/load/cwd Del NOR /tmp/pardes-snap/load/cwd Del | | LOADMARK d.txt @@ -30,7 +30,7 @@ | | == style loaded -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-34 #949494,#121212, 35-49 d,#121212, 50-51 d,#262626, 52-84 #949494,#121212, 85-99 d,#121212, |2: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, diff --git a/test/snapshots/logquiet.golden b/test/snapshots/logquiet.golden index eb8a129d..446c0dab 100644 --- a/test/snapshots/logquiet.golden +++ b/test/snapshots/logquiet.golden @@ -1,5 +1,5 @@ == snap quiet grid=100x30 cursor=62,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/logquiet/cwd Del | $ ls | $ printf '\033_Ga=q,i=1,s=1,v=1,f=24,t=d;AAAA\033\\\033[>0p' diff --git a/test/snapshots/look-center.golden b/test/snapshots/look-center.golden index a13aedbc..f5309a32 100644 --- a/test/snapshots/look-center.golden +++ b/test/snapshots/look-center.golden @@ -1,5 +1,5 @@ == snap center-open grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/look-center/cwd/big.txt Sav NOR /tmp/pardes-snap/look-center/cwd Del NOR /tmp/pardes-snap/look-center/cwd Del | 86 line 86 | 87 line 87 big.txt big.txt @@ -30,7 +30,7 @@ | 112 line 112 | 113 line 113 == snap center-dedup grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/look-center/cwd/big.txt Sav NOR /tmp/pardes-snap/look-center/cwd Del NOR /tmp/pardes-snap/look-center/cwd Del | 86 line 86 | 87 line 87 big.txt big.txt @@ -61,7 +61,7 @@ | 112 line 112 | 113 line 113 == snap center-clamp grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/look-center/cwd/big.txt Sav NOR /tmp/pardes-snap/look-center/cwd Del NOR /tmp/pardes-snap/look-center/cwd Del | 86 line 86 | 87 line 87 big.txt big.txt diff --git a/test/snapshots/look-dir.golden b/test/snapshots/look-dir.golden index 66487b22..5b77d8f4 100644 --- a/test/snapshots/look-dir.golden +++ b/test/snapshots/look-dir.golden @@ -1,5 +1,5 @@ == snap dir-open grid=100x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/look-dir/cwd Del NOR /tmp/pardes-snap/look-dir/cwd Del | | sub top.txt sub top.txt diff --git a/test/snapshots/look-file-1col.golden b/test/snapshots/look-file-1col.golden index 21e6b48b..ff4c90c7 100644 --- a/test/snapshots/look-file-1col.golden +++ b/test/snapshots/look-file-1col.golden @@ -1,5 +1,5 @@ == snap file-open-1col grid=100x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/look-file-1col/cwd/big.txt NOR /tmp/pardes-snap/look-file-1col/cwd Del | 26 line 26 | 27 line 27 big.txt diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden index b64e064b..81280d94 100644 --- a/test/snapshots/look-file.golden +++ b/test/snapshots/look-file.golden @@ -1,5 +1,5 @@ == snap file-open grid=150x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/look-file/cwd/big.txt Save NOR /tmp/pardes-snap/look-file/cwd Del NOR /tmp/pardes-snap/look-file/cwd Del | 26 line 26 | 27 line 27 big.txt big.txt @@ -30,7 +30,7 @@ | 52 line 52 | 53 line 53 == style file-open -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-89 #949494,#121212, 90-99 d,#121212, 100-101 d,#262626, 102-139 #949494,#121212, 140-149 d,#121212, |2: 0-1 d,#121212, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |3: 0-1 d,#121212, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, diff --git a/test/snapshots/lookloaded.golden b/test/snapshots/lookloaded.golden index 81fff5b6..e4720500 100644 --- a/test/snapshots/lookloaded.golden +++ b/test/snapshots/lookloaded.golden @@ -1,5 +1,5 @@ == snap file-open grid=100x30 cursor=7,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded/ | 26 line 26 | 27 line 27 big.txt big.txt @@ -30,7 +30,7 @@ | 52 line 52 | 53 line 53 == snap removed grid=100x30 cursor=37,10 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded/ | 26 line 26 | 27 line 27 big.txt big.txt @@ -61,7 +61,7 @@ | 52 line 52 | 53 line 53 == snap look-noFS grid=100x30 cursor=7,11 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded NOR /tmp/pardes-snap/lookloaded/ | 1 line 1 | 2 line 2 big.txt big.txt diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden index e2f72d13..48fdbbdd 100644 --- a/test/snapshots/lookpanes.golden +++ b/test/snapshots/lookpanes.golden @@ -1,5 +1,5 @@ == snap shells grid=130x50 cursor=122,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -50,7 +50,7 @@ | | == snap other-dir grid=130x50 cursor=7,27 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -101,7 +101,7 @@ | | == snap clicked-wins grid=130x50 cursor=7,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -152,7 +152,7 @@ | | == snap mru-alpha grid=130x50 cursor=7,9 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -203,7 +203,7 @@ | | == snap mru-beta grid=130x50 cursor=7,5 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Del NOR /tmp/pardes-snap/lookpanes/cwd Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt @@ -254,7 +254,7 @@ | | == style mru-beta -|0: 0-37 #949494,#121212, 38-129 d,#121212, +|0: 0-47 #949494,#121212, 48-129 d,#121212, |1: 0-1 d,#262626, 2-59 #949494,#121212, 60-64 d,#121212, 65-66 d,#262626, 67-104 #949494,#121212, 105-129 d,#121212, |2: 0-1 d,#444444, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-66 d,#444444, 67-129 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-66 d,#444444, 67-121 #bdbdbd,#080808, 122-129 d,#080808, diff --git a/test/snapshots/modal.golden b/test/snapshots/modal.golden index 0352730b..616341ce 100644 --- a/test/snapshots/modal.golden +++ b/test/snapshots/modal.golden @@ -1,5 +1,5 @@ == snap top grid=100x30 cursor=2,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -30,7 +30,7 @@ | | == snap moved grid=100x30 cursor=5,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -61,7 +61,7 @@ | | == snap xsel grid=100x30 cursor=15,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -92,7 +92,7 @@ | | == style xsel -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 d,#262626, 52-85 #949494,#121212, 86-99 d,#121212, |2: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, @@ -123,7 +123,7 @@ |28: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, == snap xsel2 grid=100x30 cursor=15,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -154,7 +154,7 @@ | | == snap yanked grid=100x30 cursor=15,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -185,7 +185,7 @@ | | == snap vsel grid=100x30 cursor=16,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -216,7 +216,7 @@ | | == style vsel -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 d,#262626, 52-85 #949494,#121212, 86-99 d,#121212, |2: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, @@ -247,7 +247,7 @@ |28: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, == snap typed grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -278,7 +278,7 @@ | | == snap undone grid=100x30 cursor=16,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -309,7 +309,7 @@ | | == snap redone grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt @@ -340,7 +340,7 @@ | | == snap bottom grid=100x30 cursor=2,9 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden index 3966d33d..e1414ffa 100644 --- a/test/snapshots/psearch.golden +++ b/test/snapshots/psearch.golden @@ -1,5 +1,5 @@ == snap output grid=140x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -30,7 +30,7 @@ | | == snap typing grid=140x30 cursor=44,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/psearch/cwd Del /MARK | | x MARK a @@ -61,7 +61,7 @@ | | == snap results grid=140x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -92,7 +92,7 @@ | 2 @p0:4:3 x MARK b | 3 @p0:6:3 x MARK c == snap first grid=140x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -123,7 +123,7 @@ | 2 @p0:4:3 x MARK b | 3 @p0:6:3 x MARK c == style first -|0: 0-37 #949494,#121212, 38-139 d,#121212, +|0: 0-47 #949494,#121212, 48-139 d,#121212, |1: 0-1 d,#626262, 2-37 #949494,#121212, 38-139 d,#121212, |2: 0-1 d,#444444, 2-139 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-139 #bdbdbd,#080808, @@ -154,7 +154,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-139 d,#080808, |29: 0-1 d,#121212, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-139 d,#080808, == snap second grid=140x30 cursor=4,5 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -185,7 +185,7 @@ | 2 @p0:4:3 x MARK b | 3 @p0:6:3 x MARK c == snap back grid=140x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -216,7 +216,7 @@ | 2 @p0:4:3 x MARK b | 3 @p0:6:3 x MARK c == snap nomatch grid=140x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -240,14 +240,14 @@ | | | -| -| -| -| | NOR /tmp/pardes-snap/psearch/cwd/+Search Del | 1 +| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +| 1 @p0:2:3 x MARK a +| 2 @p0:4:3 x MARK b +| 3 @p0:6:3 x MARK c == snap ttyinert grid=140x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/psearch/cwd Del | $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' | x MARK a @@ -271,14 +271,14 @@ | | | -| -| -| -| | NOR /tmp/pardes-snap/psearch/cwd/+Search Del | 1 +| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +| 1 @p0:2:3 x MARK a +| 2 @p0:4:3 x MARK b +| 3 @p0:6:3 x MARK c == snap rightsearch grid=140x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/psearch/cwd Del | | x MARK a @@ -298,12 +298,12 @@ | | | -| -| -| -| -| -| +| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +| 1 @p0:2:3 x MARK a +| 2 @p0:4:3 x MARK b +| 3 @p0:6:3 x MARK c +| NOR /tmp/pardes-snap/psearch/cwd/+Search Del +| 1 | NOR /tmp/pardes-snap/psearch/cwd/+Search Del | 1 @p0:2:3 x MARK a | 2 @p0:4:3 x MARK b diff --git a/test/snapshots/psearch.snap b/test/snapshots/psearch.snap index 77ba294b..fb721c7d 100644 --- a/test/snapshots/psearch.snap +++ b/test/snapshots/psearch.snap @@ -47,7 +47,7 @@ snap second key N stable 700 15000 snap back -# a no-match search empties the buffer; n then has nowhere to go +# a no-match search opens an empty buffer of its own; n has nowhere to go key / text zzqq key enter diff --git a/test/snapshots/reflow.golden b/test/snapshots/reflow.golden index e38657cf..5d4462e2 100644 --- a/test/snapshots/reflow.golden +++ b/test/snapshots/reflow.golden @@ -1,5 +1,5 @@ == snap widened grid=200x24 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/reflow/cwd Del | $ printf 'y%.0s' $(seq 1 3000); echo do''ne | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/test/snapshots/respawn.golden b/test/snapshots/respawn.golden index e641da48..a0bb6ac9 100644 --- a/test/snapshots/respawn.golden +++ b/test/snapshots/respawn.golden @@ -1,5 +1,5 @@ == snap respawn grid=100x30 cursor=4,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/respawn/cwd Del NOR /tmp/pardes-snap/respawn/cwd Del | | diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden index 4ca6cedf..afb048d3 100644 --- a/test/snapshots/restore.golden +++ b/test/snapshots/restore.golden @@ -1,5 +1,5 @@ == snap dumped grid=100x30 cursor=4,5 -|Kill Newcol Tutor Debug NextColor Dump Restore /tmp/pardes-snap/restore/dump.zon +|Kill Newcol Tutor Debug NextColor Dump Find Grep Restore /tmp/pardes-snap/restore/dump.zon | TTY /tmp/pardes-snap/restore/cwd Del | $ ls | $ echo KEEP''ME @@ -29,14 +29,14 @@ | | | -== snap restored grid=100x30 cursor=4,5 -|Kill Newcol Tutor Debug NextColor Dump -| TTY /tmp/pardes-snap/restore/cwd Del -| $ ls -| $ echo KEEP''ME +== snap restored grid=100x30 cursor=45,1 +|Kill Newcol Tutor Debug NextColor Dump Find Grep Restore /tmp/pardes-snap/restore/dump.zon +| INS /tmp/pardes-snap/restore/cwd Del Find / +| +| | KEEPME -| $ | +| GONESOON | | | diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden index 6d900519..c577456c 100644 --- a/test/snapshots/rsearch.golden +++ b/test/snapshots/rsearch.golden @@ -1,5 +1,5 @@ == snap opened grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -30,7 +30,7 @@ | | == snap search grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -61,7 +61,7 @@ | 1 code.txt:1:5 run count_x now | 2 code.txt:3:1 count_x again == snap select grid=180x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -86,13 +86,13 @@ | | | -| -| -| | NOR /tmp/pardes-snap/rsearch/cwd/+Search Del | 1 code.txt:4:1 pick two words -== snap path-open grid=180x30 cursor=7,18 -|Kill Newcol Tutor Debug NextColor Dump +| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del +| 1 code.txt:1:5 run count_x now +| 2 code.txt:3:1 count_x again +== snap path-open grid=180x30 cursor=7,16 +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub @@ -105,20 +105,20 @@ | | | -| -| | NOR /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Del -| 1 d1 NOR /tmp/pardes-snap/rsearch/cwd Del +| 1 d1 | 2 d2 -| 3 DEPTARGET code.txt sub +| 3 DEPTARGET NOR /tmp/pardes-snap/rsearch/cwd Del | 4 d4 -| 5 d5 +| 5 d5 code.txt sub | 6 d6 | | | | | -| | NOR /tmp/pardes-snap/rsearch/cwd/+Search Del | 1 code.txt:4:1 pick two words +| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del +| 1 code.txt:1:5 run count_x now +| 2 code.txt:3:1 count_x again diff --git a/test/snapshots/scroll.golden b/test/snapshots/scroll.golden index dd55fdf6..4faf71b2 100644 --- a/test/snapshots/scroll.golden +++ b/test/snapshots/scroll.golden @@ -1,5 +1,5 @@ == snap bottom grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 188 | 189 s.txt @@ -30,7 +30,7 @@ | | == snap wheel3 grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 185 | 186 s.txt @@ -61,7 +61,7 @@ | | == snap gutter-up grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 178 | 179 s.txt @@ -92,7 +92,7 @@ | | == snap gutter-down grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 180 | 181 s.txt @@ -123,7 +123,7 @@ | | == snap wheel-down grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 181 | 182 s.txt @@ -154,7 +154,7 @@ | | == style wheel-down -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-36 #949494,#121212, 37-49 d,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, |2: 0-1 d,#121212, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#121212, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, diff --git a/test/snapshots/scrolloff.golden b/test/snapshots/scrolloff.golden index 3efc0d6b..9210d589 100644 --- a/test/snapshots/scrolloff.golden +++ b/test/snapshots/scrolloff.golden @@ -1,5 +1,5 @@ == snap top grid=150x11 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del | 1 line 1 | 2 line 2 g.txt g.txt @@ -11,7 +11,7 @@ | 8 line 8 | 9 line 9 == snap edge grid=150x11 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del | 1 line 1 | 2 line 2 g.txt g.txt @@ -23,7 +23,7 @@ | 8 line 8 | 9 line 9 == snap scrolled1 grid=150x11 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del | 2 line 2 | 3 line 3 g.txt g.txt @@ -35,7 +35,7 @@ | 9 line 9 | 10 line 10 == snap jdown grid=150x11 cursor=7,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del | 6 line 6 | 7 line 7 g.txt g.txt @@ -47,7 +47,7 @@ | 13 line 13 | 14 line 14 == snap end grid=150x11 cursor=7,9 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del | 33 line 33 | 34 line 34 g.txt g.txt @@ -59,7 +59,7 @@ | 40 line 40 | 41 == snap kup grid=150x11 cursor=7,5 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del | 29 line 29 | 30 line 30 g.txt g.txt @@ -71,7 +71,7 @@ | 36 line 36 | 37 line 37 == snap top2 grid=150x11 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/scrolloff/cwd/g.txt Save De NOR /tmp/pardes-snap/scrolloff/cwd Del NOR /tmp/pardes-snap/scrolloff/cwd Del | 1 line 1 | 2 line 2 g.txt g.txt diff --git a/test/snapshots/selarg.golden b/test/snapshots/selarg.golden index 3ae619d3..f20b80de 100644 --- a/test/snapshots/selarg.golden +++ b/test/snapshots/selarg.golden @@ -1,5 +1,5 @@ == snap kept grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/selarg/cwd Del NOR /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | @@ -30,7 +30,7 @@ | | == snap crosspane grid=100x30 cursor=6,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/selarg/cwd Del NOR /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | @@ -61,7 +61,7 @@ | | == snap vselarg grid=100x30 cursor=12,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/selarg/cwd Del NOR /tmp/pardes-snap/selarg/cwd Del | ZZARG ZZVEE ./c.sh | diff --git a/test/snapshots/shrinktag.golden b/test/snapshots/shrinktag.golden index 190588e4..3f2e1ecf 100644 --- a/test/snapshots/shrinktag.golden +++ b/test/snapshots/shrinktag.golden @@ -1,5 +1,5 @@ == snap before grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt @@ -30,7 +30,7 @@ | | == snap shrunk grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del | NOR /tmp/pardes-snap/shrinktag/cwd Del | w.txt @@ -61,7 +61,7 @@ | | == snap move-preview grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del | NOR /tmp/pardes-snap/shrinktag/cwd Del | w.txt @@ -92,7 +92,7 @@ | | == snap restored grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt @@ -123,7 +123,7 @@ | | == snap bottom-shrunk grid=100x30 cursor=2,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/shrinktag/cwd Del NOR /tmp/pardes-snap/shrinktag/cwd Del | | w.txt w.txt diff --git a/test/snapshots/splitparent.golden b/test/snapshots/splitparent.golden index f3a5845f..614ec15e 100644 --- a/test/snapshots/splitparent.golden +++ b/test/snapshots/splitparent.golden @@ -1,5 +1,5 @@ == snap shrunk grid=100x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del | NOR /tmp/pardes-snap/splitparent/cwd Del | @@ -30,7 +30,7 @@ | | == snap swap-parent grid=100x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del | NOR /tmp/pardes-snap/splitparent/cwd Del | @@ -61,13 +61,13 @@ | | == snap tallest grid=100x5 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del | NOR /tmp/pardes-snap/splitparent/cwd Del | NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del | == snap regrown grid=100x30 cursor=54,18 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/splitparent/cwd Del NOR /tmp/pardes-snap/splitparent/cwd Del | NOR /tmp/pardes-snap/splitparent/cwd Del | diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden index 72db5de6..d92ba339 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -1,5 +1,5 @@ == snap zig-open grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/syntax/cwd/demo.zig Save De NOR /tmp/pardes-snap/syntax/cwd Del NOR /tmp/pardes-snap/syntax/cwd Del | 1 const std = @import("std"); // greet | 2 pub fn main() void { demo.zig demo.zig @@ -30,7 +30,7 @@ | | == style zig-open -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, |2: 0-1 d,#444444, 2-6 #949494,#121212, 7-18 #bdbdbd,#080808, 19-25 #cf87e8,#080808,b 26-26 #bdbdbd,#080808, 27-31 #e3c78a,#080808, 32-34 #bdbdbd,#080808, 35-42 #ffffff,#080808,b 43-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-12 #cf87e8,#080808,b 13-26 #bdbdbd,#080808, 27-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, @@ -61,7 +61,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, == style colors-off -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, |2: 0-1 d,#444444, 2-6 #949494,#121212, 7-42 #bdbdbd,#080808, 43-49 d,#080808, 50-51 d,#444444, 52-99 d,#080808, 100-101 d,#444444, 102-149 d,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-26 #bdbdbd,#080808, 27-49 d,#080808, 50-51 d,#444444, 52-59 #bdbdbd,#080808, 60-99 d,#080808, 100-101 d,#444444, 102-109 #bdbdbd,#080808, 110-149 d,#080808, @@ -92,7 +92,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 d,#080808, 100-101 d,#444444, 102-149 d,#080808, |29: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 d,#080808, 100-101 d,#444444, 102-149 d,#080808, == style colors-on -|0: 0-37 #949494,#121212, 38-149 d,#121212, +|0: 0-47 #949494,#121212, 48-149 d,#121212, |1: 0-1 d,#626262, 2-49 #949494,#121212, 50-51 d,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 d,#262626, 102-136 #949494,#121212, 137-149 d,#121212, |2: 0-1 d,#444444, 2-6 #949494,#121212, 7-18 #bdbdbd,#080808, 19-25 #cf87e8,#080808,b 26-26 #bdbdbd,#080808, 27-31 #e3c78a,#080808, 32-34 #bdbdbd,#080808, 35-42 #ffffff,#080808,b 43-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-12 #cf87e8,#080808,b 13-26 #bdbdbd,#080808, 27-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, 100-101 d,#444444, 102-149 #bdbdbd,#080808, diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden index 42cf4ae9..d351a4df 100644 --- a/test/snapshots/tag.golden +++ b/test/snapshots/tag.golden @@ -1,5 +1,5 @@ == snap tag-focus grid=150x30 cursor=34,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/tag/cwd Del NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -30,7 +30,7 @@ | | == snap tag-typed grid=150x30 cursor=40,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/tag/cwd Del t.txt NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -61,7 +61,7 @@ | | == snap tag-del grid=150x30 cursor=36,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/tag/cwd Del t NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -92,7 +92,7 @@ | | == snap tag-exit grid=150x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tag/cwd Del t.txt NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt @@ -123,7 +123,7 @@ | | == snap tag-look grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tag/cwd/t.txt Save Del INS /tmp/pardes-snap/tag/cwd Del t.txt NOR /tmp/pardes-snap/tag/cwd Del | 1 ZZLOOKED | t.txt t.txt diff --git a/test/snapshots/tagcmd.golden b/test/snapshots/tagcmd.golden index e36f2102..55468539 100644 --- a/test/snapshots/tagcmd.golden +++ b/test/snapshots/tagcmd.golden @@ -1,5 +1,5 @@ == snap edited grid=100x30 cursor=13,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -30,7 +30,7 @@ | | == snap colon grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -61,7 +61,7 @@ | | == snap word grid=100x30 cursor=44,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -92,7 +92,7 @@ | | == snap saved grid=100x30 cursor=13,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt @@ -132,7 +132,7 @@ line 6 == end file == snap escaped grid=100x30 cursor=13,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagcmd/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagcmd/cwd Del | 1 ZZEDITline 1 | 2 line 2 c.txt diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden index 6ea682d2..bd87b811 100644 --- a/test/snapshots/tagnav.golden +++ b/test/snapshots/tagnav.golden @@ -1,5 +1,5 @@ == snap start grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -30,7 +30,7 @@ | | == snap colon grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -61,7 +61,7 @@ | | == snap right-tag grid=100x30 cursor=83,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -92,7 +92,7 @@ | | == snap left-tag grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -123,7 +123,7 @@ | | == snap down-tag grid=100x30 cursor=33,16 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -154,7 +154,7 @@ | | == snap up-tag grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -185,7 +185,7 @@ | | == snap up-edge grid=100x30 cursor=0,0 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -216,7 +216,7 @@ | | == snap topbar-word grid=100x30 cursor=4,0 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -247,7 +247,7 @@ | | == snap topbar-graphemes grid=100x30 cursor=6,0 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -278,7 +278,7 @@ | | == snap back-down grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -309,7 +309,7 @@ | | == snap arrows-still-motion grid=100x30 cursor=41,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -340,7 +340,7 @@ | | == snap back-to-body grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -371,7 +371,7 @@ | | == snap tty-on grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -402,7 +402,7 @@ | | == snap tty-tag grid=100x30 cursor=83,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del NOR /tmp/pardes-snap/tagnav/cwd Del | 1 alpha | 2 beta w.txt @@ -433,7 +433,7 @@ | | == snap tty-restored grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -463,8 +463,8 @@ | | | -== snap topbar-dollar grid=100x30 cursor=37,0 -|Kill Newcol Tutor Debug NextColor Dump +== snap topbar-dollar grid=100x30 cursor=47,0 +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -494,9 +494,9 @@ | | | -== snap topbar-exec grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump Restore /tmp/pardes-snap/tagnav/dump.zon -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +== snap topbar-exec grid=100x30 cursor=47,0 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| INS /tmp/pardes-snap/tagnav/cwd/w.txt Save Del G TTY /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ @@ -525,9 +525,9 @@ | | | -== snap topbar-restore-word grid=100x30 cursor=39,0 -|Kill Newcol Tutor Debug NextColor Dump Restore /tmp/pardes-snap/tagnav/dump.zon -| NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del +== snap topbar-restore-word grid=100x30 cursor=47,0 +|Kill Newcol Tutor Debug NextColor Dump Find Grep +| INS /tmp/pardes-snap/tagnav/cwd/w.txt Save Del G TTY /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt | 3 gamma $ @@ -557,7 +557,7 @@ | | == snap topbar-restored grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagnav/cwd/w.txt Save Del TTY /tmp/pardes-snap/tagnav/cwd Del | 1 alpha $ ls | 2 beta w.txt @@ -571,8 +571,8 @@ | | | -| -| +| NOR /tmp/pardes-snap/tagnav/cwd/+Search Del +| 1 | NOR /tmp/pardes-snap/tagnav/cwd Del | | w.txt diff --git a/test/snapshots/tagpath.golden b/test/snapshots/tagpath.golden index 0b073a8c..e6fee53f 100644 --- a/test/snapshots/tagpath.golden +++ b/test/snapshots/tagpath.golden @@ -1,5 +1,5 @@ == snap start grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -30,7 +30,7 @@ | | == snap colon grid=100x30 cursor=40,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -61,7 +61,7 @@ | | == snap col0 grid=100x30 cursor=2,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -92,7 +92,7 @@ | | == snap sel-nor grid=100x30 cursor=5,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -123,7 +123,7 @@ | | == snap sel-path grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 line 1 | 2 line 2 c.txt @@ -154,7 +154,7 @@ | | == style sel-path -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-4 #949494,#121212, 5-39 #d8c8a8,#4a3a1e, 40-48 #949494,#121212, 49-49 d,#121212, 50-51 d,#262626, 52-87 #949494,#121212, 88-99 d,#121212, |2: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, @@ -185,7 +185,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, == snap yanked-path grid=100x30 cursor=42,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 l /tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 c.txt @@ -216,7 +216,7 @@ | | == snap drag-cross grid=100x30 cursor=45,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 l /tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 c.txt @@ -247,7 +247,7 @@ | | == style drag-cross -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-10 #949494,#121212, 11-45 #d8c8a8,#4a3a1e, 46-48 #949494,#121212, 49-49 d,#121212, 50-51 d,#262626, 52-87 #949494,#121212, 88-99 d,#121212, |2: 0-1 d,#444444, 2-6 #626262,#080808, 7-47 #bdbdbd,#080808, 48-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, @@ -278,7 +278,7 @@ |28: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, == snap path-inert grid=100x30 cursor=11,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/tagpath/cwd/c.txt Save Del NOR /tmp/pardes-snap/tagpath/cwd Del | 1 l /tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 c.txt diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden index 062aad33..8f61a888 100644 --- a/test/snapshots/theme.golden +++ b/test/snapshots/theme.golden @@ -1,5 +1,5 @@ == snap helix grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -30,7 +30,7 @@ | | == style helix -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 d,#262626, 52-85 #949494,#121212, 86-99 d,#121212, |2: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, @@ -61,7 +61,7 @@ |28: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, == snap dark grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -92,7 +92,7 @@ | | == style dark -|0: 0-37 #969696,#2c2a3e, 38-99 d,#2c2a3e, +|0: 0-47 #969696,#2c2a3e, 48-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -123,7 +123,7 @@ |28: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, == snap acme grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -154,7 +154,7 @@ | | == style acme -|0: 0-37 #000000,#eaffff, 38-99 d,#eaffff, +|0: 0-47 #000000,#eaffff, 48-99 d,#eaffff, |1: 0-1 d,#6e4fd0, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#383c54, 52-85 #000000,#eaffff, 86-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |3: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -185,7 +185,7 @@ |28: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |29: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, == snap colors-off grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -216,7 +216,7 @@ | | == style colors-off -|0: 0-37 #000000,#eaffff, 38-99 d,#eaffff, +|0: 0-47 #000000,#eaffff, 48-99 d,#eaffff, |1: 0-1 d,#6e4fd0, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#383c54, 52-85 #000000,#eaffff, 86-99 d,#eaffff, |2: 0-99 d,#ffffea, |3: 0-1 d,#ffffea, 2-6 #000000,#ffffea, 7-51 d,#ffffea, 52-56 #000000,#ffffea, 57-99 d,#ffffea, @@ -247,7 +247,7 @@ |28: 0-99 d,#ffffea, |29: 0-99 d,#ffffea, == snap helix-again grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt @@ -278,7 +278,7 @@ | | == style helix-again -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 d,#262626, 52-85 #949494,#121212, 86-99 d,#121212, |2: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-49 #bdbdbd,#080808, 50-51 d,#444444, 52-99 #bdbdbd,#080808, diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden index 928241b2..da6a7ad1 100644 --- a/test/snapshots/tinywin.golden +++ b/test/snapshots/tinywin.golden @@ -1,5 +1,5 @@ == snap stacked grid=100x30 cursor=4,14 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/tinywin/cwd Del | $ | NOR /tmp/pardes-snap/tinywin/cwd Del @@ -30,11 +30,11 @@ | | == snap shrunk grid=60x3 cursor=59,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/tinywin/cwd Del | NOR /tmp/pardes-snap/tinywin/cwd Del == snap columns grid=100x30 cursor=79,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/ti NOR /tmp/pardes-snap/ti NOR /tmp/pardes-snap/ti NOR /tmp/pardes-snap/ti | $ | NOR /tmp/pardes-snap/ti diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden index 69cfb9a9..471e81cf 100644 --- a/test/snapshots/tty.golden +++ b/test/snapshots/tty.golden @@ -1,5 +1,5 @@ == snap tty-on grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt @@ -30,7 +30,7 @@ | | == snap tty-echo grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt @@ -61,7 +61,7 @@ | | == snap tty-off grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | | m.txt m.txt @@ -92,7 +92,7 @@ | | == snap shift-esc-on grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt @@ -123,7 +123,7 @@ | | == snap shift-esc-off grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | | m.txt m.txt diff --git a/test/snapshots/ttyclick.golden b/test/snapshots/ttyclick.golden index d7798f77..62f540af 100644 --- a/test/snapshots/ttyclick.golden +++ b/test/snapshots/ttyclick.golden @@ -1,5 +1,5 @@ == snap tty-bodyclick grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del | $ ls | probe.txt probe.txt @@ -30,7 +30,7 @@ | | == snap tty-tagedit grid=100x30 cursor=39,1 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt probe.txt @@ -61,7 +61,7 @@ | | == snap tty-tagexit grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del | $ ls | probe.txt probe.txt @@ -92,7 +92,7 @@ | | == snap ins-bodyclick grid=100x30 cursor=11,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/ttyclick/cwd Del NOR /tmp/pardes-snap/ttyclick/cwd Del | | probe.txt probe.txt diff --git a/test/snapshots/ttyedit.golden b/test/snapshots/ttyedit.golden index e9ef9104..febffe16 100644 --- a/test/snapshots/ttyedit.golden +++ b/test/snapshots/ttyedit.golden @@ -1,5 +1,5 @@ == snap before grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -30,7 +30,7 @@ | | == snap split grid=100x30 cursor=2,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | INS /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -61,7 +61,7 @@ | | == snap opened grid=100x30 cursor=6,8 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -92,7 +92,7 @@ | | == snap joined grid=100x30 cursor=10,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt @@ -123,7 +123,7 @@ | | == snap undone grid=100x30 cursor=7,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttyedit/cwd Del NOR /tmp/pardes-snap/ttyedit/cwd Del | | words.txt words.txt diff --git a/test/snapshots/ttyfollow.golden b/test/snapshots/ttyfollow.golden index 4438fa6a..6c993bb5 100644 --- a/test/snapshots/ttyfollow.golden +++ b/test/snapshots/ttyfollow.golden @@ -1,5 +1,5 @@ == snap held-pre grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttyfollow/cwd Del NOR /tmp/pardes-snap/ttyfollow/cwd Del | 185 | 186 s.txt @@ -30,7 +30,7 @@ | | == snap held-post grid=100x30 cursor=54,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttyfollow/cwd Del TTY /tmp/pardes-snap/ttyfollow/cwd Del | 185 $ ls | 186 s.txt @@ -61,7 +61,7 @@ | | == snap tty-follows grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/ttyfollow/cwd Del TTY /tmp/pardes-snap/ttyfollow/cwd Del | 288 $ ls | 289 s.txt diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden index ec7b8730..3bdbe3ed 100644 --- a/test/snapshots/ttylook.golden +++ b/test/snapshots/ttylook.golden @@ -1,5 +1,5 @@ == snap tok1 grid=120x30 cursor=2,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -30,7 +30,7 @@ | | == style tok1 -|0: 0-37 #949494,#121212, 38-119 d,#121212, +|0: 0-47 #949494,#121212, 48-119 d,#121212, |1: 0-1 d,#626262, 2-37 #949494,#121212, 38-59 d,#121212, 60-61 d,#262626, 62-97 #949494,#121212, 98-119 d,#121212, |2: 0-1 d,#444444, 2-59 #bdbdbd,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-8 #d8c8a8,#4a3a1e, 9-59 #bdbdbd,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, @@ -61,7 +61,7 @@ |28: 0-1 d,#444444, 2-59 #bdbdbd,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-59 #bdbdbd,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, == snap tok2 grid=120x30 cursor=11,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -92,7 +92,7 @@ | | == snap tokback grid=120x30 cursor=2,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -123,7 +123,7 @@ | | == snap insert grid=120x30 cursor=4,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | | nnbig.txt plain.txt sub big.txt plain.txt sub @@ -154,7 +154,7 @@ | | == snap tok3 grid=120x30 cursor=22,3 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -185,7 +185,7 @@ | | == snap diropen grid=120x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -216,7 +216,7 @@ | | == snap noop grid=120x30 cursor=4,7 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | | big.txt plain.txt sub big.txt plain.txt sub @@ -247,7 +247,7 @@ | | == snap fileopen grid=120x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/ttylook/cwd/big.t NOR /tmp/pardes-snap/ttylook/cwd Del NOR /tmp/pardes-snap/ttylook/cwd Del | 1 line 1 | 2 line 2 big.txt plain.txt sub big.txt plain.txt sub diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden index 6904dc87..2a52eab1 100644 --- a/test/snapshots/ttyonly.golden +++ b/test/snapshots/ttyonly.golden @@ -1,5 +1,5 @@ == snap ttyonly grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/ttyonly/cwd Del | $ echo TTY''ONLY | TTYONLY @@ -30,7 +30,7 @@ | | == style ttyonly -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#626262, 2-37 #949494,#121212, 38-99 d,#121212, |2: 0-1 d,#444444, 2-99 #bdbdbd,#080808, |3: 0-1 d,#444444, 2-99 #bdbdbd,#080808, diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index b667e021..d6a51e82 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -1,5 +1,5 @@ == snap tutor grid=150x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /Tutor Save Del NOR /tmp/pardes-snap/tutor/cwd Del NOR /tmp/pardes-snap/tutor/cwd Del | 1 | 2 PARDES TUTOR diff --git a/test/snapshots/winch.golden b/test/snapshots/winch.golden index 362e9aab..97ab4e76 100644 --- a/test/snapshots/winch.golden +++ b/test/snapshots/winch.golden @@ -1,5 +1,5 @@ == snap storm grid=100x30 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/winch/cwd Del NOR /tmp/pardes-snap/winch/cwd Del | $ ls | $ for i in $(seq 600); do kill -WINCH $PPID; don @@ -30,7 +30,7 @@ | | == snap resized grid=106x34 cursor=4,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | TTY /tmp/pardes-snap/winch/cwd Del NOR /tmp/pardes-snap/winch/cwd Del | $ ls | $ for i in $(seq 600); do kill -WINCH $PPID; done; diff --git a/test/snapshots/windownav.golden b/test/snapshots/windownav.golden index 11378023..ada71876 100644 --- a/test/snapshots/windownav.golden +++ b/test/snapshots/windownav.golden @@ -1,5 +1,5 @@ == snap start grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -30,7 +30,7 @@ | | == snap to-term grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -61,7 +61,7 @@ | | == snap back-to-file grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -92,7 +92,7 @@ | | == snap altn grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -123,7 +123,7 @@ | | == snap up grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -154,7 +154,7 @@ | | == snap right grid=100x30 cursor=54,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -185,7 +185,7 @@ | | == snap left grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -216,7 +216,7 @@ | | == snap down grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -247,7 +247,7 @@ | | == snap toggle-doc grid=100x30 cursor=7,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt @@ -278,7 +278,7 @@ | | == snap toggle-back grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windownav/cwd/w.txt Save De NOR /tmp/pardes-snap/windownav/cwd Del | 1 alpha | 2 beta w.txt diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index 5492d29b..724095e1 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -1,5 +1,5 @@ == snap hover-v grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del ╎ NOR /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt @@ -30,7 +30,7 @@ | ╎ | ╎ == snap hover-h grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -61,7 +61,7 @@ | | == snap border-drag grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd De╎ NOR /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt @@ -92,7 +92,7 @@ | ╎ | ╎ == snap border-done grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd De╎ NOR /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt @@ -123,7 +123,7 @@ | ╎ | ╎ == snap hborder-done grid=100x30 cursor=4,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -154,7 +154,7 @@ | | == snap move-preview grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -185,7 +185,7 @@ | | == snap moved grid=100x30 cursor=4,15 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -216,7 +216,7 @@ | | == snap altn grid=100x30 cursor=4,19 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -247,7 +247,7 @@ | | == snap focus-right grid=100x30 cursor=44,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt @@ -278,7 +278,7 @@ | | == snap debug-on grid=100x30 cursor=44,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowo╭────────────────────────────╮ | │pardes resizes=1 │ | w.txt w.txt │terms 4 cols 2 │ @@ -309,7 +309,7 @@ | | == style debug-on -|0: 0-37 #949494,#121212, 38-99 d,#121212, +|0: 0-47 #949494,#121212, 48-99 d,#121212, |1: 0-1 d,#262626, 2-39 #949494,#121212, 40-41 d,#626262, 42-69 #949494,#121212, 70-99 d,d, |2: 0-1 d,#444444, 2-39 #bdbdbd,#080808, 40-41 d,#444444, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-87 #949494,d, 88-98 d,#121212, 99-99 d,d, |3: 0-1 d,#444444, 2-39 #bdbdbd,#080808, 40-41 d,#444444, 42-69 #bdbdbd,#080808, 70-70 d,d, 71-85 #949494,d, 86-98 d,#121212, 99-99 d,d, @@ -340,7 +340,7 @@ |28: 0-1 d,#444444, 2-39 #bdbdbd,#080808, 40-41 d,#444444, 42-99 #bdbdbd,#080808, |29: 0-1 d,#444444, 2-39 #bdbdbd,#080808, 40-41 d,#444444, 42-99 #bdbdbd,#080808, == snap debug-off grid=100x30 cursor=44,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt diff --git a/test/snapshots/yankpaste.golden b/test/snapshots/yankpaste.golden index 3f335d56..523d9d29 100644 --- a/test/snapshots/yankpaste.golden +++ b/test/snapshots/yankpaste.golden @@ -1,5 +1,5 @@ == snap linewise-below grid=100x30 cursor=13,5 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del | 1 line 1 | 2 line 2 f.txt @@ -30,7 +30,7 @@ | | == snap linewise-above grid=100x30 cursor=13,6 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del | 1 line 1 | 2 line 2 f.txt @@ -61,7 +61,7 @@ | | == snap charwise-inline grid=100x30 cursor=10,2 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del | 1 liline 1 | 2 line 2 f.txt @@ -92,7 +92,7 @@ | | == snap blankline grid=100x30 cursor=7,4 -|Kill Newcol Tutor Debug NextColor Dump +|Kill Newcol Tutor Debug NextColor Dump Find Grep | NOR /tmp/pardes-snap/yankpaste/cwd/f.txt Save De NOR /tmp/pardes-snap/yankpaste/cwd Del | 1 liline 1 | 2 f.txt |
