From a45d29ca200341f5d41fad634c18df96605df8ab Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Mon, 6 Jul 2026 14:34:07 -0300 Subject: cursor-line gutter highlight: the line number on the cursor's row takes the tag style (tag_fg/tag_bg), resolved at render time from the theme like the rest of the chrome. Same row math as the cursor pass (pinned cur_row or emulator cursor + scroll), gated on active && !tag_edit so only the focused file pane shows it. New cursorline snap script + golden proves it follows j-movement; look-file/syntax style goldens regenerated (cursor-row gutter cells only). 19/19 snap green. --- test/snapshots/syntax.golden | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/snapshots/syntax.golden') diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden index 310d6d64..372f2999 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -32,7 +32,7 @@ == style zig-open |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, -|2: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-18 d,d, 19-25 #cc70d8,d,b 26-26 d,d, 27-31 #8ab87a,d, 32-34 d,d, 35-42 #f0f0f0,d,b 43-49 d,d, 50-51 d,#525252, 52-99 d,d, +|2: 0-1 d,#525252, 2-6 #969696,#2c2a3e, 7-18 d,d, 19-25 #cc70d8,d,b 26-26 d,d, 27-31 #8ab87a,d, 32-34 d,d, 35-42 #f0f0f0,d,b 43-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-10 d,d, 11-12 #cc70d8,d,b 13-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-23 d,d, 24-25 #d0c070,d, 26-49 d,d, 50-51 d,#525252, 52-99 d,d, |5: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -63,7 +63,7 @@ == style colors-off |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, -|2: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, +|2: 0-1 d,#525252, 2-6 #969696,#2c2a3e, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |5: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -94,7 +94,7 @@ == style colors-on |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, -|2: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-18 d,d, 19-25 #cc70d8,d,b 26-26 d,d, 27-31 #8ab87a,d, 32-34 d,d, 35-42 #f0f0f0,d,b 43-49 d,d, 50-51 d,#525252, 52-99 d,d, +|2: 0-1 d,#525252, 2-6 #969696,#2c2a3e, 7-18 d,d, 19-25 #cc70d8,d,b 26-26 d,d, 27-31 #8ab87a,d, 32-34 d,d, 35-42 #f0f0f0,d,b 43-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-10 d,d, 11-12 #cc70d8,d,b 13-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-23 d,d, 24-25 #d0c070,d, 26-49 d,d, 50-51 d,#525252, 52-99 d,d, |5: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -- cgit v1.3 From c1310964ac74cef1a108bd924f8d1983c3ec0e61 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Mon, 6 Jul 2026 14:23:28 -0300 Subject: mode indicators: 3-char uppercase (nm→NOR, in→INS, sy→TTY). tagPrefix + dump-load tty detection (startsWith "TTY "), tutor.txt docs, exec/fileedit snap tag-click cols +1 for the wider prefix, all 18 goldens regenerated (indicator text + 1-col tag shift only) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pardes.zig | 10 +++---- src/tutor.txt | 14 +++++----- test/snapshots/boot.golden | 8 +++--- test/snapshots/dump.golden | 6 ++--- test/snapshots/edit.golden | 8 +++--- test/snapshots/exec.golden | 14 +++++----- test/snapshots/exec.snap | 4 +-- test/snapshots/fileedit.golden | 18 ++++++------- test/snapshots/fileedit.snap | 6 ++--- test/snapshots/images.golden | 24 ++++++++--------- test/snapshots/load.golden | 8 +++--- test/snapshots/look-dir.golden | 6 ++--- test/snapshots/look-file.golden | 12 ++++----- test/snapshots/modal.golden | 48 +++++++++++++++++----------------- test/snapshots/scroll.golden | 24 ++++++++--------- test/snapshots/syntax.golden | 24 ++++++++--------- test/snapshots/tag.golden | 38 +++++++++++++-------------- test/snapshots/theme.golden | 24 ++++++++--------- test/snapshots/tty.golden | 12 ++++----- test/snapshots/ttyonly.golden | 4 +-- test/snapshots/tutor.golden | 6 ++--- test/snapshots/windowops.golden | 58 ++++++++++++++++++++--------------------- 22 files changed, 188 insertions(+), 188 deletions(-) (limited to 'test/snapshots/syntax.golden') diff --git a/src/pardes.zig b/src/pardes.zig index c4893b25..b69c8b8d 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -840,13 +840,13 @@ pub const Pardes = struct { return std.fmt.allocPrint(arena, "img {s} Petscii {s} Ascii {s}", .{ iv.path, mode, pane_builtins_str }); } if (pane.file) |f| { - const fmode = if (pane.mode == .insert) "in" else "nm"; + const fmode = if (pane.mode == .insert) "INS" else "NOR"; return std.fmt.allocPrint(arena, "{s} {s}", .{ fmode, f.path }); } const mode = switch (pane.mode) { - .normal => "nm", - .insert => "in", - .tty => "sy", + .normal => "NOR", + .insert => "INS", + .tty => "TTY", }; return std.fmt.allocPrint(arena, "{s} {s}", .{ mode, pane.cwdSlice() }); } @@ -2918,7 +2918,7 @@ pub const Pardes = struct { if (src.scroll > 0) pane.vt.screens.active.scroll(.{ .delta_row = -@as(isize, @intCast(src.scroll)) }); } p.setCwd(i, t.cwd); - if (std.mem.startsWith(u8, src.tag, "sy ")) pane.mode = .tty; + if (std.mem.startsWith(u8, src.tag, "TTY ")) pane.mode = .tty; p.restoreTail(pane, src.tag); }, .file => { diff --git a/src/tutor.txt b/src/tutor.txt index 5a93d388..94a2a20e 100644 --- a/src/tutor.txt +++ b/src/tutor.txt @@ -18,9 +18,9 @@ over. Modal editing (helix-style) is layered on top of that. Three modes (the tag shows which): - nm NORMAL block cursor, keys move/edit. DEFAULT on startup. - in INSERT keys type text at the cursor. - sy TTY keys go straight to the shell. (terminals only) + NOR NORMAL block cursor, keys move/edit. DEFAULT on startup. + INS INSERT keys type text at the cursor. + TTY TTY keys go straight to the shell. (terminals only) This tutor is in THREE parts, ordered by what's most different from editors you may know: @@ -71,7 +71,7 @@ - or select with the keyboard (`v` chars / `x` lines), then press Tab to execute or Enter to look — the acme chords on the keyboard. - THE TAG: each pane has a one-line tag: its MODE (nm/in/sy) + directory + THE TAG: each pane has a one-line tag: its MODE (NOR/INS/TTY) + directory or file path + builtins. File panes show "Save Del" by default; Save writes the current file to disk, Del closes the window. Terminal and image panes show "Del". "Delcol" still exists as a command: type it in @@ -110,11 +110,11 @@ prompt model rather than layering an editor cursor on top. On a terminal pane: - NORMAL (nm) prompt rows are HIDDEN — a clean acme-style page. You + NORMAL (NOR) prompt rows are HIDDEN — a clean acme-style page. You navigate it with the same h/j/k/l/w/b/e as a file. - INSERT (in) same clean page; keys type an insertion overlay (the + INSERT (INS) same clean page; keys type an insertion overlay (the command you're composing). Prompts still hidden. - TTY (sy) the REAL shell — prompts + typed input shown, and keys + TTY (TTY) the REAL shell — prompts + typed input shown, and keys go straight to the pty as terminal input. ESC: insert -> normal. (Esc never reaches tty.) diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden index 85bac8dd..e17d9f3d 100644 --- a/test/snapshots/boot.golden +++ b/test/snapshots/boot.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/boot/cwd Del nm /tmp/pardes-snap/boot/cwd Del +| NOR /tmp/pardes-snap/boot/cwd Del NOR /tmp/pardes-snap/boot/cwd Del | | hello.txt hello.txt | @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/boot/cwd Del +| NOR /tmp/pardes-snap/boot/cwd Del | | hello.txt | @@ -31,7 +31,7 @@ | == style boot |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-33 #969696,#2c2a3e, 34-49 d,#2c2a3e, 50-51 d,#383c54, 52-83 #969696,#2c2a3e, 84-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#383c54, 52-84 #969696,#2c2a3e, 85-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -46,7 +46,7 @@ |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-33 #969696,#2c2a3e, 34-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/dump.golden b/test/snapshots/dump.golden index c18003d5..9527f838 100644 --- a/test/snapshots/dump.golden +++ b/test/snapshots/dump.golden @@ -10,7 +10,7 @@ .panes = .{ .{ .kind = .terminal, - .tag = "nm /tmp/pardes-snap/dump/cwd Del", + .tag = "NOR /tmp/pardes-snap/dump/cwd Del", .body = "\nd.txt\n\n\n\n typed-marker\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, @@ -27,7 +27,7 @@ }, .{ .kind = .terminal, - .tag = "nm /tmp/pardes-snap/dump/cwd Del", + .tag = "NOR /tmp/pardes-snap/dump/cwd Del", .body = "\nd.txt\n\n\n\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, @@ -44,7 +44,7 @@ }, .{ .kind = .terminal, - .tag = "nm /tmp/pardes-snap/dump/cwd Del", + .tag = "NOR /tmp/pardes-snap/dump/cwd Del", .body = "\nd.txt\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, diff --git a/test/snapshots/edit.golden b/test/snapshots/edit.golden index 846bfa30..1e253388 100644 --- a/test/snapshots/edit.golden +++ b/test/snapshots/edit.golden @@ -1,6 +1,6 @@ == snap inserted grid=100x30 cursor=4,9 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/edit/cwd Del nm /tmp/pardes-snap/edit/cwd Del +| NOR /tmp/pardes-snap/edit/cwd Del NOR /tmp/pardes-snap/edit/cwd Del | | e.txt e.txt | @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/edit/cwd Del +| NOR /tmp/pardes-snap/edit/cwd Del | | e.txt | @@ -31,7 +31,7 @@ | == style inserted |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-33 #969696,#2c2a3e, 34-49 d,#2c2a3e, 50-51 d,#383c54, 52-83 #969696,#2c2a3e, 84-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#383c54, 52-84 #969696,#2c2a3e, 85-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -46,7 +46,7 @@ |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-33 #969696,#2c2a3e, 34-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden index 23b1305b..01464fd9 100644 --- a/test/snapshots/exec.golden +++ b/test/snapshots/exec.golden @@ -1,6 +1,6 @@ == snap exec grid=100x30 cursor=4,7 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/exec/cwd Del nm /tmp/pardes-snap/exec/cwd Del +| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt | @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/exec/cwd Del +| NOR /tmp/pardes-snap/exec/cwd Del | | e.txt | @@ -31,7 +31,7 @@ | == snap kept grid=100x30 cursor=6,2 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/exec/cwd Del nm /tmp/pardes-snap/exec/cwd Del +| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt | @@ -46,7 +46,7 @@ | | | -| nm /tmp/pardes-snap/exec/cwd Del +| NOR /tmp/pardes-snap/exec/cwd Del | | e.txt | @@ -62,7 +62,7 @@ | == snap chord grid=100x30 cursor=6,2 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/exec/cwd Del nm /tmp/pardes-snap/exec/cwd Del +| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | ZZARG | ./c.sh e.txt | @@ -77,7 +77,7 @@ | | | -| nm /tmp/pardes-snap/exec/cwd Del +| NOR /tmp/pardes-snap/exec/cwd Del | | e.txt | @@ -93,7 +93,7 @@ | == snap deleted grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/exec/cwd Del nm /tmp/pardes-snap/exec/cwd Del +| NOR /tmp/pardes-snap/exec/cwd Del NOR /tmp/pardes-snap/exec/cwd Del | | e.txt e.txt | diff --git a/test/snapshots/exec.snap b/test/snapshots/exec.snap index dd8c24ee..a588d9f3 100644 --- a/test/snapshots/exec.snap +++ b/test/snapshots/exec.snap @@ -40,7 +40,7 @@ wait 10000 CHORDARG:ZZARG stable 700 10000 snap chord # middle-click Del in this pane's tag (after cwd prefix) closes it -press middle 32 2 -release middle 32 2 +press middle 33 2 +release middle 33 2 stable 700 10000 snap deleted diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden index c6fb40aa..3052122e 100644 --- a/test/snapshots/fileedit.golden +++ b/test/snapshots/fileedit.golden @@ -1,6 +1,6 @@ == snap edited grid=100x30 cursor=17,2 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/fileedit/cwd/f.txt Save Del nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 2 f.txt | 3 line 3 @@ -10,7 +10,7 @@ | 7 line 7 | 8 line 8 | 9 line 9 -| nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd Del | | f.txt | @@ -20,7 +20,7 @@ | | | -| nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd Del | | f.txt | @@ -31,7 +31,7 @@ | == snap deleted grid=100x30 cursor=7,3 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/fileedit/cwd/f.txt Save Del nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 3 f.txt | 3 line 4 @@ -41,7 +41,7 @@ | 7 line 8 | 8 line 9 | 9 line 10 -| nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd Del | | f.txt | @@ -51,7 +51,7 @@ | | | -| nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd Del | | f.txt | @@ -62,7 +62,7 @@ | == snap undone grid=100x30 cursor=7,3 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/fileedit/cwd/f.txt Save Del nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd/f.txt Save Del NOR /tmp/pardes-snap/fileedit/cwd Del | 1 liEDIT''MEne 1 | 2 line 2 f.txt | 3 line 3 @@ -72,7 +72,7 @@ | 7 line 7 | 8 line 8 | 9 line 9 -| nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd Del | | f.txt | @@ -82,7 +82,7 @@ | | | -| nm /tmp/pardes-snap/fileedit/cwd Del +| NOR /tmp/pardes-snap/fileedit/cwd Del | | f.txt | diff --git a/test/snapshots/fileedit.snap b/test/snapshots/fileedit.snap index 7bafa358..bd259c8b 100644 --- a/test/snapshots/fileedit.snap +++ b/test/snapshots/fileedit.snap @@ -33,8 +33,8 @@ snap deleted key u stable 400 5000 snap undone -# Save via the tag: middle-click the Save word (after "nm ") -press middle 42 2 -release middle 42 2 +# Save via the tag: middle-click the Save word (after "NOR ") +press middle 43 2 +release middle 43 2 settle 800 snapfile saved /tmp/pardes-snap/fileedit/cwd/f.txt diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden index b6e75fbf..442b084c 100644 --- a/test/snapshots/images.golden +++ b/test/snapshots/images.golden @@ -1,6 +1,6 @@ == snap img-open grid=100x30 cursor=4,7 |Kill Newcol Tutor Debug Colors NextColor Dump -| img /tmp/pardes-snap/images/cwd/pic.ppm Petscii nm /tmp/pardes-snap/images/cwd Del +| img /tmp/pardes-snap/images/cwd/pic.ppm Petscii NOR /tmp/pardes-snap/images/cwd Del | 🬝🬹 | 🬝▀█ pic.ppm | 🬝▀█ @@ -10,7 +10,7 @@ | █🬆█ | █🬆█ | 🬝🬹█ -| nm /tmp/pardes-snap/images/cwd Del +| NOR /tmp/pardes-snap/images/cwd Del | | pic.ppm | @@ -20,7 +20,7 @@ | | | -| nm /tmp/pardes-snap/images/cwd Del +| NOR /tmp/pardes-snap/images/cwd Del | | pic.ppm | @@ -31,7 +31,7 @@ | == style img-open |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-86 #969696,#2c2a3e, 87-99 d,#2c2a3e, |2: 0-1 d,#2a2a2a, 2-16 d,d, 17-32 #ffffff,#ffffff, 33-33 #ffffff,#352879, 34-34 #352879,#ffffff, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#2a2a2a, 2-16 d,d, 17-30 #ffffff,#ffffff, 31-32 #ffffff,#352879, 33-33 #352879,#ffffff, 34-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#2a2a2a, 2-16 d,d, 17-28 #ffffff,#ffffff, 29-30 #ffffff,#352879, 31-31 #352879,#ffffff, 32-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -41,7 +41,7 @@ |8: 0-1 d,#2a2a2a, 2-16 d,d, 17-20 #ffffff,#ffffff, 21-22 #ffffff,#352879, 23-23 #352879,#ffffff, 24-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |9: 0-1 d,#2a2a2a, 2-16 d,d, 17-18 #ffffff,#ffffff, 19-20 #ffffff,#352879, 21-21 #352879,#ffffff, 22-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |10: 0-1 d,#2a2a2a, 2-16 d,d, 17-17 #ffffff,#352879, 18-19 #352879,#ffffff, 20-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -51,7 +51,7 @@ |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -62,7 +62,7 @@ |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, == style term-palette |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-86 #969696,#2c2a3e, 87-99 d,#2c2a3e, |2: 0-1 d,#2a2a2a, 2-16 d,d, 17-32 #ffffff,#ffffff, 33-33 #ffffff,#352879, 34-34 #352879,#ffffff, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#2a2a2a, 2-16 d,d, 17-30 #ffffff,#ffffff, 31-32 #ffffff,#352879, 33-33 #352879,#ffffff, 34-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#2a2a2a, 2-16 d,d, 17-28 #ffffff,#ffffff, 29-30 #ffffff,#352879, 31-31 #352879,#ffffff, 32-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -72,7 +72,7 @@ |8: 0-1 d,#2a2a2a, 2-16 d,d, 17-20 #ffffff,#ffffff, 21-22 #ffffff,#352879, 23-23 #352879,#ffffff, 24-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |9: 0-1 d,#2a2a2a, 2-16 d,d, 17-18 #ffffff,#ffffff, 19-20 #ffffff,#352879, 21-21 #352879,#ffffff, 22-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |10: 0-1 d,#2a2a2a, 2-16 d,d, 17-17 #ffffff,#352879, 18-19 #352879,#ffffff, 20-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -82,7 +82,7 @@ |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -93,7 +93,7 @@ |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, == style no-ascii |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-86 #969696,#2c2a3e, 87-99 d,#2c2a3e, |2: 0-1 d,#2a2a2a, 2-16 d,d, 17-32 #ffffff,#ffffff, 33-33 #ffffff,#352879, 34-34 #352879,#ffffff, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#2a2a2a, 2-16 d,d, 17-30 #ffffff,#ffffff, 31-32 #ffffff,#352879, 33-33 #352879,#ffffff, 34-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#2a2a2a, 2-16 d,d, 17-28 #ffffff,#ffffff, 29-30 #ffffff,#352879, 31-31 #352879,#ffffff, 32-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -103,7 +103,7 @@ |8: 0-1 d,#2a2a2a, 2-16 d,d, 17-20 #ffffff,#ffffff, 21-22 #ffffff,#352879, 23-23 #352879,#ffffff, 24-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |9: 0-1 d,#2a2a2a, 2-16 d,d, 17-18 #ffffff,#ffffff, 19-20 #ffffff,#352879, 21-21 #352879,#ffffff, 22-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, |10: 0-1 d,#2a2a2a, 2-16 d,d, 17-17 #ffffff,#352879, 18-19 #352879,#ffffff, 20-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -113,7 +113,7 @@ |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/load.golden b/test/snapshots/load.golden index ade03fe3..5ca1bfc8 100644 --- a/test/snapshots/load.golden +++ b/test/snapshots/load.golden @@ -1,6 +1,6 @@ == snap loaded grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/load/cwd Del nm /tmp/pardes-snap/load/cwd Del +| NOR /tmp/pardes-snap/load/cwd Del NOR /tmp/pardes-snap/load/cwd Del | | LOADMARK d.txt | 1 @@ -15,7 +15,7 @@ | 10 | 11 | 12 -| nm /tmp/pardes-snap/load/cwd Del +| NOR /tmp/pardes-snap/load/cwd Del | | d.txt | @@ -31,7 +31,7 @@ | == style loaded |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-33 #969696,#2c2a3e, 34-49 d,#2c2a3e, 50-51 d,#383c54, 52-83 #969696,#2c2a3e, 84-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#383c54, 52-84 #969696,#2c2a3e, 85-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -46,7 +46,7 @@ |13: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-33 #969696,#2c2a3e, 34-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/look-dir.golden b/test/snapshots/look-dir.golden index c4337878..ccd6b9e9 100644 --- a/test/snapshots/look-dir.golden +++ b/test/snapshots/look-dir.golden @@ -1,10 +1,10 @@ == snap dir-open grid=100x30 cursor=4,8 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/look-dir/cwd Del nm /tmp/pardes-snap/look-dir/cwd Del +| NOR /tmp/pardes-snap/look-dir/cwd Del NOR /tmp/pardes-snap/look-dir/cwd Del | | sub top.txt sub top.txt | -| nm /tmp/pardes-snap/look-dir/cwd/sub Del +| NOR /tmp/pardes-snap/look-dir/cwd/sub Del | | inner.txt | @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/look-dir/cwd Del +| NOR /tmp/pardes-snap/look-dir/cwd Del | | sub top.txt | diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden index 4f6d4a71..162d9a6f 100644 --- a/test/snapshots/look-file.golden +++ b/test/snapshots/look-file.golden @@ -1,6 +1,6 @@ == snap file-open grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/look-file/cwd/big.txt Save D nm /tmp/pardes-snap/look-file/cwd Del +| NOR /tmp/pardes-snap/look-file/cwd/big.txt Save NOR /tmp/pardes-snap/look-file/cwd Del | 40 line 40 | 41 line 41 big.txt | 42 line 42 @@ -10,7 +10,7 @@ | 46 line 46 | 47 line 47 | 48 line 48 -| nm /tmp/pardes-snap/look-file/cwd Del +| NOR /tmp/pardes-snap/look-file/cwd Del | | big.txt | @@ -20,7 +20,7 @@ | | | -| nm /tmp/pardes-snap/look-file/cwd Del +| NOR /tmp/pardes-snap/look-file/cwd Del | | big.txt | @@ -31,7 +31,7 @@ | == style file-open |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-88 #969696,#2c2a3e, 89-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-89 #969696,#2c2a3e, 90-99 d,#2c2a3e, |2: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -41,7 +41,7 @@ |8: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |9: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |10: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#383c54, 2-39 #969696,#2c2a3e, 40-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -51,7 +51,7 @@ |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#383c54, 2-39 #969696,#2c2a3e, 40-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/modal.golden b/test/snapshots/modal.golden index b4922f12..668fd02c 100644 --- a/test/snapshots/modal.golden +++ b/test/snapshots/modal.golden @@ -1,6 +1,6 @@ == snap top grid=100x30 cursor=2,2 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -31,7 +31,7 @@ | == snap moved grid=100x30 cursor=2,6 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -46,7 +46,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -62,7 +62,7 @@ | == snap xsel grid=100x30 cursor=2,6 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -77,7 +77,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -93,7 +93,7 @@ | == style xsel |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#383c54, 52-84 #969696,#2c2a3e, 85-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -108,7 +108,7 @@ |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -124,7 +124,7 @@ |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, == snap xsel2 grid=100x30 cursor=2,7 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -139,7 +139,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -155,7 +155,7 @@ | == snap yanked grid=100x30 cursor=2,6 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -170,7 +170,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -186,7 +186,7 @@ | == snap vsel grid=100x30 cursor=3,7 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -201,7 +201,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -217,7 +217,7 @@ | == style vsel |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#383c54, 52-84 #969696,#2c2a3e, 85-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -232,7 +232,7 @@ |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -248,7 +248,7 @@ |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, == snap typed grid=100x30 cursor=3,7 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -263,7 +263,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -279,7 +279,7 @@ | == snap undone grid=100x30 cursor=3,7 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -294,7 +294,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -310,7 +310,7 @@ | == snap redone grid=100x30 cursor=3,7 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -325,7 +325,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | @@ -341,7 +341,7 @@ | == snap bottom grid=100x30 cursor=2,9 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/modal/cwd Del nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del NOR /tmp/pardes-snap/modal/cwd Del | | words.txt words.txt | @@ -356,7 +356,7 @@ | | | -| nm /tmp/pardes-snap/modal/cwd Del +| NOR /tmp/pardes-snap/modal/cwd Del | | words.txt | diff --git a/test/snapshots/scroll.golden b/test/snapshots/scroll.golden index 899c7dec..971f9659 100644 --- a/test/snapshots/scroll.golden +++ b/test/snapshots/scroll.golden @@ -1,6 +1,6 @@ == snap bottom grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/scroll/cwd Del nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 188 | 189 s.txt | 190 @@ -15,7 +15,7 @@ | 199 | 200 | -| nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -31,7 +31,7 @@ | == snap wheel3 grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/scroll/cwd Del nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 185 | 186 s.txt | 187 @@ -46,7 +46,7 @@ | 196 | 197 | 198 -| nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -62,7 +62,7 @@ | == snap gutter-up grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/scroll/cwd Del nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 178 | 179 s.txt | 180 @@ -77,7 +77,7 @@ | 189 | 190 | 191 -| nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -93,7 +93,7 @@ | == snap gutter-down grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/scroll/cwd Del nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 180 | 181 s.txt | 182 @@ -108,7 +108,7 @@ | 191 | 192 | 193 -| nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -124,7 +124,7 @@ | == snap wheel-down grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/scroll/cwd Del nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del NOR /tmp/pardes-snap/scroll/cwd Del | 181 | 182 s.txt | 183 @@ -139,7 +139,7 @@ | 192 | 193 | 194 -| nm /tmp/pardes-snap/scroll/cwd Del +| NOR /tmp/pardes-snap/scroll/cwd Del | | s.txt | @@ -155,7 +155,7 @@ | == style wheel-down |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#383c54, 52-86 #969696,#2c2a3e, 87-99 d,#2c2a3e, |2: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -170,7 +170,7 @@ |13: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#2a2a2a, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden index 310d6d64..a63d9c23 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -1,6 +1,6 @@ == snap zig-open grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/syntax/cwd/demo.zig Save Del nm /tmp/pardes-snap/syntax/cwd Del +| NOR /tmp/pardes-snap/syntax/cwd/demo.zig Save De NOR /tmp/pardes-snap/syntax/cwd Del | 1 const std = @import("std"); // greet | 2 pub fn main() void { demo.zig | 3 var x: u32 = 42; @@ -10,7 +10,7 @@ | | | -| nm /tmp/pardes-snap/syntax/cwd Del +| NOR /tmp/pardes-snap/syntax/cwd Del | | demo.zig | @@ -20,7 +20,7 @@ | | | -| nm /tmp/pardes-snap/syntax/cwd Del +| NOR /tmp/pardes-snap/syntax/cwd Del | | demo.zig | @@ -31,7 +31,7 @@ | == style zig-open |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-86 #969696,#2c2a3e, 87-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-18 d,d, 19-25 #cc70d8,d,b 26-26 d,d, 27-31 #8ab87a,d, 32-34 d,d, 35-42 #f0f0f0,d,b 43-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-10 d,d, 11-12 #cc70d8,d,b 13-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-23 d,d, 24-25 #d0c070,d, 26-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -41,7 +41,7 @@ |8: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |9: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |10: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -51,7 +51,7 @@ |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -62,7 +62,7 @@ |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, == style colors-off |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-86 #969696,#2c2a3e, 87-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -72,7 +72,7 @@ |8: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |9: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |10: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -82,7 +82,7 @@ |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -93,7 +93,7 @@ |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, == style colors-on |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-86 #969696,#2c2a3e, 87-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-18 d,d, 19-25 #cc70d8,d,b 26-26 d,d, 27-31 #8ab87a,d, 32-34 d,d, 35-42 #f0f0f0,d,b 43-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-10 d,d, 11-12 #cc70d8,d,b 13-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-23 d,d, 24-25 #d0c070,d, 26-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -103,7 +103,7 @@ |8: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |9: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |10: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -113,7 +113,7 @@ |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#383c54, 2-36 #969696,#2c2a3e, 37-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden index 9275777b..9632ab6a 100644 --- a/test/snapshots/tag.golden +++ b/test/snapshots/tag.golden @@ -1,6 +1,6 @@ -== snap tag-focus grid=100x30 cursor=33,1 +== snap tag-focus grid=100x30 cursor=34,1 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/tag/cwd Del nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -29,9 +29,9 @@ | | | -== snap tag-typed grid=100x30 cursor=46,1 +== snap tag-typed grid=100x30 cursor=47,1 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/tag/cwd Del echo TAG''OK nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del echo TAG''OK NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -46,7 +46,7 @@ | | | -| nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -60,9 +60,9 @@ | | | -== snap tag-exec grid=100x30 cursor=45,1 +== snap tag-exec grid=100x30 cursor=46,1 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/tag/cwd Del echo TAG''OK nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del echo TAG''OK NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -77,7 +77,7 @@ | | | -| nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -91,9 +91,9 @@ | | | -== snap tag-vsel grid=100x30 cursor=31,1 +== snap tag-vsel grid=100x30 cursor=32,1 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/tag/cwd Del echo TAG''OK nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del echo TAG''OK NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -108,7 +108,7 @@ | | | -| nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -124,7 +124,7 @@ | == style tag-vsel |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-28 #969696,#2c2a3e, 29-31 #d8c8a8,#4a3a1e, 32-45 #969696,#2c2a3e, 46-49 d,#2c2a3e, 50-51 d,#383c54, 52-82 #969696,#2c2a3e, 83-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-29 #969696,#2c2a3e, 30-32 #d8c8a8,#4a3a1e, 33-46 #969696,#2c2a3e, 47-49 d,#2c2a3e, 50-51 d,#383c54, 52-83 #969696,#2c2a3e, 84-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -139,7 +139,7 @@ |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-32 #969696,#2c2a3e, 33-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-33 #969696,#2c2a3e, 34-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -153,9 +153,9 @@ |27: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |28: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |29: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -== snap tag-del grid=100x30 cursor=29,1 +== snap tag-del grid=100x30 cursor=30,1 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/tag/cwdl echo TAG''OK nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwdl echo TAG''OK NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -170,7 +170,7 @@ | | | -| nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del | | t.txt | @@ -186,7 +186,7 @@ | == snap tag-exit grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/tag/cwdl echo TAG''OK nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwdl echo TAG''OK NOR /tmp/pardes-snap/tag/cwd Del | | t.txt t.txt | @@ -201,7 +201,7 @@ | | | -| nm /tmp/pardes-snap/tag/cwd Del +| NOR /tmp/pardes-snap/tag/cwd Del | | t.txt | diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden index b90e0011..5435eee4 100644 --- a/test/snapshots/theme.golden +++ b/test/snapshots/theme.golden @@ -1,6 +1,6 @@ == snap acme grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/theme/cwd Del nm /tmp/pardes-snap/theme/cwd Del +| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/theme/cwd Del +| NOR /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -31,7 +31,7 @@ | == style acme |0: 0-44 #000000,#eaffff, 45-99 d,#eaffff, -|1: 0-1 d,#6e4fd0, 2-34 #000000,#eaffff, 35-49 d,#eaffff, 50-51 d,#383c54, 52-84 #000000,#eaffff, 85-99 d,#eaffff, +|1: 0-1 d,#6e4fd0, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#383c54, 52-85 #000000,#eaffff, 86-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |3: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |4: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -46,7 +46,7 @@ |13: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |14: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |15: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, -|16: 0-1 d,#383c54, 2-34 #000000,#eaffff, 35-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, +|16: 0-1 d,#383c54, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |17: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |18: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, |19: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, @@ -62,7 +62,7 @@ |29: 0-1 d,#ffffea, 2-49 #000000,#ffffea, 50-51 d,#ffffea, 52-99 #000000,#ffffea, == snap colors-off grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/theme/cwd Del nm /tmp/pardes-snap/theme/cwd Del +| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -77,7 +77,7 @@ | | | -| nm /tmp/pardes-snap/theme/cwd Del +| NOR /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -93,7 +93,7 @@ | == style colors-off |0: 0-44 #000000,#eaffff, 45-99 d,#eaffff, -|1: 0-1 d,#6e4fd0, 2-34 #000000,#eaffff, 35-49 d,#eaffff, 50-51 d,#383c54, 52-84 #000000,#eaffff, 85-99 d,#eaffff, +|1: 0-1 d,#6e4fd0, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 d,#383c54, 52-85 #000000,#eaffff, 86-99 d,#eaffff, |2: 0-99 d,#ffffea, |3: 0-1 d,#ffffea, 2-6 #000000,#ffffea, 7-51 d,#ffffea, 52-56 #000000,#ffffea, 57-99 d,#ffffea, |4: 0-99 d,#ffffea, @@ -108,7 +108,7 @@ |13: 0-99 d,#ffffea, |14: 0-99 d,#ffffea, |15: 0-99 d,#ffffea, -|16: 0-1 d,#383c54, 2-34 #000000,#eaffff, 35-49 d,#eaffff, 50-99 d,#ffffea, +|16: 0-1 d,#383c54, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-99 d,#ffffea, |17: 0-99 d,#ffffea, |18: 0-1 d,#ffffea, 2-6 #000000,#ffffea, 7-99 d,#ffffea, |19: 0-99 d,#ffffea, @@ -124,7 +124,7 @@ |29: 0-99 d,#ffffea, == snap dark-again grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/theme/cwd Del nm /tmp/pardes-snap/theme/cwd Del +| NOR /tmp/pardes-snap/theme/cwd Del NOR /tmp/pardes-snap/theme/cwd Del | | t.txt t.txt | @@ -139,7 +139,7 @@ | | | -| nm /tmp/pardes-snap/theme/cwd Del +| NOR /tmp/pardes-snap/theme/cwd Del | | t.txt | @@ -155,7 +155,7 @@ | == style dark-again |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#383c54, 52-84 #969696,#2c2a3e, 85-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -170,7 +170,7 @@ |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#383c54, 2-34 #969696,#2c2a3e, 35-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden index 7e6bebc5..63e4a760 100644 --- a/test/snapshots/tty.golden +++ b/test/snapshots/tty.golden @@ -1,6 +1,6 @@ == snap tty-on grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| sy /tmp/pardes-snap/tty/cwd Del nm /tmp/pardes-snap/tty/cwd Del +| TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt | $ @@ -15,7 +15,7 @@ | | | -| nm /tmp/pardes-snap/tty/cwd Del +| NOR /tmp/pardes-snap/tty/cwd Del | | m.txt | @@ -31,7 +31,7 @@ | == snap tty-echo grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug Colors NextColor Dump -| sy /tmp/pardes-snap/tty/cwd Del nm /tmp/pardes-snap/tty/cwd Del +| TTY /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | $ ls | m.txt m.txt | $ echo SNAP''OK @@ -46,7 +46,7 @@ | | | -| nm /tmp/pardes-snap/tty/cwd Del +| NOR /tmp/pardes-snap/tty/cwd Del | | m.txt | @@ -62,7 +62,7 @@ | == snap tty-off grid=100x30 cursor=4,6 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/tty/cwd Del nm /tmp/pardes-snap/tty/cwd Del +| NOR /tmp/pardes-snap/tty/cwd Del NOR /tmp/pardes-snap/tty/cwd Del | | m.txt m.txt | @@ -77,7 +77,7 @@ | | | -| nm /tmp/pardes-snap/tty/cwd Del +| NOR /tmp/pardes-snap/tty/cwd Del | | m.txt | diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden index 20ddf792..f8722061 100644 --- a/test/snapshots/ttyonly.golden +++ b/test/snapshots/ttyonly.golden @@ -1,6 +1,6 @@ == snap ttyonly grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| sy /tmp/pardes-snap/ttyonly/cwd Del +| TTY /tmp/pardes-snap/ttyonly/cwd Del | $ echo TTY''ONLY | TTYONLY | $ @@ -31,7 +31,7 @@ | == style ttyonly |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#6e4fd0, 2-36 #969696,#2c2a3e, 37-99 d,#2c2a3e, +|1: 0-1 d,#6e4fd0, 2-37 #969696,#2c2a3e, 38-99 d,#2c2a3e, |2: 0-1 d,#525252, 2-99 d,d, |3: 0-1 d,#525252, 2-99 d,d, |4: 0-1 d,#525252, 2-99 d,d, diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index 55d66c9b..65309811 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -1,6 +1,6 @@ == snap tutor grid=100x30 cursor=7,2 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /Tutor Save Del nm /tmp/pardes-snap/tutor/cwd Del +| NOR /Tutor Save Del NOR /tmp/pardes-snap/tutor/cwd Del | 1 | 2 PARDES TUTOR | 3 tmux + vi + acme, from @@ -10,7 +10,7 @@ | 7 Press j until you reach the introdu | 8 | 9 -| nm /tmp/pardes-snap/tutor/cwd Del +| NOR /tmp/pardes-snap/tutor/cwd Del | | | @@ -20,7 +20,7 @@ | | | -| nm /tmp/pardes-snap/tutor/cwd Del +| NOR /tmp/pardes-snap/tutor/cwd Del | | | diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index 061ceca9..fae9e55b 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -1,6 +1,6 @@ == snap hover-v grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del ╎ nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del ╎ NOR /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt | ╎ @@ -15,7 +15,7 @@ | ╎ | ╎ | ╎ -| nm /tmp/pardes-snap/windowops/cwd Del ╎ +| NOR /tmp/pardes-snap/windowops/cwd Del ╎ | ╎ | w.txt ╎ | ╎ @@ -31,7 +31,7 @@ | ╎ == snap hover-h grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -46,7 +46,7 @@ | | |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -62,7 +62,7 @@ | == snap border-drag grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del╎ nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd De╎ NOR /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt | ╎ @@ -77,7 +77,7 @@ | ╎ | ╎ | ╎ -| nm /tmp/pardes-snap/windowops/cwd Del╎ +| NOR /tmp/pardes-snap/windowops/cwd De╎ | ╎ | w.txt ╎ | ╎ @@ -93,7 +93,7 @@ | ╎ == snap border-done grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del╎ nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd De╎ NOR /tmp/pardes-snap/windowops/cwd Del | ╎ | w.txt ╎ w.txt | ╎ @@ -108,7 +108,7 @@ | ╎ | ╎ | ╎ -| nm /tmp/pardes-snap/windowops/cwd Del╎ +| NOR /tmp/pardes-snap/windowops/cwd De╎ | ╎ | w.txt ╎ | ╎ @@ -124,7 +124,7 @@ | ╎ == snap hborder-done grid=100x30 cursor=4,4 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -135,7 +135,7 @@ | | |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -155,7 +155,7 @@ | == snap move-preview grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -166,7 +166,7 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -186,7 +186,7 @@ | == snap moved grid=100x30 cursor=4,15 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | @@ -197,7 +197,7 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -217,14 +217,14 @@ | == snap altn grid=100x30 cursor=4,23 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -236,7 +236,7 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -248,14 +248,14 @@ | == snap focus-left grid=100x30 cursor=4,23 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -267,7 +267,7 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -279,14 +279,14 @@ | == snap debug-on grid=100x30 cursor=4,23 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowop╭────────────────────────────╮ +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowo╭────────────────────────────╮ | │pardes resizes=1 │ | w.txt w.txt │terms 4 cols 2 │ | │active #3 38x9 │ | │scroll 0/9 │ | │pinch 1.0000 │ | │tscroll 0.0000 │ -| nm /tmp/pardes-snap/windowops/cwd Del ╰────────────────────────────╯ +| NOR /tmp/pardes-snap/windowops/cwd Del ╰────────────────────────────╯ | | w.txt | @@ -298,7 +298,7 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -310,14 +310,14 @@ | == style debug-on |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, -|1: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#383c54, 42-69 #969696,#2c2a3e, 70-99 d,d, +|1: 0-1 d,#383c54, 2-39 #969696,#2c2a3e, 40-41 d,#383c54, 42-69 #969696,#2c2a3e, 70-99 d,d, |2: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-87 #969696,d, 88-98 d,#2a2a2a, 99-99 d,d, |3: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-85 #969696,d, 86-98 d,#2a2a2a, 99-99 d,d, |4: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-85 #969696,d, 86-98 d,#2a2a2a, 99-99 d,d, |5: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-80 #969696,d, 81-98 d,#2a2a2a, 99-99 d,d, |6: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-83 #969696,d, 84-98 d,#2a2a2a, 99-99 d,d, |7: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-85 #969696,d, 86-98 d,#2a2a2a, 99-99 d,d, -|8: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#525252, 42-99 d,d, +|8: 0-1 d,#383c54, 2-39 #969696,#2c2a3e, 40-41 d,#525252, 42-99 d,d, |9: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |10: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |11: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, @@ -329,7 +329,7 @@ |17: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |18: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |19: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, -|20: 0-1 d,#6e4fd0, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#525252, 42-99 d,d, +|20: 0-1 d,#6e4fd0, 2-39 #969696,#2c2a3e, 40-41 d,#525252, 42-99 d,d, |21: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |22: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |23: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, @@ -341,14 +341,14 @@ |29: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, == snap debug-off grid=100x30 cursor=4,23 |Kill Newcol Tutor Debug Colors NextColor Dump -| nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt w.txt | | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | @@ -360,7 +360,7 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del +| NOR /tmp/pardes-snap/windowops/cwd Del | | w.txt | -- cgit v1.3 From 04cd5a2b41efd6f39c3ba15c32e60843e2c6485d Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Mon, 6 Jul 2026 13:10:53 -0300 Subject: layout: every pane open/close resizes exactly ONE sibling — never the whole column. Buggy paths fixed: Alt-n inserted a weight-1 shell (whole column reflowed) — now splitBelow the active pane; stackDocLeft (file/image/tutor open with no doc yet) gave the doc a fair share (every pane shrank) — now it halves only the old top pane's slot; ttyForDir (execute from a file pane) appended a weight-1 shell to the rightmost column — now splitBelow its bottom pane; Alt-c moved a pane out without absorbVWeight (all old siblings grew) — now the sibling above absorbs first. Underneath: splitBelow/absorbVWeight/stackDocLeft snap the whole column's weights to on-screen row counts, because computeGeom's per-pane round(avail*w/vsum) let fractional weights jiggle bystanders by a row; evictLonePristineTty recomputes geometry first (a just-stacked doc has no rect). New snap tests layout-open + layout-close cover Alt-n, doc stacking, ttyForDir, Alt-c, tag Del, pty EOF, and column-width handoff. Six goldens regenerated (fileedit, images, look-file, syntax, tutor, windowops): they had frozen the fair-share/append reflow this change removes; every diff is only the doc/split pane sizing, with untouched panes' boundaries restored bit-identical (e.g. bottom pane tag back at its boot row 17 instead of pushed to 22). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pardes.zig | 59 +++++++---- test/snapshots/fileedit.golden | 30 +++--- test/snapshots/images.golden | 94 ++++++++--------- test/snapshots/layout-close.golden | 205 +++++++++++++++++++++++++++++++++++++ test/snapshots/layout-close.snap | 53 ++++++++++ test/snapshots/layout-open.golden | 155 ++++++++++++++++++++++++++++ test/snapshots/layout-open.snap | 55 ++++++++++ test/snapshots/look-file.golden | 28 ++--- test/snapshots/syntax.golden | 46 ++++----- test/snapshots/tutor.golden | 8 +- test/snapshots/windowops.golden | 58 +++++------ 11 files changed, 640 insertions(+), 151 deletions(-) create mode 100644 test/snapshots/layout-close.golden create mode 100644 test/snapshots/layout-close.snap create mode 100644 test/snapshots/layout-open.golden create mode 100644 test/snapshots/layout-open.snap (limited to 'test/snapshots/syntax.golden') diff --git a/src/pardes.zig b/src/pardes.zig index c4893b25..13b159aa 100644 --- a/src/pardes.zig +++ b/src/pardes.zig @@ -1145,12 +1145,14 @@ pub const Pardes = struct { nt.greet = true; const f = p.layoutFindTerm(p.active).?; p.layoutInsert(f.col, f.idx + 1, free); + p.splitBelow(p.active, nt); p.active = free; return; } if (key.alt and !key.ctrl and key.cp == 'c') { const f = p.layoutFindTerm(p.active).?; if (p.ncol < MAX_COLS and p.col_n[f.col] > 1) { + p.absorbVWeight(p.active); p.layoutRemove(p.active); p.layoutAppendColumn(p.active); } @@ -2433,29 +2435,47 @@ pub const Pardes = struct { p.ncol += 1; } - /// Hand a dying pane's vertical weight to ONE sibling (the pane above, or - /// below for the topmost) so the rest of the column keeps its sizes — the - /// deletion mirror of splitBelow. Call while `id` is still in the layout. + /// Snap every pane in column `c` to its on-screen row count so later + /// weight edits move ONLY the panes they name: computeGeom rounds + /// round(avail*w/vsum) per pane, and with fractional weights a split or + /// absorb elsewhere in the column can jiggle a bystander by a row. + fn snapColWeights(p: *Pardes, c: usize) void { + for (0..p.col_n[c]) |k| { + const pid = p.col_terms[c][k]; + if (p.panes[pid]) |pp| pp.vweight = @floatFromInt(@max(1, p.rects[pid].h)); + } + } + + /// Hand a dying pane's rows to ONE sibling (the pane above, or below for + /// the topmost) so the rest of the column keeps its sizes bit-identical — + /// the deletion mirror of splitBelow. Call while `id` is still in the + /// layout, with rects current. fn absorbVWeight(p: *Pardes, id: usize) void { const f = p.layoutFindTerm(id) orelse return; if (p.col_n[f.col] <= 1) return; - const gone = p.panes[id] orelse return; + p.snapColWeights(f.col); const sib = if (f.idx > 0) p.col_terms[f.col][f.idx - 1] else p.col_terms[f.col][f.idx + 1]; - if (p.panes[sib]) |s| s.vweight += gone.vweight; + if (p.panes[sib]) |s| s.vweight += @as(f32, @floatFromInt(@max(1, p.rects[id].h))); } /// Open a window BELOW `src` (acme-style) without rebalancing the column: /// shrink ONLY src to its content height (cursor row kept visible) and hand - /// the freed rows to `nw` — together they fill src's old slot. + /// the freed rows to `nw` — together they fill src's old slot and the other + /// panes keep their sizes bit-identical (weights snap to row counts). fn splitBelow(p: *Pardes, src_id: usize, nw: *Pane) void { const src = p.panes[src_id] orelse return; const src_h = p.rects[src_id].h; const body: u16 = if (src_h > BOX_H) src_h - BOX_H else 1; const cur: u16 = if (src.file != null) body / 2 else @as(u16, @intCast(src.vt.screens.active.cursor.y)) + 1; const keep = std.math.clamp(cur, 1, @max(1, body -| 1)); - const w = src.vweight; - src.vweight = w * @as(f32, @floatFromInt(BOX_H + keep)) / @as(f32, @floatFromInt(src_h)); - nw.vweight = w - src.vweight; + if (p.layoutFindTerm(src_id)) |f| for (0..p.col_n[f.col]) |k| { + const pid = p.col_terms[f.col][k]; + if (p.panes[pid]) |pp| if (pp != nw) { + pp.vweight = @floatFromInt(@max(1, p.rects[pid].h)); + }; + }; + src.vweight = @floatFromInt(BOX_H + keep); + nw.vweight = @floatFromInt(@max(1, src_h -| (BOX_H + keep))); } /// a shell nobody has touched: no typing, cursor on the first prompt line, @@ -2482,6 +2502,7 @@ pub const Pardes = struct { if (n_tty != 1) return; const tt = p.panes[tty_id] orelse return; if (!isPristineTty(tt)) return; + p.computeGeom(); // a just-stacked doc has no rect yet; absorb snaps to rows p.absorbVWeight(tty_id); p.layoutRemove(tty_id); p.deinitPane(tt); @@ -2501,6 +2522,7 @@ pub const Pardes = struct { const nt = p.newShell(free, dir) catch return null; nt.greet = false; const rc = if (p.ncol > 0) p.ncol - 1 else 0; + if (p.col_n[rc] > 0) p.splitBelow(p.col_terms[rc][p.col_n[rc] - 1], nt); p.layoutInsert(rc, p.col_n[rc], free); return free; } @@ -2558,18 +2580,17 @@ pub const Pardes = struct { } /// stack a fresh doc pane at the top of the LEFT column (acme convention: - /// files left, terminals right) with a fair share, then evict a leftover - /// pristine shell + /// files left, terminals right), halving ONLY the old top pane's slot so + /// the rest of the column keeps its sizes; then evict a leftover pristine + /// shell fn stackDocLeft(p: *Pardes, free: usize, nt: *Pane) void { const lc = 0; - const ln = p.col_n[lc]; - if (ln > 0) { - var vsum: f32 = 0; - for (0..ln) |i| if (p.panes[p.col_terms[lc][i]]) |pp| { - vsum += pp.vweight; - }; - nt.vweight = vsum / @as(f32, @floatFromInt(ln)); - } + if (p.col_n[lc] > 0) if (p.panes[p.col_terms[lc][0]]) |top| { + p.snapColWeights(lc); + const h = p.rects[p.col_terms[lc][0]].h; + nt.vweight = @floatFromInt(@max(1, h / 2)); + top.vweight = @floatFromInt(@max(1, h -| h / 2)); + }; p.layoutInsert(lc, 0, free); p.active = free; p.evictLonePristineTty(lc, free); diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden index c6fb40aa..a1709691 100644 --- a/test/snapshots/fileedit.golden +++ b/test/snapshots/fileedit.golden @@ -7,9 +7,6 @@ | 4 line 4 | 5 line 5 | 6 line 6 -| 7 line 7 -| 8 line 8 -| 9 line 9 | nm /tmp/pardes-snap/fileedit/cwd Del | | f.txt @@ -18,8 +15,6 @@ | | f.txt | -| -| | nm /tmp/pardes-snap/fileedit/cwd Del | | f.txt @@ -29,6 +24,11 @@ | | | +| +| +| +| +| == snap deleted grid=100x30 cursor=7,3 |Kill Newcol Tutor Debug Colors NextColor Dump | nm /tmp/pardes-snap/fileedit/cwd/f.txt Save Del nm /tmp/pardes-snap/fileedit/cwd Del @@ -38,9 +38,6 @@ | 4 line 5 | 5 line 6 | 6 line 7 -| 7 line 8 -| 8 line 9 -| 9 line 10 | nm /tmp/pardes-snap/fileedit/cwd Del | | f.txt @@ -49,8 +46,6 @@ | | f.txt | -| -| | nm /tmp/pardes-snap/fileedit/cwd Del | | f.txt @@ -60,6 +55,11 @@ | | | +| +| +| +| +| == snap undone grid=100x30 cursor=7,3 |Kill Newcol Tutor Debug Colors NextColor Dump | nm /tmp/pardes-snap/fileedit/cwd/f.txt Save Del nm /tmp/pardes-snap/fileedit/cwd Del @@ -69,9 +69,6 @@ | 4 line 4 | 5 line 5 | 6 line 6 -| 7 line 7 -| 8 line 8 -| 9 line 9 | nm /tmp/pardes-snap/fileedit/cwd Del | | f.txt @@ -80,8 +77,6 @@ | | f.txt | -| -| | nm /tmp/pardes-snap/fileedit/cwd Del | | f.txt @@ -91,6 +86,11 @@ | | | +| +| +| +| +| == file saved liEDIT''MEne 1 line 2 diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden index b6e75fbf..16dc0bac 100644 --- a/test/snapshots/images.golden +++ b/test/snapshots/images.golden @@ -1,15 +1,12 @@ == snap img-open grid=100x30 cursor=4,7 |Kill Newcol Tutor Debug Colors NextColor Dump | img /tmp/pardes-snap/images/cwd/pic.ppm Petscii nm /tmp/pardes-snap/images/cwd Del -| 🬝🬹 -| 🬝▀█ pic.ppm -| 🬝▀█ -| 🬝▀█ -| 🬝▀█ -| █🬆█ -| █🬆█ -| █🬆█ -| 🬝🬹█ +| 🬝🬂 +| 🬝🬂█ pic.ppm +| 🬝🬂█ +| 🬝🬂 +| 🬝🬂█ +|╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ | nm /tmp/pardes-snap/images/cwd Del | | pic.ppm @@ -18,8 +15,6 @@ | | pic.ppm | -| -| | nm /tmp/pardes-snap/images/cwd Del | | pic.ppm @@ -29,29 +24,34 @@ | | | +| +| +| +| +| == style img-open |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, -|2: 0-1 d,#2a2a2a, 2-16 d,d, 17-32 #ffffff,#ffffff, 33-33 #ffffff,#352879, 34-34 #352879,#ffffff, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|3: 0-1 d,#2a2a2a, 2-16 d,d, 17-30 #ffffff,#ffffff, 31-32 #ffffff,#352879, 33-33 #352879,#ffffff, 34-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|4: 0-1 d,#2a2a2a, 2-16 d,d, 17-28 #ffffff,#ffffff, 29-30 #ffffff,#352879, 31-31 #352879,#ffffff, 32-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|5: 0-1 d,#2a2a2a, 2-16 d,d, 17-26 #ffffff,#ffffff, 27-28 #ffffff,#352879, 29-29 #352879,#ffffff, 30-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|6: 0-1 d,#2a2a2a, 2-16 d,d, 17-24 #ffffff,#ffffff, 25-26 #ffffff,#352879, 27-27 #352879,#ffffff, 28-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|7: 0-1 d,#2a2a2a, 2-16 d,d, 17-22 #ffffff,#ffffff, 23-24 #ffffff,#352879, 25-25 #352879,#ffffff, 26-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|8: 0-1 d,#2a2a2a, 2-16 d,d, 17-20 #ffffff,#ffffff, 21-22 #ffffff,#352879, 23-23 #352879,#ffffff, 24-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|9: 0-1 d,#2a2a2a, 2-16 d,d, 17-18 #ffffff,#ffffff, 19-20 #ffffff,#352879, 21-21 #352879,#ffffff, 22-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|10: 0-1 d,#2a2a2a, 2-16 d,d, 17-17 #ffffff,#352879, 18-19 #352879,#ffffff, 20-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|2: 0-1 d,#2a2a2a, 2-19 d,d, 20-29 #ffffff,#ffffff, 30-31 #ffffff,#6c5eb5, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|3: 0-1 d,#2a2a2a, 2-19 d,d, 20-27 #ffffff,#ffffff, 28-29 #ffffff,#6c5eb5, 30-30 #352879,#ffffff, 31-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|4: 0-1 d,#2a2a2a, 2-19 d,d, 20-25 #ffffff,#ffffff, 26-27 #ffffff,#6c5eb5, 28-28 #352879,#ffffff, 29-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|5: 0-1 d,#2a2a2a, 2-19 d,d, 20-23 #ffffff,#ffffff, 24-25 #ffffff,#6c5eb5, 26-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|6: 0-1 d,#2a2a2a, 2-19 d,d, 20-21 #ffffff,#ffffff, 22-23 #ffffff,#6c5eb5, 24-24 #352879,#ffffff, 25-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|7: 0-1 d,#2a2a2a, 2-19 d,d, 20-21 #ffffff,#6c5eb5, 22-22 #352879,#ffffff, 23-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|8: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|9: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|10: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -63,26 +63,26 @@ == style term-palette |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, -|2: 0-1 d,#2a2a2a, 2-16 d,d, 17-32 #ffffff,#ffffff, 33-33 #ffffff,#352879, 34-34 #352879,#ffffff, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|3: 0-1 d,#2a2a2a, 2-16 d,d, 17-30 #ffffff,#ffffff, 31-32 #ffffff,#352879, 33-33 #352879,#ffffff, 34-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|4: 0-1 d,#2a2a2a, 2-16 d,d, 17-28 #ffffff,#ffffff, 29-30 #ffffff,#352879, 31-31 #352879,#ffffff, 32-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|5: 0-1 d,#2a2a2a, 2-16 d,d, 17-26 #ffffff,#ffffff, 27-28 #ffffff,#352879, 29-29 #352879,#ffffff, 30-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|6: 0-1 d,#2a2a2a, 2-16 d,d, 17-24 #ffffff,#ffffff, 25-26 #ffffff,#352879, 27-27 #352879,#ffffff, 28-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|7: 0-1 d,#2a2a2a, 2-16 d,d, 17-22 #ffffff,#ffffff, 23-24 #ffffff,#352879, 25-25 #352879,#ffffff, 26-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|8: 0-1 d,#2a2a2a, 2-16 d,d, 17-20 #ffffff,#ffffff, 21-22 #ffffff,#352879, 23-23 #352879,#ffffff, 24-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|9: 0-1 d,#2a2a2a, 2-16 d,d, 17-18 #ffffff,#ffffff, 19-20 #ffffff,#352879, 21-21 #352879,#ffffff, 22-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|10: 0-1 d,#2a2a2a, 2-16 d,d, 17-17 #ffffff,#352879, 18-19 #352879,#ffffff, 20-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|2: 0-1 d,#2a2a2a, 2-19 d,d, 20-29 #ffffff,#ffffff, 30-31 #ffffff,#6c5eb5, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|3: 0-1 d,#2a2a2a, 2-19 d,d, 20-27 #ffffff,#ffffff, 28-29 #ffffff,#6c5eb5, 30-30 #352879,#ffffff, 31-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|4: 0-1 d,#2a2a2a, 2-19 d,d, 20-25 #ffffff,#ffffff, 26-27 #ffffff,#6c5eb5, 28-28 #352879,#ffffff, 29-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|5: 0-1 d,#2a2a2a, 2-19 d,d, 20-23 #ffffff,#ffffff, 24-25 #ffffff,#6c5eb5, 26-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|6: 0-1 d,#2a2a2a, 2-19 d,d, 20-21 #ffffff,#ffffff, 22-23 #ffffff,#6c5eb5, 24-24 #352879,#ffffff, 25-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|7: 0-1 d,#2a2a2a, 2-19 d,d, 20-21 #ffffff,#6c5eb5, 22-22 #352879,#ffffff, 23-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|8: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|9: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|10: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -94,26 +94,26 @@ == style no-ascii |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-85 #969696,#2c2a3e, 86-99 d,#2c2a3e, -|2: 0-1 d,#2a2a2a, 2-16 d,d, 17-32 #ffffff,#ffffff, 33-33 #ffffff,#352879, 34-34 #352879,#ffffff, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|3: 0-1 d,#2a2a2a, 2-16 d,d, 17-30 #ffffff,#ffffff, 31-32 #ffffff,#352879, 33-33 #352879,#ffffff, 34-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|4: 0-1 d,#2a2a2a, 2-16 d,d, 17-28 #ffffff,#ffffff, 29-30 #ffffff,#352879, 31-31 #352879,#ffffff, 32-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|5: 0-1 d,#2a2a2a, 2-16 d,d, 17-26 #ffffff,#ffffff, 27-28 #ffffff,#352879, 29-29 #352879,#ffffff, 30-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|6: 0-1 d,#2a2a2a, 2-16 d,d, 17-24 #ffffff,#ffffff, 25-26 #ffffff,#352879, 27-27 #352879,#ffffff, 28-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|7: 0-1 d,#2a2a2a, 2-16 d,d, 17-22 #ffffff,#ffffff, 23-24 #ffffff,#352879, 25-25 #352879,#ffffff, 26-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|8: 0-1 d,#2a2a2a, 2-16 d,d, 17-20 #ffffff,#ffffff, 21-22 #ffffff,#352879, 23-23 #352879,#ffffff, 24-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|9: 0-1 d,#2a2a2a, 2-16 d,d, 17-18 #ffffff,#ffffff, 19-20 #ffffff,#352879, 21-21 #352879,#ffffff, 22-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|10: 0-1 d,#2a2a2a, 2-16 d,d, 17-17 #ffffff,#352879, 18-19 #352879,#ffffff, 20-34 #352879,#352879, 35-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|2: 0-1 d,#2a2a2a, 2-19 d,d, 20-29 #ffffff,#ffffff, 30-31 #ffffff,#6c5eb5, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|3: 0-1 d,#2a2a2a, 2-19 d,d, 20-27 #ffffff,#ffffff, 28-29 #ffffff,#6c5eb5, 30-30 #352879,#ffffff, 31-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|4: 0-1 d,#2a2a2a, 2-19 d,d, 20-25 #ffffff,#ffffff, 26-27 #ffffff,#6c5eb5, 28-28 #352879,#ffffff, 29-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|5: 0-1 d,#2a2a2a, 2-19 d,d, 20-23 #ffffff,#ffffff, 24-25 #ffffff,#6c5eb5, 26-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|6: 0-1 d,#2a2a2a, 2-19 d,d, 20-21 #ffffff,#ffffff, 22-23 #ffffff,#6c5eb5, 24-24 #352879,#ffffff, 25-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|7: 0-1 d,#2a2a2a, 2-19 d,d, 20-21 #ffffff,#6c5eb5, 22-22 #352879,#ffffff, 23-31 #352879,#352879, 32-49 d,d, 50-51 d,#525252, 52-99 d,d, +|8: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|9: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|10: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden new file mode 100644 index 00000000..9557ec98 --- /dev/null +++ b/test/snapshots/layout-close.golden @@ -0,0 +1,205 @@ +== snap built grid=140x40 cursor=4,16 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt marker.txt +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +== snap altc grid=140x40 cursor=98,4 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt marker.txt marker.txt +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +== snap del grid=140x40 cursor=98,4 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt marker.txt marker.txt +| +| +| +| +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +== snap exit grid=140x40 cursor=4,7 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt marker.txt marker.txt +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +== snap colclose grid=140x40 cursor=4,7 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-close/cwd Del nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt marker.txt +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-close/cwd Del +| +| marker.txt +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| +| diff --git a/test/snapshots/layout-close.snap b/test/snapshots/layout-close.snap new file mode 100644 index 00000000..63f5cd81 --- /dev/null +++ b/test/snapshots/layout-close.snap @@ -0,0 +1,53 @@ +# every pane close hands its space to ONE sibling, the rest of the column +# keeps its sizes: Alt-c move-out, tag Del, and shell exit (pty EOF); an +# emptied column hands its width to one neighbor +file marker.txt x +start 40 140 +wait 8000 marker.txt +stable 700 20000 +# build a left column of five: Alt-n three times from pane 0 (active follows +# the new pane, each split takes from the freshly split pane only) +press left 5 8 +release left 5 8 +stable 400 5000 +key a-n +stable 700 15000 +key a-n +stable 700 15000 +key a-n +stable 700 15000 +snap built +# Alt-c: the active (4th) pane moves to a fresh column; the pane above it +# absorbs its rows, the other three keep theirs (columns reflow horizontally) +key a-c +stable 700 15000 +snap altc +# middle-click Del in the 2nd pane's tag: the pane above absorbs +press middle 41 6 +release middle 41 6 +stable 700 10000 +snap del +# exit the (now) 2nd shell (type the command, esc, Tab executes the word): +# pty EOF, again only the pane above absorbs +press left 5 14 +release left 5 14 +stable 400 5000 +key i +text exit +key esc +settle 700 +key tab +stable 700 10000 +snap exit +# exit the moved-out pane's shell: its column empties and hands its width to +# the middle column only; the left column's width must not change +press left 100 8 +release left 100 8 +stable 400 5000 +key i +text exit +key esc +settle 700 +key tab +stable 700 10000 +snap colclose diff --git a/test/snapshots/layout-open.golden b/test/snapshots/layout-open.golden new file mode 100644 index 00000000..2da61d61 --- /dev/null +++ b/test/snapshots/layout-open.golden @@ -0,0 +1,155 @@ +== snap before grid=100x30 cursor=4,7 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-open/cwd Del nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub sub +| +| +| +| echo one; echo two +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub +| +| +| +| +| +| +| +| +| +| +| +== snap altn-left grid=100x30 cursor=4,8 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-open/cwd Del nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub sub +| +| nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub +| +| +| +| +| +| +| +| +| +| +| +== snap altn-right grid=100x30 cursor=54,8 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-open/cwd Del nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub sub +| +| nm /tmp/pardes-snap/layout-open/cwd Del nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub sub +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub +| +| +| +| +| +| +| +| +| +| +| +== snap file-open grid=100x30 cursor=7,2 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-open/cwd/sub/f.txt Sa nm /tmp/pardes-snap/layout-open/cwd Del +| 1 echo 'TTY'OK +| nm /tmp/pardes-snap/layout-open/cwd Del sub +| +| nm /tmp/pardes-snap/layout-open/cwd Del nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub sub +| +| +| +| +| +| +| +| +| nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub +| +| +| +| +| +| +| +| sub/f.txt +| +| +| +== snap ttydir grid=100x30 cursor=7,2 +|Kill Newcol Tutor Debug Colors NextColor Dump +| nm /tmp/pardes-snap/layout-open/cwd/sub/f.txt Sa nm /tmp/pardes-snap/layout-open/cwd Del +| 1 echo 'TTY'OK +| nm /tmp/pardes-snap/layout-open/cwd Del sub +| +| nm /tmp/pardes-snap/layout-open/cwd Del nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub sub +| +| nm /tmp/pardes-snap/layout-open/cwd/sub Del +| echo 'TTY'OK +| +| TTYOK +| +| +| +| nm /tmp/pardes-snap/layout-open/cwd Del +| +| sub +| +| +| +| +| +| +| +| sub/f.txt +| +| +| diff --git a/test/snapshots/layout-open.snap b/test/snapshots/layout-open.snap new file mode 100644 index 00000000..773cf70d --- /dev/null +++ b/test/snapshots/layout-open.snap @@ -0,0 +1,55 @@ +# every pane open splits ONE existing pane, the rest of the column keeps its +# sizes: Alt-n splits the active pane, a looked-up file stacking top-left +# splits only the old top pane, an execute-spawned shell for a file's dir +# splits only the bottom pane of the rightmost column +dirmk sub +file sub/f.txt echo 'TTY'OK +start 30 100 +wait 8000 sub +stable 700 20000 +# give pane 0 (top-left) some content so its content-height split is visible +press left 5 8 +release left 5 8 +stable 400 5000 +key i +text echo one; echo two +key enter +key esc +settle 700 +stable 400 5000 +snap before +# Alt-n: new shell below pane 0 — the bottom pane's boundary must not move +key a-n +stable 700 15000 +snap altn-left +# make the right column two panes (Alt-n in a fresh column, trivial split) +press left 70 8 +release left 70 8 +stable 400 5000 +key a-n +stable 700 15000 +snap altn-right +# look sub/f.txt from the bottom-left shell: the doc stacks at the top of the +# left column, splitting only the old top pane — lower boundaries must not move +press left 5 27 +release left 5 27 +stable 400 5000 +key i +text sub/f.txt +key esc +settle 700 +stable 400 5000 +press right 7 27 +release right 7 27 +stable 700 15000 +snap file-open +# execute the file's command (middle drag over line 1): no shell has cwd sub/, +# so one is forked at the bottom of the rightmost column, splitting only the +# pane above it +press middle 8 3 +drag middle 19 3 +release middle 19 3 +wait 10000 TTYOK +motion 40 25 +stable 700 10000 +snap ttydir diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden index 4f6d4a71..9258cfdb 100644 --- a/test/snapshots/look-file.golden +++ b/test/snapshots/look-file.golden @@ -6,10 +6,7 @@ | 42 line 42 | 43 line 43 | 44 line 44 -| 45 line 45 -| 46 line 46 -| 47 line 47 -| 48 line 48 +|╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ | nm /tmp/pardes-snap/look-file/cwd Del | | big.txt @@ -18,8 +15,6 @@ | | big.txt:40 | -| -| | nm /tmp/pardes-snap/look-file/cwd Del | | big.txt @@ -29,29 +24,34 @@ | | | +| +| +| +| +| == style file-open |0: 0-44 #969696,#2c2a3e, 45-99 d,#2c2a3e, |1: 0-1 d,#6e4fd0, 2-49 #969696,#2c2a3e, 50-51 d,#383c54, 52-88 #969696,#2c2a3e, 89-99 d,#2c2a3e, |2: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |3: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |4: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|5: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, +|5: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |6: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|7: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|8: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|9: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|10: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|7: 0-1 d,#2a2a2a, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, +|8: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|9: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|10: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden index 310d6d64..80ef3525 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -6,24 +6,24 @@ | 3 var x: u32 = 42; | 4 _ = x; | 5 } +|╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ +| nm /tmp/pardes-snap/syntax/cwd Del | +| demo.zig | | | +| demo.zig +| | nm /tmp/pardes-snap/syntax/cwd Del | | demo.zig | | | -| demo.zig | | | -| nm /tmp/pardes-snap/syntax/cwd Del -| -| demo.zig -| | | | @@ -38,20 +38,20 @@ |5: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |6: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |7: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|8: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|9: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|10: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|8: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|9: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|10: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -69,20 +69,20 @@ |5: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |6: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |7: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|8: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|9: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|10: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|8: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|9: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|10: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, @@ -100,20 +100,20 @@ |5: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |6: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, |7: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|8: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|9: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|10: 0-1 d,#525252, 2-6 #5a5a5a,d, 7-49 d,d, 50-51 d,#525252, 52-99 d,d, -|11: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|8: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|9: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|10: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|11: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |12: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |13: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |14: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |15: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|16: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, +|16: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, |17: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |18: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |19: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |20: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, -|21: 0-1 d,#383c54, 2-35 #969696,#2c2a3e, 36-49 d,#2c2a3e, 50-51 d,#525252, 52-99 d,d, +|21: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |22: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |23: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, |24: 0-1 d,#525252, 2-49 d,d, 50-51 d,#525252, 52-99 d,d, diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index 55d66c9b..aa000798 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -7,9 +7,6 @@ | 4 | 5 The model is acme's: EVERYTHING is | 6 the same way. Modal editing (helix- -| 7 Press j until you reach the introdu -| 8 -| 9 | nm /tmp/pardes-snap/tutor/cwd Del | | @@ -18,9 +15,12 @@ | | | +| nm /tmp/pardes-snap/tutor/cwd Del +| +| +| | | -| nm /tmp/pardes-snap/tutor/cwd Del | | | diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index 061ceca9..5357ac7a 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -215,7 +215,7 @@ | | | -== snap altn grid=100x30 cursor=4,23 +== snap altn grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug Colors NextColor Dump | nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del | @@ -224,21 +224,21 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del | -| w.txt | | | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | | | -| nm /tmp/pardes-snap/windowops/cwd Del | -| w.txt | | | @@ -246,7 +246,7 @@ | | | -== snap focus-left grid=100x30 cursor=4,23 +== snap focus-left grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug Colors NextColor Dump | nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del | @@ -255,21 +255,21 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del | -| w.txt | | | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | | | -| nm /tmp/pardes-snap/windowops/cwd Del | -| w.txt | | | @@ -277,30 +277,30 @@ | | | -== snap debug-on grid=100x30 cursor=4,23 +== snap debug-on grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug Colors NextColor Dump | nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowop╭────────────────────────────╮ | │pardes resizes=1 │ | w.txt w.txt │terms 4 cols 2 │ -| │active #3 38x9 │ -| │scroll 0/9 │ +| │active #3 38x13 │ +| │scroll 0/13 │ | │pinch 1.0000 │ | │tscroll 0.0000 │ -| nm /tmp/pardes-snap/windowops/cwd Del ╰────────────────────────────╯ -| -| w.txt +| ╰────────────────────────────╯ | | | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | | | -| nm /tmp/pardes-snap/windowops/cwd Del | -| w.txt | | | @@ -313,23 +313,23 @@ |1: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#383c54, 42-69 #969696,#2c2a3e, 70-99 d,d, |2: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-87 #969696,d, 88-98 d,#2a2a2a, 99-99 d,d, |3: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-85 #969696,d, 86-98 d,#2a2a2a, 99-99 d,d, -|4: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-85 #969696,d, 86-98 d,#2a2a2a, 99-99 d,d, -|5: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-80 #969696,d, 81-98 d,#2a2a2a, 99-99 d,d, +|4: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-86 #969696,d, 87-98 d,#2a2a2a, 99-99 d,d, +|5: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-81 #969696,d, 82-98 d,#2a2a2a, 99-99 d,d, |6: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-83 #969696,d, 84-98 d,#2a2a2a, 99-99 d,d, |7: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-70 d,d, 71-85 #969696,d, 86-98 d,#2a2a2a, 99-99 d,d, -|8: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#525252, 42-99 d,d, +|8: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |9: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |10: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |11: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, -|12: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, +|12: 0-1 d,#383c54, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#525252, 42-99 d,d, |13: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |14: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |15: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, -|16: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, +|16: 0-1 d,#6e4fd0, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#525252, 42-99 d,d, |17: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |18: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |19: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, -|20: 0-1 d,#6e4fd0, 2-38 #969696,#2c2a3e, 39-39 d,#2c2a3e, 40-41 d,#525252, 42-99 d,d, +|20: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |21: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |22: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |23: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, @@ -339,7 +339,7 @@ |27: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |28: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, |29: 0-1 d,#525252, 2-39 d,d, 40-41 d,#525252, 42-99 d,d, -== snap debug-off grid=100x30 cursor=4,23 +== snap debug-off grid=100x30 cursor=4,19 |Kill Newcol Tutor Debug Colors NextColor Dump | nm /tmp/pardes-snap/windowops/cwd Del nm /tmp/pardes-snap/windowops/cwd Del | @@ -348,21 +348,21 @@ | | | -| nm /tmp/pardes-snap/windowops/cwd Del | -| w.txt | | | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | +| nm /tmp/pardes-snap/windowops/cwd Del | +| w.txt | | | -| nm /tmp/pardes-snap/windowops/cwd Del | -| w.txt | | | -- cgit v1.3