summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/output.zig9
-rw-r--r--test/pdf.zig4
-rw-r--r--test/snapshots/builtins.snap23
-rw-r--r--test/snapshots/dump.golden3
-rw-r--r--test/snapshots/find.golden146
-rw-r--r--test/snapshots/find.snap126
-rw-r--r--test/snapshots/fsearch.golden111
-rw-r--r--test/snapshots/fsearch.snap63
-rw-r--r--test/snapshots/grep.golden44
-rw-r--r--test/snapshots/grep.snap91
-rw-r--r--test/snapshots/lookrange.golden47
-rw-r--r--test/snapshots/lookrange.snap22
-rw-r--r--test/snapshots/lsp-client.golden23
-rw-r--r--test/snapshots/lsp-client.snap11
-rw-r--r--test/snapshots/lspdebug.snap7
-rw-r--r--test/snapshots/lsprelpath.golden170
-rw-r--r--test/snapshots/lsprelpath.snap35
-rw-r--r--test/snapshots/msg.golden4
-rw-r--r--test/snapshots/msg.snap2
-rw-r--r--test/snapshots/stepgrain.golden123
-rw-r--r--test/snapshots/stepgrain.snap59
-rw-r--r--test/snapshots/tagbottom.golden13
-rw-r--r--test/snapshots/tagbottomshort.golden38
-rw-r--r--test/snapshots/topbarexec.golden22
24 files changed, 548 insertions, 648 deletions
diff --git a/test/output.zig b/test/output.zig
index 8ba2f357..8eb389c8 100644
--- a/test/output.zig
+++ b/test/output.zig
@@ -219,6 +219,15 @@ test "references fill the asking text's query pane: sorted under their files, th
try std.testing.expectEqual(@as(?usize, 2), source.places.current);
try std.testing.expectEqual(@as(i32, 3), source.body.cur_row);
try std.testing.expectEqual(@as(usize, 6), results.query.?.total);
+ // Ctrl-n on line 1, Enter: the keyboard on that ref in the text
+ try std.testing.expectEqual(qid, p.active);
+ p.update(.{ .key = .{ .cp = 'n', .ctrl = true } });
+ try std.testing.expectEqual(@as(?usize, 3), source.places.current);
+ p.update(.{ .key = .{ .cp = Key.enter } });
+ try std.testing.expectEqual(@as(usize, 0), p.active);
+ try std.testing.expectEqual(@as(i32, 4), source.body.cur_row);
+ p.update(.{ .key = .{ .cp = 'N' } });
+ try std.testing.expectEqual(@as(?usize, 2), source.places.current);
// n in the owner steps them, round the end without a word
p.active = 0;
p.update(.{ .key = .{ .cp = 'n' } });
diff --git a/test/pdf.zig b/test/pdf.zig
index ea23f90a..d4efdfaf 100644
--- a/test/pdf.zig
+++ b/test/pdf.zig
@@ -1053,7 +1053,7 @@ test "MuPDF pane renders, navigates, searches, and round-trips its page" {
try std.testing.expect(pane.pdf.?.document_scroll_y > before_height_scroll);
const revision_before_search = active_raster.revision;
- _ = try pardes.look.runSearch(p, 0, "Pardes", .text, .top, true);
+ _ = try pardes.look.runSearch(p, 0, "Pardes", .top, true);
try std.testing.expectEqualStrings("Pardes", pane.pdf.?.search_query);
try std.testing.expectEqual(revision_before_search, active_raster.revision);
const results_id = pane.search_pane orelse return error.MissingPdfSearchResults;
@@ -1915,7 +1915,7 @@ test "PDF n/N addresses and reveals distinct MuPDF hits on one page" {
p.locations_config.context = 2;
p.locations_config.tscontext = true;
- _ = try pardes.look.runSearch(p, 0, "Pardes", .text, .top, true);
+ _ = try pardes.look.runSearch(p, 0, "Pardes", .top, true);
const results_id = pane.search_pane orelse return error.MissingPdfSearchResults;
const results = p.panes[results_id].?.file.?;
var found: [3]bool = @splat(false);
diff --git a/test/snapshots/builtins.snap b/test/snapshots/builtins.snap
index 73509c24..cf367c5a 100644
--- a/test/snapshots/builtins.snap
+++ b/test/snapshots/builtins.snap
@@ -37,6 +37,29 @@ wheel up 110 50
wheel up 110 50
wheel up 110 50
wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
+wheel up 110 50
wait 10000 Look enter, right-click
wait 10000 Exec tab, middle-click
wait 10000 Filter
diff --git a/test/snapshots/dump.golden b/test/snapshots/dump.golden
index 571bacbc..72bb85a7 100644
--- a/test/snapshots/dump.golden
+++ b/test/snapshots/dump.golden
@@ -37,6 +37,7 @@
.collapsed = false,
.serial = 1,
.tag_tail = null,
+ .attached_to = null,
.terminal = .{
.cwd = "/tmp/pardes-snap/dump/cwd",
.shell = "",
@@ -62,6 +63,7 @@
.collapsed = false,
.serial = 2,
.tag_tail = null,
+ .attached_to = null,
.terminal = .{
.cwd = "/tmp/pardes-snap/dump/cwd",
.shell = "",
@@ -87,6 +89,7 @@
.collapsed = false,
.serial = 3,
.tag_tail = null,
+ .attached_to = null,
.terminal = .{
.cwd = "/tmp/pardes-snap/dump/cwd",
.shell = "",
diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden
index 47480b83..e5c11193 100644
--- a/test/snapshots/find.golden
+++ b/test/snapshots/find.golden
@@ -2,91 +2,61 @@
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
| /tmp/pardes-snap/find/cwd/here.txt Save Tty Collapse Del
-| 1 Find SPC f
-== snap armed grid=120x41 cursor=119,4
-|3: 1 Find Find
-|4: Find /
-== snap typing grid=120x41 cursor=119,3
-|3: 1 Find Find /zqm
-|4:
-== snap results grid=120x41 cursor=7,3
-|3: 1 Find
-|5: /tmp/pardes-snap/find/cwd/+Search Save Tty Collapse Del
-|6: 1 sub/ZQMARK-beta.txt
-|7: 2 sub/nest/zqmark-gamma.txt
-|8: 3 zqmark-alpha.txt
-|9: 4
-== snap first grid=120x41 cursor=7,10
-|9: /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Tty Collapse Del
-|10: 1 beta body
-== style first grid=120x41
-|0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824,
-|1: 0-1 d,#887455, 2-119 #becfc4,#314738,
-|2: 0-1 d,#496656, 2-27 #b2c3b8,#1d2824, 28-36 #d3b0d9,#1d2824, 37-119 #b2c3b8,#1d2824,
-|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
-|4: 0-0 d,#608269, 1-119 d,#0d1410,
-|5: 0-1 d,#496656, 2-27 #b2c3b8,#1d2824, 28-35 #d3b0d9,#1d2824, 36-119 #b2c3b8,#1d2824,
-|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
-|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
-|8: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-119 #e5eee5,#0d1410,
-|9: 0-1 d,#add38a, 2-31 #becfc4,#314738, 32-47 #dfbce5,#314738, 48-119 #becfc4,#314738,
-|10: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-119 #e5eee5,#0d1410,
-|11: 0-0 d,#608269, 1-119 d,#0d1410,
-|12: 0-0 d,#608269, 1-119 d,#0d1410,
-|13: 0-0 d,#608269, 1-119 d,#0d1410,
-|14: 0-0 d,#608269, 1-119 d,#0d1410,
-|15: 0-0 d,#608269, 1-119 d,#0d1410,
-|16: 0-0 d,#608269, 1-119 d,#0d1410,
-|17: 0-0 d,#608269, 1-119 d,#0d1410,
-|18: 0-0 d,#608269, 1-119 d,#0d1410,
-|19: 0-0 d,#608269, 1-119 d,#0d1410,
-|20: 0-0 d,#608269, 1-119 d,#0d1410,
-|21: 0-0 d,#608269, 1-119 d,#0d1410,
-|22: 0-0 d,#608269, 1-119 d,#0d1410,
-|23: 0-0 d,#608269, 1-119 d,#0d1410,
-|24: 0-0 d,#608269, 1-119 d,#0d1410,
-|25: 0-0 d,#608269, 1-119 d,#0d1410,
-|26: 0-0 d,#608269, 1-119 d,#0d1410,
-|27: 0-0 d,#608269, 1-119 d,#0d1410,
-|28: 0-0 d,#608269, 1-119 d,#0d1410,
-|29: 0-0 d,#608269, 1-119 d,#0d1410,
-|30: 0-0 d,#608269, 1-119 d,#0d1410,
-|31: 0-0 d,#608269, 1-119 d,#0d1410,
-|32: 0-0 d,#608269, 1-119 d,#0d1410,
-|33: 0-0 d,#608269, 1-119 d,#0d1410,
-|34: 0-0 d,#608269, 1-119 d,#0d1410,
-|35: 0-0 d,#608269, 1-119 d,#0d1410,
-|36: 0-0 d,#608269, 1-119 d,#0d1410,
-|37: 0-0 d,#608269, 1-119 d,#0d1410,
-|38: 0-0 d,#608269, 1-119 d,#0d1410,
-|39: 0-0 d,#608269, 1-119 d,#0d1410,
-|40: 0-0 d,#608269, 1-119 d,#0d1410,
-== snap second grid=120x41 cursor=7,13
-|12: /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save Tty Collapse Del
-|13: 1 gamma body
-== snap third grid=120x41 cursor=7,16
-|15: /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Tty Collapse Del
-|16: 1 alpha body
-== snap back grid=120x41 cursor=7,13
-== snap word grid=120x41 cursor=7,13
-|3: 1 Find Find
-|4: Find /
-== snap cancel grid=120x41 cursor=7,7
-|3: 1 Find Find /
-|4:
-|13: 1 gamma body Last
-== snap nomatch grid=120x41 cursor=7,3
-|3: 1 Find
-|6: 1
-|7:
-|8:
-|13: 1 gamma body
-== snap refit grid=120x41 cursor=7,3
-|6: 1 sub/ZQMARK-beta.txt
-|7: 2 sub/nest/zqmark-gamma.txt
-|8: 3 zqmark-alpha.txt
-== snap topbar grid=120x41 cursor=12,16
-|6: 1 zqmark-alpha.txt
-|7: 2
-|8:
-|16: 1 alpha body Find
+| 1 Find zqm SPC f
+== snap armed grid=120x41 cursor=7,23
+|3: 1 Find zqm Find
+|22: ^ +Search 1/5 Del
+|23: Find
+|24: here.txt
+|25: other.txt
+|26: sub/ZQMARK-beta.txt
+|27: sub/nest/zqmark-gamma.txt
+|28: zqmark-alpha.txt
+|32: /tmp/pardes-snap/find/cwd/+Preview Del
+|33: 1
+== snap typing grid=120x41 cursor=10,23
+|3: 1 Find zqm
+|22: ^ +Search 1/3 Del
+|23: Find zqm
+|24: zqmark-alpha.txt
+|25: sub/ZQMARK-beta.txt
+|26: sub/nest/zqmark-gamma.txt
+|27:
+|28:
+|32: /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Del
+|33: 1 alpha body
+== snap next grid=120x41 cursor=10,23
+|22: ^ +Search 2/3 Del
+|32: /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Del
+|33: 1 beta body
+== snap promoted grid=120x41 cursor=7,33
+|22: +Search 2/3 Save Unattach Del
+|32: /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Tty Collapse Del
+== snap nomatch grid=120x41 cursor=11,14
+|13: ^ +Search 0 Del
+|14: Find zzqq
+|22:
+|23: /tmp/pardes-snap/find/cwd/+Preview Del
+|24: 1
+|25:
+|26:
+== snap cancel grid=120x41 cursor=7,3
+|13:
+|14:
+|22: +Search 2/3 Save Unattach Del
+|23: Find zqm
+|24: zqmark-alpha.txt
+|25: sub/ZQMARK-beta.txt
+|26: sub/nest/zqmark-gamma.txt
+== snap topbar grid=120x41 cursor=14,3
+|3: 1 Find zqm Find
+|13: +Search 1/3 Del
+|14: Find zqm
+|15: zqmark-alpha.txt
+|16: sub/ZQMARK-beta.txt
+|17: sub/nest/zqmark-gamma.txt
+|22:
+|23: /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Del
+|24: 1 alpha body
+|25:
+|26:
diff --git a/test/snapshots/find.snap b/test/snapshots/find.snap
index b2e36973..17470040 100644
--- a/test/snapshots/find.snap
+++ b/test/snapshots/find.snap
@@ -1,19 +1,18 @@
-# The Find builtin (SPC f f) = `fd`, in-core: it arms the SAME tag input `/`
-# does, but Enter walks the pane's DIRECTORY instead of its text and writes one
-# matching path per row into a "+Search" OUTPUT BUFFER. Every row is therefore
-# an ordinary look target, which is the whole point: n/N SELECT the next/prev
-# one with no code of their own, and the look chord — Enter, the same one that
-# opens a path anywhere else — is what OPENS it. Focus then follows the file
-# that opened, but the look was made FROM the results buffer, so the next n
-# resumes stepping that same list. Where each pane lands is acme's placement
-# (docs/typ/guide.typ, where new panes go): under the text of the pane with the
-# most blank rows. The walk skips .git, matches the NAME
-# case-insensitively, and sorts (readdir order is not stable). `SPC f s` is
-# Save, which moved out of `w` to make this group.
+# SPC f f: a query pane under the pane (Query.zig), line 1 `Find `, typed
+# into. The files below the pane's directory are listed once, on the disk
+# engine's worker (rg --files when it is on PATH, else the sorted walk: both
+# pass over .git), and each key scores them fuzzily (pick's scorer), the best
+# first, the matched letters tinted. The current one is shown in the
+# +Preview under the query pane, born with it so nothing moves later;
+# Ctrl-n / Ctrl-p step it, never the pointer. Enter makes the preview the
+# file's pane where it stands. Esc while typing closes the query pane and
+# gives its rows back. A query that matches nothing is a count of 0, not an
+# exit. B2 on `Find` with a selection asks with that word, the keyboard
+# staying in the text.
dirmk sub
dirmk sub/nest
dirmk .git
-file here.txt Find
+file here.txt Find zqm
file zqmark-alpha.txt alpha body
file sub/ZQMARK-beta.txt beta body
file sub/nest/zqmark-gamma.txt gamma body
@@ -22,108 +21,51 @@ file .git/zqmark-hidden.txt hidden body
start 41 120 here.txt
wait 8000 here.txt
stable 700 20000
-# SPC f is a GROUP now (Find + New + Save): the indicator stays on the tag
+# SPC f is a group (Find, New, Save, Recent, Grep): the indicator waits
key space
key f
stable 400 5000
snap group
-# ... and the second f arms the input, marker visible in the tag
+# the second f opens the query pane: every file listed, line 1 `Find `
key f
-stable 400 5000
+wait 10000 zqmark-alpha.txt
+stable 700 15000
snap armed
text zqm
-stable 400 5000
-snap typing
-# Enter walks: three hits, sorted, .git's copy skipped, other.txt not matched
-key enter
-wait 10000 zqmark-alpha.txt
stable 700 15000
-snap results
-# n SELECTS row 1 and Enter looks it — a path, so the file OPENS, under the
-# list's text, and each file after it under the one before.
-key space j n
-key enter
+snap typing
+# the next one current, its text in the preview
+key c-n
wait 10000 beta body
stable 700 15000
-snap first
-snapstyle first
-key space j n
-key enter
-wait 10000 gamma body
-stable 700 15000
-snap second
-key space j n
-key enter
-wait 10000 alpha body
-stable 700 15000
-snap third
-# N walks back up one row; Enter looks it, and the file is already open, so
-# the look just focuses it
-key space j p
+snap next
+# Enter: the preview is that file's pane now, where it stood
key enter
stable 700 15000
-snap back
-# executing the WORD Find (middle-click in a body) arms the same input — the
-# enum IS the dispatch — and Esc abandons it. The input is its own line, so an
-# abandoned one leaves nothing behind in the tag
-press middle 8 4
-release middle 8 4
-stable 700 10000
-snap word
-key esc
-settle 100
-stable 400 5000
-snap cancel
-# every search is asked from a PANE, and both a look and now a step leave you
-# somewhere else — so click back into here.txt first. That is not bookkeeping:
-# a search never refills the buffer it was asked FROM (fillResults skips it),
-# so `owned by here.txt` is the whole premise of the two steps below.
+snap promoted
+# a second Find from here.txt reuses its query pane; nothing found is 0
press left 8 4
release left 8 4
stable 400 5000
-# a no-match walk opens an empty list of its own, under the last file's text.
key space
key f
key f
text zzqq
-key enter
-stable 700 10000
-# n does not stop on the empty list, because the walk is a RING across panes
-# rather than one buffer's rows: with nothing look-able here it carries on
-# into the list that DOES have some — the zqm one — and resumes it one row
-# past where the N above left it. Nothing opens; only the selection moved.
-key space j n
-stable 400 5000
+stable 700 15000
snap nomatch
-# ... and asking for `zqm` AGAIN re-arms the list it ALREADY filled instead of
-# stacking an identical twin under the empty one — even though the step above
-# left the cursor sitting in the zqm list, so the reuse is by what a buffer
-# HOLDS (this search, this pattern, this directory), not by which one anything
-# happens to point at. Asked from here.txt again (the click, as above), and
-# the LIST it rewrites is therefore the `nomatch` frame unchanged, down to the
-# byte — only the cursor comes back with it.
-press left 8 4
-release left 8 4
-stable 400 5000
-key space
-key f
-key f
-text zqm
-key enter
-wait 10000 zqmark-alpha.txt
+# Esc: the kept rows of the last query are back
+key esc
+settle 100
stable 700 15000
-snap refit
-# Find is a TOPBAR word too: 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. Row 17 is
-# `alpha body`: the three found files stack in the order the looks above
-# OPENED them, which is beta, gamma, alpha down the column.
-press left 8 17
-drag left 13 17
-release left 13 17
+snap cancel
+# B2 on Find with `zqm` selected in here.txt: the query pane under it, the
+# keyboard still in here.txt
+press left 13 4
+drag left 15 4
+release left 15 4
stable 400 5000
press middle @Find 1
release middle @Find 1
+wait 10000 Find zqm
stable 700 15000
snap topbar
diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden
index 62c37c25..5de12bab 100644
--- a/test/snapshots/fsearch.golden
+++ b/test/snapshots/fsearch.golden
@@ -19,78 +19,69 @@
| /tmp/pardes-snap/fsearch/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| g.txt
-== snap typing grid=180x31 cursor=89,7
-|7: 1 l1 /MARK
-== snap results grid=180x31 cursor=10,8
-|7: 1 l1
-|21: /tmp/pardes-snap/fsearch/cwd/+Search Save Tty Collapse LocationsConfig Del
-|22: 1 g.txt:2:1-4
-|23: 2 MARK a
-|24: 3 g.txt:6:1-4
-|25: 4 MARK b
-|26: 5 g.txt:10:1-4
-|27: 6 MARK c
-|28: 7
-== style results grid=180x31
+== snap slash grid=180x31 cursor=3,10
+|9: ^ +Search 0 Del
+|10: /
+|11:
+|12:
+|13:
+|14:
+|15:
+|16:
+== snap typing grid=180x31 cursor=7,10
+|9: ^ +Search 1/3 Del
+|10: /MARK
+|11: 2 MARK a
+|12: 6 MARK b
+|13: 10 MARK c
+== style typing grid=180x31
|0: 0-1 d,#1d2824, 2-179 #b2c3b8,#1d2824,
|1: 0-1 d,#887455, 2-89 #becfc4,#314738, 90-91 #becfc4,#887455, 92-179 #b2c3b8,#1d2824,
|2: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-89 #b2c3b8,#1d2824, 90-91 #b2c3b8,#496656, 92-120 #b2c3b8,#1d2824, 121-129 #d3b0d9,#1d2824, 130-179 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|5: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
-|6: 0-1 d,#add38a, 2-30 #becfc4,#314738, 31-36 #dfbce5,#314738, 37-89 #becfc4,#314738, 90-90 #becfc4,#608269, 91-179 #becfc4,#0d1410,
-|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #f5f7ee,#3c614a, 11-11 #f5f7ee,#0d1410, 12-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|14: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|15: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|16: 0-0 d,#152019, 1-3 d,#0d1410, 4-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
+|6: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-36 #d3b0d9,#1d2824, 37-89 #b2c3b8,#1d2824, 90-90 #b2c3b8,#608269, 91-179 #b2c3b8,#0d1410,
+|7: 0-0 d,#5e4923, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
+|8: 0-0 d,#5e4923, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f5f7ee,#3c614a, 11-11 #f5f7ee,#0d1410, 12-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
+|9: 0-1 #000000,#add38a, 2-89 #becfc4,#314738, 90-90 #becfc4,#608269, 91-179 #becfc4,#0d1410,
+|10: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
+|11: 0-0 d,#608269, 1-5 d,#0d1410, 6-8 #59675c,#0d1410, 9-12 #f7e4a5,#5e4923, 13-13 #f7e4a5,#0d1410, 14-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
+|12: 0-0 d,#608269, 1-5 d,#0d1410, 6-8 #59675c,#0d1410, 9-12 #f7e4a5,#352e19, 13-13 #f7e4a5,#0d1410, 14-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
+|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-8 #59675c,#0d1410, 9-12 #f7e4a5,#352e19, 13-13 #f7e4a5,#0d1410, 14-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
+|14: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|15: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|16: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
|17: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-39 #d3b0d9,#1d2824, 40-89 #b2c3b8,#1d2824, 90-90 #b2c3b8,#608269, 91-179 #b2c3b8,#0d1410,
|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
|20: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
-|21: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-38 #d3b0d9,#1d2824, 39-89 #b2c3b8,#1d2824, 90-90 #b2c3b8,#608269, 91-179 #b2c3b8,#0d1410,
-|22: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410, 90-90 #59675c,#608269, 91-179 #59675c,#0d1410,
-|23: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f7e4a5,#5e4923, 11-11 #f7e4a5,#0d1410, 12-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|24: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410, 90-90 #59675c,#608269, 91-179 #59675c,#0d1410,
-|25: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f7e4a5,#5e4923, 11-11 #f7e4a5,#0d1410, 12-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|26: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410, 90-90 #59675c,#608269, 91-179 #59675c,#0d1410,
-|27: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #f7e4a5,#5e4923, 11-11 #f7e4a5,#0d1410, 12-89 #e5eee5,#0d1410, 90-90 #e5eee5,#608269, 91-179 #e5eee5,#0d1410,
-|28: 0-0 d,#608269, 1-4 d,#0d1410, 5-89 #59675c,#0d1410, 90-90 #59675c,#608269, 91-179 #59675c,#0d1410,
+|21: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|22: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|23: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|24: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|25: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|26: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|27: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
+|28: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
|29: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
|30: 0-0 d,#608269, 1-89 d,#0d1410, 90-90 d,#608269, 91-179 d,#0d1410,
-== snap second grid=180x31 cursor=10,12
-== snap third grid=180x31 cursor=10,12
+== snap ctrln grid=180x31 cursor=7,10
|7: 5 l5
|8: 6 MARK b
-|9: 7 l7
-|10: 8 l8
-|11: 9 l9
-|12: 10 MARK c
-|13: 11 l11
-|14: 12 l12
-|15:
-|16:
-== snap back grid=180x31 cursor=10,12
-|7: 1 l1
-|8: 2 MARK a
-|9: 3 l3
-|10: 4 l4
-|11: 5 l5
-|12: 6 MARK b
-|13: 7 l7
-|14: 8 l8
-|15: 9 l9
-|16: 10 MARK c
-== snap cancel grid=180x31 cursor=10,12
-== snap nomatch grid=180x31 cursor=7,26
-|11: /tmp/pardes-snap/fsearch/cwd/+Search Save Tty Collapse LocationsConfig Del
-|12: 1
+|9: ^ +Search 2/3 Del
+== snap landed grid=180x31 cursor=10,8
+|9: +Search 2/3 Save Unattach Del
+== snap n grid=180x31 cursor=10,8
+|7: 9 l9
+|8: 10 MARK c
+== snap N grid=180x31 cursor=10,7
+|7: 6 MARK b
+|8: 7 l7
+== snap cancel grid=180x31 cursor=10,7
+== snap nomatch grid=180x31 cursor=7,10
+|9: ^ +Search 0 Del
+|10: /zzqq
+|11:
+|12:
|13:
-|14:
-|15:
-|16:
diff --git a/test/snapshots/fsearch.snap b/test/snapshots/fsearch.snap
index 431e7126..fbb9baeb 100644
--- a/test/snapshots/fsearch.snap
+++ b/test/snapshots/fsearch.snap
@@ -1,13 +1,13 @@
-# `/` file search: the pattern types into the tag (persistent, no popup);
-# Enter searches the buffer in-core and writes `path:LINE:COL-ENDCOL text` into
-# a +Search OUTPUT BUFFER (a file pane with no file behind it — no Save in its
-# tag) — AND GOES TO THE FIRST HIT, which is the step `n` is and the look Enter
-# is, run for you in that buffer. From there n/N SELECT the next/prev row and
-# open nothing, and Enter — the look chord — is what scrolls the file pane to
-# the hit AND SELECTS IT: the row names the match's whole span, not just where
-# it starts. Esc abandons the input; a no-match search opens an EMPTY buffer
-# (every search gets its own, stacked under the pane) with nothing in it for n
-# to stop on, and goes nowhere.
+# `/` in a file: its query pane under it (Query.zig), line 1 `/` and the
+# pattern, typed into; nothing on the notice band. Each key searches the
+# file again (a regex, any case unless it has a capital): every match is
+# tinted and ticked on the scroll rail, the first at or after the cursor
+# selected and in view, and the rows under line 1 are the lines holding a
+# match, a line number in the gutter. Ctrl-n steps while typing; Enter puts
+# the keyboard on the match, the pattern in `/`, and keeps the rows as text;
+# n / N then step the matches in the file, round the end without a word. A
+# later `/` reuses the pane; Esc while typing brings the kept rows back. A
+# pattern that matches nothing is a count of 0, not an exit.
file g.txt l1\nMARK a\nl3\nl4\nl5\nMARK b\nl7\nl8\nl9\nMARK c\nl11\nl12
# Builtins announce themselves by default, and an announcement is a band at
# the top of the body -- which moves every row this script clicks. What the
@@ -30,51 +30,32 @@ release right 6 9
wait 10000 MARK a
stable 700 15000
snap opened
-# / starts the search input in the tag; the pattern is visible while typing
key /
stable 400 5000
+snap slash
text MARK
stable 400 5000
snap typing
+snapstyle typing
+key c-n
+stable 400 5000
+snap ctrln
key enter
-# Locations stack the target under its line now, so the two halves are
-# two rows: wait for both rather than for one joined line.
-wait 10000 g.txt:2:1-4
-wait 10000 MARK a
stable 700 10000
-# ...and the submit already looked result 1: the file scrolled to line 2 and
-# the four cells the pattern matched there came up selected — the styles below
-# are what prove the second half of that. No `n` was pressed to get here.
-snap results
-snapstyle results
-# n/N walk on from there, one row of the list per press, Enter looking what
-# the step selected
-key space j n
-key enter
-stable 700 15000
-snap second
-key space j n
-key enter
-stable 700 15000
-snap third
-# N walks back up to result 2 (line 6), Enter looks it
-key space j p
-key enter
-stable 700 15000
-snap back
-# Esc abandons the input: the tag tail is restored
+snap landed
+text n
+stable 400 5000
+snap n
+text N
+stable 400 5000
+snap N
key /
text zz
key esc
settle 100
stable 400 5000
snap cancel
-# a no-match search: nothing in the empty list for n to stop on, so the ring
-# carries it back into the list that has rows and it resumes there
key /
text zzqq
-key enter
stable 700 10000
-key space j n
-stable 400 5000
snap nomatch
diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden
index 957096c3..6dbe19fa 100644
--- a/test/snapshots/grep.golden
+++ b/test/snapshots/grep.golden
@@ -19,22 +19,28 @@
| /tmp/pardes-snap/grep/cwd Tty+bash Save Mode Filter Collapse Del
| ls
| a.txt noise.txt sub
-== snap typing grid=180x31 cursor=89,7
-|7: 1 hello TARGET one Grep /TARGET
-== snap results grid=180x31 cursor=7,7
-|7: 1 hello TARGET one
-|21: /tmp/pardes-snap/grep/cwd/+Search Save Tty Collapse LocationsConfig Del
-|22: 1 a.txt:1:7-12 hello TARGET one
-|23: 2 a.txt:3:6-11 last TARGET line
-|24: 3 sub/b.txt:2:1-6 TARGET inside sub
-|25: 4
-== snap first grid=180x31 cursor=18,7
-== snap opened-hit grid=180x31 cursor=12,12
-|10: /tmp/pardes-snap/grep/cwd/sub/b.txt Save Tty Collapse Del
-|11: 1 deep
-|12: 2 TARGET inside sub
-== snap nomatch grid=180x31 cursor=2,4
-|25: /tmp/pardes-snap/grep/cwd/sub/+Search Save Tty Collapse LocationsConfig Del
-|26: 1
-== snap chordsel grid=180x31 cursor=19,7
-== snap chord grid=180x31 cursor=19,7
+== snap typing grid=180x31 cursor=13,10
+|9: ^ +Search 1/3 Del
+|10: Grep TARGET
+|11: a.txt
+|12: 1 hello TARGET one
+|13: /tmp/pardes-snap/grep/cwd/+Preview Del
+|14: 1
+== snap second grid=180x31 cursor=13,10
+|7: 2 nothing here
+|8: 3 last TARGET line
+|9: ^ +Search 2/3 Del
+== snap preview grid=180x31 cursor=13,10
+|9: ^ +Search 3/3 Del
+|13: /tmp/pardes-snap/grep/cwd/sub/b.txt Del
+|14: 1 deep
+|15: 2 TARGET inside sub
+== snap opened-hit grid=180x31 cursor=12,15
+|9: +Search 3/3 Save Unattach Del
+|13: /tmp/pardes-snap/grep/cwd/sub/b.txt Save Tty Collapse Del
+== snap nomatch grid=180x31 cursor=11,15
+|14: ^ +Search 0 Del
+|15: Grep zzqq
+== snap esc grid=180x31 cursor=12,15
+|14: 1 deep
+|15: 2 TARGET inside sub
diff --git a/test/snapshots/grep.snap b/test/snapshots/grep.snap
index b3ce2947..16e61d20 100644
--- a/test/snapshots/grep.snap
+++ b/test/snapshots/grep.snap
@@ -1,31 +1,20 @@
-# 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-ENDCOL text` — the match's whole span, so
-# looking it SELECTS the hit — 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 SELECT the next/prev row like any other result list and open nothing —
-# one press per row, the location at its head, never the matched text after it;
-# Enter looks what they leave selected, and a row pointing into a file nothing
-# has open yet opens it.
+# The Grep builtin (topbar word, `SPC f g`): the query pane under the pane
+# that asked, line 1 `Grep ` and the text, the lines of the files below its
+# directory holding it (literally, any case unless it has a capital), on the
+# disk engine's worker once the typing pauses: rg --json when it is on PATH,
+# else the sorted walk. The rows sit under their file's name, a line number
+# in the gutter. A hit in a file an open pane shows is shown there; one in a
+# file nothing shows, in the +Preview under the query pane, which Enter makes
+# the file's pane. A query that matches nothing is a count of 0, and Esc
+# while typing brings the kept rows back.
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
-# Builtins announce themselves by default, and an announcement is a band at
-# the top of the body -- which moves every row this script clicks. What the
-# verbs do is what is under test, not the announcement.
config Verbose off
-# The stacked layout spends two rows on each hit, which puts the third one
-# below the fold of this results pane; the claim here is which hits there are.
-config LocationsConfig layout:inline
start 31 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 9
release left 5 9
stable 400 5000
@@ -39,70 +28,34 @@ release right 6 9
wait 10000 hello TARGET
stable 700 15000
snap opened
-# middle-click Grep on the topbar: the input
-# arms on the ACTIVE pane's tag, exactly where `/` would have typed
+# middle-click Grep on the topbar: the query pane under a.txt, typed into
press middle @Grep 1
release middle @Grep 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
+# three lines (the pane is short: its count says how many)
+wait 10000 +Search 1/3
stable 700 15000
-snap results
-# n selects the first row and Enter looks it: absolute path, line 1, columns
-# 7..12 (`TARGET`), and those six cells come up selected
-key space j n
-key enter
+snap typing
+# a.txt's hits are shown in a.txt; sub/b.txt's in the preview
+key c-n
stable 700 15000
-snap first
-# ...and stepping on into sub/b.txt, then looking it, opens the file nothing
-# had open
-key space j n
-key enter
+snap second
+key c-n
+wait 10000 deep
stable 700 15000
-key space j n
+snap preview
key enter
-wait 10000 TARGET inside sub
stable 700 15000
snap opened-hit
-# a pattern nothing holds: an empty list of its own, with nothing in it for n
-# to stop on — so the ring carries that step out of it and on round. It lands
-# in the SHELL, whose `ls` row is free text and steps word by word: the TARGET
-# list is standing on its last row, and a row-grained walk has nothing left in
-# it to offer. The look above is why these read the way they do: it left the
-# cursor in sub/b.txt, so the empty list is named in sub/ rather than cwd/, and
-# it left the hit SELECTED there (a ranged result row is one a look selects).
-# Armed from the LEADER, not the topbar word, because of that selection: a
-# topbar execute chords whatever is selected into its argument, so a
-# middle-click here would run `Grep TARGET` and never ask for a pattern at
-# all. The leader path runs the builtin with no argument, which is what this
-# step is about; the chord itself is the last two snaps below.
key space
key f
key g
stable 400 5000
text zzqq
-key enter
stable 700 10000
-key space j 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. TARGET already has
-# a list open from above, so this refills THAT one; only the zzqq list below is
-# a second buffer, because only it is a different search.
-press left @TARGET 8
-drag left @TARGET+6 8
-release left @TARGET+6 8
+key esc
+settle 100
stable 400 5000
-snap chordsel
-press middle @Grep 1
-release middle @Grep 1
-wait 10000 sub/b.txt:2:1
-stable 700 15000
-snap chord
+snap esc
diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden
index 4a286faa..86a4b0ac 100644
--- a/test/snapshots/lookrange.golden
+++ b/test/snapshots/lookrange.golden
@@ -68,28 +68,31 @@
|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
|15: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-11 #e5eee5,#0d1410, 12-149 #f5f7ee,#3c614a,
|16: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #f5f7ee,#3c614a, 11-149 #f5f7ee,#0d1410,
-== snap hit1 grid=150x31 cursor=15,14
-|17: /tmp/pardes-snap/lookrange/cwd/+Search Save Tty Collapse LocationsConfig Del
-|18: 1 r.txt:7:4-9
-|19: 2 gg NEEDLE gg
-|20: 3 r.txt:8:6-11
-|21: 4 hhhh NEEDLE
-|22: 5
+== snap hit1 grid=150x31 cursor=17,15
+|21: +Search 2/2 Save Unattach Del
+|22: /NEEDLE
+|23: 7 gg NEEDLE gg
+|24: 8 hhhh NEEDLE
== style hit1 grid=150x31
-|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-9 #e5eee5,#0d1410, 10-15 #f5f7ee,#3c614a, 16-16 #f5f7ee,#0d1410, 17-149 #e5eee5,#0d1410,
-|15: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
-|16: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
-|17: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-40 #d3b0d9,#1d2824, 41-149 #b2c3b8,#1d2824,
-|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-9 #e5eee5,#0d1410, 10-15 #f7e4a5,#5e4923, 16-16 #f7e4a5,#0d1410, 17-149 #e5eee5,#0d1410,
-|20: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-|21: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-11 #e5eee5,#0d1410, 12-17 #f7e4a5,#5e4923, 18-149 #f7e4a5,#0d1410,
-|22: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-== snap hit2 grid=150x31 cursor=17,15
-== style hit2 grid=150x31
-|14: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
+|14: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-9 #e5eee5,#0d1410, 10-15 #e5eee5,#352e19, 16-149 #e5eee5,#0d1410,
|15: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-11 #e5eee5,#0d1410, 12-17 #f5f7ee,#3c614a, 18-149 #f5f7ee,#0d1410,
-== snap back grid=150x31 cursor=15,14
-== style back grid=150x31
+|16: 0-0 d,#5e4923, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
+|18: 0-0 d,#e5eee5, 1-149 d,#0d1410,
+|21: 0-1 d,#496656, 2-149 #b2c3b8,#1d2824,
+|22: 0-0 d,#608269, 1-1 d,#0d1410, 2-149 #e5eee5,#0d1410,
+|23: 0-0 d,#608269, 1-5 d,#0d1410, 6-8 #59675c,#0d1410, 9-11 #e5eee5,#0d1410, 12-17 #f7e4a5,#352e19, 18-18 #f7e4a5,#0d1410, 19-149 #e5eee5,#0d1410,
+|24: 0-0 d,#608269, 1-1 d,#0d1410, 2-5 d,#3c614a, 6-149 #f5f7ee,#3c614a,
+== snap hit2 grid=150x31 cursor=15,14
+== style hit2 grid=150x31
|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-9 #e5eee5,#0d1410, 10-15 #f5f7ee,#3c614a, 16-16 #f5f7ee,#0d1410, 17-149 #e5eee5,#0d1410,
-|15: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
+|15: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-11 #e5eee5,#0d1410, 12-17 #e5eee5,#352e19, 18-149 #e5eee5,#0d1410,
+|16: 0-0 d,#e5eee5, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
+|18: 0-0 d,#5e4923, 1-149 d,#0d1410,
+|23: 0-0 d,#608269, 1-5 d,#0d1410, 6-8 #59675c,#0d1410, 9-11 #e5eee5,#0d1410, 12-17 #f7e4a5,#5e4923, 18-18 #f7e4a5,#0d1410, 19-149 #e5eee5,#0d1410,
+== snap back grid=150x31 cursor=17,15
+== style back grid=150x31
+|14: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-9 #e5eee5,#0d1410, 10-15 #e5eee5,#352e19, 16-149 #e5eee5,#0d1410,
+|15: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-11 #e5eee5,#0d1410, 12-17 #f5f7ee,#3c614a, 18-149 #f5f7ee,#0d1410,
+|16: 0-0 d,#5e4923, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
+|18: 0-0 d,#e5eee5, 1-149 d,#0d1410,
+|23: 0-0 d,#608269, 1-5 d,#0d1410, 6-8 #59675c,#0d1410, 9-11 #e5eee5,#0d1410, 12-17 #f7e4a5,#352e19, 18-18 #f7e4a5,#0d1410, 19-149 #e5eee5,#0d1410,
diff --git a/test/snapshots/lookrange.snap b/test/snapshots/lookrange.snap
index eb1db60a..5133e911 100644
--- a/test/snapshots/lookrange.snap
+++ b/test/snapshots/lookrange.snap
@@ -51,28 +51,24 @@ release right 12 7
stable 700 15000
snap stale
snapstyle stale
-# --- and now the first consumer. The look above left r.txt focused, so `/`
-# arms on it: the rows it writes carry the match's span, and the submit goes
-# straight to the first of them — with the word itself selected, which is the
-# whole reason the row spells a range and not a position.
+# --- and `/`: its query pane under r.txt, line 1 the pattern, the lines
+# holding it as rows (a line number in the gutter, the match tinted); Enter
+# puts the keyboard on the match after the cursor, the word itself selected.
key /
text NEEDLE
-key enter
-# Locations stack the target under its line now: two rows, two waits.
-wait 10000 r.txt:7:4-9
wait 10000 gg NEEDLE gg
stable 700 15000
+key enter
+stable 700 15000
snap hit1
snapstyle hit1
-# n selects the next row, and the Enter after it goes to that hit
-key space j n
-key enter
+# n: the next match in the text, selected
+text n
stable 700 15000
snap hit2
snapstyle hit2
-# N walks back onto the first hit; Enter looks it, still selected
-key space j p
-key enter
+# N walks back onto the first, still selected
+text N
stable 700 15000
snap back
snapstyle back
diff --git a/test/snapshots/lsp-client.golden b/test/snapshots/lsp-client.golden
index c9fad7b7..18ccd775 100644
--- a/test/snapshots/lsp-client.golden
+++ b/test/snapshots/lsp-client.golden
@@ -15,15 +15,16 @@
| 3 a + b
| 4 }
| 5
-== snap gr-list grid=100x25 cursor=21,6
+== snap gr-list grid=100x25 cursor=7,14
|3: 1 mod lib;
-|15: /tmp/pardes-snap/lsp-client/cwd/+Search Save Tty Collapse LocationsConfig Del
-|16: 1 lib.rs:2:8-10
-|17: 2 pub fn add(a: i32, b: i32) -> i32 {
-|18: 3 main.rs:4:13-15
-|19: 4 let x = add(1, 2);
-|20: 5 main.rs:5:13-15
-|21: 6 let y = add(3, 4);
-|22: 7
-== snap gr-opened grid=100x25 cursor=21,7
-== snap gr-back grid=100x25 cursor=21,6
+|13: ^ +Search 1/3 Del
+|14: Refs
+|15: lib.rs
+|16: 2 pub fn add(a: i32, b: i32) -> i32 {
+|17: main.rs
+|18: 4 let x = add(1, 2);
+|19: /tmp/pardes-snap/lsp-client/cwd/+Preview Del
+|20: 1
+== snap gr-opened grid=100x25 cursor=21,6
+|13: +Search 2/3 Save Unattach Del
+== snap gr-back grid=100x25 cursor=21,7
diff --git a/test/snapshots/lsp-client.snap b/test/snapshots/lsp-client.snap
index db94525e..d9827a2a 100644
--- a/test/snapshots/lsp-client.snap
+++ b/test/snapshots/lsp-client.snap
@@ -6,7 +6,8 @@
# gd on a cross-file Location -> a look: lib.rs opens with `add` selected,
# and the message row still carries the server's settled state
# ("lsp lspmock: ready") because nothing has cleared it yet.
-# gr -> sorted rows, selecting the next occurrence; n/N continue there.
+# gr -> the text's query pane, line 1 `Refs`, rows under their files,
+# the next occurrence current; n/N step the places in the text.
file main.rs mod lib;\n\nfn main() {\n let x = add(1, 2);\n let y = add(3, 4);\n let _ = x + y;\n}\n
file lib.rs // mock fixture\npub fn add(a: i32, b: i32) -> i32 {\n a + b\n}\n
start 25 100 main.rs
@@ -26,12 +27,12 @@ key r
wait 10000 add(3, 4)
stable 700 15000
snap gr-list
-# step from the selected middle row to the last hit, then return
-key space j n
+# Ctrl-n on line 1 steps to the next hit, Enter lands there; N in the text
+# goes back to the one before, round the places in main.rs
+key c-n
key enter
stable 700 15000
snap gr-opened
-key space j p
-key enter
+text N
stable 700 15000
snap gr-back
diff --git a/test/snapshots/lspdebug.snap b/test/snapshots/lspdebug.snap
index ec8d136d..22fa097b 100644
--- a/test/snapshots/lspdebug.snap
+++ b/test/snapshots/lspdebug.snap
@@ -39,11 +39,8 @@ text client queries
key enter
wait 10000 client queries
wait 10000 definition
-# the report sits between the source and the results, so Del asks where its
-# rows go: k, back to the source above
-key space d
-key k
-key space w j enter
+# Enter left the keyboard in the report, on the match; its query pane is
+# attached to it, so one Del closes both, their rows back to the source
key space d
stable 700 15000
snap report-closed
diff --git a/test/snapshots/lsprelpath.golden b/test/snapshots/lsprelpath.golden
index d961d6bd..59a3c5d0 100644
--- a/test/snapshots/lsprelpath.golden
+++ b/test/snapshots/lsprelpath.golden
@@ -1,4 +1,4 @@
-== snap absrow grid=100x35 cursor=21,16
+== snap absrow grid=100x35 cursor=7,17
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
| /tmp/pardes-snap/lsprelpath/cwd/sub/parent.zig Save Tty Collapse TreeContext Def Refs Del
@@ -9,56 +9,70 @@
| 5
| 6 };
| 7 }
-| /tmp/pardes-snap/lsprelpath/cwd/sub/+Search Save Tty Collapse LocationsConfig Del
-| 1 /tmp/pardes-snap/lsprelpath/cwd/shade.zig:1:11-15
-| 2 pub const Shade = enum {
-| 3 parent.zig:3:22-26
-| 4 pub fn pick(s: shade.Shade) u8 {
-| /tmp/pardes-snap/lsprelpath/cwd/shade.zig Save Tty Collapse TreeContext Def Refs Del
-| 1 pub const Shade = enum {
-| 2 verdigris,
-| 3 cinnabar,
-| 4 };
-| 5
-== snap abslook grid=100x35 cursor=32,5
+| 8
+|
+|
+|
+|
+|
+|^ +Search 2/2 Del
+| Refs
+| /tmp/pardes-snap/lsprelpath/cwd/shade.zig
+| 1 pub const Shade = enum {
+| parent.zig
+| 3 pub fn pick(s: shade.Shade) u8 {
+|
+|
+|
+|
+| /tmp/pardes-snap/lsprelpath/cwd/sub/+Preview Del
+| 1
+== snap abslook grid=100x35 cursor=21,27
|3: 1 const shade = @import("../shade.zig");
+|16: +Search 1/2 Save Unattach Del
+|26: /tmp/pardes-snap/lsprelpath/cwd/shade.zig Save Tty Collapse TreeContext Def Refs Del
+|27: 1 pub const Shade = enum {
+|28: 2 verdigris,
+|29: 3 cinnabar,
+|30: 4 };
+|31: 5
== style abslook grid=100x35
|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-37 #becfc4,#314738, 38-48 #dfbce5,#314738, 49-99 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-48 #d3b0d9,#1d2824, 49-99 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-20 #e5eee5,#0d1410, 21-27 #c9a7ed,#0d1410, 28-28 #e5eee5,#0d1410, 29-42 #b8d88a,#0d1410, 43-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-27 #e5eee5,#0d1410, 28-32 #f5f7ee,#3c614a, 33-99 #e5eee5,#0d1410,
-|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-24 #c9a7ed,#0d1410, 25-99 #e5eee5,#0d1410,
+|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-27 #e5eee5,#0d1410, 28-32 #f5f7ee,#3c614a, 33-99 #e5eee5,#0d1410,
+|6: 0-0 d,#e5eee5, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-24 #c9a7ed,#0d1410, 25-99 #e5eee5,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
-|9: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
-|10: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-45 #d3b0d9,#1d2824, 46-99 #b2c3b8,#1d2824,
-|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-21 #f7e4a5,#5e4923, 22-22 #f7e4a5,#0d1410, 23-24 #e5eee5,#0d1410, 25-29 #c9a7ed,#0d1410, 30-99 #e5eee5,#0d1410,
-|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|14: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-27 #e5eee5,#0d1410, 28-32 #f7e4a5,#5e4923, 33-99 #e5eee5,#0d1410,
-|15: 0-1 d,#496656, 2-33 #b2c3b8,#1d2824, 34-43 #d3b0d9,#1d2824, 44-99 #b2c3b8,#1d2824,
-|16: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-21 #f5f7ee,#3c614a, 22-22 #f5f7ee,#0d1410, 23-24 #e5eee5,#0d1410, 25-29 #c9a7ed,#0d1410, 30-99 #e5eee5,#0d1410,
-|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
-|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
-|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
-|20: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|21: 0-0 d,#608269, 1-99 d,#0d1410,
+|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
+|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
+|11: 0-0 d,#608269, 1-99 d,#0d1410,
+|12: 0-0 d,#608269, 1-99 d,#0d1410,
+|13: 0-0 d,#608269, 1-99 d,#0d1410,
+|14: 0-0 d,#608269, 1-99 d,#0d1410,
+|15: 0-0 d,#608269, 1-99 d,#0d1410,
+|16: 0-1 d,#496656, 2-99 #b2c3b8,#1d2824,
+|17: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
+|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
+|19: 0-0 d,#608269, 1-7 d,#0d1410, 8-10 #59675c,#0d1410, 11-20 #e5eee5,#0d1410, 21-25 #f7e4a5,#5e4923, 26-26 #f7e4a5,#0d1410, 27-99 #e5eee5,#0d1410,
+|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
+|21: 0-0 d,#608269, 1-7 d,#0d1410, 8-10 #59675c,#0d1410, 11-31 #e5eee5,#0d1410, 32-36 #f7e4a5,#5e4923, 37-99 #e5eee5,#0d1410,
|22: 0-0 d,#608269, 1-99 d,#0d1410,
|23: 0-0 d,#608269, 1-99 d,#0d1410,
|24: 0-0 d,#608269, 1-99 d,#0d1410,
|25: 0-0 d,#608269, 1-99 d,#0d1410,
-|26: 0-0 d,#608269, 1-99 d,#0d1410,
-|27: 0-0 d,#608269, 1-99 d,#0d1410,
-|28: 0-0 d,#608269, 1-99 d,#0d1410,
-|29: 0-0 d,#608269, 1-99 d,#0d1410,
-|30: 0-0 d,#608269, 1-99 d,#0d1410,
-|31: 0-0 d,#608269, 1-99 d,#0d1410,
+|26: 0-1 d,#add38a, 2-33 #becfc4,#314738, 34-43 #dfbce5,#314738, 44-99 #becfc4,#314738,
+|27: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-16 #e5eee5,#0d1410, 17-21 #f5f7ee,#3c614a, 22-22 #f5f7ee,#0d1410, 23-24 #e5eee5,#0d1410, 25-29 #c9a7ed,#0d1410, 30-99 #e5eee5,#0d1410,
+|28: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
+|29: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
+|30: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
+|31: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|32: 0-0 d,#608269, 1-99 d,#0d1410,
|33: 0-0 d,#608269, 1-99 d,#0d1410,
|34: 0-0 d,#608269, 1-99 d,#0d1410,
-== snap subrow grid=100x35 cursor=20,16
+== snap subrow grid=100x35 cursor=7,17
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
| /tmp/pardes-snap/lsprelpath/cwd/sub/subdir.zig Save Tty Collapse TreeContext Def Refs Del
@@ -69,53 +83,67 @@
| 5
| 6 };
| 7 }
-| /tmp/pardes-snap/lsprelpath/cwd/sub/+Search Save Tty Collapse LocationsConfig Del
-| 1 inner/tint.zig:1:11-14
-| 2 pub const Tint = enum {
-| 3 subdir.zig:3:20-23
-| 4 pub fn hue(t: tint.Tint) u8 {
-| /tmp/pardes-snap/lsprelpath/cwd/sub/inner/tint.zig Save Tty Collapse TreeContext Def Refs Del
-| 1 pub const Tint = enum {
-| 2 ochre,
-| 3 indigo,
-| 4 };
-| 5
-== snap sublook grid=100x35 cursor=29,5
+| 8
+|
+|
+|
+|
+|
+|^ +Search 2/2 Del
+| Refs
+| inner/tint.zig
+| 1 pub const Tint = enum {
+| subdir.zig
+| 3 pub fn hue(t: tint.Tint) u8 {
+|
+|
+|
+|
+| /tmp/pardes-snap/lsprelpath/cwd/sub/+Preview Del
+| 1
+== snap sublook grid=100x35 cursor=20,27
|3: 1 const tint = @import("inner/tint.zig");
+|16: +Search 1/2 Save Unattach Del
+|26: /tmp/pardes-snap/lsprelpath/cwd/sub/inner/tint.zig Save Tty Collapse TreeContext Def Refs Del
+|27: 1 pub const Tint = enum {
+|28: 2 ochre,
+|29: 3 indigo,
+|30: 4 };
+|31: 5
== style sublook grid=100x35
|0: 0-1 d,#1d2824, 2-99 #b2c3b8,#1d2824,
|1: 0-1 d,#887455, 2-99 #becfc4,#314738,
-|2: 0-1 d,#add38a, 2-37 #becfc4,#314738, 38-48 #dfbce5,#314738, 49-99 #becfc4,#314738,
+|2: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-48 #d3b0d9,#1d2824, 49-99 #b2c3b8,#1d2824,
|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-19 #e5eee5,#0d1410, 20-26 #c9a7ed,#0d1410, 27-27 #e5eee5,#0d1410, 28-43 #b8d88a,#0d1410, 44-99 #e5eee5,#0d1410,
|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-25 #e5eee5,#0d1410, 26-29 #f5f7ee,#3c614a, 30-99 #e5eee5,#0d1410,
-|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-24 #c9a7ed,#0d1410, 25-99 #e5eee5,#0d1410,
+|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-25 #e5eee5,#0d1410, 26-29 #f5f7ee,#3c614a, 30-99 #e5eee5,#0d1410,
+|6: 0-0 d,#e5eee5, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-24 #c9a7ed,#0d1410, 25-99 #e5eee5,#0d1410,
|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
-|9: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
-|10: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-45 #d3b0d9,#1d2824, 46-99 #b2c3b8,#1d2824,
-|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-20 #f7e4a5,#5e4923, 21-21 #f7e4a5,#0d1410, 22-23 #e5eee5,#0d1410, 24-28 #c9a7ed,#0d1410, 29-99 #e5eee5,#0d1410,
-|13: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|14: 0-0 d,#152019, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-10 #e5eee5,#0d1410, 11-13 #c9a7ed,#0d1410, 14-25 #e5eee5,#0d1410, 26-29 #f7e4a5,#5e4923, 30-99 #e5eee5,#0d1410,
-|15: 0-1 d,#496656, 2-43 #b2c3b8,#1d2824, 44-52 #d3b0d9,#1d2824, 53-99 #b2c3b8,#1d2824,
-|16: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-16 #e5eee5,#0d1410, 17-20 #f5f7ee,#3c614a, 21-21 #f5f7ee,#0d1410, 22-23 #e5eee5,#0d1410, 24-28 #c9a7ed,#0d1410, 29-99 #e5eee5,#0d1410,
-|17: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
-|18: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
-|19: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
-|20: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
-|21: 0-0 d,#608269, 1-99 d,#0d1410,
+|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
+|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
+|11: 0-0 d,#608269, 1-99 d,#0d1410,
+|12: 0-0 d,#608269, 1-99 d,#0d1410,
+|13: 0-0 d,#608269, 1-99 d,#0d1410,
+|14: 0-0 d,#608269, 1-99 d,#0d1410,
+|15: 0-0 d,#608269, 1-99 d,#0d1410,
+|16: 0-1 d,#496656, 2-99 #b2c3b8,#1d2824,
+|17: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
+|18: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
+|19: 0-0 d,#608269, 1-7 d,#0d1410, 8-10 #59675c,#0d1410, 11-20 #e5eee5,#0d1410, 21-24 #f7e4a5,#5e4923, 25-25 #f7e4a5,#0d1410, 26-99 #e5eee5,#0d1410,
+|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-99 #e5eee5,#0d1410,
+|21: 0-0 d,#608269, 1-7 d,#0d1410, 8-10 #59675c,#0d1410, 11-29 #e5eee5,#0d1410, 30-33 #f7e4a5,#5e4923, 34-99 #e5eee5,#0d1410,
|22: 0-0 d,#608269, 1-99 d,#0d1410,
|23: 0-0 d,#608269, 1-99 d,#0d1410,
|24: 0-0 d,#608269, 1-99 d,#0d1410,
|25: 0-0 d,#608269, 1-99 d,#0d1410,
-|26: 0-0 d,#608269, 1-99 d,#0d1410,
-|27: 0-0 d,#608269, 1-99 d,#0d1410,
-|28: 0-0 d,#608269, 1-99 d,#0d1410,
-|29: 0-0 d,#608269, 1-99 d,#0d1410,
-|30: 0-0 d,#608269, 1-99 d,#0d1410,
-|31: 0-0 d,#608269, 1-99 d,#0d1410,
+|26: 0-1 d,#add38a, 2-43 #becfc4,#314738, 44-52 #dfbce5,#314738, 53-99 #becfc4,#314738,
+|27: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-16 #e5eee5,#0d1410, 17-20 #f5f7ee,#3c614a, 21-21 #f5f7ee,#0d1410, 22-23 #e5eee5,#0d1410, 24-28 #c9a7ed,#0d1410, 29-99 #e5eee5,#0d1410,
+|28: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
+|29: 0-0 d,#608269, 1-4 d,#0d1410, 5-10 #59675c,#0d1410, 11-99 #e5eee5,#0d1410,
+|30: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-99 #e5eee5,#0d1410,
+|31: 0-0 d,#608269, 1-4 d,#0d1410, 5-99 #59675c,#0d1410,
|32: 0-0 d,#608269, 1-99 d,#0d1410,
|33: 0-0 d,#608269, 1-99 d,#0d1410,
|34: 0-0 d,#608269, 1-99 d,#0d1410,
-== snap clicked grid=100x35 cursor=15,12
+== snap clicked grid=100x35 cursor=29,5
diff --git a/test/snapshots/lsprelpath.snap b/test/snapshots/lsprelpath.snap
index a83abf46..8420e134 100644
--- a/test/snapshots/lsprelpath.snap
+++ b/test/snapshots/lsprelpath.snap
@@ -8,7 +8,8 @@
# short to be called.
#
# A row in the SAME directory shortens to a bare basename; the two that a
-# prefix strip can actually get wrong are here, one app each, as `gr` rows:
+# prefix strip can actually get wrong are here, one app each, as `gr` rows
+# (the file headers of the asking text's query pane, line 1 `Refs`):
#
# PARENT the enum is one level UP from the asking file, so nothing is
# stripped and the row carries `/tmp/.../cwd/shade.zig`. This is
@@ -32,26 +33,25 @@ file sub/subdir.zig const tint = @import("inner/tint.zig");\n\npub fn hue(t: tin
start 35 100 sub/parent.zig
wait 8000 fn pick
stable 700 20000
-# `gr` on `Shade` in the signature (file line 3, click row 6): its
-# declaration's row is in the parent directory.
press left 31 6
release left 31 6
stable 400 5000
key g
key r
-wait 15000 cwd/shade.zig:1:
+# the query pane under parent.zig, line 1 `Refs`, the rows under each file:
+# shade.zig's spelled whole, its directory being above
+wait 15000 cwd/shade.zig
stable 700 15000
snap absrow
-key esc
-settle 100
-# An absolute row has to keep resolving — it is the spelling every row had
-# before this, and the one every hit outside the tree still has.
-key space j n
+# the current row is parent.zig's own; the one before it is shade.zig's,
+# shown in the +Preview, which Enter makes shade.zig's pane
+key c-p
+wait 10000 verdigris
+stable 700 15000
key enter
stable 700 15000
snap abslook
snapstyle abslook
-# ---- SUBDIRECTORY: under it, so the strip leaves `inner/tint.zig` ----
start 35 100 sub/subdir.zig
wait 8000 fn hue
stable 700 20000
@@ -60,23 +60,16 @@ release left 29 6
stable 400 5000
key g
key r
-wait 15000 inner/tint.zig:1:
+wait 15000 inner/tint.zig
stable 700 15000
snap subrow
-key esc
-settle 100
-key space j n
+key c-p
+wait 10000 ochre
+stable 700 15000
key enter
stable 700 15000
snap sublook
snapstyle sublook
-# The mouse spelling, on the OTHER row (grid row 12, 1-based click row 13). A
-# right click expands to the file-ish word under the cursor
-# (config.wordBounds), which has to take `inner/tint.zig:3:5-10` WHOLE — the
-# separator inside a stripped path is a file char, so the scan runs back over
-# `inner/` and stops on the space of the line-number prefix. A look focuses
-# what it opens, so the header's cursor is the assertion: the end of `indigo`
-# on line 3 of tint.zig.
press right 12 13
release right 12 13
stable 700 15000
diff --git a/test/snapshots/msg.golden b/test/snapshots/msg.golden
index 24018546..950c4d67 100644
--- a/test/snapshots/msg.golden
+++ b/test/snapshots/msg.golden
@@ -37,10 +37,10 @@
|8:
|9:
== snap prompt grid=70x17 cursor=69,3
-|3: 1 EXTERNAL /EXT
+|3: 1 EXTERNAL Select /EXT
== snap prompt-wins grid=70x17 cursor=69,4
|3: 1 AGAIN --:--:-- reloaded /tmp/pardes-snap/msg/cwd/a.txt
-|4: 2 /EXT
+|4: 2 Select /EXT
== snap esc grid=70x17 cursor=7,4
|3: 1 AGAIN
|4: 2
diff --git a/test/snapshots/msg.snap b/test/snapshots/msg.snap
index 5252508a..64a77bb2 100644
--- a/test/snapshots/msg.snap
+++ b/test/snapshots/msg.snap
@@ -58,7 +58,7 @@ snap reloaded
# its builtins instead of losing them to a long pattern. Note the tag row above
# ends at `Del`: the marker and the pattern are no longer on it at all. (The
# `/` keystroke also cleared the reload message, which is the rule above.)
-key /
+key s
text EXT
stable 700 15000
snap prompt
diff --git a/test/snapshots/stepgrain.golden b/test/snapshots/stepgrain.golden
index 3101b920..43445ed4 100644
--- a/test/snapshots/stepgrain.golden
+++ b/test/snapshots/stepgrain.golden
@@ -1,43 +1,55 @@
-== snap results grid=150x31 cursor=7,3
+== snap results grid=150x31 cursor=13,13
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
| /tmp/pardes-snap/stepgrain/cwd/a.txt Save Tty Collapse Del
| 1 hello ZQMARK one
| 2 see also sub/b.txt for ZQMARK two
-| /tmp/pardes-snap/stepgrain/cwd/+Search Save Tty Collapse LocationsConfig Del
-| 1 a.txt:1:7-12
-| 2 hello ZQMARK one
-| 3 a.txt:2:24-29
-| 4 see also sub/b.txt for ZQMARK two
-| 5 sub/b.txt:1:1-6
-| 6 ZQMARK inside sub
-| 7
-== snap step-row1 grid=150x31 cursor=7,6
-== style step-row1 grid=150x31
+|
+|
+|
+|
+|
+|
+|
+|^ +Search 1/3 Del
+| Grep ZQMARK
+| a.txt
+| 1 hello ZQMARK one
+| 2 see also sub/b.txt for ZQMARK two
+| sub/b.txt
+| 1 ZQMARK inside sub
+|
+|
+|
+| /tmp/pardes-snap/stepgrain/cwd/+Preview Del
+| 1
+== snap step-row2 grid=150x31 cursor=13,13
+|12: ^ +Search 2/3 Del
+== style step-row2 grid=150x31
|0: 0-1 d,#1d2824, 2-149 #b2c3b8,#1d2824,
|1: 0-1 d,#887455, 2-149 #becfc4,#314738,
|2: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-38 #d3b0d9,#1d2824, 39-149 #b2c3b8,#1d2824,
-|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
-|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
-|5: 0-1 d,#add38a, 2-32 #becfc4,#314738, 33-40 #dfbce5,#314738, 41-149 #becfc4,#314738,
-|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-18 #f5f7ee,#3c614a, 19-149 #f5f7ee,#0d1410,
-|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-12 #e5eee5,#0d1410, 13-18 #f7e4a5,#5e4923, 19-19 #f7e4a5,#0d1410, 20-149 #e5eee5,#0d1410,
-|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-|9: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-29 #e5eee5,#0d1410, 30-35 #f7e4a5,#5e4923, 36-36 #f7e4a5,#0d1410, 37-149 #e5eee5,#0d1410,
-|10: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-|11: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-12 #f7e4a5,#5e4923, 13-13 #f7e4a5,#0d1410, 14-149 #e5eee5,#0d1410,
-|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-|13: 0-0 d,#608269, 1-149 d,#0d1410,
-|14: 0-0 d,#608269, 1-149 d,#0d1410,
-|15: 0-0 d,#608269, 1-149 d,#0d1410,
-|16: 0-0 d,#608269, 1-149 d,#0d1410,
-|17: 0-0 d,#608269, 1-149 d,#0d1410,
-|18: 0-0 d,#608269, 1-149 d,#0d1410,
+|3: 0-0 d,#5e4923, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-12 #e5eee5,#0d1410, 13-18 #e5eee5,#352e19, 19-149 #e5eee5,#0d1410,
+|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-29 #e5eee5,#0d1410, 30-35 #f5f7ee,#3c614a, 36-36 #f5f7ee,#0d1410, 37-149 #e5eee5,#0d1410,
+|5: 0-0 d,#608269, 1-149 d,#0d1410,
+|6: 0-0 d,#608269, 1-149 d,#0d1410,
+|7: 0-0 d,#e5eee5, 1-149 d,#0d1410,
+|8: 0-0 d,#608269, 1-149 d,#0d1410,
+|9: 0-0 d,#608269, 1-149 d,#0d1410,
+|10: 0-0 d,#608269, 1-149 d,#0d1410,
+|11: 0-0 d,#608269, 1-149 d,#0d1410,
+|12: 0-1 #000000,#add38a, 2-149 #becfc4,#314738,
+|13: 0-0 d,#608269, 1-1 d,#0d1410, 2-149 #e5eee5,#0d1410,
+|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-149 #e5eee5,#0d1410,
+|15: 0-0 d,#608269, 1-7 d,#0d1410, 8-10 #59675c,#0d1410, 11-16 #e5eee5,#0d1410, 17-22 #f7e4a5,#5e4923, 23-23 #f7e4a5,#0d1410, 24-149 #e5eee5,#0d1410,
+|16: 0-0 d,#608269, 1-7 d,#0d1410, 8-10 #59675c,#0d1410, 11-33 #e5eee5,#0d1410, 34-39 #f7e4a5,#5e4923, 40-40 #f7e4a5,#0d1410, 41-149 #e5eee5,#0d1410,
+|17: 0-0 d,#608269, 1-1 d,#0d1410, 2-149 #e5eee5,#0d1410,
+|18: 0-0 d,#608269, 1-7 d,#0d1410, 8-10 #59675c,#0d1410, 11-16 #f7e4a5,#5e4923, 17-17 #f7e4a5,#0d1410, 18-149 #e5eee5,#0d1410,
|19: 0-0 d,#608269, 1-149 d,#0d1410,
|20: 0-0 d,#608269, 1-149 d,#0d1410,
|21: 0-0 d,#608269, 1-149 d,#0d1410,
-|22: 0-0 d,#608269, 1-149 d,#0d1410,
-|23: 0-0 d,#608269, 1-149 d,#0d1410,
+|22: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-41 #d3b0d9,#1d2824, 42-149 #b2c3b8,#1d2824,
+|23: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
|24: 0-0 d,#608269, 1-149 d,#0d1410,
|25: 0-0 d,#608269, 1-149 d,#0d1410,
|26: 0-0 d,#608269, 1-149 d,#0d1410,
@@ -45,29 +57,32 @@
|28: 0-0 d,#608269, 1-149 d,#0d1410,
|29: 0-0 d,#608269, 1-149 d,#0d1410,
|30: 0-0 d,#608269, 1-149 d,#0d1410,
-== snap step-row2 grid=150x31 cursor=7,8
-== style step-row2 grid=150x31
-|6: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-|8: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-19 #f5f7ee,#3c614a, 20-149 #f5f7ee,#0d1410,
-== snap step-row3 grid=150x31 cursor=7,10
-== snap step-wrap grid=150x31 cursor=7,6
-== snap blank-in-path grid=150x31 cursor=7,6
-|5: /tmp/pardes-snap/stepgrain/cwd/+Search Save Tty Collapse Del
-|6: 1 two words.txt
-|7: 2
-|8:
-|9:
-|10:
-|11:
-|12:
+== snap step-row3 grid=150x31 cursor=13,13
+|12: ^ +Search 3/3 Del
+|22: /tmp/pardes-snap/stepgrain/cwd/sub/b.txt Del
+|23: 1 ZQMARK inside sub
+== snap step-wrap grid=150x31 cursor=13,13
+|12: ^ +Search 1/3 Del
+== snap blank-in-path grid=150x31 cursor=12,13
+|12: ^ +Search 1/1 Del
+|13: Find words
+|14: two words.txt
+|15:
+|16:
+|17:
+|18:
+|22: /tmp/pardes-snap/stepgrain/cwd/two words.txt Del
+|23: 1
== style blank-in-path grid=150x31
-|6: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-19 #f5f7ee,#3c614a, 20-149 #f5f7ee,#0d1410,
-|7: 0-0 d,#608269, 1-4 d,#0d1410, 5-149 #59675c,#0d1410,
-|8: 0-0 d,#608269, 1-149 d,#0d1410,
-|9: 0-0 d,#608269, 1-149 d,#0d1410,
-|10: 0-0 d,#608269, 1-149 d,#0d1410,
-|11: 0-0 d,#608269, 1-149 d,#0d1410,
-|12: 0-0 d,#608269, 1-149 d,#0d1410,
-== snap blank-opened grid=150x31 cursor=7,9
-|8: /tmp/pardes-snap/stepgrain/cwd/two words.txt Save Tty Collapse Del
-|9: 1
+|3: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
+|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-149 #e5eee5,#0d1410,
+|7: 0-0 d,#608269, 1-149 d,#0d1410,
+|14: 0-0 d,#608269, 1-1 d,#0d1410, 2-5 #e5eee5,#0d1410, 6-10 #f7e4a5,#5e4923,b 11-149 #e5eee5,#0d1410,
+|15: 0-0 d,#608269, 1-149 d,#0d1410,
+|16: 0-0 d,#608269, 1-149 d,#0d1410,
+|17: 0-0 d,#608269, 1-149 d,#0d1410,
+|18: 0-0 d,#608269, 1-149 d,#0d1410,
+|22: 0-1 d,#496656, 2-32 #b2c3b8,#1d2824, 33-46 #d3b0d9,#1d2824, 47-149 #b2c3b8,#1d2824,
+== snap blank-opened grid=150x31 cursor=7,23
+|12: +Search 1/1 Save Unattach Del
+|22: /tmp/pardes-snap/stepgrain/cwd/two words.txt Save Tty Collapse Del
diff --git a/test/snapshots/stepgrain.snap b/test/snapshots/stepgrain.snap
index 0f555ff8..e807981c 100644
--- a/test/snapshots/stepgrain.snap
+++ b/test/snapshots/stepgrain.snap
@@ -1,22 +1,11 @@
-# WHAT ONE PRESS OF `n` TAKES, and why that is not one answer. A pane's rows
-# decide it (output_pane.Grain, read in Pardes.lookSpanIn):
+# ONE PRESS, ONE ROW. A query pane's rows are one a line with a hit, the
+# hit's line under a gutter number, and Ctrl-n / Ctrl-p (typing on line 1)
+# step them a row at a time, round the end: row 2 below matched on a line
+# that mentions `sub/b.txt`, and the step does not stop on that word, as the
+# old word-grained walk did; the fourth press wraps back to row 1.
#
-# free text — a terminal, a file, a PDF — is stepped WORD by word, several
-# stops to a line, because a line of it may name several places at once (the
-# `ls` row in ttylook.snap hops big.txt -> plain.txt -> sub);
-#
-# a RESULTS BUFFER is stepped ROW by row, on the location at the head of the
-# row, because a row there IS one location and the words after it are the
-# MATCHED TEXT — the same hit, spelled out. That text is full of look-able
-# words, and stopping on them was stopping on the same result twice.
-#
-# This script is the second rule. Row 2 below matched on a line that mentions
-# `sub/b.txt`, so the old word-grained walk stopped there before it ever
-# reached row 3; now `n` presses and rows correspond one to one, and the fourth
-# press wraps the ring back to row 1.
-#
-# LARGEST from the head, so a path with a BLANK in it is one span rather than
-# the word in front of it: `two words.txt` selects whole and opens.
+# A path with a BLANK in it is one name: `two words.txt` is found whole by
+# Find and Enter opens exactly it.
dirmk sub
file a.txt hello ZQMARK one\nsee also sub/b.txt for ZQMARK two
file sub/b.txt ZQMARK inside sub
@@ -24,52 +13,36 @@ run touch 'two words.txt'
start 31 150 a.txt
wait 8000 hello ZQMARK
stable 700 20000
-# Grep from the leader: three hits, sorted by path, the empty file contributing
-# none. Row 2 is the one whose TEXT holds a path.
+# Grep from the leader: three hits, under their files, the empty file
+# contributing none. Row 2 is the one whose TEXT holds a path.
key space
key f
key g
stable 400 5000
text ZQMARK
-key enter
-wait 10000 sub/b.txt:1:1
+wait 10000 ZQMARK inside sub
stable 700 15000
snap results
-# one press, one row: the head of row 1...
-key space j n
-stable 400 5000
-snap step-row1
-snapstyle step-row1
-# ...the head of row 2, and NOT the `sub/b.txt` sitting in its matched text —
-# the cursor column is the assertion
-key space j n
+key c-n
stable 400 5000
snap step-row2
snapstyle step-row2
-# ...row 3, and then the ring comes round to row 1 again
-key space j n
+key c-n
stable 400 5000
snap step-row3
-key space j n
+key c-n
stable 400 5000
snap step-wrap
-# Back into the file, so the Find below is asked from a pane that is not a
-# results buffer (fillResults never refills the buffer it was asked from).
-press left 8 4
-release left 8 4
+key esc
+settle 100
stable 400 5000
-# A path with a blank in it: the row is one span from its first cell, because
-# the walk asks about the LONGEST run of the row first and the filesystem is
-# what vouches for it. Enter then opens exactly what is selected.
+# Find `words`: the name with a blank in it, whole
key space
key f
key f
text words
-key enter
wait 10000 two words.txt
stable 700 15000
-key space j n
-stable 400 5000
snap blank-in-path
snapstyle blank-in-path
key enter
diff --git a/test/snapshots/tagbottom.golden b/test/snapshots/tagbottom.golden
index ef1bab3a..cf690a40 100644
--- a/test/snapshots/tagbottom.golden
+++ b/test/snapshots/tagbottom.golden
@@ -150,10 +150,19 @@
|8: 8 hhh
|9: 9 iii
|10: 10 jjj
-== snap search-prompt grid=100x31 cursor=99,12
-|12: 1 ZZONE /ZZ
+== snap search-prompt grid=100x31 cursor=5,21
+|20: /tmp/pardes-snap/tagbottom/cwd/bottom.txt Save Tty Collapse Del
+|21: /ZZ
+|22: 1 ZZONE
+|23: 2 ZZTWO
+|30: ^ +Search 1/2 Del
== snap leader grid=100x31 cursor=9,13
|12: 1 ZZONE SPC
+|20:
+|21:
+|22:
+|23:
+|30: /tmp/pardes-snap/tagbottom/cwd/bottom.txt Save Tty Collapse Del
== snap cut-down grid=100x31 cursor=7,5
|2: 1 aaa
|3: 2 bbb
diff --git a/test/snapshots/tagbottomshort.golden b/test/snapshots/tagbottomshort.golden
index 00d8cad0..1979cc60 100644
--- a/test/snapshots/tagbottomshort.golden
+++ b/test/snapshots/tagbottomshort.golden
@@ -1,41 +1,41 @@
-== snap roomy grid=80x11 cursor=79,2
+== snap roomy grid=80x11 cursor=5,5
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
-| 1 one /ZZ
+| 1 one
| 2 two
-| 3 three
-| 4 four
-| 5 five
-| 6 six
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| /ZZ
|
|
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
-== snap two-body grid=80x5 cursor=79,2
+|
+|
+|^ +Search 0 Del
+== snap two-body grid=80x5 cursor=5,3
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
-| 1 one /ZZ
-| 2 two
| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
-== snap one-body grid=80x4 cursor=79,2
+| /ZZ
+|^ +Search 0 Del
+== snap one-body grid=80x4 cursor=79,3
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
-| 1 one /ZZ
| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+|^ +Search 0 Del
== snap tag-only grid=80x2 cursor=79,1
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
-== snap regrown grid=80x11 cursor=79,2
+== snap regrown grid=80x11 cursor=5,5
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
-| 1 one /ZZ
+| 1 one
| 2 two
-| 3 three
-| 4 four
-| 5 five
-| 6 six
+| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+| /ZZ
|
|
-| /tmp/pardes-snap/tagbottomshort/cwd/s.txt Save Tty Collapse Del
+|
+|
+|^ +Search 0 Del
== snap leader-one-body grid=80x4 cursor=7,2
| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit
| New Tty Find Grep Joincol Delcol
diff --git a/test/snapshots/topbarexec.golden b/test/snapshots/topbarexec.golden
index 5b7d2234..63ed382c 100644
--- a/test/snapshots/topbarexec.golden
+++ b/test/snapshots/topbarexec.golden
@@ -26,14 +26,20 @@
|8: │pinch 1.0000 │
|9: │tscroll 0.0000 │
|10: ╰────────────────────────────────────╯
-== snap arg-still-spliced grid=90x21 cursor=14,5
+== snap arg-still-spliced grid=90x21 cursor=14,4
|1: New Tty Find Grep Joincol Delcol New Tty Find Grep Joincol Delcol
|2: /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa
|3: ve Mode Filter Collapse Del ve Mode Filter Collapse Del
-|4: ls Find ls
-|5: zmarkfile.txt zmarkfile.txt
-|6:
-|7: /tmp/pardes-snap/topbarexec/cwd/+Search Sav
-|8: e Tty Collapse Del
-|9: 1 zmarkfile.txt
-|10: 2
+|4: zmarkfile.txt Find ls
+|5: zmarkfile.txt
+|6: +Search 1/1 Del
+|7: Find zmarkfile.txt
+|8: zmarkfile.txt
+|9: /tmp/pardes-snap/topbarexec/cwd/zmarkfile.t
+|10: xt Del
+|11: 1 hay ZQNEEDLE stack
+|12:
+|13: /tmp/pardes-snap/topbarexec/cwd Tty+bash Sa
+|14: ve Mode Filter Collapse Del
+|15: ls
+|16: zmarkfile.txt