diff options
| author | Gabriel Schneider <[email protected]> | 2026-08-08 10:44:56 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-08-10 09:17:07 -0300 |
| commit | 198889ab8f78b12c9881a20309a792e419ba1386 (patch) | |
| tree | 264bb756389f4c4cbaf68a6a2aabf3d602450a36 /test | |
| parent | c3c8bbd8d8add99088c774c54bc1acf1e39ec895 (diff) | |
| download | pardes-198889ab8f78b12c9881a20309a792e419ba1386.tar.gz pardes-198889ab8f78b12c9881a20309a792e419ba1386.zip | |
Esc alternates between the last two panes; Toggleterm is gone
Esc ran Toggleterm, which hopped between the newest DOC and the newest
TERMINAL. That distinction never earned its keep. It made Esc unpredictable —
which of three panes you landed on depended on their kinds, not on where you
had been — and it could not alternate between two files at all, which is the
case you hit most. Editing two files, Esc did nothing.
The replacement already existed. Last (SPC j j) is "the pane you were in
before this one, whichever it was": it walks the jump stack for the newest
entry naming a different pane and restores its line and column. So Esc, and
Shift-Esc in tty, now run Last, and Toggleterm is deleted rather than renamed
— a third implementation of "go to the other pane" was the thing to avoid.
SPC w t goes with it; the w group is the four directional moves, and the jump
group already had SPC j j.
Held down, Esc alternates. Two files, a file and its shell, a file and a
+Search — all the same, because Last has no notion of kind to get wrong.
This depends on the swap in the same series: Last reads the stack backwards,
and until hopping stopped appending, the pane you came from could fall off it.
windownav.snap needed only its keys and prose changed — its golden did not
move at all, which is the useful evidence here: for the one scenario the old
builtin handled well, Last produces an identical focus sequence.
Coverage for what it did not handle is new: a unit test opens a second FILE by
looking its name and asserts Esc alternates between two panes of the SAME
kind, which is the case that used to be a no-op.
Docs follow: tutor.txt, docs/helix-keys.md, docs/design.typ, and the builtin
index goldens, which are now one row shorter.
75/75 snapshots, both unit suites, and the macOS ABI build all pass.
Diffstat (limited to 'test')
46 files changed, 647 insertions, 596 deletions
diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden index 02b5e2e6..1109132c 100644 --- a/test/snapshots/argv.golden +++ b/test/snapshots/argv.golden @@ -1,6 +1,6 @@ == snap noargs grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/argv/cwd New Del +|$ /tmp/pardes-snap/argv/cwd New Del | $ echo ARGV''TTY | ARGVTTY | $ @@ -31,7 +31,7 @@ | == snap filearg grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/argv/cwd/notes.txt Save New Del +| /tmp/pardes-snap/argv/cwd/notes.txt Save New Del | 3 line 3 | 4 line 4 | 5 line 5 @@ -62,7 +62,7 @@ | == snap filearg-n3 grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/argv/cwd/notes.txt Save New Del +| /tmp/pardes-snap/argv/cwd/notes.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -93,7 +93,7 @@ | == snap dirarg grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/argv/cwd/sub New Del +| /tmp/pardes-snap/argv/cwd/sub New Del | | inside.txt | diff --git a/test/snapshots/badutf.golden b/test/snapshots/badutf.golden index 6e30321c..dceef522 100644 --- a/test/snapshots/badutf.golden +++ b/test/snapshots/badutf.golden @@ -1,6 +1,6 @@ == snap badbytes grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/badutf/cwd/bad.txt Save New Del +| /tmp/pardes-snap/badutf/cwd/bad.txt Save New Del | 1 hello �� world | 2 latin-1 caf� tail | 3 truncated �� here diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden index a0eca707..d347b7eb 100644 --- a/test/snapshots/boot.golden +++ b/test/snapshots/boot.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/boot/cwd New Del +| /tmp/pardes-snap/boot/cwd New Del | | hello.txt | @@ -31,7 +31,7 @@ | == style boot |0: 0-56 #949494,#121212, 57-99 d,#121212, -|1: 0-1 #ffffff,#626262, 2-34 #949494,#121212, 35-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index 08c701d7..afee3f3f 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -1,6 +1,6 @@ == snap boot grid=120x60 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del +| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -61,7 +61,7 @@ | == snap index grid=120x60 cursor=7,32 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del +| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -91,7 +91,7 @@ | | | -| /tmp/pardes-snap/builtins/cwd/+Help New Del +| /tmp/pardes-snap/builtins/cwd/+Help New Del | 1 pardes builtins, and how to run each: | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. @@ -122,7 +122,7 @@ | 28 SPC l w Lspwhy == snap index-tail grid=120x60 cursor=7,58 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del +| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -152,7 +152,8 @@ | | | -| /tmp/pardes-snap/builtins/cwd/+Help New Del +| /tmp/pardes-snap/builtins/cwd/+Help New Del +| 24 SPC l i Lspinfo | 25 SPC l k Hover | 26 SPC l r Rename | 27 SPC l s Symbols @@ -175,15 +176,14 @@ | 44 SPC w j Down C-w j, C-w down | 45 SPC w k Up C-w k, C-w up | 46 SPC w l Right C-w l, C-w right -| 47 SPC w t Toggleterm -| 48 Look enter, right-click -| 49 Exec tab, middle-click -| 50 Theme -| 51 Shell -| 52 +| 47 Look enter, right-click +| 48 Exec tab, middle-click +| 49 Theme +| 50 Shell +| 51 == snap not-a-picker grid=120x60 cursor=7,58 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del +| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -213,7 +213,8 @@ | | | -| /tmp/pardes-snap/builtins/cwd/+Help New Del +| /tmp/pardes-snap/builtins/cwd/+Help New Del +| 24 SPC l i Lspinfo | 25 SPC l k Hover | 26 SPC l r Rename | 27 SPC l s Symbols @@ -236,15 +237,14 @@ | 44 SPC w j Down C-w j, C-w down | 45 SPC w k Up C-w k, C-w up | 46 SPC w l Right C-w l, C-w right -| 47 SPC w t Toggleterm -| 48 Look enter, right-click -| 49 Exec tab, middle-click -| 50 Theme -| 51 Shell -| 52 +| 47 Look enter, right-click +| 48 Exec tab, middle-click +| 49 Theme +| 50 Shell +| 51 == snap window-group grid=120x60 cursor=7,32 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del +| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -274,15 +274,15 @@ | | | -| /tmp/pardes-snap/builtins/cwd/+Help New Del +| /tmp/pardes-snap/builtins/cwd/+Help New Del | 1 pardes builtins under SPC w | 2 | 3 SPC w h Left C-w h, C-w left | 4 SPC w j Down C-w j, C-w down | 5 SPC w k Up C-w k, C-w up | 6 SPC w l Right C-w l, C-w right -| 7 SPC w t Toggleterm -| 8 +| 7 +| | | | @@ -305,7 +305,7 @@ | == snap tutor-from-index grid=120x60 cursor=7,17 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del +| /tmp/pardes-snap/builtins/cwd/notes.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -320,7 +320,7 @@ | | | -| /Tutor Save New Del +| /Tutor Save New Del | 1 | 2 PARDES TUTOR | 3 tmux + vi + acme, from scratch. @@ -335,7 +335,7 @@ | 12 ================================================================= | 13 | 14 Pardes is tmux + vi + acme, made from scratch. The foundation is -| /tmp/pardes-snap/builtins/cwd/+Help New Del +| /tmp/pardes-snap/builtins/cwd/+Help New Del | 1 pardes builtins, and how to run each: | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. diff --git a/test/snapshots/builtins.snap b/test/snapshots/builtins.snap index b29a1109..93e33710 100644 --- a/test/snapshots/builtins.snap +++ b/test/snapshots/builtins.snap @@ -40,11 +40,11 @@ key n stable 700 15000 snap not-a-picker # and the mid-chord filter is untouched: `SPC w ?` still answers "what can w -# still reach", rewriting the same +Help buffer with just that group — five -# rows, each now also showing the Ctrl-w chord that is the other way in, and -# none of the three path-less builtins, which `w` cannot reach. +# still reach", rewriting the same +Help buffer with just that group — the four +# directional moves, each now also showing the Ctrl-w chord that is the other +# way in, and none of the three path-less builtins, which `w` cannot reach. key space w ? -wait 10000 Toggleterm +wait 10000 Right stable 700 15000 snap window-group # back to the whole index, and a NAME in it is live text like anywhere else: diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden index 56436881..f5d6f003 100644 --- a/test/snapshots/cmdword.golden +++ b/test/snapshots/cmdword.golden @@ -1,6 +1,6 @@ == snap opened grid=120x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -31,7 +31,7 @@ | == snap atexec grid=120x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -46,7 +46,7 @@ | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -62,7 +62,7 @@ | == snap atlook grid=120x30 cursor=4,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -77,7 +77,7 @@ | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -93,7 +93,7 @@ | == snap lookword grid=120x30 cursor=7,10 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -101,14 +101,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -124,7 +124,7 @@ | == snap nested grid=120x30 cursor=4,24 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -132,14 +132,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -153,9 +153,9 @@ | | | -== snap execword grid=120x30 cursor=42,16 +== snap execword grid=120x30 cursor=104,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -163,14 +163,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del Exec +| /tmp/pardes-snap/cmdword/cwd New Del Exec | echo ZZ''E | | ZZE @@ -184,9 +184,9 @@ | | | -== snap tagcmd grid=120x30 cursor=56,16 +== snap tagcmd grid=120x30 cursor=118,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -194,14 +194,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del Exec @`echo ZZ''T` +| /tmp/pardes-snap/cmdword/cwd New Del Exec @`echo ZZ''T` | echo ZZ''E | | ZZE diff --git a/test/snapshots/cornerdrag.golden b/test/snapshots/cornerdrag.golden index 7b48482f..ae933701 100644 --- a/test/snapshots/cornerdrag.golden +++ b/test/snapshots/cornerdrag.golden @@ -62,7 +62,7 @@ | ╎ == snap edge-done grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag/cwd New Del +| /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag/cwd New Del | | w.txt w.txt | @@ -93,7 +93,7 @@ | == snap corner-drag grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag╎cwd New Del +| /tmp/pardes-snap/cornerdrag/ /tmp/pardes-snap/cornerdrag╎cwd New Del | ╎ | w.txt w.txt ╎ | ╎ diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden index 8aa4385e..da0e2467 100644 --- a/test/snapshots/exec-bigdrag.golden +++ b/test/snapshots/exec-bigdrag.golden @@ -1,6 +1,6 @@ == snap alive grid=200x60 cursor=119,37 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/exec-bigdrag/cwd New Del /tmp/pardes-snap/exec-bigdrag/cwd New Del +| /tmp/pardes-snap/exec-bigdrag/cwd New Del /tmp/pardes-snap/exec-bigdrag/cwd New Del | bash: line: command not found | big.txt | bash: 4line: command not found @@ -30,7 +30,7 @@ | bash: 2835line: command not found | | bash: 2846line: command not found -| /tmp/pardes-snap/exec-bigdrag/cwd New Del +| /tmp/pardes-snap/exec-bigdrag/cwd New Del | bash: e: command not found | big.txt | bash: ne: command not found diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden index 6419cba0..0a33df22 100644 --- a/test/snapshots/find.golden +++ b/test/snapshots/find.golden @@ -1,6 +1,6 @@ == snap group grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del SPC f +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | @@ -38,10 +38,10 @@ | | | -| +| SPC f == snap armed grid=120x40 cursor=9,39 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | @@ -82,7 +82,7 @@ | Find / == snap typing grid=120x40 cursor=12,39 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | @@ -123,7 +123,7 @@ | Find /zqm == snap results grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | @@ -158,13 +158,13 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap first grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | @@ -182,7 +182,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -199,13 +199,13 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == style first |0: 0-56 #949494,#121212, 57-119 d,#121212, -|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-119 d,#121212, +|1: 0-1 #ffffff,#626262, 2-99 #949494,#121212, 100-119 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #bdbdbd,#080808, 11-119 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, @@ -223,7 +223,7 @@ |16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, -|19: 0-1 #ffffff,#262626, 2-59 #949494,#121212, 60-119 d,#121212, +|19: 0-1 #ffffff,#262626, 2-99 #949494,#121212, 100-119 d,#121212, |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-119 d,#080808, |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, @@ -240,13 +240,13 @@ |33: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, |34: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, |35: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, -|36: 0-1 #ffffff,#262626, 2-42 #949494,#121212, 43-119 d,#121212, +|36: 0-1 #ffffff,#262626, 2-99 #949494,#121212, 100-119 d,#121212, |37: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 #080808,#80a0ff, |38: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-31 #bdbdbd,#080808, 32-119 d,#080808, |39: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-22 #bdbdbd,#080808, 23-119 d,#080808, == snap second grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | @@ -255,7 +255,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -264,7 +264,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -281,22 +281,22 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap third grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | | -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del | 1 alpha body | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -305,7 +305,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -322,22 +322,22 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap back grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | | -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del | 1 alpha body | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -346,7 +346,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -363,22 +363,22 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap word grid=120x40 cursor=9,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | | Find / -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del | 1 alpha body | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -387,7 +387,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -404,22 +404,22 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap cancel grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | | -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del | 1 alpha body | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -428,7 +428,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -445,22 +445,22 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap nomatch grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del | 1 alpha body | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -469,7 +469,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -486,22 +486,22 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap refit grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del | 1 alpha body | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -510,7 +510,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -527,22 +527,22 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt == snap topbar grid=120x40 cursor=12,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/find/cwd/here.txt Save New Del +| /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del | 1 alpha body -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 zqmark-alpha.txt -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del | 1 gamma body | | @@ -551,7 +551,7 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del | 1 beta body | | @@ -568,7 +568,7 @@ | | | -| /tmp/pardes-snap/find/cwd/+Search New Del +| /tmp/pardes-snap/find/cwd/+Search New Del | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden index 08132e28..8de3f0e7 100644 --- a/test/snapshots/fsearch.golden +++ b/test/snapshots/fsearch.golden @@ -1,6 +1,6 @@ == snap opened grid=180x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -15,7 +15,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -31,7 +31,7 @@ | == snap typing grid=180x30 cursor=8,29 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -46,7 +46,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -62,7 +62,7 @@ | /MARK == snap results grid=180x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -77,7 +77,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -93,7 +93,7 @@ | 3 g.txt:10:1-4 MARK c == snap first grid=180x30 cursor=10,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -108,7 +108,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -124,7 +124,7 @@ | 3 g.txt:10:1-4 MARK c == style first |0: 0-56 #949494,#121212, 57-179 d,#121212, -|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 #ffffff,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-121 #ffffff,#262626, 122-157 #949494,#121212, 158-179 d,#121212, +|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-59 d,#121212, 60-61 #ffffff,#262626, 62-99 #949494,#121212, 100-119 d,#121212, 120-121 #ffffff,#262626, 122-159 #949494,#121212, 160-179 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #080808,#80a0ff, 11-12 #bdbdbd,#080808, 13-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, @@ -139,7 +139,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-9 #bdbdbd,#080808, 10-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, -|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 #ffffff,#262626, 62-97 #949494,#121212, 98-119 d,#121212, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, +|16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-61 #ffffff,#262626, 62-99 #949494,#121212, 100-119 d,#121212, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, @@ -155,7 +155,7 @@ |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-25 #bdbdbd,#080808, 26-59 d,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, == snap second grid=180x30 cursor=10,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -170,7 +170,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -186,7 +186,7 @@ | 3 g.txt:10:1-4 MARK c == snap third grid=180x30 cursor=10,11 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -201,7 +201,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -217,7 +217,7 @@ | 3 g.txt:10:1-4 MARK c == snap back grid=180x30 cursor=10,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -232,7 +232,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -248,7 +248,7 @@ | 3 g.txt:10:1-4 MARK c == snap cancel grid=180x30 cursor=10,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -263,7 +263,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | @@ -279,7 +279,7 @@ | 3 g.txt:10:1-4 MARK c == snap nomatch grid=180x30 cursor=10,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd/g.txt Save New Del /tmp/pardes-snap/fsearch/cwd New Del /tmp/pardes-snap/fsearch/cwd New Del | 1 l1 | 2 MARK a g.txt g.txt | 3 l3 @@ -294,7 +294,7 @@ | 12 l12 | | -| /tmp/pardes-snap/fsearch/cwd New Del +| /tmp/pardes-snap/fsearch/cwd New Del | | g.txt | diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden index f64119a8..ed1086df 100644 --- a/test/snapshots/grep.golden +++ b/test/snapshots/grep.golden @@ -1,6 +1,6 @@ == snap opened grid=180x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -15,7 +15,7 @@ | | | -| /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | @@ -31,7 +31,7 @@ | == snap typing grid=180x30 cursor=15,29 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -46,7 +46,7 @@ | | | -| /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | @@ -62,7 +62,7 @@ | Grep /TARGET == snap results grid=180x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -77,7 +77,7 @@ | | | -| /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | @@ -93,7 +93,7 @@ | 3 sub/b.txt:2:1-6 TARGET inside sub == snap first grid=180x30 cursor=18,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -108,7 +108,7 @@ | | | -| /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | @@ -124,7 +124,7 @@ | 3 sub/b.txt:2:1-6 TARGET inside sub == snap opened-hit grid=180x30 cursor=17,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -139,7 +139,7 @@ | | /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del | 1 deep -| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del +| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | @@ -155,7 +155,7 @@ | 3 sub/b.txt:2:1-6 TARGET inside sub == snap nomatch grid=180x30 cursor=17,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -170,7 +170,7 @@ | 1 | /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del | 1 deep -| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del +| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | @@ -186,7 +186,7 @@ | 3 sub/b.txt:2:1-6 TARGET inside sub == snap chordsel grid=180x30 cursor=19,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -201,7 +201,7 @@ | 1 | /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del | 1 deep -| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del +| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | @@ -217,7 +217,7 @@ | 3 sub/b.txt:2:1-6 TARGET inside sub == snap chord grid=180x30 cursor=19,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del +| /tmp/pardes-snap/grep/cwd/a.txt Save New Del /tmp/pardes-snap/grep/cwd New Del /tmp/pardes-snap/grep/cwd New Del | 1 hello TARGET one | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line @@ -232,7 +232,7 @@ | 1 | /tmp/pardes-snap/grep/cwd/sub/b.txt Save New Del | 1 deep -| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del +| 2 TARGET inside sub /tmp/pardes-snap/grep/cwd New Del | | a.txt noise.txt sub | diff --git a/test/snapshots/jumps.golden b/test/snapshots/jumps.golden index cf9b01d5..a557ce1f 100644 --- a/test/snapshots/jumps.golden +++ b/test/snapshots/jumps.golden @@ -1,6 +1,6 @@ == snap start grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -31,7 +31,7 @@ | 28 line 28 == snap to-shell grid=150x30 cursor=79,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -62,7 +62,7 @@ | 28 line 28 == snap to-file grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -93,7 +93,7 @@ | 28 line 28 == snap goto-100 grid=150x30 cursor=7,26 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 76 line 76 | 77 line 77 big.txt | 78 line 78 @@ -124,7 +124,7 @@ | 103 line 103 == snap back-in-file grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -155,7 +155,7 @@ | 28 line 28 == snap back-to-shell grid=150x30 cursor=79,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -186,7 +186,7 @@ | 28 line 28 == snap forward-file grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -217,7 +217,7 @@ | 28 line 28 == snap forward-100 grid=150x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -248,7 +248,7 @@ | 113 line 113 == snap last grid=150x30 cursor=79,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -279,7 +279,7 @@ | 113 line 113 == snap last-back grid=150x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -310,7 +310,7 @@ | 113 line 113 == snap jumplist grid=150x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 86 line 86 | 87 line 87 big.txt | 88 line 88 @@ -332,78 +332,78 @@ | 104 line 104 | 105 line 105 | 106 line 106 -| /tmp/pardes-snap/jumps/cwd/+Jumps New Del -| 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 -| 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 107 line 107 +| 108 line 108 +| /tmp/pardes-snap/jumps/cwd/+Jumps New Del +| 1 @p1:3:3 /tmp/pardes-snap/jumps/cwd +| 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 3 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -| 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -== snap step1 grid=150x30 cursor=7,2 +== snap step1-shell grid=150x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del -| 1 line 1 -| 2 line 2 big.txt -| 3 line 3 -| 4 line 4 -| 5 line 5 -| 6 line 6 -| 7 line 7 -| 8 line 8 -| 9 line 9 -| 10 line 10 -| 11 line 11 -| 12 line 12 -| 13 line 13 -| 14 line 14 -| 15 line 15 -| 16 line 16 -| 17 line 17 -| 18 line 18 -| 19 line 19 -| 20 line 20 -| 21 line 21 -| /tmp/pardes-snap/jumps/cwd/+Jumps New Del -| 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 -| 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| 86 line 86 +| 87 line 87 big.txt +| 88 line 88 +| 89 line 89 +| 90 line 90 +| 91 line 91 +| 92 line 92 +| 93 line 93 +| 94 line 94 +| 95 line 95 +| 96 line 96 +| 97 line 97 +| 98 line 98 +| 99 line 99 +| 100 line 100 +| 101 line 101 +| 102 line 102 +| 103 line 103 +| 104 line 104 +| 105 line 105 +| 106 line 106 +| 107 line 107 +| 108 line 108 +| /tmp/pardes-snap/jumps/cwd/+Jumps New Del +| 1 @p1:3:3 /tmp/pardes-snap/jumps/cwd +| 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 3 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -| 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -== style step1 +== style step1-shell |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#626262, 2-48 #949494,#121212, 49-74 d,#121212, 75-76 #ffffff,#262626, 77-110 #949494,#121212, 111-149 d,#121212, -|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|4: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|5: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|6: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|7: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|8: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|9: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|10: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|11: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|12: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|1: 0-1 #ffffff,#626262, 2-54 #949494,#121212, 55-74 d,#121212, 75-76 #ffffff,#262626, 77-129 #949494,#121212, 130-149 d,#121212, +|2: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|3: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|4: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|5: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|6: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|7: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|8: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|9: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|10: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|11: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|12: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |13: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |14: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |15: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|16: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|20: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|21: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|22: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|23: 0-1 #ffffff,#262626, 2-42 #949494,#121212, 43-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 #080808,#80a0ff, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-40 #bdbdbd,#080808, 41-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-51 #bdbdbd,#080808, 52-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-55 #bdbdbd,#080808, 56-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|16: 0-0 d,#121212, 1-1 d,#080808, 2-6 #949494,#121212, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|20: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|21: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|22: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|23: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|24: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|25: 0-1 #ffffff,#262626, 2-54 #949494,#121212, 55-74 d,#121212, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 #080808,#80a0ff, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, +|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-51 #bdbdbd,#080808, 52-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-40 #bdbdbd,#080808, 41-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-55 #bdbdbd,#080808, 56-74 d,#080808, 75-75 d,#444444, 76-76 d,#080808, 77-149 #bdbdbd,#080808, -== snap step2-shell grid=150x30 cursor=7,2 +== snap step2-file grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del | 1 line 1 | 2 line 2 big.txt | 3 line 3 @@ -425,18 +425,19 @@ | 19 line 19 | 20 line 20 | 21 line 21 -| /tmp/pardes-snap/jumps/cwd/+Jumps New Del -| 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 -| 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 22 line 22 +| 23 line 23 +| /tmp/pardes-snap/jumps/cwd/+Jumps New Del +| 1 @p1:3:3 /tmp/pardes-snap/jumps/cwd +| 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 3 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -| 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -== snap step4-line100 grid=150x30 cursor=7,12 +== snap step4-line100 grid=150x30 cursor=7,13 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del -| 90 line 90 -| 91 line 91 big.txt +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| 89 line 89 +| 90 line 90 big.txt +| 91 line 91 | 92 line 92 | 93 line 93 | 94 line 94 @@ -456,49 +457,49 @@ | 108 line 108 | 109 line 109 | 110 line 110 -| /tmp/pardes-snap/jumps/cwd/+Jumps New Del -| 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 -| 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 111 line 111 +| /tmp/pardes-snap/jumps/cwd/+Jumps New Del +| 1 @p1:3:3 /tmp/pardes-snap/jumps/cwd +| 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 3 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -| 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -== snap step-back grid=150x30 cursor=7,2 +== snap step-back grid=150x30 cursor=7,13 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del -| 1 line 1 -| 2 line 2 big.txt -| 3 line 3 -| 4 line 4 -| 5 line 5 -| 6 line 6 -| 7 line 7 -| 8 line 8 -| 9 line 9 -| 10 line 10 -| 11 line 11 -| 12 line 12 -| 13 line 13 -| 14 line 14 -| 15 line 15 -| 16 line 16 -| 17 line 17 -| 18 line 18 -| 19 line 19 -| 20 line 20 -| 21 line 21 -| /tmp/pardes-snap/jumps/cwd/+Jumps New Del -| 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 -| 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| 89 line 89 +| 90 line 90 big.txt +| 91 line 91 +| 92 line 92 +| 93 line 93 +| 94 line 94 +| 95 line 95 +| 96 line 96 +| 97 line 97 +| 98 line 98 +| 99 line 99 +| 100 line 100 +| 101 line 101 +| 102 line 102 +| 103 line 103 +| 104 line 104 +| 105 line 105 +| 106 line 106 +| 107 line 107 +| 108 line 108 +| 109 line 109 +| 110 line 110 +| 111 line 111 +| /tmp/pardes-snap/jumps/cwd/+Jumps New Del +| 1 @p1:3:3 /tmp/pardes-snap/jumps/cwd +| 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 3 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -| 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -== snap look-row grid=150x30 cursor=7,12 +== snap look-row grid=150x30 cursor=7,13 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del -| 90 line 90 -| 91 line 91 big.txt +| /tmp/pardes-snap/jumps/cwd/big.txt Save New Del /tmp/pardes-snap/jumps/cwd New Del +| 89 line 89 +| 90 line 90 big.txt +| 91 line 91 | 92 line 92 | 93 line 93 | 94 line 94 @@ -518,10 +519,9 @@ | 108 line 108 | 109 line 109 | 110 line 110 -| /tmp/pardes-snap/jumps/cwd/+Jumps New Del -| 1 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 -| 2 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 3 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 111 line 111 +| /tmp/pardes-snap/jumps/cwd/+Jumps New Del +| 1 @p1:3:3 /tmp/pardes-snap/jumps/cwd +| 2 /tmp/pardes-snap/jumps/cwd/big.txt:1:1 line 1 +| 3 @p1:3:3 /tmp/pardes-snap/jumps/cwd | 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 -| 5 @p1:3:3 /tmp/pardes-snap/jumps/cwd -| 6 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 diff --git a/test/snapshots/jumps.snap b/test/snapshots/jumps.snap index 6ab9df2a..1e2a9075 100644 --- a/test/snapshots/jumps.snap +++ b/test/snapshots/jumps.snap @@ -16,10 +16,13 @@ stable 700 20000 # a FILE boots alone now, so this is one column holding big.txt, focused, and # the stack is one entry deep snap start -# two focus moves, so the stack is file -> shell -> file. The shell has to be -# opened before it can be walked to, and SPC c n (Newcol) puts it in a column -# of its own on the right AND focuses it — so opening it IS the first of the -# two moves, and the stack below is the same one a shell at boot left. +# two focus moves. The shell has to be opened before it can be walked to, and +# SPC c n (Newcol) puts it in a column of its own on the right AND focuses it — +# so opening it IS the first of the two moves, and the stack below is the same +# one a shell at boot left. Walking straight back to the file does NOT leave +# `file -> shell -> file` behind: a hop to the entry under the top one is the +# same two places again, so trackJump swaps them rather than appending, and the +# stack is `shell -> file` with the file on top (see trackJump). key space c n stable 700 15000 snap to-shell @@ -40,7 +43,7 @@ snap back-in-file key c-o stable 400 5000 snap back-to-shell -# Ctrl-i forward, twice: the shell entry, then line 100 again. Sent as the +# Ctrl-i forward, twice: back to line 1 of the file, then line 100 again. Sent as the # kitty-protocol CSI u (`CSI 105;5u`) because on the wire Ctrl-i IS Tab — # see config.jump_keys. send \e[105;5u @@ -63,15 +66,21 @@ stable 700 15000 snap jumplist # n/N step the rows and look them, exactly as they do a +Search: the stepped # row is selected in the buffer (snapstyle) and the pane it names follows. -# Row 1 is the file at line 1, row 2 the shell (no path, so `@pN`), row 4 the +# Row 1 is the shell (no path, so `@pN`), row 2 the file at line 1, row 4 the # file at line 100 — so the body visibly rides the list. +# +# ponytail: stepping onto an `@pN` row selects it but does NOT focus that pane — +# the cursor stays where it was, which is why step1-shell's header is still the +# file's. Only rows with a PATH move focus. Nothing tested this before, because +# until the swap above the shell never survived on the stack to be listed at +# all. Fix belongs in the location-list step, next to the path case. key n stable 700 15000 -snap step1 -snapstyle step1 +snap step1-shell +snapstyle step1-shell key n stable 700 15000 -snap step2-shell +snap step2-file key n stable 700 15000 key n @@ -82,8 +91,9 @@ stable 700 15000 snap step-back # and an ordinary LOOK on a row goes there too — the leading word IS a # location, so the right-click look resolves it like any other path. Row 4 -# again, this time by clicking it. -press right 16 28 -release right 16 28 +# again, this time by clicking it: the buffer's four rows are the last four +# screen rows, so row 4 is the bottom one. +press right 16 30 +release right 16 30 stable 700 15000 snap look-row diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden index e2ff65ce..e809621e 100644 --- a/test/snapshots/layout-close.golden +++ b/test/snapshots/layout-close.golden @@ -1,18 +1,18 @@ == snap built grid=140x40 cursor=4,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/layout-close/cwd New Del /tmp/pardes-snap/layout-close/cwd New Del +| /tmp/pardes-snap/layout-close/cwd New Del /tmp/pardes-snap/layout-close/cwd New Del | | marker.txt marker.txt | -| /tmp/pardes-snap/layout-close/cwd New Del +| /tmp/pardes-snap/layout-close/cwd New Del | | marker.txt | -| /tmp/pardes-snap/layout-close/cwd New Del +| /tmp/pardes-snap/layout-close/cwd New Del | | marker.txt | -| /tmp/pardes-snap/layout-close/cwd New Del +| /tmp/pardes-snap/layout-close/cwd New Del | | marker.txt | @@ -20,7 +20,7 @@ | | | -| /tmp/pardes-snap/layout-close/cwd New Del +| /tmp/pardes-snap/layout-close/cwd New Del | | marker.txt | @@ -164,7 +164,7 @@ | == snap colclose grid=140x40 cursor=4,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/layout-close/cwd New Del /tmp/pardes-snap/layout-close/cwd New Del +| /tmp/pardes-snap/layout-close/cwd New Del /tmp/pardes-snap/layout-close/cwd New Del | | marker.txt marker.txt | diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index c33b1633..9398b158 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -1,6 +1,6 @@ == snap spc grid=100x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del SPC +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -38,10 +38,10 @@ | | | -| +| SPC == snap spc-h grid=100x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del SPC h +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -79,10 +79,10 @@ | | | -| +| SPC h == snap abandoned grid=100x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -123,7 +123,7 @@ | == snap unmapped grid=100x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -164,7 +164,7 @@ | == snap help-word grid=100x40 cursor=7,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -184,7 +184,7 @@ | | | -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins, and how to run each: | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. @@ -205,7 +205,7 @@ | 18 SPC k Kill topbar == snap help-group grid=100x40 cursor=7,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -225,7 +225,7 @@ | | | -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC h | 2 | 3 SPC h t Tutor topbar @@ -246,7 +246,7 @@ | == snap tutor grid=100x40 cursor=7,12 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -256,7 +256,7 @@ | | | -| /Tutor Save New Del +| /Tutor Save New Del | 1 | 2 PARDES TUTOR | 3 tmux + vi + acme, from scratch. @@ -266,7 +266,7 @@ | 7 Press j until you reach the introduction. | 8 | 9 -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC h | 2 | 3 SPC h t Tutor topbar @@ -287,7 +287,7 @@ | == snap deleted grid=100x40 cursor=7,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -307,7 +307,7 @@ | | | -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC h | 2 | 3 SPC h t Tutor topbar @@ -328,7 +328,7 @@ | == snap help-all grid=100x40 cursor=7,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -348,7 +348,7 @@ | | | -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins, and how to run each: | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. @@ -369,7 +369,7 @@ | 18 SPC k Kill topbar == snap help-toggles grid=100x40 cursor=7,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -389,7 +389,7 @@ | | | -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC t | 2 | 3 SPC t a Ascii @@ -410,7 +410,7 @@ | == snap help-window grid=100x40 cursor=7,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -430,15 +430,15 @@ | | | -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC w | 2 | 3 SPC w h Left C-w h, C-w left | 4 SPC w j Down C-w j, C-w down | 5 SPC w k Up C-w k, C-w up | 6 SPC w l Right C-w l, C-w right -| 7 SPC w t Toggleterm -| 8 +| 7 +| | | | @@ -451,7 +451,7 @@ | == snap help-language grid=100x40 cursor=7,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | @@ -471,7 +471,7 @@ | | | -| /tmp/pardes-snap/leader/cwd/+Help New Del +| /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC l | 2 | 3 SPC l D WsDiagnostics @@ -492,7 +492,7 @@ | == snap del-output grid=100x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/leader/cwd/cmds.txt Save New Del | 1 Help | | diff --git a/test/snapshots/leader.snap b/test/snapshots/leader.snap index 18abf103..c71aaee6 100644 --- a/test/snapshots/leader.snap +++ b/test/snapshots/leader.snap @@ -80,7 +80,7 @@ snap help-toggles key space key w key ? -wait 10000 Toggleterm +wait 10000 Right stable 700 15000 snap help-window # `SPC l ?`: the LANGUAGE group — every LSP command lives here rather than on @@ -95,7 +95,7 @@ wait 10000 WsDiagnostics stable 700 15000 snap help-language # Output buffers close through the same explicit Del builtin as every other -# pane. Body-normal Esc is now Toggleterm and deliberately keeps +Help alive. +# pane. Body-normal Esc is now Last and deliberately keeps +Help alive. key space d settle 100 stable 700 15000 diff --git a/test/snapshots/logquiet.golden b/test/snapshots/logquiet.golden index 88d59b6d..9698fd2b 100644 --- a/test/snapshots/logquiet.golden +++ b/test/snapshots/logquiet.golden @@ -1,6 +1,6 @@ == snap quiet grid=100x30 cursor=62,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/logquiet/cwd New Del +|$ /tmp/pardes-snap/logquiet/cwd New Del | $ ls | $ printf '\033_Ga=q,i=1,s=1,v=1,f=24,t=d;AAAA\033\\\033[>0p' | $ '\033_Ga=q,i=1,s=1,v=1,f=24,t=d;AAAA\033\\\033[>0p'Gi=1;OK diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden index 276de16b..acdb02a3 100644 --- a/test/snapshots/lookpanes.golden +++ b/test/snapshots/lookpanes.golden @@ -1,6 +1,6 @@ == snap shells grid=130x50 cursor=122,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del +| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | @@ -51,7 +51,7 @@ | == snap other-dir grid=130x50 cursor=7,27 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del +| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | @@ -102,7 +102,7 @@ | == snap clicked-wins grid=130x50 cursor=7,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del +| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | @@ -153,7 +153,7 @@ | == snap mru-alpha grid=130x50 cursor=7,21 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del +| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | @@ -204,7 +204,7 @@ | == snap mru-beta grid=130x50 cursor=7,9 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del +| /tmp/pardes-snap/lookpanes/cwd/beta/bmark.txt Save New Del /tmp/pardes-snap/lookpanes/cwd New Del | 1 both.txt | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | @@ -255,7 +255,7 @@ | == style mru-beta |0: 0-56 #949494,#121212, 57-129 d,#121212, -|1: 0-1 #ffffff,#262626, 2-59 #949494,#121212, 60-64 d,#121212, 65-66 #ffffff,#262626, 67-104 #949494,#121212, 105-129 d,#121212, +|1: 0-1 #ffffff,#262626, 2-59 #949494,#121212, 60-64 d,#121212, 65-66 #ffffff,#262626, 67-109 #949494,#121212, 110-129 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-121 #bdbdbd,#080808, 122-129 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-64 d,#080808, 65-65 d,#444444, 66-66 d,#080808, 67-129 #bdbdbd,#080808, diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden index 11b0bd2f..6e292431 100644 --- a/test/snapshots/lookrange.golden +++ b/test/snapshots/lookrange.golden @@ -1,6 +1,6 @@ == snap opened grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -31,7 +31,7 @@ | == snap wholelines grid=150x30 cursor=11,21 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -46,7 +46,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 1 aaaa | 2 bbbb | 3 cccc dccc @@ -62,7 +62,7 @@ | == style wholelines |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808, @@ -77,7 +77,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212, +|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff, @@ -93,7 +93,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, == snap onelinespan grid=150x30 cursor=15,23 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -108,7 +108,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 1 aaaa | 2 bbbb | 3 cccc dccc @@ -124,7 +124,7 @@ | == style onelinespan |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808, @@ -139,7 +139,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212, +|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, @@ -155,7 +155,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, == snap fullspan grid=150x30 cursor=9,21 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -170,7 +170,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 1 aaaa | 2 bbbb | 3 cccc dccc @@ -186,7 +186,7 @@ | == style fullspan |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808, @@ -201,7 +201,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212, +|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #bdbdbd,#080808, 8-149 #080808,#80a0ff, @@ -217,7 +217,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, == snap stale grid=150x30 cursor=10,24 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -232,7 +232,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -248,7 +248,7 @@ | == style stale |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808, @@ -263,7 +263,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212, +|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, @@ -279,7 +279,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, == snap results grid=150x30 cursor=10,24 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -294,7 +294,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -305,12 +305,12 @@ | 9 iiii | | -| /tmp/pardes-snap/lookrange/cwd/+Search New Del +| /tmp/pardes-snap/lookrange/cwd/+Search New Del | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == snap hit1 grid=150x30 cursor=15,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -325,7 +325,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -336,12 +336,12 @@ | 9 iiii | | -| /tmp/pardes-snap/lookrange/cwd/+Search New Del +| /tmp/pardes-snap/lookrange/cwd/+Search New Del | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == style hit1 |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808, @@ -356,7 +356,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212, +|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, @@ -367,12 +367,12 @@ |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|27: 0-1 #ffffff,#262626, 2-47 #949494,#121212, 48-149 d,#121212, +|27: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808, == snap hit2 grid=150x30 cursor=17,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -387,7 +387,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 3 cccc dccc | 4 dddd | 5 eeee @@ -398,12 +398,12 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/+Search New Del +| /tmp/pardes-snap/lookrange/cwd/+Search New Del | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == style hit2 |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808, @@ -418,7 +418,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212, +|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, @@ -429,12 +429,12 @@ |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|27: 0-1 #ffffff,#262626, 2-47 #949494,#121212, 48-149 d,#121212, +|27: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff, == snap back grid=150x30 cursor=15,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/look.txt Save New Del | 1 r.txt:3-5 | 2 r.txt:7:4-9 | 3 r.txt:3:2-5:3 @@ -449,7 +449,7 @@ | | | -| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del +| /tmp/pardes-snap/lookrange/cwd/r.txt Save New Del | 2 bbbb | 3 cccc dccc | 4 dddd @@ -460,12 +460,12 @@ | 9 iiii | | -| /tmp/pardes-snap/lookrange/cwd/+Search New Del +| /tmp/pardes-snap/lookrange/cwd/+Search New Del | 1 r.txt:7:4-9 gg NEEDLE gg | 2 r.txt:8:6-11 hhhh NEEDLE == style back |0: 0-56 #949494,#121212, 57-149 d,#121212, -|1: 0-1 #ffffff,#262626, 2-53 #949494,#121212, 54-149 d,#121212, +|1: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-149 d,#080808, @@ -480,7 +480,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|16: 0-1 #ffffff,#626262, 2-50 #949494,#121212, 51-149 d,#121212, +|16: 0-1 #ffffff,#626262, 2-129 #949494,#121212, 130-149 d,#121212, |17: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, @@ -491,6 +491,6 @@ |24: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-149 d,#080808, |25: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, -|27: 0-1 #ffffff,#262626, 2-47 #949494,#121212, 48-149 d,#121212, +|27: 0-1 #ffffff,#262626, 2-129 #949494,#121212, 130-149 d,#121212, |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808, diff --git a/test/snapshots/lsp.golden b/test/snapshots/lsp.golden index 46d4a94a..48577a7f 100644 --- a/test/snapshots/lsp.golden +++ b/test/snapshots/lsp.golden @@ -1,6 +1,6 @@ == snap opened grid=120x40 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -41,7 +41,7 @@ | == snap cursor grid=120x40 cursor=17,9 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -82,7 +82,7 @@ | == snap definition grid=120x40 cursor=15,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -123,7 +123,7 @@ | == snap hover grid=120x40 cursor=15,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -159,12 +159,12 @@ | | | -| /tmp/pardes-snap/lsp/cwd/+Hover New Del +| /tmp/pardes-snap/lsp/cwd/+Hover New Del | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) == snap symbols grid=120x40 cursor=15,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -196,16 +196,16 @@ | | | -| /tmp/pardes-snap/lsp/cwd/+Search New Del +| /tmp/pardes-snap/lsp/cwd/+Search New Del | 1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std | 2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper fn helper(x: u32) u32 | 3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main fn main() void -| /tmp/pardes-snap/lsp/cwd/+Hover New Del +| /tmp/pardes-snap/lsp/cwd/+Hover New Del | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) == snap step grid=120x40 cursor=15,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -237,16 +237,16 @@ | | | -| /tmp/pardes-snap/lsp/cwd/+Search New Del +| /tmp/pardes-snap/lsp/cwd/+Search New Del | 1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std | 2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper fn helper(x: u32) u32 | 3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main fn main() void -| /tmp/pardes-snap/lsp/cwd/+Hover New Del +| /tmp/pardes-snap/lsp/cwd/+Hover New Del | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) == snap nothing grid=120x40 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del +| /tmp/pardes-snap/lsp/cwd/a.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper(x: u32) u32 { @@ -278,10 +278,10 @@ | | | -| /tmp/pardes-snap/lsp/cwd/+Search New Del +| /tmp/pardes-snap/lsp/cwd/+Search New Del | 1 /tmp/pardes-snap/lsp/cwd/a.zig:1:7-9 std | 2 /tmp/pardes-snap/lsp/cwd/a.zig:3:4-9 helper fn helper(x: u32) u32 | 3 /tmp/pardes-snap/lsp/cwd/a.zig:7:8-11 main fn main() void -| /tmp/pardes-snap/lsp/cwd/+Hover New Del +| /tmp/pardes-snap/lsp/cwd/+Hover New Del | 1 fn helper(x: u32) u32 | 2 (fn (u32) u32) diff --git a/test/snapshots/lspdebug.golden b/test/snapshots/lspdebug.golden index b34a264f..ce90c19d 100644 --- a/test/snapshots/lspdebug.golden +++ b/test/snapshots/lspdebug.golden @@ -1,6 +1,6 @@ == snap opened grid=120x44 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del +| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper() u32 { @@ -45,7 +45,7 @@ | == snap ctrlclick grid=120x44 cursor=15,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del +| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper() u32 { @@ -90,7 +90,7 @@ | == snap plainclick grid=120x44 cursor=21,9 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del +| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper() u32 { @@ -135,7 +135,7 @@ | == snap why grid=120x44 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del +| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper() u32 { @@ -168,7 +168,7 @@ | | | -| /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del +| /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del | 1 lsp explain — the definition query at byte 29 of z.zig | 2 | 3 zig lib dir: /usr/lib/zig (open) — `std` imports resolve @@ -180,7 +180,7 @@ | 9 0 row(s) == snap info grid=120x44 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del +| /tmp/pardes-snap/lspdebug/cwd/z.zig Save New Del | 1 const std = @import("std"); | 2 | 3 fn helper() u32 { @@ -197,7 +197,7 @@ | | | -| /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del +| /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del | 1 backend: zls-inproc | 2 zls: 0.16.1-dev+3e0d0820 (compiled in — no server process, no JSON-RPC) | 3 zig lib dir: /usr/lib/zig [OK] @@ -213,7 +213,7 @@ | 10 mvzr /home/goblin/00-projects/0x4200.cafe/02-pardes-code/zig-pkg/mvzr-0.3.9-ZSOky6t2AQCA7efmm5EYbPb5↩ | sOdbXa4EFsUgYbQ6hZv9/src/mvzr.zig | 11 mupdf /home/goblin/00-projects/0x4200.cafe/02-pardes-code/src/pdf.zig -| /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del +| /tmp/pardes-snap/lspdebug/cwd/+Lsp New Del | 1 lsp explain — the definition query at byte 29 of z.zig | 2 | 3 zig lib dir: /usr/lib/zig (open) — `std` imports resolve diff --git a/test/snapshots/msg.golden b/test/snapshots/msg.golden index 67ab94ea..77c2678b 100644 --- a/test/snapshots/msg.golden +++ b/test/snapshots/msg.golden @@ -1,6 +1,6 @@ == snap opened grid=70x14 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -15,7 +15,7 @@ | == snap saved grid=70x14 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -30,7 +30,7 @@ | --:--:-- saved /tmp/pardes-snap/msg/cwd/a.txt == snap repainted grid=70x16 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -47,7 +47,7 @@ | --:--:-- saved /tmp/pardes-snap/msg/cwd/a.txt == snap keycleared grid=70x16 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -64,7 +64,7 @@ | == snap saved-again grid=70x16 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -81,7 +81,7 @@ | --:--:-- saved /tmp/pardes-snap/msg/cwd/a.txt == snap mousecleared grid=70x16 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -98,7 +98,7 @@ | == snap reloaded grid=70x16 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 EXTERNAL | 2 | @@ -115,7 +115,7 @@ | --:--:-- reloaded /tmp/pardes-snap/msg/cwd/a.txt == snap prompt grid=70x16 cursor=7,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 EXTERNAL | 2 | @@ -132,7 +132,7 @@ | /EXT == snap prompt-wins grid=70x16 cursor=7,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 AGAIN | 2 | @@ -149,7 +149,7 @@ | /EXT == snap esc grid=70x16 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/msg/cwd/a.txt Save New Del +| /tmp/pardes-snap/msg/cwd/a.txt Save New Del | 1 AGAIN | 2 | diff --git a/test/snapshots/pipe.golden b/test/snapshots/pipe.golden index 0cd57642..080eb71c 100644 --- a/test/snapshots/pipe.golden +++ b/test/snapshots/pipe.golden @@ -1,6 +1,6 @@ == snap prompt grid=180x12 cursor=14,11 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del +| /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del | 1 alpha beta | 2 gamma delta | @@ -13,7 +13,7 @@ | |tr a-z A-Z == snap filtered grid=180x12 cursor=17,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del +| /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del | 1 ALPHA BETA | 2 gamma delta | @@ -26,7 +26,7 @@ | == snap undone grid=180x12 cursor=17,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del +| /tmp/pardes-snap/pipe/cwd/pipe.txt Save New Del | 1 alpha beta | 2 gamma delta | diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden index 0ce9f2ee..25af2036 100644 --- a/test/snapshots/psearch.golden +++ b/test/snapshots/psearch.golden @@ -1,6 +1,6 @@ == snap output grid=140x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -31,7 +31,7 @@ | == snap typing grid=140x30 cursor=8,29 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -62,7 +62,7 @@ | /MARK == snap results grid=140x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -87,13 +87,13 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap first grid=140x30 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -118,13 +118,13 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == style first |0: 0-56 #949494,#121212, 57-139 d,#121212, -|1: 0-1 #ffffff,#626262, 2-37 #949494,#121212, 38-139 d,#121212, +|1: 0-1 #ffffff,#626262, 2-119 #949494,#121212, 120-139 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-3 #bdbdbd,#080808, 4-7 #080808,#80a0ff, 8-139 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, @@ -149,13 +149,13 @@ |23: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, |24: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, |25: 0-0 d,#444444, 1-1 d,#080808, 2-139 #bdbdbd,#080808, -|26: 0-1 #ffffff,#262626, 2-45 #949494,#121212, 46-139 d,#121212, +|26: 0-1 #ffffff,#262626, 2-119 #949494,#121212, 120-139 d,#121212, |27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-139 #080808,#80a0ff, |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808, |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808, == snap second grid=140x30 cursor=7,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -180,13 +180,13 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap back grid=140x30 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -211,13 +211,13 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap nomatch grid=140x30 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -240,15 +240,15 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap ttyinert grid=140x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/psearch/cwd New Del +|$ /tmp/pardes-snap/psearch/cwd New Del | $ printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' | x MARK a | zz @@ -271,15 +271,15 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c == snap rightsearch grid=140x30 cursor=7,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/psearch/cwd New Del +| /tmp/pardes-snap/psearch/cwd New Del | | x MARK a | zz @@ -302,9 +302,9 @@ | | | -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 -| /tmp/pardes-snap/psearch/cwd/+Search New Del +| /tmp/pardes-snap/psearch/cwd/+Search New Del | 1 @p0:2:3-6 x MARK a | 2 @p0:4:3-6 x MARK b | 3 @p0:6:3-6 x MARK c diff --git a/test/snapshots/reflow.golden b/test/snapshots/reflow.golden index 09d6bfad..b6b303d9 100644 --- a/test/snapshots/reflow.golden +++ b/test/snapshots/reflow.golden @@ -1,6 +1,6 @@ == snap widened grid=200x24 cursor=4,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/reflow/cwd New Del +|$ /tmp/pardes-snap/reflow/cwd New Del | $ printf 'y%.0s' $(seq 1 3000); echo do''ne | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy | yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden index 2ff8e586..dea5e81f 100644 --- a/test/snapshots/restore.golden +++ b/test/snapshots/restore.golden @@ -1,6 +1,6 @@ == snap dumped grid=100x30 cursor=4,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill Restore /tmp/pardes-snap/restore/dump.zon -|$ /tmp/pardes-snap/restore/cwd New Del +|$ /tmp/pardes-snap/restore/cwd New Del | $ ls | $ echo KEEP''ME | KEEPME @@ -31,7 +31,7 @@ | == snap restored grid=100x30 cursor=4,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/restore/cwd New Del +| /tmp/pardes-snap/restore/cwd New Del | | | KEEPME diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden index f21af871..852be46d 100644 --- a/test/snapshots/rsearch.golden +++ b/test/snapshots/rsearch.golden @@ -1,6 +1,6 @@ == snap opened grid=180x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -15,7 +15,7 @@ | | | -| /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd New Del | | code.txt sub | @@ -31,7 +31,7 @@ | == snap search grid=180x30 cursor=13,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -46,7 +46,7 @@ | | | -| /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd New Del | | code.txt sub | @@ -62,7 +62,7 @@ | 2 code.txt:3:1-7 count_x again == snap select grid=180x30 cursor=14,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -77,7 +77,7 @@ | | | -| /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd New Del | | code.txt sub | @@ -93,7 +93,7 @@ | 2 code.txt:3:1-7 count_x again == snap path-open grid=180x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -108,7 +108,7 @@ | /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del | 1 d1 | 2 d2 -| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del +| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del | 4 d4 | 5 d5 code.txt sub | 6 d6 @@ -124,7 +124,7 @@ | 2 code.txt:3:1-7 count_x again == snap step1 grid=180x30 cursor=13,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -139,7 +139,7 @@ | /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del | 1 d1 | 2 d2 -| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del +| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del | 4 d4 | 5 d5 code.txt sub | 6 d6 @@ -155,7 +155,7 @@ | 2 code.txt:3:1-7 count_x again == snap step2 grid=180x30 cursor=17,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -170,7 +170,7 @@ | /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del | 1 d1 | 2 d2 -| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del +| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del | 4 d4 | 5 d5 code.txt sub | 6 d6 @@ -186,7 +186,7 @@ | 2 code.txt:3:1-7 count_x again == snap step3 grid=180x30 cursor=17,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -201,7 +201,7 @@ | /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del | 1 d1 | 2 d2 -| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del +| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del | 4 d4 | 5 d5 code.txt sub | 6 d6 @@ -217,7 +217,7 @@ | 2 code.txt:3:1-7 count_x again == snap selclick grid=180x30 cursor=14,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -232,7 +232,7 @@ | /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del | 1 d1 | 2 d2 -| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del +| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del | 4 d4 | 5 d5 code.txt sub | 6 d6 @@ -248,7 +248,7 @@ | 2 code.txt:3:1-7 count_x again == snap outside grid=180x30 cursor=20,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del +| /tmp/pardes-snap/rsearch/cwd/code.txt Save New Del /tmp/pardes-snap/rsearch/cwd New Del /tmp/pardes-snap/rsearch/cwd New Del | 1 run count_x now | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again @@ -263,7 +263,7 @@ | /tmp/pardes-snap/rsearch/cwd/sub/dep.txt Save New Del | 1 d1 | 2 d2 -| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del +| 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del | 4 d4 | 5 d5 code.txt sub | 6 d6 diff --git a/test/snapshots/selregex.golden b/test/snapshots/selregex.golden index 8317a2a6..59dc5d86 100644 --- a/test/snapshots/selregex.golden +++ b/test/snapshots/selregex.golden @@ -1,6 +1,6 @@ == snap prompt-armed grid=160x24 cursor=11,23 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del | 1 const one = 1; | 2 const two = 2; | 3 const three = 3; @@ -25,7 +25,7 @@ | Select / == snap preview grid=160x24 cursor=16,23 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del | 1 const one = 1; | 2 const two = 2; | 3 const three = 3; @@ -50,7 +50,7 @@ | Select /const == style preview |0: 0-56 #949494,#121212, 57-159 d,#121212, -|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#80a0ff, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808, @@ -72,10 +72,10 @@ |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, -|23: 0-0 d,#444444, 1-1 d,#080808, 2-15 #949494,#121212, 16-159 d,#121212, +|23: 0-0 d,#444444, 1-1 d,#080808, 2-15 #bdbdbd,#080808, 16-159 d,#080808, == snap three-selected grid=160x24 cursor=11,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del | 1 const one = 1; | 2 const two = 2; | 3 const three = 3; @@ -100,7 +100,7 @@ | == style three-selected |0: 0-56 #949494,#121212, 57-159 d,#121212, -|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-11 #080808,#80a0ff, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808, @@ -125,7 +125,7 @@ |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, == snap narrowed grid=160x24 cursor=12,23 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del | 1 const one = 1; | 2 const two = 2; | 3 const three = 3; @@ -150,7 +150,7 @@ | Select /t == style narrowed |0: 0-56 #949494,#121212, 57-159 d,#121212, -|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808, @@ -172,10 +172,10 @@ |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, |22: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, -|23: 0-0 d,#444444, 1-1 d,#080808, 2-11 #949494,#121212, 12-159 d,#121212, +|23: 0-0 d,#444444, 1-1 d,#080808, 2-11 #bdbdbd,#080808, 12-159 d,#080808, == snap esc-restores grid=160x24 cursor=11,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del | 1 const one = 1; | 2 const two = 2; | 3 const three = 3; @@ -200,7 +200,7 @@ | == style esc-restores |0: 0-56 #949494,#121212, 57-159 d,#121212, -|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-159 d,#121212, +|1: 0-1 #ffffff,#626262, 2-139 #949494,#121212, 140-159 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-11 #080808,#80a0ff, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-18 #bdbdbd,#080808, 19-19 #e3c78a,#080808, 20-20 #bdbdbd,#080808, 21-159 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #080808,#445483, 11-11 #80a0ff,#080808, 12-20 #bdbdbd,#080808, 21-21 #e3c78a,#080808, 22-22 #bdbdbd,#080808, 23-159 d,#080808, @@ -225,7 +225,7 @@ |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-159 d,#080808, == snap commented grid=160x24 cursor=14,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del | 1 // const one = 1; | 2 // const two = 2; | 3 // const three = 3; @@ -250,7 +250,7 @@ | == snap uncommented grid=160x24 cursor=11,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del +| /tmp/pardes-snap/selregex/cwd/m.zig Save New Del | 1 const one = 1; | 2 const two = 2; | 3 const three = 3; diff --git a/test/snapshots/shellset.golden b/test/snapshots/shellset.golden index 330d21dc..5cf503f7 100644 --- a/test/snapshots/shellset.golden +++ b/test/snapshots/shellset.golden @@ -1,6 +1,6 @@ == snap boot grid=90x20 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/shellset/cwd/cmd.txt Save New Del +| /tmp/pardes-snap/shellset/cwd/cmd.txt Save New Del | 1 Shell zznosuchshell | | @@ -21,7 +21,7 @@ | == snap builtin-ran grid=90x20 cursor=25,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/shellset/cwd/cmd.txt Save New Del +| /tmp/pardes-snap/shellset/cwd/cmd.txt Save New Del | 1 Shell zznosuchshell | | diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden index 7cb2d098..68e8ad1f 100644 --- a/test/snapshots/tag.golden +++ b/test/snapshots/tag.golden @@ -1,6 +1,6 @@ -== snap tag-focus grid=150x30 cursor=34,1 +== snap tag-focus grid=150x30 cursor=39,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tag/cwd New Del /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd New Del /tmp/pardes-snap/tag/cwd New Del | | t.txt t.txt | @@ -15,7 +15,7 @@ | | | -| /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd New Del | | t.txt | @@ -29,9 +29,9 @@ | | | -== snap tag-typed grid=150x30 cursor=40,1 +== snap tag-typed grid=150x30 cursor=45,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tag/cwd New Del t.txt /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd t.txt New Del /tmp/pardes-snap/tag/cwd New Del | | t.txt t.txt | @@ -46,7 +46,7 @@ | | | -| /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd New Del | | t.txt | @@ -60,9 +60,9 @@ | | | -== snap tag-del grid=150x30 cursor=36,1 +== snap tag-del grid=150x30 cursor=41,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tag/cwd New Del t /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd t New Del /tmp/pardes-snap/tag/cwd New Del | | t.txt t.txt | @@ -77,7 +77,7 @@ | | | -| /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd New Del | | t.txt | @@ -93,7 +93,7 @@ | == snap tag-exit grid=150x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tag/cwd New Del t.txt /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd t.txt New Del /tmp/pardes-snap/tag/cwd New Del | | t.txt t.txt | @@ -108,7 +108,7 @@ | | | -| /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd New Del | | t.txt | @@ -124,7 +124,7 @@ | == snap tag-look grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tag/cwd/t.txt Save New Del /tmp/pardes-snap/tag/cwd New Del t.txt /tmp/pardes-snap/tag/cwd New Del +| /tmp/pardes-snap/tag/cwd/t.txt Save New Del /tmp/pardes-snap/tag/cwd t.txt /tmp/pardes-snap/tag/cwd New Del | 1 ZZLOOKED | t.txt t.txt | diff --git a/test/snapshots/tag.snap b/test/snapshots/tag.snap index b0c9de44..966bfd52 100644 --- a/test/snapshots/tag.snap +++ b/test/snapshots/tag.snap @@ -6,7 +6,9 @@ file t.txt ZZLOOKED start 30 150 -n 3 wait 8000 t.txt stable 700 20000 -# click into the tag tail of pane 0: straight into insert. The layout box shows +# click into the tag tail of pane 0: straight into insert. Column 40 is inside +# the gap that right-aligns the builtins — ordinary spaces in the tag, so this +# is the tail like any other part of it. The layout box shows # the pane's BODY mode, not the tag's, so the evidence for "this click went to # insert" is the next step — the typed text lands as text instead of running as # normal-mode commands. @@ -32,12 +34,12 @@ key esc settle 100 stable 400 5000 snap tag-exit -# re-enter the tag and look the typed word: Enter opens t.txt as a file pane -press left 40 2 -release left 40 2 -stable 400 5000 -key left -key left +# re-enter the tag and look the typed word: Enter opens t.txt as a file pane. +# Clicked ON the word rather than past the end of the tag and walked back into +# it — the builtins are right-aligned now (config.tag_right_pad), so the tag no +# longer ends where the typing does and a click past it lands in the gap. +press left 43 2 +release left 43 2 stable 400 5000 key enter wait 10000 ZZLOOKED diff --git a/test/snapshots/tagcmd.golden b/test/snapshots/tagcmd.golden index 57fbd567..bb341ac8 100644 --- a/test/snapshots/tagcmd.golden +++ b/test/snapshots/tagcmd.golden @@ -1,6 +1,6 @@ == snap edited grid=100x30 cursor=13,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del | 1 ZZEDITline 1 | 2 line 2 | 3 line 3 @@ -29,9 +29,9 @@ | | | -== snap colon grid=100x30 cursor=35,1 +== snap colon grid=100x30 cursor=68,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del | 1 ZZEDITline 1 | 2 line 2 | 3 line 3 @@ -60,9 +60,9 @@ | | | -== snap word grid=100x30 cursor=40,1 +== snap word grid=100x30 cursor=72,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del | 1 ZZEDITline 1 | 2 line 2 | 3 line 3 @@ -93,7 +93,7 @@ | == snap saved grid=100x30 cursor=13,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del | 1 ZZEDITline 1 | 2 line 2 | 3 line 3 @@ -133,7 +133,7 @@ line 6 == end file == snap escaped grid=100x30 cursor=13,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagcmd/cwd/c.txt Save New Del | 1 ZZEDITline 1 | 2 line 2 | 3 line 3 diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden index 72cfd175..e3e5e8d2 100644 --- a/test/snapshots/tagnav.golden +++ b/test/snapshots/tagnav.golden @@ -29,7 +29,7 @@ | | | -== snap colon grid=100x30 cursor=35,1 +== snap colon grid=100x30 cursor=36,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha @@ -60,7 +60,7 @@ | | | -== snap right-tag grid=100x30 cursor=79,1 +== snap right-tag grid=100x30 cursor=80,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha @@ -91,7 +91,7 @@ | | | -== snap left-tag grid=100x30 cursor=35,1 +== snap left-tag grid=100x30 cursor=36,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha @@ -122,7 +122,7 @@ | | | -== snap down-tag grid=100x30 cursor=29,16 +== snap down-tag grid=100x30 cursor=30,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha @@ -153,7 +153,7 @@ | | | -== snap up-tag grid=100x30 cursor=35,1 +== snap up-tag grid=100x30 cursor=36,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha @@ -277,7 +277,7 @@ | | | -== snap back-down grid=100x30 cursor=35,1 +== snap back-down grid=100x30 cursor=36,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha @@ -308,7 +308,7 @@ | | | -== snap arrows-still-motion grid=100x30 cursor=37,1 +== snap arrows-still-motion grid=100x30 cursor=38,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha @@ -401,7 +401,7 @@ | | | -== snap tty-tag grid=100x30 cursor=79,1 +== snap tty-tag grid=100x30 cursor=80,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagnav/cwd/w.txt Save New Del $ /tmp/pardes-snap/tagnav/cwd New Del | 1 alpha diff --git a/test/snapshots/tagpath.golden b/test/snapshots/tagpath.golden index ae7f08b0..f0c7c15c 100644 --- a/test/snapshots/tagpath.golden +++ b/test/snapshots/tagpath.golden @@ -1,6 +1,6 @@ == snap start grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -29,9 +29,9 @@ | | | -== snap colon grid=100x30 cursor=36,1 +== snap colon grid=100x30 cursor=68,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -62,7 +62,7 @@ | == snap col0 grid=100x30 cursor=2,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -93,7 +93,7 @@ | == snap sel-path grid=100x30 cursor=35,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -124,7 +124,7 @@ | == style sel-path |0: 0-56 #949494,#121212, 57-99 d,#121212, -|1: 0-1 #ffffff,#626262, 2-35 #080808,#80a0ff, 36-48 #949494,#121212, 49-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-35 #080808,#80a0ff, 36-79 #949494,#121212, 80-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, @@ -155,7 +155,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, == snap yanked-path grid=100x30 cursor=41,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del | 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 | 3 line 3 @@ -186,7 +186,7 @@ | == snap drag-cross grid=100x30 cursor=41,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del | 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 | 3 line 3 @@ -217,7 +217,7 @@ | == style drag-cross |0: 0-56 #949494,#121212, 57-99 d,#121212, -|1: 0-1 #ffffff,#626262, 2-10 #949494,#121212, 11-41 #080808,#80a0ff, 42-48 #949494,#121212, 49-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-10 #949494,#121212, 11-41 #080808,#80a0ff, 42-79 #949494,#121212, 80-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-46 #bdbdbd,#080808, 47-99 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, @@ -248,7 +248,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, == snap path-inert grid=100x30 cursor=11,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del +| /tmp/pardes-snap/tagpath/cwd/c.txt Save New Del | 1 l/tmp/pardes-snap/tagpath/cwd/c.txtine 1 | 2 line 2 | 3 line 3 diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden index 2f2568ec..08d5a271 100644 --- a/test/snapshots/themesel.golden +++ b/test/snapshots/themesel.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -31,7 +31,7 @@ | 28 line 28 == snap list grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -46,7 +46,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| /tmp/pardes-snap/themesel/cwd/+Themes New Del +| /tmp/pardes-snap/themesel/cwd/+Themes New Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -62,7 +62,7 @@ | 13 Theme ashen == snap step-helix grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -77,7 +77,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| /tmp/pardes-snap/themesel/cwd/+Themes New Del +| /tmp/pardes-snap/themesel/cwd/+Themes New Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -93,7 +93,7 @@ | 13 Theme ashen == style step-helix |0: 0-56 #949494,#121212, 57-99 d,#121212, -|1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-12 #bdbdbd,#080808, 13-99 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, @@ -108,7 +108,7 @@ |13: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808, |14: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808, |15: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-13 #bdbdbd,#080808, 14-99 d,#080808, -|16: 0-1 #ffffff,#262626, 2-46 #949494,#121212, 47-99 d,#121212, +|16: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 #080808,#80a0ff, |18: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808, |19: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808, @@ -124,7 +124,7 @@ |29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-99 d,#080808, == snap step-dark grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -139,7 +139,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| /tmp/pardes-snap/themesel/cwd/+Themes New Del +| /tmp/pardes-snap/themesel/cwd/+Themes New Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -155,7 +155,7 @@ | 13 Theme ashen == style step-dark |0: 0-56 #969696,#2c2a3e, 57-99 d,#2c2a3e, -|1: 0-1 #ffffff,#6e4fd0, 2-49 #969696,#2c2a3e, 50-99 d,#2c2a3e, +|1: 0-1 #ffffff,#6e4fd0, 2-79 #969696,#2c2a3e, 80-99 d,#2c2a3e, |2: 0-0 d,#525252, 1-1 d,d, 2-6 #969696,#2c2a3e, 7-99 d,d, |3: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |4: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, @@ -170,7 +170,7 @@ |13: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |14: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |15: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, -|16: 0-1 #ffffff,#383c54, 2-46 #969696,#2c2a3e, 47-99 d,#2c2a3e, +|16: 0-1 #ffffff,#383c54, 2-79 #969696,#2c2a3e, 80-99 d,#2c2a3e, |17: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |18: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 #d8c8a8,#4a3a1e, |19: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, @@ -186,7 +186,7 @@ |29: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, == snap step-acme grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -201,7 +201,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| /tmp/pardes-snap/themesel/cwd/+Themes New Del +| /tmp/pardes-snap/themesel/cwd/+Themes New Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -217,7 +217,7 @@ | 13 Theme ashen == style step-acme |0: 0-56 #000000,#eaffff, 57-99 d,#eaffff, -|1: 0-1 #ffffff,#6e4fd0, 2-49 #000000,#eaffff, 50-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-79 #000000,#eaffff, 80-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-99 d,#ffffea, |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, @@ -232,7 +232,7 @@ |13: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea, |14: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea, |15: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea, -|16: 0-1 #ffffff,#383c54, 2-46 #000000,#eaffff, 47-99 d,#eaffff, +|16: 0-1 #ffffff,#383c54, 2-79 #000000,#eaffff, 80-99 d,#eaffff, |17: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea, |18: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea, |19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 #000000,#eeee9e, @@ -248,7 +248,7 @@ |29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea, == snap step-generated grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -263,7 +263,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| /tmp/pardes-snap/themesel/cwd/+Themes New Del +| /tmp/pardes-snap/themesel/cwd/+Themes New Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -279,7 +279,7 @@ | 13 Theme ashen == style step-generated |0: 0-56 #e0e0e0,#1e262e, 57-99 d,#1e262e, -|1: 0-1 #000000,#ffa060, 2-49 #e0e0e0,#1e262e, 50-99 d,#1e262e, +|1: 0-1 #000000,#ffa060, 2-79 #e0e0e0,#1e262e, 80-99 d,#1e262e, |2: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #e0e0e0,#1e262e, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26, |3: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26, |4: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26, @@ -294,7 +294,7 @@ |13: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26, |14: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26, |15: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-13 #e0e0e0,#161e26, 14-99 d,#161e26, -|16: 0-1 #ffffff,#303840, 2-46 #e0e0e0,#1e262e, 47-99 d,#1e262e, +|16: 0-1 #ffffff,#303840, 2-79 #e0e0e0,#1e262e, 80-99 d,#1e262e, |17: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-17 #e0e0e0,#161e26, 18-99 d,#161e26, |18: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26, |19: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26, @@ -310,7 +310,7 @@ |29: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-17 #e0e0e0,#161e26, 18-99 d,#161e26, == snap step-back grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -325,7 +325,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| /tmp/pardes-snap/themesel/cwd/+Themes New Del +| /tmp/pardes-snap/themesel/cwd/+Themes New Del | 1 Theme helix | 2 Theme dark | 3 Theme acme @@ -341,7 +341,7 @@ | 13 Theme ashen == style step-back |0: 0-56 #000000,#eaffff, 57-99 d,#eaffff, -|1: 0-1 #ffffff,#6e4fd0, 2-49 #000000,#eaffff, 50-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-79 #000000,#eaffff, 80-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-99 d,#ffffea, |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, @@ -356,7 +356,7 @@ |13: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea, |14: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea, |15: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-13 #000000,#ffffea, 14-99 d,#ffffea, -|16: 0-1 #ffffff,#383c54, 2-46 #000000,#eaffff, 47-99 d,#eaffff, +|16: 0-1 #ffffff,#383c54, 2-79 #000000,#eaffff, 80-99 d,#eaffff, |17: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea, |18: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea, |19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-99 #000000,#eeee9e, @@ -372,7 +372,7 @@ |29: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-17 #000000,#ffffea, 18-99 d,#ffffea, == snap tail grid=100x30 cursor=7,28 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -387,7 +387,7 @@ | 12 line 12 | 13 line 13 | 14 line 14 -| /tmp/pardes-snap/themesel/cwd/+Themes New Del +| /tmp/pardes-snap/themesel/cwd/+Themes New Del | 217 Theme wolf_alabaster_dark_bg | 218 Theme wolf_alabaster_dark_mono | 219 Theme wolf_alabaster_light @@ -403,7 +403,7 @@ | 229 == snap picked grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del +| /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -434,7 +434,7 @@ | 28 line 28 == style picked |0: 0-56 #000000,#eaffff, 57-99 d,#eaffff, -|1: 0-1 #ffffff,#6e4fd0, 2-49 #000000,#eaffff, 50-99 d,#eaffff, +|1: 0-1 #ffffff,#6e4fd0, 2-79 #000000,#eaffff, 80-99 d,#eaffff, |2: 0-1 d,#ffffea, 2-6 #000000,#eaffff, 7-12 #000000,#ffffea, 13-99 d,#ffffea, |3: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, |4: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, diff --git a/test/snapshots/themesel.snap b/test/snapshots/themesel.snap index 56d81494..d714fa84 100644 --- a/test/snapshots/themesel.snap +++ b/test/snapshots/themesel.snap @@ -53,7 +53,7 @@ stable 700 15000 snap step-back snapstyle step-back # PICKING is just stopping. Walk down into the list and explicitly Del it: the -# theme the last step left behind is still on. Body-normal Esc is Toggleterm, +# theme the last step left behind is still on. Body-normal Esc is Last, # so it deliberately leaves this document-like output buffer open. key space w j stable 400 5000 diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden index f753d70c..6e085aa9 100644 --- a/test/snapshots/tinywin.golden +++ b/test/snapshots/tinywin.golden @@ -1,17 +1,17 @@ == snap stacked grid=100x30 cursor=4,14 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/tinywin/cwd New Del +|$ /tmp/pardes-snap/tinywin/cwd New Del | $ -| /tmp/pardes-snap/tinywin/cwd New Del +| /tmp/pardes-snap/tinywin/cwd New Del | | -| /tmp/pardes-snap/tinywin/cwd New Del +| /tmp/pardes-snap/tinywin/cwd New Del | | -| /tmp/pardes-snap/tinywin/cwd New Del +| /tmp/pardes-snap/tinywin/cwd New Del | | -| /tmp/pardes-snap/tinywin/cwd New Del +| /tmp/pardes-snap/tinywin/cwd New Del | | | @@ -31,8 +31,8 @@ | == snap shrunk grid=60x3 cursor=59,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/tinywin/cwd New Del -| /tmp/pardes-snap/tinywin/cwd New Del +|$ /tmp/pardes-snap/tinywin/cwd New Del +| /tmp/pardes-snap/tinywin/cwd New Del == snap columns grid=100x30 cursor=79,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/tinywi /tmp/pardes-snap/tinywi /tmp/pardes-snap/tinywi /tmp/pardes-snap/tinywi diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden index bbba818d..f15afcb9 100644 --- a/test/snapshots/tty.golden +++ b/test/snapshots/tty.golden @@ -122,7 +122,38 @@ | | | -== snap shift-esc-off grid=100x30 cursor=4,6 +== snap shift-esc-nodoc grid=100x30 cursor=4,6 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill +|$ /tmp/pardes-snap/tty/cwd New Del /tmp/pardes-snap/tty/cwd New Del +| $ ls +| m.txt m.txt +| $ echo SNAP''OK +| SNAPOK +| $ +| +| +| +| +| +| +| +| +| +| /tmp/pardes-snap/tty/cwd New Del +| +| m.txt +| +| +| +| +| +| +| +| +| +| +| +== snap ctrl-b-off grid=100x30 cursor=4,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tty/cwd New Del /tmp/pardes-snap/tty/cwd New Del | diff --git a/test/snapshots/tty.snap b/test/snapshots/tty.snap index a3af511d..58f4c1ee 100644 --- a/test/snapshots/tty.snap +++ b/test/snapshots/tty.snap @@ -1,6 +1,11 @@ -# tty mode round-trip: Ctrl-b in, run a command, Ctrl-b out. Shift-Esc is the -# same toggle (CSI 27;2u — needs a host that reports modifiers on Escape); a -# PLAIN Esc is not, it still goes to the shell. +# tty mode round-trip: Ctrl-b in, run a command, Ctrl-b out. Shift-Esc (CSI +# 27;2u — needs a host that reports modifiers on Escape) also gets you IN; a +# PLAIN Esc does not, it still goes to the shell. +# +# Getting OUT is Ctrl-b alone. Shift-Esc in tty is what Escape is in normal +# mode instead — Last, the pane you were in before this one — leaving this pane +# in tty so coming back lands in the program you left. The hop itself is +# covered by a unit test in pardes.zig. file m.txt marker start 30 100 -n 3 wait 8000 m.txt @@ -16,10 +21,16 @@ snap tty-echo key c-b stable 600 8000 snap tty-off -# Shift-Esc: in, then out again — the same toggle from the other key +# Shift-Esc: in, the same as Ctrl-b... send \e[27;2u stable 600 8000 snap shift-esc-on +# ...but not out. With no doc pane to hop to it changes nothing: still tty, +# prompts still shown, same pane focused. send \e[27;2u stable 600 8000 -snap shift-esc-off +snap shift-esc-nodoc +# Ctrl-b still leaves tty in place, which is now the only thing that does. +key c-b +stable 600 8000 +snap ctrl-b-off diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden index bcce61d4..69b5961a 100644 --- a/test/snapshots/ttyhelp.golden +++ b/test/snapshots/ttyhelp.golden @@ -1,6 +1,6 @@ == snap boot grid=100x30 cursor=4,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/ttyhelp/cwd New Del +|$ /tmp/pardes-snap/ttyhelp/cwd New Del | $ | | @@ -31,9 +31,9 @@ | == snap helped grid=100x30 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/ttyhelp/cwd New Del +|$ /tmp/pardes-snap/ttyhelp/cwd New Del | $ -| /tmp/pardes-snap/ttyhelp/cwd/+Help New Del +| /tmp/pardes-snap/ttyhelp/cwd/+Help New Del | 1 pardes builtins, and how to run each: | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. @@ -62,9 +62,9 @@ | 26 SPC l r Rename == snap leaderworks grid=100x30 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/ttyhelp/cwd New Del +|$ /tmp/pardes-snap/ttyhelp/cwd New Del | $ -| /tmp/pardes-snap/ttyhelp/cwd/+Help New Del +| /tmp/pardes-snap/ttyhelp/cwd/+Help New Del | 1 pardes builtins, and how to run each: | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden index 09b54c88..3b82e3c7 100644 --- a/test/snapshots/ttylook.golden +++ b/test/snapshots/ttylook.golden @@ -1,6 +1,6 @@ == snap tok1 grid=120x30 cursor=2,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -15,7 +15,7 @@ | | | -| /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub | @@ -31,7 +31,7 @@ | == style tok1 |0: 0-56 #949494,#121212, 57-119 d,#121212, -|1: 0-1 #ffffff,#626262, 2-37 #949494,#121212, 38-59 d,#121212, 60-61 #ffffff,#262626, 62-97 #949494,#121212, 98-119 d,#121212, +|1: 0-1 #ffffff,#626262, 2-39 #949494,#121212, 40-59 d,#121212, 60-61 #ffffff,#262626, 62-99 #949494,#121212, 100-119 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-8 #080808,#80a0ff, 9-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, @@ -46,7 +46,7 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, -|16: 0-1 #ffffff,#262626, 2-37 #949494,#121212, 38-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, +|16: 0-1 #ffffff,#262626, 2-39 #949494,#121212, 40-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |17: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, @@ -62,7 +62,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-59 #bdbdbd,#080808, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, == snap tok2 grid=120x30 cursor=11,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -77,7 +77,7 @@ | | | -| /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub | @@ -93,7 +93,7 @@ | == snap tokback grid=120x30 cursor=2,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -108,7 +108,7 @@ | | | -| /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub | @@ -124,7 +124,7 @@ | == snap insert grid=120x30 cursor=4,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del | | nnbig.txt plain.txt sub big.txt plain.txt sub | @@ -139,7 +139,7 @@ | | | -| /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub | @@ -155,7 +155,7 @@ | == snap tok3 grid=120x30 cursor=22,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -170,7 +170,7 @@ | | | -| /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub | @@ -186,7 +186,7 @@ | == snap diropen grid=120x30 cursor=4,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -201,7 +201,7 @@ | | | -| /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub | @@ -217,7 +217,7 @@ | == snap noop grid=120x30 cursor=4,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub big.txt plain.txt sub | @@ -232,7 +232,7 @@ | | | -| /tmp/pardes-snap/ttylook/cwd New Del +| /tmp/pardes-snap/ttylook/cwd New Del | | big.txt plain.txt sub | diff --git a/test/snapshots/ttyonly.golden b/test/snapshots/ttyonly.golden index 2af37176..dad9105f 100644 --- a/test/snapshots/ttyonly.golden +++ b/test/snapshots/ttyonly.golden @@ -1,6 +1,6 @@ == snap ttyonly grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -|$ /tmp/pardes-snap/ttyonly/cwd New Del +|$ /tmp/pardes-snap/ttyonly/cwd New Del | $ echo TTY''ONLY | TTYONLY | $ @@ -31,7 +31,7 @@ | == style ttyonly |0: 0-56 #949494,#121212, 57-99 d,#121212, -|1: 0-1 #ffffff,#626262, 2-37 #949494,#121212, 38-99 d,#121212, +|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-99 #bdbdbd,#080808, diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index 93ecbe58..8bfb47fe 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -1,6 +1,6 @@ == snap tutor grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /Tutor Save New Del /tmp/pardes-snap/tutor/cwd New Del /tmp/pardes-snap/tutor/cwd New Del +| /Tutor Save New Del /tmp/pardes-snap/tutor/cwd New Del /tmp/pardes-snap/tutor/cwd New Del | 1 | 2 PARDES TUTO↩ | R diff --git a/test/snapshots/windownav.snap b/test/snapshots/windownav.snap index 5652116b..c9de55ac 100644 --- a/test/snapshots/windownav.snap +++ b/test/snapshots/windownav.snap @@ -1,12 +1,11 @@ # RULE: moving focus is a BUILTIN like any other, so there is ONE # implementation and every route reaches it. SPC w h/j/k/l run Left/Down/Up/ -# Right — the geometric focusDir the Ctrl-w prefix also runs — and SPC w t -# plus body-normal Esc run Toggleterm, the hop between the most recently -# focused DOCUMENT (a file, an image, a +Search/+Help output buffer: things -# you READ) and the most -# recently focused TERMINAL. "Most recent" is the focus history the core -# already keeps to hand focus back when a pane closes, so the hop back is the -# same key. Focus shows up in the golden's `cursor=` header: that is the +# Right — the geometric focusDir the Ctrl-w prefix also runs — and SPC j j +# plus body-normal Esc run Last, the hop to the pane you were in BEFORE this +# one, whichever kind it was. It reads the focus history the core already keeps +# to hand focus back when a pane closes, and going somewhere is itself recorded, +# which is what makes the hop back the same key. Focus shows up in the golden's +# `cursor=` header: that is the # ACTIVE pane's cursor, so each snap is named by the pane it should land in. file w.txt alpha\nbeta\ngamma start 30 100 w.txt @@ -15,22 +14,20 @@ wait 8000 w.txt stable 700 20000 # A FILE boots alone now, so the terminal every hop below needs is opened here: # SPC c n (Newcol) puts it in a column of its own on the right and focuses it, -# SPC w h comes straight back. WHAT THIS COST: the first SPC w t used to run -# against a shell that had never been focused, which is Toggleterm's fallback -# scan; nothing reaches that branch any more, because every way a script has of -# making a terminal also focuses it. +# SPC w h comes straight back — which also puts the shell on the stack, and Last +# only ever names a pane that is on it. key space c n stable 700 15000 key space w h stable 400 5000 # left column = the file, right column = that shell; the file has focus snap start -# SPC w t: the hop to the most recently focused TERMINAL, the one just opened -key space w t +# SPC j j: the pane before this one, which is the shell just opened +key space j j stable 400 5000 snap to-term -# ...and back, because the file is now the latest document -key space w t +# ...and back, because going there made the file the pane before THAT +key space j j stable 400 5000 snap back-to-file # A bare Esc from a body in normal mode dispatches that SAME builtin: file to @@ -63,12 +60,12 @@ snap left key space w j stable 400 5000 snap down -# SPC w t from a terminal: the file, which is the only document here -key space w t +# SPC j j from a terminal: the file, which is where SPC w h left off +key space j j stable 400 5000 snap toggle-doc -# ...and back to the LATEST terminal — the one just left, not the launch shell -# in the right column, which was focused earlier -key space w t +# ...and back to the shell just left, not the launch shell in the right column, +# which was focused earlier +key space j j stable 400 5000 snap toggle-back diff --git a/test/snapshots/wrap.golden b/test/snapshots/wrap.golden index 7481cec3..2b4c530b 100644 --- a/test/snapshots/wrap.golden +++ b/test/snapshots/wrap.golden @@ -75,7 +75,7 @@ | == snap on-wide grid=128x14 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/wrap/cwd/long.txt Save New Del +| /tmp/pardes-snap/wrap/cwd/long.txt Save New Del | 1 0---------1---------2---------3---------4---------5---------6---------7---------8---------9---------A---------B---------↩ | C---------D---------E---------F---------G---------H---------I---------J--------- | 2 second line diff --git a/test/snapshots/yankpaste.golden b/test/snapshots/yankpaste.golden index 1a5e7c7f..612c81f0 100644 --- a/test/snapshots/yankpaste.golden +++ b/test/snapshots/yankpaste.golden @@ -1,6 +1,6 @@ == snap linewise-below grid=100x30 cursor=13,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del +| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -31,7 +31,7 @@ | == snap linewise-above grid=100x30 cursor=13,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del +| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del | 1 line 1 | 2 line 2 | 3 line 3 @@ -62,7 +62,7 @@ | == snap charwise-inline grid=100x30 cursor=10,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del +| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del | 1 liline 1 | 2 line 2 | 3 line 3 @@ -93,7 +93,7 @@ | == snap blankline grid=100x30 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del +| /tmp/pardes-snap/yankpaste/cwd/f.txt Save New Del | 1 liline 1 | 2 | 3 |