summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/look.zig35
-rw-r--r--src/pardes.zig29
-rw-r--r--test/snapshots/find.golden203
-rw-r--r--test/snapshots/find.snap14
-rw-r--r--test/snapshots/fsearch.golden108
-rw-r--r--test/snapshots/psearch.golden100
-rw-r--r--test/snapshots/rsearch.golden40
7 files changed, 310 insertions, 219 deletions
diff --git a/src/look.zig b/src/look.zig
index 61970de1..2b788bde 100644
--- a/src/look.zig
+++ b/src/look.zig
@@ -179,13 +179,24 @@ const find_max_hits = 512;
const find_max_depth = 16;
const find_max_steps = 100_000;
+/// Directories a source tree has no answers in, skipped whole. fd reads
+/// .gitignore for this; pardes has no ignore parser, and every one of these
+/// costs a real search: agave's `target/` alone is 456_000 of its 460_000
+/// entries and holds 1_200 of the 1_242 paths matching "bank", so a Find for
+/// `bank` burned the whole 512-hit budget on build artifacts and never
+/// reached `runtime/src/bank.rs`. That looked like a broken matcher.
+const find_skip = [_][]const u8{
+ ".git", ".jj", "target", "node_modules",
+ ".venv", "__pycache__", ".zig-cache", "zig-out",
+};
+
/// `fd`, in-core: every path under `dir` whose NAME contains `pat` (plain
/// case-insensitive substring — fd's default is a regex and pardes has no
-/// regex engine to spend on one), one ABSOLUTE path per line into `out`.
-/// Absolute because each line is an ordinary look target that outlives the
-/// walk: a terminal's cwd can move out from under its own results buffer.
-/// Only real directories are entered, so a symlink can never close a cycle,
-/// and `.git` is skipped whole (fd's default too).
+/// regex engine to spend on one), one path per line into `out`, RELATIVE to
+/// `dir` — the results buffer is itself named `dir/+Search`, so every row
+/// resolves against the same directory the walk started in and reads as the
+/// short name the searcher was looking for. Only real directories are
+/// entered, so a symlink can never close a cycle.
pub fn find(arena: std.mem.Allocator, dir: []const u8, pat: []const u8, out: *std.ArrayList(u8)) void {
var hits: std.ArrayList([]const u8) = .empty;
if (platform_has_fs) {
@@ -196,19 +207,19 @@ pub fn find(arena: std.mem.Allocator, dir: []const u8, pat: []const u8, out: *st
var root = std.Io.Dir.cwd().openDir(io, dir, .{ .iterate = true }) catch return;
defer root.close(io);
// walkSelectively, not walk: descending is opt-in, which is the only
- // way to express the depth cap and the .git skip at all.
+ // way to express the depth cap and find_skip at all.
var w = root.walkSelectively(arena) catch return;
defer w.deinit();
var steps: usize = 0;
- while (steps < find_max_steps and hits.items.len < find_max_hits) {
+ walk: while (steps < find_max_steps and hits.items.len < find_max_hits) {
steps += 1; // an unreadable dir burns a step too, so it cannot spin
const e = (w.next(io) catch continue) orelse break;
if (std.ascii.indexOfIgnoreCase(e.basename, pat) != null)
- hits.append(arena, std.fmt.allocPrint(arena, "{s}/{s}", .{
- std.mem.trimEnd(u8, dir, "/"), e.path,
- }) catch break) catch break;
- if (e.kind == .directory and e.depth() < find_max_depth and !std.mem.eql(u8, e.basename, ".git"))
- w.enter(io, e) catch {};
+ // e.path points into the walker's own buffer, dead at next()
+ hits.append(arena, arena.dupe(u8, e.path) catch break) catch break;
+ if (e.kind != .directory or 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 {};
}
} else {
// web: the build-generated source archive IS the filesystem, and it is
diff --git a/src/pardes.zig b/src/pardes.zig
index 4d821e60..8e644470 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -2640,8 +2640,10 @@ pub const Pardes = struct {
// 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;
var idbuf: [16]u8 = undefined;
+ // relative to `dir`, like Find's rows — and `dir` IS this file's
+ // own directory, so that is exactly its basename
const loc: []const u8 = if (has_path)
- pane.file.?.path
+ std.fs.path.basename(pane.file.?.path)
else
std.fmt.bufPrint(&idbuf, "@p{d}", .{id}) catch return;
for (pl.lines, 0..) |ln, i| {
@@ -2663,6 +2665,19 @@ pub const Pardes = struct {
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;
};
const free = p.freeSlot() orelse {
@@ -4616,6 +4631,18 @@ pub const Pardes = struct {
};
src.vweight = @floatFromInt(BOX_H + keep);
nw.vweight = @floatFromInt(@max(1, src_h -| (BOX_H + keep)));
+ // an output buffer is worth exactly its own text: a three-hit +Search
+ // is four rows, not half the source. Nothing else can want the rows,
+ // so they go straight back to the pane they were taken from.
+ if (nw.file) |f| if (f.output) {
+ // trimmed: every row ends in a newline, and the empty line after
+ // the last one is not a result
+ const want: f32 = @floatFromInt(BOX_H + fileLineCount(std.mem.trimEnd(u8, f.content, "\n")));
+ if (want < nw.vweight) {
+ src.vweight += nw.vweight - want;
+ nw.vweight = want;
+ }
+ };
}
/// a shell nobody has touched: no typing, cursor on the first prompt line,
diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden
index 59b939ae..7e741329 100644
--- a/test/snapshots/find.golden
+++ b/test/snapshots/find.golden
@@ -143,11 +143,6 @@
|
|
|
-| NOR /tmp/pardes-snap/find/cwd/+Search Del
-| 1 /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt
-| 2 /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt
-| 3 /tmp/pardes-snap/find/cwd/zqmark-alpha.txt
-| 4
|
|
|
@@ -162,6 +157,11 @@
|
|
|
+|
+| NOR /tmp/pardes-snap/find/cwd/+Search Del
+| 1 sub/ZQMARK-beta.txt
+| 2 sub/nest/zqmark-gamma.txt
+| 3 zqmark-alpha.txt
== snap first grid=120x40 cursor=7,2
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del
@@ -174,8 +174,6 @@
|
|
|
-| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
-| 1 beta body
|
|
|
@@ -184,11 +182,8 @@
|
|
|
-| NOR /tmp/pardes-snap/find/cwd/+Search Del
-| 1 /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt
-| 2 /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt
-| 3 /tmp/pardes-snap/find/cwd/zqmark-alpha.txt
-| 4
+| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
+| 1 beta body
|
|
|
@@ -203,6 +198,11 @@
|
|
|
+|
+| NOR /tmp/pardes-snap/find/cwd/+Search Del
+| 1 sub/ZQMARK-beta.txt
+| 2 sub/nest/zqmark-gamma.txt
+| 3 zqmark-alpha.txt
== style first
|0: 0-37 #949494,#121212, 38-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,
@@ -215,20 +215,20 @@
|8: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|9: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|10: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|11: 0-1 d,#262626, 2-59 #949494,#121212, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|12: 0-1 d,#444444, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|11: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|12: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|13: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|14: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|15: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|16: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|17: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|18: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|19: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|20: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|21: 0-1 d,#262626, 2-42 #949494,#121212, 43-59 d,#121212, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|22: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 #d8c8a8,#4a3a1e, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|23: 0-1 d,#444444, 2-6 #626262,#080808, 7-57 #bdbdbd,#080808, 58-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|24: 0-1 d,#444444, 2-6 #626262,#080808, 7-48 #bdbdbd,#080808, 49-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|19: 0-1 d,#262626, 2-59 #949494,#121212, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|20: 0-1 d,#444444, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|21: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|22: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|23: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|24: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|25: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|26: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|27: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
@@ -240,10 +240,10 @@
|33: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|34: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
|35: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|36: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|37: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|38: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
-|39: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|36: 0-1 d,#262626, 2-42 #949494,#121212, 43-59 d,#121212, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|37: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 #d8c8a8,#4a3a1e, 60-61 d,#444444, 62-119 #bdbdbd,#080808,
+|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
| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del
@@ -251,14 +251,12 @@
| here.txt other.txt sub 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/sub/nest/zqmark-gamma.txt Sa
+| 1 gamma body
|
|
|
@@ -266,11 +264,9 @@
|
|
|
-| NOR /tmp/pardes-snap/find/cwd/+Search Del
-| 1 /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt
-| 2 /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt
-| 3 /tmp/pardes-snap/find/cwd/zqmark-alpha.txt
-| 4
+| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
+| 1 beta body
+|
|
|
|
@@ -285,20 +281,23 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/+Search Del
+| 1 sub/ZQMARK-beta.txt
+| 2 sub/nest/zqmark-gamma.txt
+| 3 zqmark-alpha.txt
== snap third grid=120x40 cursor=7,2
|Kill Newcol Tutor Debug NextColor Dump
| 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/zqmark-alpha.txt Save Del here.txt other.txt sub zqmark-alpha.txt
-| 1 alpha body
+| here.txt other.txt sub zqmark-alpha.txt
|
-| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
-| 1 gamma body
|
+| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del
+| 1 alpha body
|
|
-| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
-| 1 beta body
+| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
+| 1 gamma body
|
|
|
@@ -306,12 +305,9 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
+| 1 beta body
|
-| NOR /tmp/pardes-snap/find/cwd/+Search Del
-| 1 /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt
-| 2 /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt
-| 3 /tmp/pardes-snap/find/cwd/zqmark-alpha.txt
-| 4
|
|
|
@@ -326,20 +322,23 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/+Search Del
+| 2 sub/nest/zqmark-gamma.txt
+| 3 zqmark-alpha.txt
+| 4
== snap back grid=120x40 cursor=7,2
|Kill Newcol Tutor Debug NextColor Dump
| 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/zqmark-alpha.txt Save Del here.txt other.txt sub zqmark-alpha.txt
-| 1 alpha body
+| here.txt other.txt sub zqmark-alpha.txt
|
-| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
-| 1 gamma body
|
+| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del
+| 1 alpha body
|
|
-| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
-| 1 beta body
+| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
+| 1 gamma body
|
|
|
@@ -347,12 +346,9 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
+| 1 beta body
|
-| NOR /tmp/pardes-snap/find/cwd/+Search Del
-| 1 /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt
-| 2 /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt
-| 3 /tmp/pardes-snap/find/cwd/zqmark-alpha.txt
-| 4
|
|
|
@@ -367,20 +363,23 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/+Search Del
+| 1 sub/ZQMARK-beta.txt
+| 2 sub/nest/zqmark-gamma.txt
+| 3 zqmark-alpha.txt
== snap word grid=120x40 cursor=56,1
|Kill Newcol Tutor Debug NextColor Dump
| INS /tmp/pardes-snap/find/cwd/here.txt Save Del Find / NOR /tmp/pardes-snap/find/cwd Del
-|╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌
-| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del here.txt other.txt sub zqmark-alpha.txt
-| 1 alpha body
+| 1 Find
+| here.txt other.txt sub zqmark-alpha.txt
|
-| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
-| 1 gamma body
|
+| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del
+| 1 alpha body
|
|
-| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
-| 1 beta body
+| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
+| 1 gamma body
|
|
|
@@ -388,12 +387,9 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
+| 1 beta body
|
-| NOR /tmp/pardes-snap/find/cwd/+Search Del
-| 1 /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt
-| 2 /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt
-| 3 /tmp/pardes-snap/find/cwd/zqmark-alpha.txt
-| 4
|
|
|
@@ -408,20 +404,23 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/+Search Del
+| 1 sub/ZQMARK-beta.txt
+| 2 sub/nest/zqmark-gamma.txt
+| 3 zqmark-alpha.txt
== snap cancel grid=120x40 cursor=7,2
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del
-|╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌
-| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del here.txt other.txt sub zqmark-alpha.txt
-| 1 alpha body
+| 1 Find
+| here.txt other.txt sub zqmark-alpha.txt
|
-| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
-| 1 gamma body
|
+| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del
+| 1 alpha body
|
|
-| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
-| 1 beta body
+| NOR /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Sa
+| 1 gamma body
|
|
|
@@ -429,12 +428,9 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save Del
+| 1 beta body
|
-| NOR /tmp/pardes-snap/find/cwd/+Search Del
-| 1 /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt
-| 2 /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt
-| 3 /tmp/pardes-snap/find/cwd/zqmark-alpha.txt
-| 4
|
|
|
@@ -449,18 +445,30 @@
|
|
|
+| NOR /tmp/pardes-snap/find/cwd/+Search Del
+| 1 sub/ZQMARK-beta.txt
+| 2 sub/nest/zqmark-gamma.txt
+| 3 zqmark-alpha.txt
== snap nomatch grid=120x40 cursor=7,2
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/find/cwd/here.txt Save Del NOR /tmp/pardes-snap/find/cwd Del
-|╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌
-| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del here.txt other.txt sub zqmark-alpha.txt
+| 1 Find
+| here.txt other.txt sub zqmark-alpha.txt
+|
+|
+| NOR /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save Del
| 1 alpha body
|
+|
| 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
|
@@ -471,16 +479,39 @@
|
|
|
+|
+|
+|
+|
+|
+|
+|
+|
+|
| NOR /tmp/pardes-snap/find/cwd/+Search Del
| 1
+== snap refit grid=120x40 cursor=7,2
+|Kill Newcol Tutor Debug NextColor Dump
+| 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/zqmark-alpha.txt Save Del
+| 1 alpha body
+|
+|
+| 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
|
|
|
@@ -490,3 +521,13 @@
|
|
|
+|
+|
+|
+|
+|
+|
+| 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 03fefaa7..bad36bb6 100644
--- a/test/snapshots/find.snap
+++ b/test/snapshots/find.snap
@@ -66,7 +66,9 @@ key esc
settle 700
stable 400 5000
snap cancel
-# a no-match walk empties the buffer; n then has nowhere to go
+# 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.
key space
key f
key f
@@ -76,3 +78,13 @@ stable 700 10000
key n
stable 400 5000
snap nomatch
+# ... and it grows BACK when the next search finds more: the refit trades rows
+# with the neighbour in both directions, so three hits are three rows again
+key space
+key f
+key f
+text zqm
+key enter
+wait 10000 zqmark-alpha.txt
+stable 700 15000
+snap refit
diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden
index 8aa46b00..ab37dbe9 100644
--- a/test/snapshots/fsearch.golden
+++ b/test/snapshots/fsearch.golden
@@ -77,13 +77,9 @@
| 12 l12
|
|
-| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del NOR /tmp/pardes-snap/fsearch/cwd Del
-| 1 /tmp/pardes-snap/fsearch/cwd/g.txt:2:1 MARK a
-| 2 /tmp/pardes-snap/fsearch/cwd/g.txt:6:1 MARK b g.txt
-| 3 /tmp/pardes-snap/fsearch/cwd/g.txt:10:1 MARK c
-| 4
-|
+| NOR /tmp/pardes-snap/fsearch/cwd Del
|
+| g.txt
|
|
|
@@ -91,6 +87,10 @@
|
|
|
+| 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
== snap first grid=180x30 cursor=7,3
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del
@@ -108,13 +108,9 @@
| 12 l12
|
|
-| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del NOR /tmp/pardes-snap/fsearch/cwd Del
-| 1 /tmp/pardes-snap/fsearch/cwd/g.txt:2:1 MARK a
-| 2 /tmp/pardes-snap/fsearch/cwd/g.txt:6:1 MARK b g.txt
-| 3 /tmp/pardes-snap/fsearch/cwd/g.txt:10:1 MARK c
-| 4
-|
+| NOR /tmp/pardes-snap/fsearch/cwd Del
|
+| g.txt
|
|
|
@@ -122,6 +118,10 @@
|
|
|
+| 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
== style first
|0: 0-37 #949494,#121212, 38-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,
@@ -139,20 +139,20 @@
|13: 0-1 d,#444444, 2-6 #626262,#080808, 7-9 #bdbdbd,#080808, 10-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|14: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|15: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|16: 0-1 d,#262626, 2-45 #949494,#121212, 46-59 d,#121212, 60-61 d,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|17: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 #d8c8a8,#4a3a1e, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|18: 0-1 d,#444444, 2-6 #626262,#080808, 7-51 #bdbdbd,#080808, 52-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|19: 0-1 d,#444444, 2-6 #626262,#080808, 7-52 #bdbdbd,#080808, 53-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
+|16: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
+|17: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
+|18: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
+|19: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|20: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|21: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|22: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|23: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|24: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
|25: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|26: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|27: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|28: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
-|29: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
+|26: 0-1 d,#262626, 2-45 #949494,#121212, 46-59 d,#121212, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
+|27: 0-1 d,#444444, 2-6 #626262,#080808, 7-59 #d8c8a8,#4a3a1e, 60-61 d,#444444, 62-119 #bdbdbd,#080808, 120-121 d,#444444, 122-179 #bdbdbd,#080808,
+|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
| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del
@@ -170,13 +170,9 @@
| 12 l12
|
|
-| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del NOR /tmp/pardes-snap/fsearch/cwd Del
-| 1 /tmp/pardes-snap/fsearch/cwd/g.txt:2:1 MARK a
-| 2 /tmp/pardes-snap/fsearch/cwd/g.txt:6:1 MARK b g.txt
-| 3 /tmp/pardes-snap/fsearch/cwd/g.txt:10:1 MARK c
-| 4
-|
+| NOR /tmp/pardes-snap/fsearch/cwd Del
|
+| g.txt
|
|
|
@@ -184,30 +180,30 @@
|
|
|
-== snap third grid=180x30 cursor=7,9
+| 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
+== snap third grid=180x30 cursor=7,11
|Kill Newcol Tutor Debug NextColor Dump
| 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
| 3 l3
-| 4 l4 g.txt g.txt
+| 4 l4
| 5 l5
-| 6 MARK b
+| 6 MARK b g.txt
| 7 l7
-| 8 l8 g.txt
+| 8 l8
| 9 l9
| 10 MARK c
| 11 l11
| 12 l12
|
|
+| NOR /tmp/pardes-snap/fsearch/cwd Del
|
-|
-| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del NOR /tmp/pardes-snap/fsearch/cwd Del
-| 1 /tmp/pardes-snap/fsearch/cwd/g.txt:2:1 MARK a
-| 2 /tmp/pardes-snap/fsearch/cwd/g.txt:6:1 MARK b g.txt
-| 3 /tmp/pardes-snap/fsearch/cwd/g.txt:10:1 MARK c
-| 4
-|
-|
+| g.txt
|
|
|
@@ -215,6 +211,10 @@
|
|
|
+| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del
+| 2 g.txt:6:1 MARK b
+| 3 g.txt:10:1 MARK c
+| 4
== snap back grid=180x30 cursor=7,7
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del
@@ -232,13 +232,9 @@
| 12 l12
|
|
-| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del NOR /tmp/pardes-snap/fsearch/cwd Del
-| 1 /tmp/pardes-snap/fsearch/cwd/g.txt:2:1 MARK a
-| 2 /tmp/pardes-snap/fsearch/cwd/g.txt:6:1 MARK b g.txt
-| 3 /tmp/pardes-snap/fsearch/cwd/g.txt:10:1 MARK c
-| 4
-|
+| NOR /tmp/pardes-snap/fsearch/cwd Del
|
+| g.txt
|
|
|
@@ -246,6 +242,10 @@
|
|
|
+| 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
== snap cancel grid=180x30 cursor=7,7
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del
@@ -263,13 +263,9 @@
| 12 l12
|
|
-| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del NOR /tmp/pardes-snap/fsearch/cwd Del
-| 1 /tmp/pardes-snap/fsearch/cwd/g.txt:2:1 MARK a
-| 2 /tmp/pardes-snap/fsearch/cwd/g.txt:6:1 MARK b g.txt
-| 3 /tmp/pardes-snap/fsearch/cwd/g.txt:10:1 MARK c
-| 4
-|
+| NOR /tmp/pardes-snap/fsearch/cwd Del
|
+| g.txt
|
|
|
@@ -277,6 +273,10 @@
|
|
|
+| 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
== snap nomatch grid=180x30 cursor=7,7
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/fsearch/cwd/g.txt Save Del NOR /tmp/pardes-snap/fsearch/cwd Del NOR /tmp/pardes-snap/fsearch/cwd Del
@@ -294,11 +294,9 @@
| 12 l12
|
|
-| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del NOR /tmp/pardes-snap/fsearch/cwd Del
-| 1
-| g.txt
-|
+| NOR /tmp/pardes-snap/fsearch/cwd Del
|
+| g.txt
|
|
|
@@ -308,3 +306,5 @@
|
|
|
+| NOR /tmp/pardes-snap/fsearch/cwd/+Search Del
+| 1
diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden
index c89ec509..3966d33d 100644
--- a/test/snapshots/psearch.golden
+++ b/test/snapshots/psearch.golden
@@ -70,11 +70,6 @@
| zz
| x MARK c
|
-| 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
-| 4
|
|
|
@@ -91,6 +86,11 @@
|
|
|
+|
+| 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 first grid=140x30 cursor=4,3
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/psearch/cwd Del
@@ -101,11 +101,6 @@
| zz
| x MARK c
|
-| 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
-| 4
|
|
|
@@ -122,6 +117,11 @@
|
|
|
+|
+| 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
== style first
|0: 0-37 #949494,#121212, 38-139 d,#121212,
|1: 0-1 d,#626262, 2-37 #949494,#121212, 38-139 d,#121212,
@@ -132,27 +132,27 @@
|6: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
|7: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
|8: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
-|9: 0-1 d,#262626, 2-45 #949494,#121212, 46-139 d,#121212,
-|10: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 #d8c8a8,#4a3a1e,
-|11: 0-1 d,#444444, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-139 d,#080808,
-|12: 0-1 d,#444444, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-139 d,#080808,
-|13: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|14: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|15: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|16: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|17: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|18: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|19: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|20: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|21: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|22: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|23: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|24: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|25: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|26: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|27: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|28: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
-|29: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 d,#080808,
+|9: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|10: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|11: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|12: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|13: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|14: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|15: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|16: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|17: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|18: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|19: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|20: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|21: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|22: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|23: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|24: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|25: 0-1 d,#444444, 2-139 #bdbdbd,#080808,
+|26: 0-1 d,#262626, 2-45 #949494,#121212, 46-139 d,#121212,
+|27: 0-1 d,#444444, 2-6 #626262,#080808, 7-139 #d8c8a8,#4a3a1e,
+|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
| NOR /tmp/pardes-snap/psearch/cwd Del
@@ -163,11 +163,6 @@
| zz
| x MARK c
|
-| 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
-| 4
|
|
|
@@ -184,6 +179,11 @@
|
|
|
+|
+| 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 back grid=140x30 cursor=4,3
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/psearch/cwd Del
@@ -194,11 +194,6 @@
| zz
| x MARK c
|
-| 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
-| 4
|
|
|
@@ -215,6 +210,11 @@
|
|
|
+|
+| 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 nomatch grid=140x30 cursor=4,3
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/psearch/cwd Del
@@ -225,8 +225,6 @@
| zz
| x MARK c
|
-| NOR /tmp/pardes-snap/psearch/cwd/+Search Del
-| 1
|
|
|
@@ -246,6 +244,8 @@
|
|
|
+| NOR /tmp/pardes-snap/psearch/cwd/+Search Del
+| 1
== snap ttyinert grid=140x30 cursor=4,8
|Kill Newcol Tutor Debug NextColor Dump
| TTY /tmp/pardes-snap/psearch/cwd Del
@@ -256,8 +256,6 @@
| zz
| x MARK c
| $
-| NOR /tmp/pardes-snap/psearch/cwd/+Search Del
-| 1
|
|
|
@@ -277,6 +275,8 @@
|
|
|
+| NOR /tmp/pardes-snap/psearch/cwd/+Search Del
+| 1
== snap rightsearch grid=140x30 cursor=4,3
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/psearch/cwd Del
@@ -287,11 +287,6 @@
| zz
| x MARK c
|
-| 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
-| 4
|
|
|
@@ -308,3 +303,8 @@
|
|
|
+|
+| 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
diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden
index a4914f31..6d900519 100644
--- a/test/snapshots/rsearch.golden
+++ b/test/snapshots/rsearch.golden
@@ -46,12 +46,9 @@
|
|
|
-| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del NOR /tmp/pardes-snap/rsearch/cwd Del
-| 1 /tmp/pardes-snap/rsearch/cwd/code.txt:1:5 run count_x
-| 2 /tmp/pardes-snap/rsearch/cwd/code.txt:3:1 count_x aga code.txt sub
-| 3
-|
+| NOR /tmp/pardes-snap/rsearch/cwd Del
|
+| code.txt sub
|
|
|
@@ -60,6 +57,9 @@
|
|
|
+| 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 select grid=180x30 cursor=7,2
|Kill Newcol Tutor Debug NextColor Dump
| NOR /tmp/pardes-snap/rsearch/cwd/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del
@@ -77,11 +77,9 @@
|
|
|
-| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del NOR /tmp/pardes-snap/rsearch/cwd Del
-| 1 /tmp/pardes-snap/rsearch/cwd/code.txt:4:1 pick two wo
-| 2 code.txt sub
-|
+| NOR /tmp/pardes-snap/rsearch/cwd Del
|
+| code.txt sub
|
|
|
@@ -91,7 +89,9 @@
|
|
|
-== snap path-open grid=180x30 cursor=7,12
+| 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/code.txt Save Del NOR /tmp/pardes-snap/rsearch/cwd Del NOR /tmp/pardes-snap/rsearch/cwd Del
| 1 run count_x now
@@ -101,24 +101,24 @@
|
| code.txt
|
-| NOR /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Del
-| 1 d1
-| 2 d2
-| 3 DEPTARGET
-| 4 d4
-| 5 d5
-| 6 d6
-| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del NOR /tmp/pardes-snap/rsearch/cwd Del
-| 1 /tmp/pardes-snap/rsearch/cwd/code.txt:4:1 pick two wo
-| 2 code.txt sub
|
|
|
|
|
|
+| NOR /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Del
+| 1 d1 NOR /tmp/pardes-snap/rsearch/cwd Del
+| 2 d2
+| 3 DEPTARGET code.txt sub
+| 4 d4
+| 5 d5
+| 6 d6
+|
|
|
|
|
|
+| NOR /tmp/pardes-snap/rsearch/cwd/+Search Del
+| 1 code.txt:4:1 pick two words
generated by cgit v1.3 (git 2.53.0) at 2026-10-02 06:16:30 +0000