diff options
Diffstat (limited to 'test')
29 files changed, 25 insertions, 935 deletions
diff --git a/test/behaviour/keys.zig b/test/behaviour/keys.zig index 476504ce..eeaacf7d 100644 --- a/test/behaviour/keys.zig +++ b/test/behaviour/keys.zig @@ -323,30 +323,6 @@ test "keys: SPC j n from the pane a Look gave the keyboard walks back into the c try std.testing.expect(std.mem.startsWith(u8, try s.read(sel), "Theme ")); } -test "keys: SPC j n and SPC j p walk on from the place a Look's +Search listing chose, its keyboard left in the file" { - var tmp = std.testing.tmpDir(.{}); - defer tmp.cleanup(); - try tmp.dir.writeFile(std.testing.io, .{ .sub_path = "look-owner.txt", .data = "alpha target\nbeta target\ngamma target\n" }); - var dir: [4096]u8 = undefined; - const at = dir[0..try tmp.dir.realPath(std.testing.io, &dir)]; - var s = try Session.initFile(std.testing.allocator, "x\n"); - defer s.deinit(); - try s.write("/ctl", "LookWord list\n"); // the +Search listing is what is walked - try s.write("/look", s.at("{s}/look-owner.txt\n", .{at})); - const file = try s.focused(); - try s.write(s.at("/pane/{d}/exec", .{file}), "Look target\n"); - try std.testing.expectEqual(file, try s.focused()); - // The Look took the first; the walk goes on from it, and back. - try s.keys(" jn"); - const results = try s.focused(); - try std.testing.expect(results != file); - const sel = s.at("/pane/{d}/sel", .{results}); - try s.expect(sel, "look-owner.txt:2:6-11"); - try s.keys(" jp"); - try std.testing.expectEqual(results, try s.focused()); - try s.expect(sel, "look-owner.txt:1:7-12"); -} - /// Screen row `row` as drawn. fn screenRow(s: *Session, row: usize) ![]const u8 { var rows = std.mem.splitScalar(u8, try s.screen(), '\n'); diff --git a/test/behaviour/look_and_exec.zig b/test/behaviour/look_and_exec.zig index ee9554cc..e88a0053 100644 --- a/test/behaviour/look_and_exec.zig +++ b/test/behaviour/look_and_exec.zig @@ -593,7 +593,7 @@ test "look-and-exec: a look that goes to another pane leaves the looking pane's } } -test "look-and-exec: a looked word is found in its own pane, next place after the dot, wrapping, and opens no pane; LookWord list lists it in +Search" { +test "look-and-exec: a looked word is found in its own pane, next place after the dot, wrapping, and opens no pane" { var s = try Session.initFile(std.testing.allocator, "foo x foo y\n"); defer s.deinit(); const n = try s.focused(); @@ -604,31 +604,6 @@ test "look-and-exec: a looked word is found in its own pane, next place after th try expectEqual(.{ at, at + 3 }, try s.range(s.at("/pane/{d}/dot", .{n}))); } try s.expect("/index", index); - try s.write("/ctl", "LookWord list\n"); - try s.write(look, "foo\n"); - try std.testing.expect(lines(try s.read("/index")) > lines(index)); - // ...and look reads back that +Search pane, where the places are. - const search = try paneNamed(&s, "/+Search"); - try std.testing.expect(has(try s.read(look), s.at("{d}\n", .{search}))); -} - -test "look-and-exec: a second LookWord list look in a directory refills its +Search rather than stacking another" { - var tmp = std.testing.tmpDir(.{}); - defer tmp.cleanup(); - try tmp.dir.writeFile(std.testing.io, .{ .sub_path = "words.txt", .data = "alpha beta\nalpha beta\n" }); - var s = try Session.initFile(std.testing.allocator, "x\n"); - defer s.deinit(); - const n = try s.focused(); - try s.write(s.at("/pane/{d}/name", .{n}), s.at("{s}/words.txt\n", .{try tmpPath(&s, &tmp)})); - try s.write(s.at("/pane/{d}/exec", .{n}), "Get\n"); - try s.write("/ctl", "LookWord list\n"); - try s.write(s.at("/pane/{d}/look", .{n}), "alpha\n"); - const first = try paneNamed(&s, "/+Search"); - try s.write(s.at("/pane/{d}/look", .{n}), "beta\n"); - try expectEqual(@as(usize, 1), std.mem.count(u8, try s.read("/index"), "/+Search ")); - try expectEqual(first, try paneNamed(&s, "/+Search")); - // Refilled with beta's places (columns 7-10), not alpha's. - try std.testing.expect(has(try s.read(s.at("/pane/{d}/body", .{first})), "words.txt:1:7-10\n")); } test "look-and-exec: `@pN:` looks at pane N as `a.txt:` looks at a.txt, and a line past the end is said one way, `:N` or `file:N`" { diff --git a/test/behaviour/modes.zig b/test/behaviour/modes.zig index 961ca788..ef39d912 100644 --- a/test/behaviour/modes.zig +++ b/test/behaviour/modes.zig @@ -174,8 +174,6 @@ fn listed(s: *Session, n: u32) !bool { test "modes: in window mode d deletes the outlined pane, asking k or j between two, c collapses it, and the mode stays on" { var s = try Session.initFile(std.testing.allocator, "top\n"); defer s.deinit(); - // The neighbours below are what is under test: each New right under its asker. - try s.write("/ctl", "Placement pardes\n"); const top = try s.focused(); try s.write(s.at("/pane/{d}/exec", .{top}), "New\n"); const mid = try s.focused(); @@ -451,8 +449,6 @@ test "modes: Ctrl-o and Ctrl-i drop the selections, select mode and the extra cu test "modes: hopping between two panes by Esc, window mode or a click makes no places, so one Ctrl-o goes back across and the next has nowhere to go" { var s = try Session.initFile(std.testing.allocator, std.mem.asBytes(&@as([100][4]u8, @splat("row\n".*)))); defer s.deinit(); - // Two panes of room, not acme's fit to the doc. - try s.write("/ctl", "Placement pardes\n"); const doc = try s.focused(); try s.keys("\u{F015}n"); // a shell under the doc const shell = try s.focused(); diff --git a/test/behaviour/panes.zig b/test/behaviour/panes.zig index 0c0edbf9..12be354a 100644 --- a/test/behaviour/panes.zig +++ b/test/behaviour/panes.zig @@ -182,7 +182,6 @@ test "panes: an unsaved file's tag is its name alone, its dirty file says it is test "panes: a pane closed while its question stands ends the question in the log" { var s = try Session.initFile(std.testing.allocator, "x\n"); defer s.deinit(); - try s.write("/ctl", "Placement pardes\n"); const top = try s.focused(); try s.write(s.at("/pane/{d}/exec", .{top}), "New\n"); const closing = try s.focused(); diff --git a/test/behaviour/placement.zig b/test/behaviour/placement.zig index 3d261808..73d69883 100644 --- a/test/behaviour/placement.zig +++ b/test/behaviour/placement.zig @@ -45,22 +45,7 @@ test "placement: New and 9P's new take the bottom half of the column's last pane try std.testing.expect(try tagRow(&s, "/made") >= was + (rows - was) / 2); } -test "placement: Placement pardes puts a new pane right under the asking one, and bare it steps back to acme" { - var s = try Session.initFile(std.testing.allocator, "x\n"); - defer s.deinit(); - try s.write("/ctl", "Placement pardes\n"); - try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPlacement pardes\n") != null); - const top = try s.focused(); - try s.write(s.at("/pane/{d}/exec", .{top}), "New\n"); - const below = try s.focused(); - // Directly under the asking pane, as New always put it. - try s.write(s.at("/pane/{d}/exec", .{top}), "New\n"); - try std.testing.expectEqualStrings(s.at("{d}:{d},{d},{d}", .{ try s.column(0), top, try s.focused(), below }), try s.columns()); - try s.write("/ctl", "Placement\n"); - try std.testing.expect(std.mem.indexOf(u8, try s.read("/ctl"), "\nPlacement acme\n") != null); -} - -test "placement: a look under pardes's placement, from a pane pane/new made after Delcol, opens its file in a column" { +test "placement: a look from a pane pane/new made after Delcol opens its file in a column" { var tmp = std.testing.tmpDir(.{}); defer tmp.cleanup(); try tmp.dir.writeFile(std.testing.io, .{ .sub_path = "f.txt", .data = "file\n" }); @@ -69,7 +54,6 @@ test "placement: a look under pardes's placement, from a pane pane/new made afte var s = try Session.initFile(std.testing.allocator, "x\n"); defer s.deinit(); const first = try s.focused(); - try s.write(s.at("/pane/{d}/exec", .{first}), "Placement\n"); try s.write(s.at("/pane/{d}/exec", .{first}), "Delcol\n"); const made = try s.newPane(); try s.write(s.at("/pane/{d}/look", .{made}), s.at("{s}/f.txt:#4\n", .{dir})); diff --git a/test/behaviour/root_ctl.zig b/test/behaviour/root_ctl.zig index 12f2b56a..7bf15ee2 100644 --- a/test/behaviour/root_ctl.zig +++ b/test/behaviour/root_ctl.zig @@ -62,7 +62,6 @@ test "root-ctl: the root ctl reads the settings as a write takes them, and takes .{ "Del", "not a session control message \"Del\": write it to pane/<n>/ctl" }, .{ "Nonsense 1", "unknown control message \"Nonsense\"" }, .{ "Verbose maybe", "bad value in control message; takes on, off \"maybe\"" }, - .{ "Placement east", "bad value in control message; takes acme, pardes \"east\"" }, // A number's refusal names its range. .{ "InactiveDim 200", "bad value in control message; takes 0-100 (a percentage) \"200\"" }, .{ "MessageLinger x", "bad value in control message; takes 0-60000 (milliseconds) \"x\"" }, diff --git a/test/monkey9p.zig b/test/monkey9p.zig index 8870e389..d87fed07 100644 --- a/test/monkey9p.zig +++ b/test/monkey9p.zig @@ -62,20 +62,20 @@ const unsafe = "/~$`;|&<>.\\*?![]{}'\""; const runes = [_][]const u8{ "\xc3\xa9", "e\xcc\x81", "\xe6\x97\xa5\xe6\x9c\xac", "\xf0\x9f\x98\x80", "\xce\x94", "\xc2\xa0", "\xe2\x80\x8b", "\xc2\x80", "\xc2\x9f" }; const odd = [_][]const u8{ "", "\n", "\r\n", "\x00", "\xff", "\xfe\xff", "\xe6\x97", "\xc0\x80", "\x1b[2J", "\x7f", "\t", "\n\n\n", " ", " \n" }; const words = [_][]const u8{ - "alpha", "beta", "foo", "bar", "x", "hello", "zz", "0", "1", "-1", "99999999999", - "on", "off", "follow", "follow new", "lock", "unlock", "clean", "dirty", "show", "dot=addr", "addr=dot", - "limit=addr", "nomark", "mark", "get", "put", "del", "delete", "name", "cleartag", "answer", "answer -", - "size 80 24", "size 20 6", "size 5000 5000", "winsize 80 24", "winsize 0 0", "sig INT", "sig TERM", "sig HUP", "sig KILL", "sig BOGUS", "exec", - "Placement acme", "Placement pardes", "Wrap on", "Wrap off", + "alpha", "beta", "foo", "bar", "x", "hello", "zz", "0", "1", "-1", "99999999999", + "on", "off", "follow", "follow new", "lock", "unlock", "clean", "dirty", "show", "dot=addr", "addr=dot", + "limit=addr", "nomark", "mark", "get", "put", "del", "delete", "name", "cleartag", "answer", "answer -", + "size 80 24", "size 20 6", "size 5000 5000", "winsize 80 24", "winsize 0 0", "sig INT", "sig TERM", "sig HUP", "sig KILL", "sig BOGUS", "exec", + "Wrap on", "Wrap off", }; const shell_lines = [_][]const u8{ "true", "false", "echo hi", "echo m9p", "sleep 1", "ls", "cat nonexist", "printf abc", "exit 3", "seq 1 2000", "yes | head -n 3000", "date", "pwd", "env | wc" }; const builtins = [_][]const u8{ - "Look", "Exec", "Kill", "Dump", "Msg", "NextColor", "Themes", "DumpThemes", "TreeContext", "PdfFit", "PdfTint", "PdfSections", "Petscii", - "Palette", "Ascii", "Save", "New", "Newcol", "Del", "Filter", "Mode", "Togglettymode", "Edit", "Undo", "Redo", "Collapse", - "Delcol", "DelAbove", "DelBelow", "Term", "Repl", "Joincol", "Config", "LocationsConfig", "Messages", "Mini", "Find", "Grep", "Left", - "Down", "Up", "Right", "Back", "Forward", "Last", "Recent", "Jumplist", "Colors", "Wrap", "Tagbottom", "Debug", "FocusTint", - "Verbose", "Motion", "InactiveDim", "DumpDir", "Theme", "Placement", "BootShell", "LookWord", "Get", "Put", "Undo", "Redo", "Zerox", - "Snarf", "Paste", "Cut", "Sort", "Font", "Local", + "Look", "Exec", "Kill", "Dump", "Msg", "NextColor", "Themes", "DumpThemes", "TreeContext", "PdfFit", "PdfTint", "PdfSections", "Petscii", + "Palette", "Ascii", "Save", "New", "Newcol", "Del", "Filter", "Mode", "Togglettymode", "Edit", "Undo", "Redo", "Collapse", + "Delcol", "DelAbove", "DelBelow", "Term", "Repl", "Joincol", "Config", "LocationsConfig", "Messages", "Mini", "Find", "Grep", "Left", + "Down", "Up", "Right", "Back", "Forward", "Last", "Recent", "Jumplist", "Colors", "Wrap", "Tagbottom", "Debug", "FocusTint", + "Verbose", "Motion", "InactiveDim", "DumpDir", "Theme", "Get", "Put", "Undo", "Redo", "Zerox", "Snarf", "Paste", "Cut", + "Sort", "Font", "Local", }; const pane_files = [_][]const u8{ "name", "body", "tag", "ctl", "addr", "dot", "limit", "data", "xdata", "sel", "dirty", "mark", "scroll", "errors", "event", "look", "exec", "tagexec", "pty", "pty/run", "pty/data", "pty/ctl", "pty/status" }; const root_files = [_][]const u8{ "README", "index", "status", "focus", "ctl", "commands", "recent", "look", "exec", "log", "screen", "listeners", "layout", "tag", "tagexec", "pane", "pane/new", "col", "" }; @@ -326,9 +326,9 @@ fn editCommand(r: Random, a: Allocator) []const u8 { fn eventRecord(r: Random, a: Allocator) []const u8 { const text = shellSafe(a, editText(r, a)); var rec: []const u8 = print(a, "{c}{c}{d} {d} {d} {d} {s}\n", .{ - pick(r, "EFKMZ"), pick(r, "xXlLiIdDZ"), - pick(r, &[_]i64{ 0, 1, 5, 10 }), pick(r, &[_]i64{ 0, 2, 7, 1 << 40, -1 }), - pick(r, &[_]u8{ 0, 1, 2, 8 }), text.len, + pick(r, "EFKMZ"), pick(r, "xXlLiIdDZ"), + pick(r, &[_]i64{ 0, 1, 5, 10 }), pick(r, &[_]i64{ 0, 2, 7, 1 << 40, -1 }), + pick(r, &[_]u8{ 0, 1, 2, 8 }), text.len, text, }); if (chance(r) < 0.3) rec = mutate(r, a, rec); diff --git a/test/output.zig b/test/output.zig index c476af28..9fba1a77 100644 --- a/test/output.zig +++ b/test/output.zig @@ -793,61 +793,6 @@ test "LookNext/LookPrev selects one output location per row and opens nothing" { try std.testing.expectEqual(panes.Output.Grain.word, panes.Output.grain(p.panes[p.active].?.file.?.output)); } -test "LookNext/LookPrev keeps the result output a Look chose through a no-match answer, and a stale serial once it is deleted" { - if (platform == .web) return; - var tmp = std.testing.tmpDir(.{}); - defer tmp.cleanup(); - try tmp.dir.writeFile(std.testing.io, .{ - .sub_path = "look-owner.txt", - .data = "alpha target\nbeta target\ngamma target\n", - }); - var path_buf: [256]u8 = undefined; - const path = try std.fmt.bufPrint(&path_buf, ".zig-cache/tmp/{s}/look-owner.txt", .{tmp.sub_path}); - const p = try Pardes.init(std.testing.allocator, .{ .file = path, .cols = 80, .rows = 24 }); - defer p.deinit(); - p.locations_config.layout = .@"inline"; - p.settings.look_word = .list; // the +Search listing is what is walked - - try std.testing.expect(p.executeBuiltinLine(0, "Look target")); - const rid = p.panes[0].?.search_pane orelse return error.MissingResults; - const results = p.panes[rid].?; - const first = results.body.cur_row; - try std.testing.expectEqual(@as(usize, 0), p.active); - try std.testing.expect(results.look_at != null); - try std.testing.expectEqual(results.serial, p.look_walk_owner orelse return error.MissingLookOwner); - - // The walk on and back from it is test/behaviour/keys.zig's; what is - // left needs answers put in by fillResults. - // A later no-match answer has no position to resume and therefore cannot - // steal the provenance established by the Look above. - const owner = results.serial; - const dir = std.fs.path.dirname(path) orelse "."; - try panes.Output.fillResults( - p, - 0, - dir, - .search, - "no-such-result", - try p.gpa.dupe(u8, ""), - null, - ); - try std.testing.expectEqual(owner, p.look_walk_owner.?); - lookKey(p, 'n'); - try std.testing.expectEqual(rid, p.active); - try std.testing.expectEqual(first + 1, results.body.cur_row); - - // Emptying the owner itself keeps its identity as the ring's starting - // point. Deleting it then leaves a stale serial, never an id that can bind - // to the unrelated pane subsequently allocated in the same slot. - try panes.Output.fillResults(p, 0, dir, .search, "target", try p.gpa.dupe(u8, ""), null); - try std.testing.expectEqual(owner, p.look_walk_owner.?); - try std.testing.expect(p.executeBuiltinLine(rid, "Del")); - try std.testing.expect(p.paneBySerial(owner) == null); - const replacement = try p.newShell(rid, ""); - try std.testing.expect(replacement.serial != owner); - try std.testing.expect(p.paneBySerial(owner) == null); -} - test "LookPrev exactly reverses LookNext across output panes and the ring seam" { if (platform == .web) return; var cwd_buf: [4096]u8 = undefined; diff --git a/test/process/terminals.zig b/test/process/terminals.zig index 250c4fb0..24772ced 100644 --- a/test/process/terminals.zig +++ b/test/process/terminals.zig @@ -212,17 +212,12 @@ fn namedOnce(gpa: std.mem.Allocator, exe: [:0]const u8) !void { const c = try process.Conn.dial(gpa, d.socket()); defer c.deinit(gpa); const root = d.root(); - try expectEqual(@as(c_int, 0), libc.mkdir(try std.fmt.allocPrintSentinel(a, "{s}/sub", .{root}, 0), 0o755)); - // A look at a directory starts a terminal there (DirLook terminal); - // DirLook pane, the default, lists it in a pane. - try c.write("/ctl", "DirLook terminal\n"); var made: std.ArrayList(u32) = .empty; - try made.append(a, try c.look(a, f.at("{s}/sub", .{root}), null)); const before = try serials(a, c); try c.write("/pane/1/ctl", "Term\n"); if (shell(a, "command -v fish >/dev/null", .{}) == 0) try c.write("/pane/1/ctl", "Term fish\n"); for (try serials(a, c)) |s| if (std.mem.indexOfScalar(u32, before, s) == null) try made.append(a, s); - try expect(made.items.len >= 2); + try expect(made.items.len >= 1); process.sleep(1500); // their shells start and say where they are // A shell started again by pty/ctl exec: named as it was. try c.write(f.at("/pane/{d}/pty/ctl", .{made.items[0]}), "exec\n"); diff --git a/test/process/tree.zig b/test/process/tree.zig index 27b51bf1..70b2a89c 100644 --- a/test/process/tree.zig +++ b/test/process/tree.zig @@ -258,7 +258,7 @@ fn discovery(gpa: std.mem.Allocator, exe: [:0]const u8) !void { if (std.mem.eql(u8, which, "arg")) which = w.next().?; try expect(contains(&.{ "root", "pane", "both" }, which)); } - try expect(row(commands, "Placement arg root acme,pardes")); + try expect(row(commands, "Pager arg root pardes,off")); try expect(std.mem.endsWith(u8, commands, "\n")); try expectEqual(commands.len, (try c.stat("/commands")).length); try c.write(f.at("/pane/{d}/ctl", .{first}), "Msg said through ctl\n"); diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index a4733cdc..93a6ab2b 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -16,15 +16,12 @@ |12: 3 SPC c d Delcol |13: 4 SPC c j Joincol topbar |14: 5 SPC c n Newcol topbar -|15: 6 SPC c p Placement -|16: 7 +|15: 6 == snap docs-group grid=120x67 cursor=7,10 |10: 1 pardes builtins under SPC h |12: 3 SPC h c Changelog topbar |13: 4 SPC h m Messages |14: 5 SPC h t Tutor topbar -|15: 6 -|16: == snap tutor-from-index grid=120x67 cursor=7,16 |10: 1 pardes builtins under SPC h Tutor |15: /tmp/pardes-snap/builtins/cwd/+Tutor Save Term Collapse Del diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden deleted file mode 100644 index 2b99a8a1..00000000 --- a/test/snapshots/cmdword.golden +++ /dev/null @@ -1,28 +0,0 @@ -== snap opened grid=120x31 cursor=7,3 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save Term Collapse Del -| 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` -== snap atexec grid=120x31 cursor=7,3 -|17: /tmp/pardes-snap/cmdword/cwd (echo ZZ''E) exit 0 Kill Save Collapse Del -|18: % echo ZZ''E -|19: ZZE -|20: exit 0 -== snap atlook grid=120x31 cursor=2,24 -|17: /tmp/pardes-snap/cmdword/cwd (echo ZZ''L) exit 0 Kill Save Collapse Del -|21: % echo ZZ''L -|22: ZZL -|23: exit 0 -== snap lookword grid=120x31 cursor=7,6 -|5: /tmp/pardes-snap/cmdword/cwd/p.txt Save Term Collapse Del -|6: 1 just text -== snap nested grid=120x31 cursor=4,11 -|8: /tmp/pardes-snap/cmdword/cwd Term+bash Save Mode Filter Collapse Del -|9: ls -|10: cmds.txt p.txt zzmark.txt -== snap execword grid=120x31 cursor=4,11 -|8: /tmp/pardes-snap/cmdword/cwd Term+bash Save Mode Filter Collapse Del Exec -== snap tagcmd grid=120x31 cursor=4,11 -|8: /tmp/pardes-snap/cmdword/cwd Term+bash Save Mode Filter Collapse Del Exec @`echo ZZ''T` -|11: echo ZZ''T -|12: ZZT diff --git a/test/snapshots/cmdword.snap b/test/snapshots/cmdword.snap deleted file mode 100644 index 42a91e18..00000000 --- a/test/snapshots/cmdword.snap +++ /dev/null @@ -1,93 +0,0 @@ -# `@`...`` — a word that names a COMMAND instead of a file to open. The -# delimiters are config.cmd_open/cmd_close and nothing else in the editor knows -# how one is spelled. -# -# A backtick is not a file char, so the ordinary word expansion would stop dead -# inside one and hand a look the fragment `echo`. config.wordBounds takes the -# whole run instead, which is what makes a single CLICK the way you invoke one -# (acme does the same for its own `<`/`|`/`>` command words). -# -# EXECUTE runs it, as a command pane, and leaves you where you were; LOOK runs -# it and lands you in the pane that answered — looking at a thing means being -# shown it, and a directory's look has always been exactly that (a shell -# there, ls'd). -# -# And Look and Exec are ORDINARY BUILTINS now, so their names are executable -# words like Save or Grep: `Look p.txt` run off the page is the same look a -# right click on `p.txt` is. Which is also what makes `@`Look .`` nest — Exec -# unwraps it and the contents go straight back through the one dispatcher. -file cmds.txt @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` -file p.txt just text -file zzmark.txt x -# Builtins announce themselves by default, and an announcement is a band at -# the top of the body -- which would move every row this script clicks. The -# verbs are what is under test here, not the announcement. -config Verbose off -# a directory looked at opens a terminal there (DirLook terminal), as this -# script was written for; DirLook pane, the default, is dirpane.snap's -config DirLook terminal -start 31 120 cmds.txt -wait 8000 Newcol Joincol -wait 8000 cmds.txt -stable 700 20000 -snap opened -# a single middle CLICK inside the run (col 11 is inside `echo`) expands to the -# whole `@`echo ZZ''E`` and runs it as a command pane; focus stays on the file -press middle 11 4 -release middle 11 4 -wait 10000 ZZE -stable 700 15000 -snap atexec -# LOOK on the second one (col 24, inside its `echo`) runs it too, in the same -# command pane now its first is done, below it, AND focuses it — that is the -# whole difference between the two verbs -press right 24 4 -release right 24 4 -wait 10000 ZZL -stable 700 15000 -snap atlook -# `Look p.txt` middle-dragged: the builtin by NAME, with an argument -press middle 36 4 -drag middle 45 4 -release middle 45 4 -wait 10000 just text -stable 700 15000 -snap lookword -# nesting: `@`Look .`` — Exec unwraps it, `Look .` is parsed as the ordinary -# Look builtin with an argument, and Look opens the directory (a shell there, -# ls'd — zzmark.txt is only ever in that listing; a command pane is no shell) -press middle 49 4 -release middle 49 4 -wait 10000 zzmark.txt -stable 700 15000 -snap nested -# the same syntax typed into a TAG — the other place the expansion has to know -# about backticks. The look above left that shell focused, so `:` opens ITS -# tag, and the word run from a shell's own tag is typed into it; `A` appends at the end of it, Esc and `h` put the normal-mode cursor on -# the last character typed, and the execute key runs the word under it -# exactly as the body's does. -key : -key A -key space -text Exec -key esc -settle 100 -key h -key tab -stable 700 8000 -# ...except that word is `Exec` ITSELF, with nothing to execute. This is the -# case that must not hang a re-entrant dispatcher: it runs out of argument -# immediately and does nothing at all. Executing gave the keyboard back to the -# body, and `:` finds the tag's cursor where it was left. -snap execword -key : -key A -key space -text @`echo ZZ''T` -key esc -settle 100 -key h -key tab -wait 10000 ZZT -stable 700 15000 -snap tagcmd diff --git a/test/snapshots/doccol.golden b/test/snapshots/doccol.golden deleted file mode 100644 index 426dc948..00000000 --- a/test/snapshots/doccol.golden +++ /dev/null @@ -1,25 +0,0 @@ -== snap boot grid=100x31 cursor=7,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/doccol/cwd/a.txt Save Term Coll /tmp/pardes-snap/doccol/cwd Term+bash Save Mode -| apse Del Filter Collapse Del -| 1 AAA ls -| a.txt b.txt c.txt -== snap two-docs grid=100x31 cursor=7,19 -|17: /tmp/pardes-snap/doccol/cwd/b.txt Save Term Coll -|18: apse Del -|19: 1 BBB -|20: 2 B-TWO -== snap moved grid=100x31 cursor=57,22 -|17: -|18: -|19: -|20: /tmp/pardes-snap/doccol/cwd/b.txt Save Term Coll -|21: apse Del -|22: 1 BBB -|23: 2 B-TWO -== snap worked grid=100x31 cursor=59,23 -== snap third grid=100x31 cursor=57,28 -|26: /tmp/pardes-snap/doccol/cwd/c.txt Save Term Coll -|27: apse Del -|28: 1 CCC diff --git a/test/snapshots/doccol.snap b/test/snapshots/doccol.snap deleted file mode 100644 index bdc5db67..00000000 --- a/test/snapshots/doccol.snap +++ /dev/null @@ -1,61 +0,0 @@ -# A file opened from a terminal joins the column a FILE PANE was last used in. -# a.txt boots on the left and b.txt joins it there; b.txt is then dragged into -# the RIGHT column and worked in, so that column is the newest one a doc was -# read in while a.txt keeps the lowest pane id. The c.txt look then comes from -# the right shell and must land under b.txt. Slot order — the rule this -# replaces — would have answered a.txt (pane 0) and put c.txt back on the left. -file a.txt AAA -file b.txt BBB\nB-TWO -file c.txt CCC -# a FILE boots alone (and always outranked -n), so the shell whose ls output -# the looks below are clicked in is opened here: Alt-n stacks it below a.txt -# and Alt-c moves it into a column of its own on the right — the layout the -# boot used to hand over — and SPC w h Enter comes back to a.txt, which is where the -# boot left focus. (`New`/`Newcol` open an empty +New scratch now, not a -# shell, so the shell has to be asked for by name.) -# 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 -# pins the pardes placement rule (Placement pardes), which it covers -config Placement pardes -start 31 100 a.txt -wait 8000 AAA -stable 700 20000 -key a-n -key a-c -wait 8000 c.txt -stable 700 20000 -key space w h enter -stable 400 5000 -snap boot -# look b.txt in the shell's ls output: the second doc splits the first, so -# both docs are in the left column and a.txt is the lower-numbered pane -press right 60 6 -release right 60 6 -wait 10000 BBB -stable 700 20000 -snap two-docs -# drag b.txt's layout box (the gutter cells of its tag row) into the right -# column, below the shell -press left 1 18 -drag left 75 21 -release left 75 21 -stable 700 15000 -snap moved -# use a.txt, then b.txt: what counts is the doc last USED, so a.txt being the -# most recent for a moment must not survive the click into b.txt -press left 5 5 -release left 5 5 -stable 400 5000 -press left 60 23 -release left 60 23 -key j -stable 400 5000 -snap worked -# look c.txt from the shell: below b.txt, in the right column -press right 67 6 -release right 67 6 -wait 10000 CCC -stable 700 20000 -snap third diff --git a/test/snapshots/jumps.snap b/test/snapshots/jumps.snap index 7e66aa91..0c8919e6 100644 --- a/test/snapshots/jumps.snap +++ b/test/snapshots/jumps.snap @@ -79,8 +79,7 @@ snap jumplist # took two steps. A results buffer is a LIST — its rows are locations, and the # text after one says what is THERE rather than naming another place to go — so # the walk takes the location at the head of a row and moves on to the next row -# (output_pane.Grain.line). Free text still steps every word: that is the -# terminal walk in ttylook, and it is why the two goldens differ. +# (output_pane.Grain.line). Free text still steps every word. # # An `@pN` row moves focus like any other, which it did not use to: the STEP # only selects now, and the look Enter runs goes to the pane by the same route diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index 66739ef8..e047786c 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -92,8 +92,7 @@ |8: 3 SPC c d Delcol |9: 4 SPC c j Joincol topbar |10: 5 SPC c n Newcol topbar -|11: 6 SPC c p Placement -|12: 7 +|11: 6 |35: |36: |37: diff --git a/test/snapshots/look-dir.golden b/test/snapshots/look-dir.golden deleted file mode 100644 index 5cb0694d..00000000 --- a/test/snapshots/look-dir.golden +++ /dev/null @@ -1,22 +0,0 @@ -== snap dir-open grid=100x31 cursor=4,11 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/look-dir/cwd Term+bash Save Mod /tmp/pardes-snap/look-dir/cwd Term+bash Save Mod -| e Filter Collapse Del e Filter Collapse Del -| ls ls -| sub top.txt sub top.txt -| -| /tmp/pardes-snap/look-dir/cwd/sub Term+bash Save -| Mode Filter Collapse Del -| ls -| inner.txt -| -| -| -| -| -| -| /tmp/pardes-snap/look-dir/cwd Term+bash Save Mod -| e Filter Collapse Del -| ls -| sub top.txt diff --git a/test/snapshots/look-dir.snap b/test/snapshots/look-dir.snap deleted file mode 100644 index 2032d0c0..00000000 --- a/test/snapshots/look-dir.snap +++ /dev/null @@ -1,23 +0,0 @@ -# right-click look on a typed dir name opens a shell there (split below) + ls -dirmk sub -file sub/inner.txt inner-marker -file top.txt x -# a directory looked at opens a terminal there (DirLook terminal), as this -# script was written for; DirLook pane, the default, is dirpane.snap's -config DirLook terminal -start 31 100 -n 3 -wait 8000 top.txt -stable 700 20000 -press left 5 9 -release left 5 9 -stable 400 5000 -key i -text sub -key esc -settle 100 -stable 400 5000 -press right 6 9 -release right 6 9 -wait 10000 inner.txt -stable 700 20000 -snap dir-open diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden deleted file mode 100644 index b0a3110f..00000000 --- a/test/snapshots/lookpanes.golden +++ /dev/null @@ -1,80 +0,0 @@ -== snap shells grid=130x51 cursor=122,4 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save Term Collaps /tmp/pardes-snap/lookpanes/cwd Term+bash Save Mode Filter Colla -| e Del pse Del -| 1 both.txt ls zqonly.txt pick.txt twin.txt -| 2 b-marker alpha beta zzboot.txt -| -| /tmp/pardes-snap/lookpanes/cwd/alpha Term+bash Save Mode Filter -| Collapse Del -| ls -| amark.txt both.txt pick.txt twin.txt zqonly.txt -== snap other-dir grid=130x51 cursor=7,8 -|6: /tmp/pardes-snap/lookpanes/cwd/alpha/zqonly.txt Save Term Colla -|7: pse Del /tmp/pardes-snap/lookpanes/cwd/alpha Term+bash Save Mode Filter -|8: 1 ONLY-IN-ALPHA Collapse Del -== snap clicked-wins grid=130x51 cursor=7,12 -|10: /tmp/pardes-snap/lookpanes/cwd/beta/both.txt Save Term Collapse amark.txt both.txt pick.txt twin.txt zqonly.txt -|11: Del -|12: 1 BOTH-FROM-BETA -== snap mru-alpha grid=130x51 cursor=72,14 -|12: 1 BOTH-FROM-BETA /tmp/pardes-snap/lookpanes/cwd/alpha/pick.txt Save Term Collaps -|13: e Del -|14: 1 PICK-FROM-ALPHA -== snap mru-beta grid=130x51 cursor=7,16 -|14: /tmp/pardes-snap/lookpanes/cwd/beta/twin.txt Save Term Collapse 1 PICK-FROM-ALPHA -|15: Del -|16: 1 TWIN-FROM-BETA -== style mru-beta grid=130x51 -|0: 0-1 d,#1d2824, 2-129 #b2c3b8,#1d2824, -|1: 0-1 d,#887455, 2-64 #becfc4,#314738, 65-66 #becfc4,#887455, 67-129 #b2c3b8,#1d2824, -|2: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-47 #d3b0d9,#1d2824, 48-64 #b2c3b8,#1d2824, 65-66 #b2c3b8,#496656, 67-97 #b2c3b8,#1d2824, 98-107 #d3b0d9,#1d2824, 108-129 #b2c3b8,#1d2824, -|3: 0-1 d,#1d2824, 2-129 #b2c3b8,#1d2824, -|4: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-65 #e5eee5,#608269, 66-129 #e5eee5,#0d1410, -|5: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-65 #e5eee5,#608269, 66-129 #e5eee5,#0d1410, -|6: 0-1 d,#496656, 2-38 #b2c3b8,#1d2824, 39-49 #d3b0d9,#1d2824, 50-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-129 #b2c3b8,#0d1410, -|7: 0-1 d,#1d2824, 2-64 #b2c3b8,#1d2824, 65-66 #b2c3b8,#496656, 67-103 #b2c3b8,#1d2824, 104-113 #d3b0d9,#1d2824, 114-129 #b2c3b8,#1d2824, -|8: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-67 #e5eee5,#1d2824, 68-129 #b2c3b8,#1d2824, -|9: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-66 d,#0d1410, 67-129 #e5eee5,#0d1410, -|10: 0-1 d,#496656, 2-37 #b2c3b8,#1d2824, 38-46 #d3b0d9,#1d2824, 47-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-66 #b2c3b8,#0d1410, 67-129 #e5eee5,#0d1410, -|11: 0-2 d,#1d2824, 3-64 #b2c3b8,#1d2824, 65-65 #b2c3b8,#608269, 66-129 #b2c3b8,#0d1410, -|12: 0-0 d,#608269, 1-4 d,#0d1410, 5-6 #59675c,#0d1410, 7-64 #e5eee5,#0d1410, 65-66 #e5eee5,#496656, 67-103 #b2c3b8,#1d2824, 104-112 #d3b0d9,#1d2824, 113-129 #b2c3b8,#1d2824, -|13: 0-0 d,#608269, 1-64 d,#0d1410, 65-66 d,#1d2824, 67-129 #b2c3b8,#1d2824, -|14: 0-1 d,#add38a, 2-37 #becfc4,#314738, 38-46 #dfbce5,#314738, 47-64 #becfc4,#314738, 65-65 #becfc4,#608269, 66-69 #becfc4,#0d1410, 70-71 #59675c,#0d1410, 72-129 #e5eee5,#0d1410, -|15: 0-2 d,#314738, 3-64 #becfc4,#314738, 65-65 #becfc4,#608269, 66-129 #becfc4,#0d1410, -|16: 0-0 d,#608269, 1-1 d,#0d1410, 2-4 d,#0d1410,b 5-6 #616f64,#0d1410,b 7-64 #e5eee5,#0d1410, 65-65 #e5eee5,#608269, 66-129 #e5eee5,#0d1410, -|17: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|18: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|19: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|20: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|21: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|22: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|23: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|24: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|25: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|26: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|27: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|28: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|29: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|30: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|31: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|32: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|33: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|34: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|35: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|36: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|37: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|38: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|39: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|40: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|41: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|42: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|43: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|44: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|45: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|46: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|47: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|48: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|49: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, -|50: 0-0 d,#608269, 1-64 d,#0d1410, 65-65 d,#608269, 66-129 d,#0d1410, diff --git a/test/snapshots/lookpanes.snap b/test/snapshots/lookpanes.snap deleted file mode 100644 index 2834a4a9..00000000 --- a/test/snapshots/lookpanes.snap +++ /dev/null @@ -1,95 +0,0 @@ -# a look resolves against EVERY open pane's directory, in access order: the -# pane the click came from first, then the rest most-recently-focused first, -# and only a word NO directory holds falls through to a search. Two dirs -# (alpha, beta) hold same-named files and the shell's own cwd holds none of -# them, so every look below would have been a search before. -dirmk alpha -dirmk beta -file zzboot.txt x -file alpha/amark.txt a -file alpha/zqonly.txt ONLY-IN-ALPHA -file alpha/pick.txt PICK-FROM-ALPHA -file alpha/twin.txt TWIN-FROM-ALPHA -file alpha/both.txt BOTH-FROM-ALPHA -file beta/pick.txt PICK-FROM-BETA -file beta/twin.txt TWIN-FROM-BETA -file beta/both.txt BOTH-FROM-BETA -# the file argument opens a pane whose directory is beta's, and nothing else — -# so the workdir shell every look below falls through is opened with Alt-n -# (`New`/`Newcol` open an empty +New scratch now, and one inheriting beta's -# directory at that) and Alt-c puts it in a column of its own on the right; -# its first line is a word to look FROM that pane -file beta/bmark.txt both.txt\nb-marker -# 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 -# a directory looked at opens a terminal there (DirLook terminal), as this -# script was written for; DirLook pane, the default, is dirpane.snap's -config DirLook terminal -start 51 130 beta/bmark.txt -wait 8000 b-marker -stable 700 20000 -key a-n -key a-c -wait 8000 zzboot.txt -stable 700 20000 -key space w h -stable 400 5000 -# an ordinary dir look on the shell's own ls output: a shell in ./alpha, -# split below it -press right 70 6 -release right 70 6 -wait 10000 amark.txt -stable 700 20000 -# type the words to look into what is left of the workdir shell (past its own -# ls output, on the same row: its last row is the resize handle) -press left 95 5 -release left 95 5 -stable 400 5000 -key i -text zqonly.txt pick.txt twin.txt -key esc -settle 100 -stable 400 5000 -snap shells -# make the beta pane the most recently focused, so the walk has to pass it -press left 10 5 -release left 10 5 -stable 700 10000 -# zqonly.txt is only under alpha: the clicked shell's cwd fails, beta fails, -# the alpha shell answers. Before, this word became a search. -press right 99 5 -release right 99 5 -wait 10000 ONLY-IN-ALPHA -stable 700 20000 -snap other-dir -# both.txt is in BOTH dirs and alpha is now the most recent (its file pane -# just opened), but the CLICK still wins: looked inside the beta pane it -# opens beta's copy -press right 10 5 -release right 10 5 -wait 10000 BOTH-FROM-BETA -stable 700 20000 -snap clicked-wins -# from a pane whose own dir holds neither copy the access order decides: -# focus the alpha shell, look pick.txt (in both dirs) -> alpha's -press left 70 14 -release left 70 14 -stable 700 10000 -press right 109 5 -release right 109 5 -wait 10000 PICK-FROM-ALPHA -stable 700 20000 -snap mru-alpha -# focus the beta pane instead and the same look flips: twin.txt is in both -# dirs, beta is most recent, beta's copy opens -press left 10 5 -release left 10 5 -stable 700 10000 -press right 118 5 -release right 118 5 -wait 10000 TWIN-FROM-BETA -stable 700 20000 -snap mru-beta -snapstyle mru-beta diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden deleted file mode 100644 index 59082a6c..00000000 --- a/test/snapshots/rsearch.golden +++ /dev/null @@ -1,43 +0,0 @@ -== snap opened grid=210x31 cursor=7,7 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/rsearch/cwd Term+bash Save Mode Filter Collapse Del -| ls -| code.txt sub -| -| /tmp/pardes-snap/rsearch/cwd/code.txt Save Term Collapse Del -| 1 run count_x now -| 2 open sub/dep.txt:3 here -| 3 count_x again -| 4 pick two words -== snap search grid=210x31 cursor=13,9 -|11: /tmp/pardes-snap/rsearch/cwd/+Search Save Term Collapse LocationsConfig Del -|12: 1 code.txt:1:5-11 -|13: 2 run count_x now -|14: 3 code.txt:3:1-7 -|15: 4 count_x again -|16: 5 -== snap select grid=210x31 cursor=14,10 -|12: 1 code.txt:4:1-8 -|13: 2 pick two words -|14: 3 -|15: -|16: -== snap path-open grid=210x31 cursor=16,17 -|14: /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save Term Collapse Del -|15: 1 d1 -|16: 2 d2 -|17: 3 DEPTARGET -|18: 4 d4 -|19: 5 d5 -|20: 6 d6 -== snap step1 grid=210x31 cursor=13,9 -|12: 2 run count_x now -|13: 3 code.txt:3:1-7 -== snap step2 grid=210x31 cursor=13,9 -== snap step3 grid=210x31 cursor=13,9 -== snap selclick grid=210x31 cursor=14,10 -|12: 1 code.txt:4:1-8 -|13: 2 pick two words -== snap outside grid=210x31 cursor=20,10 -|12: 1 code.txt:4:10-14 diff --git a/test/snapshots/rsearch.snap b/test/snapshots/rsearch.snap deleted file mode 100644 index 75d0212c..00000000 --- a/test/snapshots/rsearch.snap +++ /dev/null @@ -1,99 +0,0 @@ -# acme button-3 in a text file = search: right-click / right-select reuse the -# `/` machinery. A click expands the file-ish word (config.isFileChar) and, when -# it names no file, searches the buffer for it — hits into the +Search output -# buffer, n/N walk them like `/`. A right-select searches the span verbatim. -# A real path (sub/dep.txt:3) still resolves and OPENS — expansion keeps / . : -# so paths are not broken; only the non-file case falls through to search. -dirmk sub -file sub/dep.txt d1\nd2\nDEPTARGET\nd4\nd5\nd6 -file code.txt run count_x now\nopen sub/dep.txt:3 here\ncount_x again\npick two words -# 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 +Search listing is what this walks: LookWord list (search, acme's look3, -# is the default; ctl.zig tests it) -config LookWord list -start 31 210 -n 1 -wait 8000 code.txt -stable 700 20000 -# open code.txt: type the name in a shell, right-click it (ordinary look) -press left 5 9 -release left 5 9 -stable 400 5000 -key i -text code.txt -key esc -settle 100 -stable 400 5000 -press right 6 9 -release right 6 9 -wait 10000 count_x -stable 700 15000 -snap opened -# code.txt opens under the shell's text, its line 1 on screen row 8. -# right-CLICK the identifier `count_x` (line 1, the 'n' at col 15). It names no -# file, so the click searches for it: the results list both lines containing it. -press right 15 8 -release right 15 8 -# Locations stack the target under its line now: two rows, two waits. -wait 10000 code.txt:1:5-11 -wait 10000 run count_x now -stable 700 15000 -snap search -# right-SELECT `pick two` (line 4, sweep cols 8..15): a multi-word span passes -# through verbatim (the space is kept), unlike a click's single-word expansion. -press right 8 11 -drag right 15 11 -release right 15 11 -wait 10000 code.txt:4:1-8 -wait 10000 pick two words -stable 700 15000 -snap select -# right-CLICK the path `sub/dep.txt:3` (line 2, col 18): isFileChar keeps / . : -# so the click expands the whole token and it RESOLVES — a look, not a search — -# opening dep.txt scrolled to line 3 (DEPTARGET). The "don't break paths" case. -press right 18 9 -release right 18 9 -wait 10000 DEPTARGET -stable 700 15000 -snap path-open -# A click does not merely LIST the hits, it goes to one: this re-search of -# `count_x` (line 1, col 15) also STEPS onto hit 1, so the cursor lands in the -# match, not where the click was. -press right 15 8 -release right 15 8 -stable 700 15000 -snap step1 -# ...and the same word clicked in its OTHER place (line 3, col 10) opens NO -# second +Search: the list is already armed on this pattern, so the click is -# `n`. Cursor moves to hit 2, line 3. -press right 10 10 -release right 10 10 -stable 700 15000 -snap step2 -# past the last hit the ring wraps: back to hit 1, line 1. -press right 10 10 -release right 10 10 -stable 700 15000 -snap step3 -# acme sized code.txt to its four lines, so line 4 is on its last row: a -# pane's last row is text like any other, never a resize handle. -# A LEFT sweep over `pick two` (line 4, cols 8..15) and then a right CLICK -# INSIDE it: the click takes the whole selection — the search is for the -# two-word span (`4:1-8`), which the file-ish word expansion could never -# produce from the single word under the click. -press left 8 11 -drag left 15 11 -release left 15 11 -stable 400 5000 -press right 11 11 -release right 11 11 -stable 700 15000 -snap selclick -# ...and a right click OUTSIDE the selection is the ordinary word click again: -# `words` (line 4, col 19), not the span left lying in the pane. -press right 19 11 -release right 19 11 -stable 700 15000 -snap outside diff --git a/test/snapshots/shellset.snap b/test/snapshots/shellset.snap index 7d213a84..63fe03f1 100644 --- a/test/snapshots/shellset.snap +++ b/test/snapshots/shellset.snap @@ -31,9 +31,9 @@ key tab stable 700 15000 # NOTHING happened on screen, and that is the assertion: a name the builtin # parser does not know is a command line, so it would have forked a terminal -# for this directory and printed `Shell: command not found` into it (that is -# cmdword.snap's contract). One pane, no error — `Shell` was consumed as a -# builtin and its argument went with it. +# for this directory and printed `Shell: command not found` into it. One +# pane, no error — `Shell` was consumed as a builtin and its argument went +# with it. snap builtin-ran # a new terminal, which asks for a shell that is not there. It gets the # fallback: the pane greets, `ls` runs, and its output is on screen. Alt-n and diff --git a/test/snapshots/splitparent.golden b/test/snapshots/splitparent.golden deleted file mode 100644 index 3073d4d3..00000000 --- a/test/snapshots/splitparent.golden +++ /dev/null @@ -1,35 +0,0 @@ -== snap shrunk grid=100x31 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/splitparent/cwd Term+bash Save /tmp/pardes-snap/splitparent/cwd Term+bash Save -| Mode Filter Collapse Del Mode Filter Collapse Del -| ls ls -| -| /tmp/pardes-snap/splitparent/cwd Term+bash Save -| Mode Filter Collapse Del -| ls -== snap swap-parent grid=100x31 cursor=4,13 -|10: /tmp/pardes-snap/splitparent/cwd Term+bash Save -|11: Mode Filter Collapse Del -|12: ls -== snap tallest grid=100x6 cursor=4,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/splitparent/cwd Term+bash Save /tmp/pardes-snap/splitparent/cwd Term+bash Save -| /tmp/pardes-snap/splitparent/cwd Term+bash Save Mode Filter Collapse Del -| /tmp/pardes-snap/splitparent/cwd Term+bash Save ls -| e in that column: each keeps its tag and 2 rows -== snap regrown grid=100x31 cursor=4,13 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/splitparent/cwd Term+bash Save /tmp/pardes-snap/splitparent/cwd Term+bash Save -| Mode Filter Collapse Del Mode Filter Collapse Del -| ls ls -| -| /tmp/pardes-snap/splitparent/cwd Term+bash Save -| Mode Filter Collapse Del -| ls -| -| /tmp/pardes-snap/splitparent/cwd Term+bash Save -| Mode Filter Collapse Del -| e in that column: each keeps its tag and 2 rows diff --git a/test/snapshots/splitparent.snap b/test/snapshots/splitparent.snap deleted file mode 100644 index 93ed9e21..00000000 --- a/test/snapshots/splitparent.snap +++ /dev/null @@ -1,34 +0,0 @@ -# a new pane never opens under a too-short parent: Alt-n from a pane too short to halve -# splits the tall sibling in its column instead; when NO pane could leave the -# newcomer 2 body rows, the tallest one anywhere is split, and when that one -# cannot keep its own tag and 2 rows either, the pane is refused -# pins the pardes placement rule (Placement pardes), which it covers -config Placement pardes -start 31 100 -n 3 -stable 700 20000 -# shrink pane 0 (top-left), a terminal, as far as it goes, its tag and 2 body -# rows: the pane below's grip dragged up under its tag (a terminal has no -# rule between panes; the grip is the handle) -press left 1 18 -drag left 1 3 -release left 1 3 -motion 40 25 -stable 500 8000 -snap shrunk -# Alt-n from the short pane: the new shell opens below the tall sibling -# underneath it, not as another 1-row sliver -key a-n -stable 700 15000 -snap swap-parent -# squeeze the grid until no pane can give a new one its tag and 2 rows, then -# Alt-n again: the new shell is refused, and the message row says why (before -# every pane had to keep only a tag and one row, the tallest pane anywhere was -# split here) -resize 6 100 -stable 700 15000 -key a-n -stable 700 15000 -snap tallest -resize 31 100 -stable 700 15000 -snap regrown diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden deleted file mode 100644 index 30a5b564..00000000 --- a/test/snapshots/ttylook.golden +++ /dev/null @@ -1,71 +0,0 @@ -== snap tok1 grid=120x31 cursor=2,5 -| Newcol Joincol Find Grep Help Changelog Tutor Dump Themes Config Debug Exit -| New Term Find Grep Joincol Delcol New Term Find Grep Joincol Delcol -| /tmp/pardes-snap/ttylook/cwd Term+bash Save Mode Filter Co /tmp/pardes-snap/ttylook/cwd Term+bash Save Mode Filter Co -| llapse Del llapse Del -| ls ls -| big.txt plain.txt sub big.txt plain.txt sub -| -| -| -| -| -| -| -| -| -| -| -| /tmp/pardes-snap/ttylook/cwd Term+bash Save Mode Filter Co -| llapse Del -| ls -| big.txt plain.txt sub -== style tok1 grid=120x31 -|0: 0-1 d,#1d2824, 2-119 #b2c3b8,#1d2824, -|1: 0-1 d,#887455, 2-59 #becfc4,#314738, 60-61 #becfc4,#887455, 62-119 #b2c3b8,#1d2824, -|2: 0-1 d,#add38a, 2-30 #becfc4,#314738, 31-40 #dfbce5,#314738, 41-59 #becfc4,#314738, 60-61 #becfc4,#496656, 62-90 #b2c3b8,#1d2824, 91-100 #d3b0d9,#1d2824, 101-119 #b2c3b8,#1d2824, -|3: 0-1 d,#314738, 2-59 #becfc4,#314738, 60-61 #becfc4,#1d2824, 62-119 #b2c3b8,#1d2824, -|4: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, -|5: 0-0 d,#608269, 1-1 d,#0d1410, 2-8 #f5f7ee,#3c614a, 9-10 #f5f7ee,#0d1410, 11-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, -|6: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|7: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|8: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|9: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|10: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|11: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|12: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|13: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|14: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|15: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|16: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|17: 0-1 d,#496656, 2-30 #b2c3b8,#1d2824, 31-40 #d3b0d9,#1d2824, 41-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410, -|18: 0-1 d,#1d2824, 2-59 #b2c3b8,#1d2824, 60-60 #b2c3b8,#608269, 61-119 #b2c3b8,#0d1410, -|19: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, -|20: 0-0 d,#608269, 1-1 d,#0d1410, 2-59 #e5eee5,#0d1410, 60-60 #e5eee5,#608269, 61-119 #e5eee5,#0d1410, -|21: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|22: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|23: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|24: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|25: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|26: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|27: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|28: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|29: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -|30: 0-0 d,#608269, 1-59 d,#0d1410, 60-60 d,#608269, 61-119 d,#0d1410, -== snap tok2 grid=120x31 cursor=11,5 -== snap tokback grid=120x31 cursor=2,5 -== snap insert grid=120x31 cursor=4,5 -|5: nnbig.txt plain.txt sub big.txt plain.txt sub -== snap tok3 grid=120x31 cursor=22,5 -|5: big.txt plain.txt sub big.txt plain.txt sub -== snap diropen grid=120x31 cursor=4,10 -|7: /tmp/pardes-snap/ttylook/cwd/sub Term+bash Save Mode Filte -|8: r Collapse Del -|9: ls -== snap noop grid=120x31 cursor=2,5 -== snap fileopen grid=120x31 cursor=3,4 -|22: /tmp/pardes-snap/ttylook/cwd/+Search Save Term Collapse Lo -|23: cationsConfig Del -|24: 1 @p1:1:1-2 -|25: 2 ls -|26: 3 diff --git a/test/snapshots/ttylook.snap b/test/snapshots/ttylook.snap deleted file mode 100644 index 62760ae6..00000000 --- a/test/snapshots/ttylook.snap +++ /dev/null @@ -1,65 +0,0 @@ -# tty n/N token motion (normal mode only): n/N SELECT the next/prev -# whitespace-separated token that look resolves — several per line, so the -# greet ls row hops big.txt -> plain.txt -> sub — moving the cursor to the -# token start and opening NOTHING. Return looks the selection (dir -> shell -# +ls there, file -> pane) and focus follows what opened. The first n wraps -# from the prompt row to the first token; insert-mode n still types; and a -# pane with nothing look-able in it never traps the walk, because the walk is -# a RING ACROSS PANES rather than a scan of the one you are in. -lines big.txt 40 -file plain.txt just text -dirmk sub -# a directory looked at opens a terminal there (DirLook terminal), as this -# script was written for; DirLook pane, the default, is dirpane.snap's -config DirLook terminal -start 31 120 -n 3 -wait 8000 big.txt -stable 700 20000 -# first n: cursor sits at the shell prompt below the output — wrap lands on -# the ls row's first token, big.txt; nothing opens -key space j n -stable 400 5000 -snap tok1 -snapstyle tok1 -# same row, next token: plain.txt -key space j n -stable 400 5000 -snap tok2 -# N steps back to big.txt -key space j p -stable 400 5000 -snap tokback -# insert-mode n still types (a run splice), no stepping; undo it -key i -text nn -key esc -settle 100 -stable 400 5000 -snap insert -key u -stable 400 5000 -# resume the walk from big.txt's start: plain.txt, then sub -key space j n -stable 400 5000 -key space j n -stable 400 5000 -snap tok3 -# Return looks the selected dir: a shell opens below in sub and ls's it -key enter -stable 700 15000 -snap diropen -# the fresh pane's dir is empty, and that is not where n stops: the ring is -# spined on the panes that have LOOKED, so the step leaves this shell for the -# one it was looked out of. That pane's cursor is on its last token (`sub`), -# so the walk runs off the end and comes round to its first — big.txt. -key space j n -stable 400 5000 -snap noop -# back in the first pane, Enter with the cursor ON a token looks it (no -# selection: the cursor word expands) — big.txt opens as a file pane -press left 4 5 -release left 4 5 -stable 400 5000 -key enter -stable 700 15000 -snap fileopen diff --git a/test/snapshots/ttytaken.snap b/test/snapshots/ttytaken.snap index a6ccb632..928993a6 100644 --- a/test/snapshots/ttytaken.snap +++ b/test/snapshots/ttytaken.snap @@ -4,7 +4,7 @@ # and into a command pane of its own once `less` owns the terminal -- where # it runs, instead of becoming keystrokes the pager would eat. Nothing about # the pager's screen changes. (From any pane but a terminal, an Exec always -# runs as a command pane: exec.snap and cmdword.snap.) +# runs as a command pane: exec.snap.) lines big.txt 40 start 31 210 -n 1 wait 8000 big.txt |
