diff options
Diffstat (limited to 'test')
81 files changed, 1292 insertions, 1050 deletions
diff --git a/test/macos_e2e.swift b/test/macos_e2e.swift index 42bc8229..16992271 100644 --- a/test/macos_e2e.swift +++ b/test/macos_e2e.swift @@ -47,7 +47,7 @@ private struct ScriptError: Error { let message: String } -/// What the two C callbacks reach through `userdata`. A class, because a C +/// What the three C callbacks reach through `userdata`. A class, because a C /// function pointer cannot capture: a pointer the runtime struct carries is the /// only way back into Swift state. private final class Host { @@ -177,6 +177,18 @@ private final class Driver: PardesViewDelegate { yank = String(decoding: bytes, as: UTF8.self) } host.clipboard = yank + }, + read_clipboard: { ud in + // Main thread, inside pardes_tick, and answered on the spot: + // the core asked for the clipboard and pardes_paste hands it + // back before this returns. `host.clipboard`, never + // NSPasteboard, for the same reason as set_clipboard above. + // No pump — the tick that emitted this effect is still + // draining and will pick up whatever the paste queued. + guard let ud else { return } + let host = Unmanaged<Host>.fromOpaque(ud).takeUnretainedValue() + let text = host.clipboard ?? "" + text.withCString { pardes_paste($0, text.utf8.count) } }) let rc = pardes_init(&runtime, got.cols, got.rows) diff --git a/test/snapshots/argv.golden b/test/snapshots/argv.golden index 1109132c..6cf79be0 100644 --- a/test/snapshots/argv.golden +++ b/test/snapshots/argv.golden @@ -94,7 +94,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 -| +| ls | inside.txt | | diff --git a/test/snapshots/boot.golden b/test/snapshots/boot.golden index d347b7eb..d0e9ba09 100644 --- a/test/snapshots/boot.golden +++ b/test/snapshots/boot.golden @@ -1,7 +1,7 @@ == snap boot grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/boot/cwd New Del -| +| ls | hello.txt | | diff --git a/test/snapshots/builtins.golden b/test/snapshots/builtins.golden index a54b8281..61d7bec1 100644 --- a/test/snapshots/builtins.golden +++ b/test/snapshots/builtins.golden @@ -96,30 +96,30 @@ | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. | 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol -| 7 SPC c n Newcol topbar -| 8 SPC d Del -| 9 SPC f c Config -| 10 SPC f f Find topbar -| 11 SPC f g Grep topbar -| 12 SPC f n New topbar -| 13 SPC f s Save -| 14 SPC h t Tutor topbar -| 15 SPC j i Forward C-i -| 16 SPC j j Last -| 17 SPC j l Jumplist -| 18 SPC j o Back C-o -| 19 SPC k Kill topbar -| 20 SPC l D WsDiagnostics -| 21 SPC l S WsSymbols -| 22 SPC l a CodeAction -| 23 SPC l d Diagnostics -| 24 SPC l h SelectRefs -| 25 SPC l i Lspinfo -| 26 SPC l k Hover -| 27 SPC l r Rename -| 28 SPC l s Symbols +| 5 SPC ? Help topbar +| 6 SPC P ClipPasteBefore +| 7 SPC R ClipReplace +| 8 SPC Y ClipYankMain +| 9 SPC c d Delcol +| 10 SPC c n Newcol topbar +| 11 SPC d Del +| 12 SPC f c Config +| 13 SPC f f Find topbar +| 14 SPC f g Grep topbar +| 15 SPC f n New topbar +| 16 SPC f s Save +| 17 SPC h t Tutor topbar +| 18 SPC j i Forward C-i +| 19 SPC j j Last +| 20 SPC j l Jumplist +| 21 SPC j o Back C-o +| 22 SPC k Kill topbar +| 23 SPC l D WsDiagnostics +| 24 SPC l S WsSymbols +| 25 SPC l a CodeAction +| 26 SPC l d Diagnostics +| 27 SPC l h SelectRefs +| 28 SPC l i Lspinfo == 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 @@ -153,34 +153,34 @@ | | | /tmp/pardes-snap/builtins/cwd/+Help New Del -| 26 SPC l k Hover -| 27 SPC l r Rename -| 28 SPC l s Symbols -| 29 SPC l w Lspwhy -| 30 SPC s d Dump topbar -| 31 SPC s r Restore -| 32 SPC t a Ascii -| 33 SPC t b Tagbottom -| 34 SPC t c Colors -| 35 SPC t d Debug topbar -| 36 SPC t i PdfTint -| 37 SPC t l Palette -| 38 SPC t n NextColor topbar -| 39 SPC t p Petscii -| 40 SPC t r Crt -| 41 SPC t s PdfSections -| 42 SPC t t ThemeSel -| 43 SPC t w Wrap -| 44 SPC t z PdfFit -| 45 SPC w h Left C-w h, C-w left -| 46 SPC w j Down C-w j, C-w down -| 47 SPC w k Up C-w k, C-w up -| 48 SPC w l Right C-w l, C-w right -| 49 Look enter, right-click -| 50 Exec tab, middle-click -| 51 Theme -| 52 Shell -| 53 +| 31 SPC l s Symbols +| 32 SPC l w Lspwhy +| 33 SPC p ClipPaste +| 34 SPC s d Dump topbar +| 35 SPC s r Restore +| 36 SPC t a Ascii +| 37 SPC t b Tagbottom +| 38 SPC t c Colors +| 39 SPC t d Debug topbar +| 40 SPC t i PdfTint +| 41 SPC t l Palette +| 42 SPC t n NextColor topbar +| 43 SPC t p Petscii +| 44 SPC t r Crt +| 45 SPC t s PdfSections +| 46 SPC t t ThemeSel +| 47 SPC t w Wrap +| 48 SPC t z PdfFit +| 49 SPC w h Left C-w h, C-w left +| 50 SPC w j Down C-w j, C-w down +| 51 SPC w k Up C-w k, C-w up +| 52 SPC w l Right C-w l, C-w right +| 53 SPC y ClipYank +| 54 Look enter, right-click +| 55 Exec tab, middle-click +| 56 Theme +| 57 Shell +| 58 == 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 @@ -214,34 +214,34 @@ | | | /tmp/pardes-snap/builtins/cwd/+Help New Del -| 26 SPC l k Hover -| 27 SPC l r Rename -| 28 SPC l s Symbols -| 29 SPC l w Lspwhy -| 30 SPC s d Dump topbar -| 31 SPC s r Restore -| 32 SPC t a Ascii -| 33 SPC t b Tagbottom -| 34 SPC t c Colors -| 35 SPC t d Debug topbar -| 36 SPC t i PdfTint -| 37 SPC t l Palette -| 38 SPC t n NextColor topbar -| 39 SPC t p Petscii -| 40 SPC t r Crt -| 41 SPC t s PdfSections -| 42 SPC t t ThemeSel -| 43 SPC t w Wrap -| 44 SPC t z PdfFit -| 45 SPC w h Left C-w h, C-w left -| 46 SPC w j Down C-w j, C-w down -| 47 SPC w k Up C-w k, C-w up -| 48 SPC w l Right C-w l, C-w right -| 49 Look enter, right-click -| 50 Exec tab, middle-click -| 51 Theme -| 52 Shell -| 53 +| 31 SPC l s Symbols +| 32 SPC l w Lspwhy +| 33 SPC p ClipPaste +| 34 SPC s d Dump topbar +| 35 SPC s r Restore +| 36 SPC t a Ascii +| 37 SPC t b Tagbottom +| 38 SPC t c Colors +| 39 SPC t d Debug topbar +| 40 SPC t i PdfTint +| 41 SPC t l Palette +| 42 SPC t n NextColor topbar +| 43 SPC t p Petscii +| 44 SPC t r Crt +| 45 SPC t s PdfSections +| 46 SPC t t ThemeSel +| 47 SPC t w Wrap +| 48 SPC t z PdfFit +| 49 SPC w h Left C-w h, C-w left +| 50 SPC w j Down C-w j, C-w down +| 51 SPC w k Up C-w k, C-w up +| 52 SPC w l Right C-w l, C-w right +| 53 SPC y ClipYank +| 54 Look enter, right-click +| 55 Exec tab, middle-click +| 56 Theme +| 57 Shell +| 58 == 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 @@ -277,10 +277,10 @@ | /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 +| 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 | | @@ -340,27 +340,27 @@ | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. | 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol -| 7 SPC c n Newcol topbar -| 8 SPC d Del -| 9 SPC f c Config -| 10 SPC f f Find topbar -| 11 SPC f g Grep topbar -| 12 SPC f n New topbar -| 13 SPC f s Save -| 14 SPC h t Tutor topbar -| 15 SPC j i Forward C-i -| 16 SPC j j Last -| 17 SPC j l Jumplist -| 18 SPC j o Back C-o -| 19 SPC k Kill topbar -| 20 SPC l D WsDiagnostics -| 21 SPC l S WsSymbols -| 22 SPC l a CodeAction -| 23 SPC l d Diagnostics -| 24 SPC l h SelectRefs -| 25 SPC l i Lspinfo -| 26 SPC l k Hover -| 27 SPC l r Rename -| 28 SPC l s Symbols +| 5 SPC ? Help topbar +| 6 SPC P ClipPasteBefore +| 7 SPC R ClipReplace +| 8 SPC Y ClipYankMain +| 9 SPC c d Delcol +| 10 SPC c n Newcol topbar +| 11 SPC d Del +| 12 SPC f c Config +| 13 SPC f f Find topbar +| 14 SPC f g Grep topbar +| 15 SPC f n New topbar +| 16 SPC f s Save +| 17 SPC h t Tutor topbar +| 18 SPC j i Forward C-i +| 19 SPC j j Last +| 20 SPC j l Jumplist +| 21 SPC j o Back C-o +| 22 SPC k Kill topbar +| 23 SPC l D WsDiagnostics +| 24 SPC l S WsSymbols +| 25 SPC l a CodeAction +| 26 SPC l d Diagnostics +| 27 SPC l h SelectRefs +| 28 SPC l i Lspinfo diff --git a/test/snapshots/builtins.snap b/test/snapshots/builtins.snap index f6b5723b..3b8fb684 100644 --- a/test/snapshots/builtins.snap +++ b/test/snapshots/builtins.snap @@ -30,10 +30,12 @@ snap index key g e stable 700 15000 snap index-tail -# n/N here must NOT run the rows. ThemeSel's buffer executes what it steps -# onto, and that is safe because wearing a theme is free; this list holds Kill, -# Del and Delcol, so stepping it would end the session. Three presses, and the -# panes and the listing are all where they were. +# n/N here run NOTHING, and no longer could: they are a MOTION, and the only +# thing they do is move the selection onto look-able text. A row here is a key +# path and a NAME — this list holds Kill, Del and Delcol — and a name is not a +# path, so the ring finds nothing to stop on in this buffer or in the file +# above it. Three presses, and the panes and the listing are all where they +# were. Picking a command is executing its row, two snaps down. key n key n key n @@ -48,17 +50,20 @@ 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: -# middle-click `Tutor` and the tutor opens. That is the picking a stepping -# picker would have done, minus running the rows you passed. +# middle-click `Tutor` and the tutor opens. That is how a list of commands is +# picked from — you run the row you want and the ones you passed stay unrun, +# which is the whole reason n/N were never allowed to be the picker. # # The one place in this suite a builtin cannot be added for free: the click is # a SCREEN coordinate, so every row inserted above `SPC h t` in the listing -# moves Tutor down one and this number with it. +# moves Tutor down one and this number with it. The five clipboard builtins +# put three there — SPC P, SPC R and SPC Y, uppercase sorting ahead of the +# lowercase `SPC h` — which is why this reads 49 and not 46. key space ? wait 10000 SPC c n stable 700 15000 -press middle 20 46 -release middle 20 46 +press middle 20 49 +release middle 20 49 wait 10000 PARDES TUTOR stable 700 15000 snap tutor-from-index diff --git a/test/snapshots/chordcut.golden b/test/snapshots/chordcut.golden index ebe3769a..16d007e2 100644 --- a/test/snapshots/chordcut.golden +++ b/test/snapshots/chordcut.golden @@ -1,7 +1,7 @@ == snap opened grid=90x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4 @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -32,7 +32,7 @@ == snap cut grid=90x30 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2 f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4 @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -63,7 +63,7 @@ == snap copied grid=90x30 cursor=10,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2 f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4 @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -94,7 +94,7 @@ == snap pointpaste grid=90x30 cursor=16,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2 f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4line @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -125,7 +125,7 @@ == snap replaced grid=90x30 cursor=11,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2 f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4line @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -156,7 +156,7 @@ == snap cancelexec grid=90x30 cursor=25,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4line @@ -171,7 +171,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -187,7 +187,7 @@ == snap execafter grid=90x30 cursor=25,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4line @@ -202,7 +202,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -218,7 +218,7 @@ == snap cancellook grid=90x30 cursor=25,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4line @@ -233,7 +233,7 @@ | | | /tmp/pardes-snap/chordcut/cw -| +| ls | f.txt g.txt | | @@ -249,7 +249,7 @@ == snap lookafter grid=90x30 cursor=7,17 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt | 3 line 3 | 4 line 4line @@ -264,7 +264,7 @@ | | | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls | 2 line 2 f.txt g.txt | 3 | @@ -342,7 +342,7 @@ == snap ttyprobe grid=90x30 cursor=44,13 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw$ /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 $ ls +| 1 line 1 $ ls ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt | 3 line 3 $ | 4 line 4line $ @@ -357,7 +357,7 @@ | | | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls | 2 line 2 f.txt g.txt | 3 | @@ -373,7 +373,7 @@ == snap ttyprompt grid=90x30 cursor=38,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/chordcut/cw$ /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 $ ls +| 1 line 1 $ ls ls | 2 2echo B''OO g.txt f.txt g.txt f.txt g.txt | 3 line 3 $ | 4 line 4line $ @@ -388,7 +388,7 @@ | $ | $ line | /tmp/pardes-snap/chordcut/cw /tmp/pardes-snap/chordcut/cw -| 1 line 1 +| 1 line 1 ls | 2 line 2 f.txt g.txt | 3 | diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden index f5d6f003..940ce6fb 100644 --- a/test/snapshots/cmdword.golden +++ b/test/snapshots/cmdword.golden @@ -48,7 +48,7 @@ | | /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E -| +| echo ZZ''E | ZZE | | @@ -79,9 +79,9 @@ | | /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E -| +| echo ZZ''E | ZZE -| +| echo ZZ''L | ZZL | | @@ -110,9 +110,9 @@ | | /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E -| +| echo ZZ''E | ZZE -| +| echo ZZ''L | ZZL | | @@ -141,11 +141,11 @@ | | /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E -| +| echo ZZ''E | ZZE -| +| echo ZZ''L | ZZL -| +| ls | cmds.txt p.txt zzmark.txt | | @@ -172,11 +172,11 @@ | | /tmp/pardes-snap/cmdword/cwd New Del Exec | echo ZZ''E -| +| echo ZZ''E | ZZE -| +| echo ZZ''L | ZZL -| +| ls | cmds.txt p.txt zzmark.txt | | @@ -203,13 +203,13 @@ | | /tmp/pardes-snap/cmdword/cwd New Del Exec @`echo ZZ''T` | echo ZZ''E -| +| echo ZZ''E | ZZE -| +| echo ZZ''L | ZZL -| +| ls | cmds.txt p.txt zzmark.txt -| +| echo ZZ''T | ZZT | | diff --git a/test/snapshots/cornerdrag.golden b/test/snapshots/cornerdrag.golden index ae933701..a1aa5d03 100644 --- a/test/snapshots/cornerdrag.golden +++ b/test/snapshots/cornerdrag.golden @@ -1,7 +1,7 @@ == snap hover-corner grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd New Del ╎ /tmp/pardes-snap/cornerdrag/cwd New Del -| ╎ +| ls ╎ ls | w.txt ╎ w.txt | ╎ | ╎ @@ -16,7 +16,7 @@ | ╎ |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ | /tmp/pardes-snap/cornerdrag/cwd New Del ╎ -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -32,7 +32,7 @@ == snap edge-drag grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag╎cwd New Del /tmp/pardes-snap/cornerdrag/cwd New Del -| ╎ +| ls ╎ ls | w.txt ╎ w.txt | ╎ | ╎ @@ -47,7 +47,7 @@ | ╎ | ╎ | /tmp/pardes-snap/cornerdrag╎cwd New Del -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -63,7 +63,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 -| +| ls ls | w.txt w.txt | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/cornerdrag/ -| +| ls | w.txt | | @@ -94,7 +94,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 -| ╎ +| ls ls ╎ | w.txt w.txt ╎ | ╎ | ╎ @@ -109,7 +109,7 @@ | ╎ | ╎ | /tmp/pardes-snap/cornerdrag/ ╎ -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -125,14 +125,14 @@ == snap corner-done grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd New Del /tmp/pardes-snap/cornerdrag/cwd New De -| +| ls ls | w.txt w.txt | | | | | /tmp/pardes-snap/cornerdrag/cwd New Del -| +| ls | w.txt | | @@ -156,14 +156,14 @@ == snap clamp-x grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd New Del /tmp/pardes-snap/cornerdrag/╎wd New De -| ╎ +| ls ls ╎ | w.txt w.txt ╎ | ╎ | ╎ | ╎ | ╎ | /tmp/pardes-snap/cornerdrag/cwd New Del ╎ -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -187,14 +187,14 @@ == snap clamp-y grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd New Del ╎ /tmp/pardes-snap/cornerdrag/cwd New De -| ╎ +| ls ╎ ls | w.txt ╎ w.txt | ╎ | ╎ | ╎ | ╎ | /tmp/pardes-snap/cornerdrag/cwd New Del ╎ -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -218,7 +218,7 @@ == snap clamp-done grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cornerdrag/cwd New Del /tmp/pardes-snap/cornerdrag/cwd New De -| +| ls ls | w.txt w.txt | | diff --git a/test/snapshots/cursorline.golden b/test/snapshots/cursorline.golden index 3a0f5cd9..ce416b91 100644 --- a/test/snapshots/cursorline.golden +++ b/test/snapshots/cursorline.golden @@ -1,7 +1,7 @@ == snap top grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cursorline/cwd/cur.txt Save New /tmp/pardes-snap/cursorline/cwd New Del /tmp/pardes-snap/cursorline/cwd New Del -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 cur.txt cur.txt | 3 line 3 | 4 line 4 @@ -16,7 +16,7 @@ | 13 line 13 | 14 line 14 | 15 line 15 /tmp/pardes-snap/cursorline/cwd New Del -| 16 line 16 +| 16 line 16 ls | 17 line 17 cur.txt | 18 line 18 | 19 line 19 @@ -63,7 +63,7 @@ == snap down3 grid=150x30 cursor=7,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/cursorline/cwd/cur.txt Save New /tmp/pardes-snap/cursorline/cwd New Del /tmp/pardes-snap/cursorline/cwd New Del -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 cur.txt cur.txt | 3 line 3 | 4 line 4 @@ -78,7 +78,7 @@ | 13 line 13 | 14 line 14 | 15 line 15 /tmp/pardes-snap/cursorline/cwd New Del -| 16 line 16 +| 16 line 16 ls | 17 line 17 cur.txt | 18 line 18 | 19 line 19 diff --git a/test/snapshots/doccol.golden b/test/snapshots/doccol.golden index c6d5468a..a18a3546 100644 --- a/test/snapshots/doccol.golden +++ b/test/snapshots/doccol.golden @@ -1,7 +1,7 @@ == snap boot grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save New Del /tmp/pardes-snap/doccol/cwd New Del -| 1 AAA +| 1 AAA ls | a.txt b.txt c.txt | | @@ -32,7 +32,7 @@ == snap two-docs grid=100x30 cursor=7,17 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save New Del /tmp/pardes-snap/doccol/cwd New Del -| 1 AAA +| 1 AAA ls | a.txt b.txt c.txt | | @@ -63,7 +63,7 @@ == snap moved grid=100x30 cursor=57,20 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save New Del /tmp/pardes-snap/doccol/cwd New Del -| 1 AAA +| 1 AAA ls | a.txt b.txt c.txt | | @@ -94,7 +94,7 @@ == snap worked grid=100x30 cursor=59,21 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save New Del /tmp/pardes-snap/doccol/cwd New Del -| 1 AAA +| 1 AAA ls | a.txt b.txt c.txt | | @@ -125,7 +125,7 @@ == snap third grid=100x30 cursor=57,26 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/doccol/cwd/a.txt Save New Del /tmp/pardes-snap/doccol/cwd New Del -| 1 AAA +| 1 AAA ls | a.txt b.txt c.txt | | diff --git a/test/snapshots/dump.golden b/test/snapshots/dump.golden index 2b81e2f2..1cda1a95 100644 --- a/test/snapshots/dump.golden +++ b/test/snapshots/dump.golden @@ -11,14 +11,14 @@ .{ .kind = .terminal, .tag = "/tmp/pardes-snap/dump/cwd New Del", - .body = "\nd.txt\n\n\n\n typed-marker\n\n\n\n\n\n\n\n", + .body = "ls\nd.txt\n\n\n\n typed-marker\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, .rows = 14, .vweight = 1, .terminal = .{ .cwd = "/tmp/pardes-snap/dump/cwd", - .stream = "\nd.txt\n", + .stream = "ls\nd.txt\n", .stream_b64 = <elided> .cursor = .{ .col = 2, .row = 2 }, }, @@ -28,14 +28,14 @@ .{ .kind = .terminal, .tag = "/tmp/pardes-snap/dump/cwd New Del", - .body = "\nd.txt\n\n\n\n\n\n\n\n\n\n\n", + .body = "ls\nd.txt\n\n\n\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, .rows = 13, .vweight = 1, .terminal = .{ .cwd = "/tmp/pardes-snap/dump/cwd", - .stream = "\nd.txt\n", + .stream = "ls\nd.txt\n", .stream_b64 = <elided> .cursor = .{ .col = 2, .row = 2 }, }, @@ -45,14 +45,14 @@ .{ .kind = .terminal, .tag = "/tmp/pardes-snap/dump/cwd New Del", - .body = "\nd.txt\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + .body = "ls\nd.txt\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", .scroll = 0, .cols = 48, .rows = 28, .vweight = 1, .terminal = .{ .cwd = "/tmp/pardes-snap/dump/cwd", - .stream = "\nd.txt\n", + .stream = "ls\nd.txt\n", .stream_b64 = <elided> .cursor = .{ .col = 2, .row = 2 }, }, diff --git a/test/snapshots/edit.golden b/test/snapshots/edit.golden index 58fda8f9..ed7a2a41 100644 --- a/test/snapshots/edit.golden +++ b/test/snapshots/edit.golden @@ -1,7 +1,7 @@ == snap inserted grid=100x30 cursor=16,9 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/edit/cwd New Del /tmp/pardes-snap/edit/cwd New Del -| +| ls ls | e.txt e.txt | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/edit/cwd New Del -| +| ls | e.txt | | diff --git a/test/snapshots/exec-bigdrag.golden b/test/snapshots/exec-bigdrag.golden index da0e2467..3cfe6ef9 100644 --- a/test/snapshots/exec-bigdrag.golden +++ b/test/snapshots/exec-bigdrag.golden @@ -1,61 +1,61 @@ == 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 -| bash: line: command not found -| big.txt +| ls bash: line: command not found +| big.txt 4line 2705line 2706line 2707line 2708line 2709line 2710line 2711line 2712line 2713line 2714lin | bash: 4line: command not found -| +| 15line 2716line 2717line 2718line 2719line 2720line 2721line 2722line 2723line 2724line 2725li | bash: 15line: command not found -| +| 726line 2727line 2728line 2729line 2730line 2731line 2732line 2733line 2734line 2735line 2736l | bash: 726line: command not found -| +| 2737line 2738line 2739line 2740line 2741line 2742line 2743line 2744line 2745line 2746line 2747 | bash: 2737line: command not found -| +| 2748line 2749line 2750line 2751line 2752line 2753line 2754line 2755line 2756line 2757line 275 | bash: 2748line: command not found -| +| e 2759line 2760line 2761line 2762line 2763line 2764line 2765line 2766line 2767line 2768line 27 | bash: e: command not found -| +| ne 2770line 2771line 2772line 2773line 2774line 2775line 2776line 2777line 2778line 2779line 2 | bash: ne: command not found -| +| ine 2781line 2782line 2783line 2784line 2785line 2786line 2787line 2788line 2789line 2790line | bash: ine: command not found -| +| line 2792line 2793line 2794line 2795line 2796line 2797line 2798line 2799line 2800line 2801line | bash: line: command not found -| +| 2line 2803line 2804line 2805line 2806line 2807line 2808line 2809line 2810line 2811line 2812lin | bash: 2line: command not found -| +| 13line 2814line 2815line 2816line 2817line 2818line 2819line 2820line 2821line 2822line 2823li | bash: 13line: command not found -| +| 824line 2825line 2826line 2827line 2828line 2829line 2830line 2831line 2832line 2833line 2834l | bash: 824line: command not found -| +| 2835line 2836line 2837line 2838line 2839line 2840line 2841line 2842line 2843line 2844line 2845 | bash: 2835line: command not found -| +| 2846line 2847line 2848line 2849line 2850line 2851line 2852line 2853line 2854line 2855line 285 | bash: 2846line: command not found -| /tmp/pardes-snap/exec-bigdrag/cwd New Del -| bash: e: command not found -| big.txt +| /tmp/pardes-snap/exec-bigdrag/cwd New Del e 2857line 2858line 2859line 2860line 2861line 2862line 2863line 2864line 2865line 2866line 28 +| ls bash: e: command not found +| big.txt ne 2868line 2869line 2870line 2871line 2872line 2873line 2874line 2875line 2876line 2877line 2 | bash: ne: command not found -| +| ine 2879line 2880line 2881line 2882line 2883line 2884line 2885line 2886line 2887line 2888line | bash: ine: command not found -| echo alive-o''k +| liecho alive-o''kne 2890line 2891line 2892line 2893line 2894line 2895line 2896line 2897line 2898li | bash: line: command not found -| +| 0line 2901line 2902line 2903line 2904line 2905line 2906line 2907line 2908line 2909line 2910lin | bash: 0line: command not found -| +| 11line 2912line 2913line 2914line 2915line 2916line 2917line 2918line 2919line 2920line 2921li | bash: 11line: command not found -| +| 922line 2923line 2924line 2925line 2926line 2927line 2928line 2929line 2930line 2931line 2932l | bash: 922line: command not found -| +| 2933line 2934line 2935line 2936line 2937line 2938line 2939line 2940line 2941line 2942line 2943 | bash: 2933line: command not found -| +| 2944line 2945line 2946line 2947line 2948line 2949line 2950line 2951line 2952line 2953line 295 | bash: 2944line: command not found -| +| e 2955line 2956line 2957line 2958line 2959line 2960line 2961line 2962line 2963line 2964line 29 | bash: e: command not found -| +| ne 2966line 2967line 2968line 2969line 2970line 2971line 2972line 2973line 2974line 2975line 2 | bash: ne: command not found -| +| ine 2977line 2978line 2979line 2980line 2981line 2982line 2983line 2984line 2985line 2986line | bash: ine: command not found -| +| line 2988line 2989line 2990line 2991line 2992line 2993line 2994line 2995line 2996line 2997line | bash: line: command not found -| +| echo alive-o''k | alive-ok | diff --git a/test/snapshots/exec.golden b/test/snapshots/exec.golden index c3c53696..abc60aec 100644 --- a/test/snapshots/exec.golden +++ b/test/snapshots/exec.golden @@ -1,7 +1,7 @@ == snap exec grid=100x30 cursor=16,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd New Del /tmp/pardes-snap/exec/cwd New Del -| +| ls ls | e.txt e.txt | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/exec/cwd New Del -| +| ls | e.txt | | @@ -32,7 +32,7 @@ == snap kept grid=100x30 cursor=6,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd New Del /tmp/pardes-snap/exec/cwd New Del -| ZZARG +| ZZARG ls | ./c.sh e.txt | | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/exec/cwd New Del -| +| ls | e.txt | | @@ -63,7 +63,7 @@ == snap chord grid=100x30 cursor=6,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd New Del /tmp/pardes-snap/exec/cwd New Del -| ZZARG +| ZZARG ls | ./c.sh e.txt | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/exec/cwd New Del -| +| ls | e.txt | | @@ -94,7 +94,7 @@ == snap deleted grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/exec/cwd New Del /tmp/pardes-snap/exec/cwd New Del -| +| ls ls | e.txt e.txt | | diff --git a/test/snapshots/fileedit.golden b/test/snapshots/fileedit.golden index ae0a60fe..72e6b713 100644 --- a/test/snapshots/fileedit.golden +++ b/test/snapshots/fileedit.golden @@ -1,7 +1,7 @@ == snap edited grid=150x30 cursor=17,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fileedit/cwd/f.txt Save New Del /tmp/pardes-snap/fileedit/cwd New Del /tmp/pardes-snap/fileedit/cwd New Del -| 1 liEDIT''MEne 1 +| 1 liEDIT''MEne 1 ls ls | 2 line 2 f.txt f.txt | 3 line 3 | 4 line 4 @@ -16,7 +16,7 @@ | 13 line 13 | 14 line 14 | 15 line 15 /tmp/pardes-snap/fileedit/cwd New Del -| 16 line 16 +| 16 line 16 ls | 17 line 17 f.txt | 18 line 18 | 19 line 19 @@ -32,7 +32,7 @@ == snap deleted grid=150x30 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fileedit/cwd/f.txt Save New Del /tmp/pardes-snap/fileedit/cwd New Del /tmp/pardes-snap/fileedit/cwd New Del -| 1 liEDIT''MEne 1 +| 1 liEDIT''MEne 1 ls ls | 2 line 3 f.txt f.txt | 3 line 4 | 4 line 5 @@ -47,7 +47,7 @@ | 13 line 14 | 14 line 15 | 15 line 16 /tmp/pardes-snap/fileedit/cwd New Del -| 16 line 17 +| 16 line 17 ls | 17 line 18 f.txt | 18 line 19 | 19 line 20 @@ -63,7 +63,7 @@ == snap undone grid=150x30 cursor=13,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/fileedit/cwd/f.txt Save New Del /tmp/pardes-snap/fileedit/cwd New Del /tmp/pardes-snap/fileedit/cwd New Del -| 1 liEDIT''MEne 1 +| 1 liEDIT''MEne 1 ls ls | 2 line 2 f.txt f.txt | 3 line 3 | 4 line 4 @@ -78,7 +78,7 @@ | 13 line 13 | 14 line 14 | 15 line 15 /tmp/pardes-snap/fileedit/cwd New Del -| 16 line 16 +| 16 line 16 ls | 17 line 17 f.txt | 18 line 18 | 19 line 19 diff --git a/test/snapshots/filewatch.golden b/test/snapshots/filewatch.golden index 3224dd27..f81d5709 100644 --- a/test/snapshots/filewatch.golden +++ b/test/snapshots/filewatch.golden @@ -1,7 +1,7 @@ == snap edited grid=150x30 cursor=15,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save New De /tmp/pardes-snap/filewatch/cwd New Del /tmp/pardes-snap/filewatch/cwd New Del -| 1 liMYEDITne 1 +| 1 liMYEDITne 1 ls ls | 2 line 2 sub w.txt sub w.txt | 3 /tmp/pardes-snap/filewatch/cwd/sub/s.txt | 4 line 4 @@ -16,7 +16,7 @@ | 13 | | /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Ne /tmp/pardes-snap/filewatch/cwd New Del -| 1 line 1 +| 1 line 1 ls | 2 line 2 sub w.txt | 3 line 3 | 4 line 4 @@ -32,7 +32,7 @@ == snap reloaded grid=150x30 cursor=15,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save New De /tmp/pardes-snap/filewatch/cwd New Del /tmp/pardes-snap/filewatch/cwd New Del -| 1 EXTERNAL +| 1 EXTERNAL ls ls | 2 sub w.txt sub w.txt | | @@ -47,7 +47,7 @@ | | --:--:-- reloaded /tmp/pardes-snap/filewatch/cw | /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Ne /tmp/pardes-snap/filewatch/cwd New Del -| 1 line 1 +| 1 line 1 ls | 2 line 2 sub w.txt | 3 line 3 | 4 line 4 @@ -63,7 +63,7 @@ == snap reloaded_sub grid=150x30 cursor=15,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save New De /tmp/pardes-snap/filewatch/cwd New Del /tmp/pardes-snap/filewatch/cwd New Del -| 1 EXTERNAL +| 1 EXTERNAL ls ls | 2 sub w.txt sub w.txt | | @@ -78,7 +78,7 @@ | | --:--:-- reloaded /tmp/pardes-snap/filewatch/cw | /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Ne /tmp/pardes-snap/filewatch/cwd New Del -| 1 RENAMED +| 1 RENAMED ls | 2 sub w.txt | | @@ -94,7 +94,7 @@ == snap undone grid=150x30 cursor=15,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/filewatch/cwd/w.txt Save New De /tmp/pardes-snap/filewatch/cwd New Del /tmp/pardes-snap/filewatch/cwd New Del -| 1 liMYEDITne 1 +| 1 liMYEDITne 1 ls ls | 2 line 2 sub w.txt sub w.txt | 3 /tmp/pardes-snap/filewatch/cwd/sub/s.txt | 4 line 4 @@ -109,7 +109,7 @@ | 13 | | /tmp/pardes-snap/filewatch/cwd/sub/s.txt Save Ne /tmp/pardes-snap/filewatch/cwd New Del -| 1 RENAMED +| 1 RENAMED ls | 2 sub w.txt | | diff --git a/test/snapshots/find.golden b/test/snapshots/find.golden index 0a33df22..30f9a2ab 100644 --- a/test/snapshots/find.golden +++ b/test/snapshots/find.golden @@ -162,7 +162,7 @@ | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt -== snap first grid=120x40 cursor=7,2 +== snap first grid=120x40 cursor=7,20 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find @@ -205,8 +205,8 @@ | 3 zqmark-alpha.txt == style first |0: 0-56 #949494,#121212, 57-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, +|1: 0-1 #ffffff,#262626, 2-99 #949494,#121212, 100-119 d,#121212, +|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 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, |5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, @@ -223,8 +223,8 @@ |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-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, +|19: 0-1 #ffffff,#626262, 2-99 #949494,#121212, 100-119 d,#121212, +|20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 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, |23: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 d,#080808, @@ -241,10 +241,10 @@ |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-99 #949494,#121212, 100-119 d,#121212, -|37: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-119 #080808,#80a0ff, +|37: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-25 #bdbdbd,#080808, 26-119 d,#080808, |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 +== snap second grid=120x40 cursor=7,29 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find @@ -255,8 +255,6 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del -| 1 gamma body | | | @@ -264,10 +262,10 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body | | +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -275,6 +273,8 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | | @@ -285,19 +285,15 @@ | 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt -== snap third grid=120x40 cursor=7,2 +== snap third grid=120x40 cursor=7,33 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | | -| /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 -| 1 gamma body | | | @@ -305,12 +301,12 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body | | | | +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -318,27 +314,27 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| 1 alpha body | | | /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 +| 4 +== snap back grid=120x40 cursor=7,29 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | | -| /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 -| 1 gamma body | | | @@ -346,12 +342,12 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body | | | | +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -359,27 +355,26 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| 1 alpha body | | | /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 +== snap word grid=120x40 cursor=7,29 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | -| Find / -| /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 -| 1 gamma body | | | @@ -387,12 +382,13 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body | | | | +| Find / +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -400,27 +396,27 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| 1 alpha body | | | /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 +== snap cancel grid=120x40 cursor=7,38 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/find/cwd/here.txt Save New Del | 1 Find | | | -| /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 -| 1 gamma body | | | @@ -428,12 +424,12 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body -| | | | +| Find / +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -441,27 +437,25 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| 1 alpha body | | | /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 +== snap nomatch grid=120x40 cursor=7,38 |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 Find / | 1 Find | -| /tmp/pardes-snap/find/cwd/+Search New Del -| 1 -| /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 -| 1 gamma body | | | @@ -469,12 +463,14 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body | | | | +| /tmp/pardes-snap/find/cwd/+Search New Del +| 1 +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -482,27 +478,25 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| 1 alpha body | | | /tmp/pardes-snap/find/cwd/+Search New Del -| 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt +| 4 == 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 Find / | 1 Find | -| /tmp/pardes-snap/find/cwd/+Search New Del -| 1 -| /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 -| 1 gamma body | | | @@ -510,12 +504,14 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body | | | | +| /tmp/pardes-snap/find/cwd/+Search New Del +| 1 +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -523,27 +519,23 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| 1 alpha body | | | /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 +| 4 +== snap topbar grid=120x40 cursor=12,33 |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 Find / | 1 Find | -| /tmp/pardes-snap/find/cwd/+Search New Del -| 1 -| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del -| 1 alpha body -| /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 -| 1 gamma body | | | @@ -551,14 +543,16 @@ | | | -| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del -| 1 beta body | | | | | | +| /tmp/pardes-snap/find/cwd/+Search New Del +| 1 +| /tmp/pardes-snap/find/cwd/sub/ZQMARK-beta.txt Save New Del +| 1 beta body | | | @@ -566,9 +560,15 @@ | | | +| /tmp/pardes-snap/find/cwd/sub/nest/zqmark-gamma.txt Save New Del +| 1 gamma body | | +| /tmp/pardes-snap/find/cwd/zqmark-alpha.txt Save New Del +| 1 alpha body +| /tmp/pardes-snap/find/cwd/+Search New Del +| 1 zqmark-alpha.txt | /tmp/pardes-snap/find/cwd/+Search New Del -| 1 sub/ZQMARK-beta.txt | 2 sub/nest/zqmark-gamma.txt | 3 zqmark-alpha.txt +| 4 diff --git a/test/snapshots/find.snap b/test/snapshots/find.snap index 1fd36aa6..8f288525 100644 --- a/test/snapshots/find.snap +++ b/test/snapshots/find.snap @@ -1,11 +1,13 @@ # The Find builtin (SPC f f) = `fd`, in-core: it arms the SAME tag input `/` # does, but Enter walks the pane's DIRECTORY instead of its text and writes one # matching path per row into a "+Search" OUTPUT BUFFER. Every row is therefore -# an ordinary look target, which is the whole point: n/N step the rows and look -# them with no code of their own, opening each found file, and focus returns to -# the pane that owns the search so the next n keeps stepping. The walk skips -# .git, matches the NAME case-insensitively, and sorts (readdir order is not -# stable). `SPC f s` is Save, which moved out of `w` to make this group. +# an ordinary look target, which is the whole point: n/N SELECT the next/prev +# one with no code of their own, and the look chord — Enter, the same one that +# opens a path anywhere else — is what OPENS it. Focus then follows the file +# that opened, but the look was made FROM the results buffer, so the next n +# resumes stepping that same list. The walk skips .git, matches the NAME +# case-insensitively, and sorts (readdir order is not stable). `SPC f s` is +# Save, which moved out of `w` to make this group. dirmk sub dirmk sub/nest dirmk .git @@ -35,25 +37,30 @@ key enter wait 10000 zqmark-alpha.txt stable 700 15000 snap results -# n looks row 1 — a path, so the file OPENS — and focus comes back here. The -# look comes FROM the results buffer, but that is an output pane and not a +# n SELECTS row 1 and Enter looks it — a path, so the file OPENS. The look +# comes FROM the results buffer, but that is an output pane and not a # document, so the file joins the docs above it (below here.txt) instead of # stacking under the list: the +Search stays at the foot of the column. key n +key enter wait 10000 beta body stable 700 15000 snap first snapstyle first key n +key enter wait 10000 gamma body stable 700 15000 snap second key n +key enter wait 10000 alpha body stable 700 15000 snap third -# N walks back up: the file is already open, so the look just focuses it +# N walks back up one row; Enter looks it, and the file is already open, so +# the look just focuses it key N +key enter stable 700 15000 snap back # executing the WORD Find (middle-click in a body) arms the same input — the @@ -66,23 +73,39 @@ key esc settle 100 stable 400 5000 snap cancel -# a no-match walk opens an empty list; n then has nowhere to go. The list is -# exactly as tall as its results — one blank row plus its tag — and it stacks -# above the earlier one, whose height is untouched. +# every search is asked from a PANE, and both a look and now a step leave you +# somewhere else — so click back into here.txt first. That is not bookkeeping: +# a search never refills the buffer it was asked FROM (fillResults skips it), +# so `owned by here.txt` is the whole premise of the two steps below. +press left 8 3 +release left 8 3 +stable 400 5000 +# a no-match walk opens an empty list of its own. It is exactly as tall as its +# results — one blank row plus its tag — and it stacks above the earlier one, +# whose height is untouched. key space key f key f text zzqq key enter stable 700 10000 +# n does not stop on the empty list, because the walk is a RING across panes +# rather than one buffer's rows: with nothing look-able here it carries on +# into the list that DOES have some — the zqm one — and resumes it one row +# past where the N above left it. Nothing opens; only the selection moved. key n stable 400 5000 snap nomatch # ... and asking for `zqm` AGAIN re-arms the list it ALREADY filled instead of -# stacking an identical twin under the empty one — even though n/N were armed -# on the zzqq list, so the reuse is by what a buffer HOLDS (this search, this -# pattern, this directory), not by which one the pane happens to point at. The -# frame is therefore the `results` frame unchanged, down to the byte. +# stacking an identical twin under the empty one — even though the step above +# left the cursor sitting in the zqm list, so the reuse is by what a buffer +# HOLDS (this search, this pattern, this directory), not by which one anything +# happens to point at. Asked from here.txt again (the click, as above), and +# the LIST it rewrites is therefore the `nomatch` frame unchanged, down to the +# byte — only the cursor comes back with it. +press left 8 3 +release left 8 3 +stable 400 5000 key space key f key f @@ -94,10 +117,12 @@ snap refit # Find is a TOPBAR word too (row 1, its own column, next to Grep): the same # builtin the leader path runs, reached with the mouse. Chorded — a selection # held when it runs IS the argument — so dragging over `alpha` and clicking -# Find walks for that name with nothing typed and no input armed. -press left 8 8 -drag left 13 8 -release left 13 8 +# Find walks for that name with nothing typed and no input armed. Row 34 is +# `alpha body`: the three found files stack in the order the looks above +# OPENED them, which is beta, gamma, alpha down the column. +press left 8 34 +drag left 13 34 +release left 13 34 stable 400 5000 press middle 12 1 release middle 12 1 diff --git a/test/snapshots/fsearch.golden b/test/snapshots/fsearch.golden index f0c89e1b..bbe7df83 100644 --- a/test/snapshots/fsearch.golden +++ b/test/snapshots/fsearch.golden @@ -1,7 +1,7 @@ == 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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -32,7 +32,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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -63,7 +63,7 @@ == 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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -94,7 +94,7 @@ == 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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -150,13 +150,13 @@ |24: 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, |25: 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, |26: 0-1 #ffffff,#262626, 2-48 #949494,#121212, 49-59 d,#121212, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, -|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-59 #080808,#80a0ff, 60-60 d,#444444, 61-61 d,#080808, 62-119 #bdbdbd,#080808, 120-120 d,#444444, 121-121 d,#080808, 122-179 #bdbdbd,#080808, +|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-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, |28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-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, |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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -171,7 +171,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -187,7 +187,7 @@ == 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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -202,7 +202,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -212,13 +212,13 @@ | | | /tmp/pardes-snap/fsearch/cwd/+Search New Del -| 1 g.txt:2:1-4 MARK a | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c +| 4 == 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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -233,7 +233,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -249,7 +249,7 @@ == 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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -264,7 +264,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -277,10 +277,10 @@ | 1 g.txt:2:1-4 MARK a | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c -== snap nomatch grid=180x30 cursor=10,7 +== snap nomatch grid=180x30 cursor=7,28 |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 -| 1 l1 +| 1 l1 ls ls | 2 MARK a g.txt g.txt | 3 l3 | 4 l4 @@ -295,7 +295,7 @@ | | | /tmp/pardes-snap/fsearch/cwd New Del -| +| ls | g.txt | | @@ -305,6 +305,6 @@ | /tmp/pardes-snap/fsearch/cwd/+Search New Del | 1 | /tmp/pardes-snap/fsearch/cwd/+Search New Del -| 1 g.txt:2:1-4 MARK a | 2 g.txt:6:1-4 MARK b | 3 g.txt:10:1-4 MARK c +| 4 diff --git a/test/snapshots/fsearch.snap b/test/snapshots/fsearch.snap index af1363dd..b9b7ddf4 100644 --- a/test/snapshots/fsearch.snap +++ b/test/snapshots/fsearch.snap @@ -1,11 +1,11 @@ # `/` file search: the pattern types into the tag (persistent, no popup); # Enter searches the buffer in-core and writes `path:LINE:COL-ENDCOL text` into # a +Search OUTPUT BUFFER (a file pane with no file behind it — no Save in its -# tag); n/N select the next/prev row there and look it, so the file pane -# scrolls to the hit AND SELECTS IT — the row names the match's whole span, not -# just where it starts. Esc abandons the input; a no-match search opens an EMPTY buffer -# (every search gets its own, stacked under the pane) and leaves n with -# nowhere to go. +# tag); n/N SELECT the next/prev row there and open nothing, and Enter — the +# look chord — is what scrolls the file pane to the hit AND SELECTS IT: the row +# names the match's whole span, not just where it starts. Esc abandons the +# input; a no-match search opens an EMPTY buffer (every search gets its own, +# stacked under the pane) with nothing in it for n to stop on. file g.txt l1\nMARK a\nl3\nl4\nl5\nMARK b\nl7\nl8\nl9\nMARK c\nl11\nl12 start 30 180 -n 3 wait 8000 g.txt @@ -34,21 +34,25 @@ key enter wait 10000 g.txt:2:1-4 MARK stable 700 10000 snap results -# n selects result 1 in the results buffer, scrolls the file to line 2 and -# selects the four cells the pattern matched there — the styles below are what -# prove the second half of that +# n selects result 1 and Enter looks it: the file scrolls to line 2 and the +# four cells the pattern matched there come up selected — the styles below are +# what prove the second half of that key n +key enter stable 700 15000 snap first snapstyle first key n +key enter stable 700 15000 snap second key n +key enter stable 700 15000 snap third -# N walks back up to result 2 (line 6) +# N walks back up to result 2 (line 6), Enter looks it key N +key enter stable 700 15000 snap back # Esc abandons the input: the tag tail is restored @@ -58,7 +62,8 @@ key esc settle 100 stable 400 5000 snap cancel -# a no-match search: n has nowhere to go (nothing changes, no crash) +# a no-match search: nothing in the empty list for n to stop on, so the ring +# carries it back into the list that has rows and it resumes there key / text zzqq key enter diff --git a/test/snapshots/ghostty-mid.golden b/test/snapshots/ghostty-mid.golden index d951915c..39da0f5b 100644 --- a/test/snapshots/ghostty-mid.golden +++ b/test/snapshots/ghostty-mid.golden @@ -1,9 +1,9 @@ == snap ghostty-mid grid=100x30 cursor=4,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ghostty-mid/cwd New Del /tmp/pardes-snap/ghostty-mid/cwd New Del -| ZZPAD +| ZZPAD ls | ./g.sh g.txt -| +| ./g.sh | GHOSTOK | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/ghostty-mid/cwd New Del -| +| ls | g.txt | | diff --git a/test/snapshots/grep.golden b/test/snapshots/grep.golden index a8252249..846ab703 100644 --- a/test/snapshots/grep.golden +++ b/test/snapshots/grep.golden @@ -1,7 +1,7 @@ == 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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/grep/cwd New Del -| +| ls | a.txt noise.txt sub | | @@ -32,7 +32,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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/grep/cwd New Del -| +| ls | a.txt noise.txt sub | | @@ -63,7 +63,7 @@ == 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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/grep/cwd New Del -| +| ls | a.txt noise.txt sub | | @@ -94,7 +94,7 @@ == 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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/grep/cwd New Del -| +| ls | a.txt noise.txt sub | | @@ -122,10 +122,10 @@ | 1 a.txt:1:7-12 hello TARGET one | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub -== snap opened-hit grid=180x30 cursor=17,4 +== snap opened-hit grid=180x30 cursor=12,16 |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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -140,7 +140,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 -| +| ls | a.txt noise.txt sub | | @@ -150,13 +150,13 @@ | | | /tmp/pardes-snap/grep/cwd/+Search New Del -| 1 a.txt:1:7-12 hello TARGET one | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub -== snap nomatch grid=180x30 cursor=17,4 +| 4 +== snap nomatch grid=180x30 cursor=37,28 |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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -166,28 +166,28 @@ | | | -| /tmp/pardes-snap/grep/cwd/+Search New Del -| 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 -| +| ls | a.txt noise.txt sub | | | | | -| -| +| /tmp/pardes-snap/grep/cwd/sub/+Search New Del +| 1 | /tmp/pardes-snap/grep/cwd/+Search New Del -| 1 a.txt:1:7-12 hello TARGET one | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub +| 4 == 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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -197,28 +197,28 @@ | | | -| /tmp/pardes-snap/grep/cwd/+Search New Del -| 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 -| +| ls | a.txt noise.txt sub | | | | | -| -| +| /tmp/pardes-snap/grep/cwd/sub/+Search New Del +| 1 | /tmp/pardes-snap/grep/cwd/+Search New Del -| 1 a.txt:1:7-12 hello TARGET one | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub +| 4 == 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 -| 1 hello TARGET one +| 1 hello TARGET one ls ls | 2 nothing here a.txt noise.txt sub a.txt noise.txt sub | 3 last TARGET line | @@ -228,21 +228,21 @@ | | | -| /tmp/pardes-snap/grep/cwd/+Search New Del -| 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 -| +| ls | a.txt noise.txt sub | | | | | -| -| +| /tmp/pardes-snap/grep/cwd/sub/+Search New Del +| 1 | /tmp/pardes-snap/grep/cwd/+Search New Del -| 1 a.txt:1:7-12 hello TARGET one | 2 a.txt:3:6-11 last TARGET line | 3 sub/b.txt:2:1-6 TARGET inside sub +| 4 diff --git a/test/snapshots/grep.snap b/test/snapshots/grep.snap index 817f613f..1d3efc9e 100644 --- a/test/snapshots/grep.snap +++ b/test/snapshots/grep.snap @@ -6,8 +6,9 @@ # looking it SELECTS the hit — with the path RELATIVE to the directory # of the pane that asked — the same directory its results buffer is named in, # so the short name resolves; only a hit from outside that tree stays absolute. -# n/N walk the rows like any other result list, and a row pointing into a file -# nothing has open yet opens it. +# n/N SELECT the next/prev row like any other result list and open nothing; +# Enter looks what they leave selected, and a row pointing into a file nothing +# has open yet opens it. dirmk sub file a.txt hello TARGET one\nnothing here\nlast TARGET line file sub/b.txt deep\nTARGET inside sub @@ -44,25 +45,32 @@ key enter wait 10000 sub/b.txt:2:1 stable 700 15000 snap results -# n looks the first row: absolute path, line 1, columns 7..12 (`TARGET`), and -# those six cells come up selected +# n selects the first row and Enter looks it: absolute path, line 1, columns +# 7..12 (`TARGET`), and those six cells come up selected key n +key enter stable 700 15000 snap first -# ...and stepping on into sub/b.txt opens the file nothing had open +# ...and stepping on into sub/b.txt, then looking it, opens the file nothing +# had open key n +key enter stable 700 15000 key n +key enter wait 10000 TARGET inside sub stable 700 15000 snap opened-hit -# a pattern nothing holds: an empty list of its own, n has nowhere to go. -# Armed from the LEADER, not the topbar word: the n above left the hit -# SELECTED in a.txt (a ranged result row is one a look selects), and a topbar -# execute chords whatever is selected into its argument — so a middle-click -# here would run `Grep TARGET` and never ask for a pattern at all. The leader -# path runs the builtin with no argument, which is what this step is about; the -# chord itself is the last two snaps below. +# a pattern nothing holds: an empty list of its own, with nothing in it for n +# to stop on — so the ring carries that step back into the TARGET list. The +# look above is why both of those read the way they do: it left the cursor in +# sub/b.txt, so the empty list is named in sub/ rather than cwd/, and it left +# the hit SELECTED there (a ranged result row is one a look selects). +# Armed from the LEADER, not the topbar word, because of that selection: a +# topbar execute chords whatever is selected into its argument, so a +# middle-click here would run `Grep TARGET` and never ask for a pattern at +# all. The leader path runs the builtin with no argument, which is what this +# step is about; the chord itself is the last two snaps below. key space key f key g diff --git a/test/snapshots/hscroll.golden b/test/snapshots/hscroll.golden index 959dac81..3aad04d8 100644 --- a/test/snapshots/hscroll.golden +++ b/test/snapshots/hscroll.golden @@ -1,7 +1,7 @@ == snap opened grid=90x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd -| 1 short1 END_A_MARKER_WAY +| 1 short1 END_A_MARKER_WAY ls ls | wide.txt wide.txt | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/hscroll/cwd -| +| ls | wide.txt | | @@ -32,7 +32,7 @@ == snap wheeled grid=90x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd -| 1 ND_A_MARKER_WAY_OUT_RIG +| 1 ND_A_MARKER_WAY_OUT_RIG ls ls | wide.txt wide.txt | | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/hscroll/cwd -| +| ls | wide.txt | | @@ -63,7 +63,7 @@ == snap clamped grid=90x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd -| 1 short1 END_A_MARKER_WAY +| 1 short1 END_A_MARKER_WAY ls ls | wide.txt wide.txt | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/hscroll/cwd -| +| ls | wide.txt | | @@ -94,7 +94,7 @@ == snap dollar grid=90x30 cursor=26,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd -| 1 padpadpadpadpad_TAIL +| 1 padpadpadpadpad_TAIL ls ls | wide.txt wide.txt | | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/hscroll/cwd -| +| ls | wide.txt | | @@ -125,7 +125,7 @@ == snap zero grid=90x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd /tmp/pardes-snap/hscroll/cwd -| 1 short1 END_A_MARKER_WAY +| 1 short1 END_A_MARKER_WAY ls ls | wide.txt wide.txt | | @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/hscroll/cwd -| +| ls | wide.txt | | diff --git a/test/snapshots/images.golden b/test/snapshots/images.golden index 4d54e9bf..e02ec8d6 100644 --- a/test/snapshots/images.golden +++ b/test/snapshots/images.golden @@ -1,7 +1,7 @@ == snap img-open grid=150x30 cursor=11,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | img /tmp/pardes-snap/images/cwd/pic.ppm New Del /tmp/pardes-snap/images/cwd New Del /tmp/pardes-snap/images/cwd New Del -| +| ls ls | pic.ppm pic.ppm | 4*🬹~F~N🬰|G🬏▚Y~KF🬴s<fcSf🬰b^🬘J%🬝ZH|S_"Z}╲%'"qA🬗a🬝🬻 | 8jDStG▄40e~.>>T&zZ/🬻iTY=`S~╳bkZR37v🬦🬵d4QHZ8X▛▟ @@ -16,7 +16,7 @@ | 🬆f│Q_V🬗wGx🬱=5▛5*&V🬟🬄ZrXGz2🬝🬻█ | !🬷W🬐(🬭]7x_>▗er🬯~▚di🬬4jY:🬝▟ | gU~🬧3▙bjr\C#kKMpffAjps🬝🬻 /tmp/pardes-snap/images/cwd New Del -| *🬯G"🬣▟d🬮▀zJ🬪EHV▟╳9}y▛▄ +| *🬯G"🬣▟d🬮▀zJ🬪EHV▟╳9}y▛▄ ls | ``))~RyJ🬴jA~w=hLpX🬝🬻█ pic.ppm | 4x▀J"TG7=y-QZ🬙╲~▛🬻 | 🬯/+╳f9ZG🬕+{QN_🬝🬹 @@ -94,7 +94,7 @@ == snap no-ascii grid=150x30 cursor=11,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | img /tmp/pardes-snap/images/cwd/pic.ppm New Del /tmp/pardes-snap/images/cwd New Del /tmp/pardes-snap/images/cwd New Del -| +| ls ls | pic.ppm pic.ppm | ╳╱╱🬻🬫🬴🬸│🬜🬴🬬█▗╲│█🬷█🬴🬙🬋─🬬🬋╳🬺🬲│█🬫▜▞│🬪🬝🬴🬝🬸╲🬣██🬛🬸🬛🬸│🬻 | 🬝🬺┼─▜🬱🬬🬻🬸🬔╲█🬻╱██🬝╲▙🬻🬹▙▀🬺╲┼🬺╳🬷▜─🬙█││🬴🬎🬹╲█🬺▜🬴─▙🬻╲ @@ -109,7 +109,7 @@ | 🬎╱│─██🬳▀🬪🬺🬎│▜█🬴🬸🬻🬆🬜▟█🬻🬬▀🬺╱▜🬵 | │▟▐🬻█🬬🬥🬬🬕█🬻🬴┼🬑🬝🬬▞╱▟🬬╱🬝▜🬣█╳█ | 🬰█│🬧🬰▛╱🬬╲─🬬█┼🬩█🬬▜─🬴│🬝🬲─🬵 /tmp/pardes-snap/images/cwd New Del -| 🬴🬷🬰🬐🬸▘╱🬍▄│╲▞█╳╱▟╱🬝🬛🬬🬶🬻█ +| 🬴🬷🬰🬐🬸▘╱🬍▄│╲▞█╳╱▟╱🬝🬛🬬🬶🬻█ ls | ███╱█🬺🬺█🬇▙🬸🬫🬙█🬴▙🬝╱🬺╱ pic.ppm | █╱▙🬺█▜╱█🬬▜█🬕╲🬩╲█🬝│ | 🬌🬸🬴🬴█▄🬬▙▛🬫🬔┼╳█🬺╳█ @@ -125,7 +125,7 @@ == snap tag-edit grid=150x30 cursor=45,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | img /tmp/pardes-snap/images/cwd/pic.ppmZork New /tmp/pardes-snap/images/cwd New Del /tmp/pardes-snap/images/cwd New Del -| +| ls ls | pic.ppm pic.ppm | ╳╱╱🬻🬫🬴🬸│🬜🬴🬬█▗╲│█🬷█🬴🬙🬋─🬬🬋╳🬺🬲│█🬫▜▞│🬪🬝🬴🬝🬸╲🬣██🬛🬸🬛🬸│🬻 | 🬝🬺┼─▜🬱🬬🬻🬸🬔╲█🬻╱██🬝╲▙🬻🬹▙▀🬺╲┼🬺╳🬷▜─🬙█││🬴🬎🬹╲█🬺▜🬴─▙🬻╲ @@ -140,7 +140,7 @@ | 🬎╱│─██🬳▀🬪🬺🬎│▜█🬴🬸🬻🬆🬜▟█🬻🬬▀🬺╱▜🬵 | │▟▐🬻█🬬🬥🬬🬕█🬻🬴┼🬑🬝🬬▞╱▟🬬╱🬝▜🬣█╳█ | 🬰█│🬧🬰▛╱🬬╲─🬬█┼🬩█🬬▜─🬴│🬝🬲─🬵 /tmp/pardes-snap/images/cwd New Del -| 🬴🬷🬰🬐🬸▘╱🬍▄│╲▞█╳╱▟╱🬝🬛🬬🬶🬻█ +| 🬴🬷🬰🬐🬸▘╱🬍▄│╲▞█╳╱▟╱🬝🬛🬬🬶🬻█ ls | ███╱█🬺🬺█🬇▙🬸🬫🬙█🬴▙🬝╱🬺╱ pic.ppm | █╱▙🬺█▜╱█🬬▜█🬕╲🬩╲█🬝│ | 🬌🬸🬴🬴█▄🬬▙▛🬫🬔┼╳█🬺╳█ diff --git a/test/snapshots/jumps.golden b/test/snapshots/jumps.golden index a557ce1f..5e8cbbab 100644 --- a/test/snapshots/jumps.golden +++ b/test/snapshots/jumps.golden @@ -32,7 +32,7 @@ == 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 -| 1 line 1 +| 1 line 1 ls | 2 line 2 big.txt | 3 line 3 | 4 line 4 @@ -63,7 +63,7 @@ == 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 -| 1 line 1 +| 1 line 1 ls | 2 line 2 big.txt | 3 line 3 | 4 line 4 @@ -94,7 +94,7 @@ == 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 -| 76 line 76 +| 76 line 76 ls | 77 line 77 big.txt | 78 line 78 | 79 line 79 @@ -125,7 +125,7 @@ == 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 -| 1 line 1 +| 1 line 1 ls | 2 line 2 big.txt | 3 line 3 | 4 line 4 @@ -156,7 +156,7 @@ == 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 -| 1 line 1 +| 1 line 1 ls | 2 line 2 big.txt | 3 line 3 | 4 line 4 @@ -187,7 +187,7 @@ == 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 -| 1 line 1 +| 1 line 1 ls | 2 line 2 big.txt | 3 line 3 | 4 line 4 @@ -218,7 +218,7 @@ == 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 -| 86 line 86 +| 86 line 86 ls | 87 line 87 big.txt | 88 line 88 | 89 line 89 @@ -249,7 +249,7 @@ == 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 -| 86 line 86 +| 86 line 86 ls | 87 line 87 big.txt | 88 line 88 | 89 line 89 @@ -280,7 +280,7 @@ == 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 -| 86 line 86 +| 86 line 86 ls | 87 line 87 big.txt | 88 line 88 | 89 line 89 @@ -311,7 +311,7 @@ == 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 -| 86 line 86 +| 86 line 86 ls | 87 line 87 big.txt | 88 line 88 | 89 line 89 @@ -339,10 +339,10 @@ | 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 -== snap step1-shell grid=150x30 cursor=7,16 +== snap step1-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 -| 86 line 86 +| 86 line 86 ls | 87 line 87 big.txt | 88 line 88 | 89 line 89 @@ -372,7 +372,7 @@ | 4 /tmp/pardes-snap/jumps/cwd/big.txt:100:1 line 100 == style step1-shell |0: 0-56 #949494,#121212, 57-149 d,#121212, -|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, +|1: 0-1 #ffffff,#262626, 2-54 #949494,#121212, 55-74 d,#121212, 75-76 #ffffff,#626262, 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, @@ -387,7 +387,7 @@ |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 #949494,#121212, 7-14 #bdbdbd,#080808, 15-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-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, @@ -397,14 +397,14 @@ |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, +|26: 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, |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-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 -| 1 line 1 +| 1 line 1 ls | 2 line 2 big.txt | 3 line 3 | 4 line 4 @@ -435,7 +435,7 @@ == 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 -| 89 line 89 +| 89 line 89 ls | 90 line 90 big.txt | 91 line 91 | 92 line 92 @@ -459,14 +459,14 @@ | 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 -== snap step-back grid=150x30 cursor=7,13 +| 5 +== snap step-back 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 -| 89 line 89 +| 89 line 89 ls | 90 line 90 big.txt | 91 line 91 | 92 line 92 @@ -490,14 +490,14 @@ | 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 == 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 -| 89 line 89 +| 89 line 89 ls | 90 line 90 big.txt | 91 line 91 | 92 line 92 @@ -521,7 +521,7 @@ | 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 diff --git a/test/snapshots/jumps.snap b/test/snapshots/jumps.snap index 1e2a9075..db131bd4 100644 --- a/test/snapshots/jumps.snap +++ b/test/snapshots/jumps.snap @@ -64,36 +64,58 @@ snap last-back key space j l 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 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. +# n/N select the next/prev look-able span and Enter looks it, exactly as they +# do a +Search: the stepped span is selected in the buffer (snapstyle) and the +# Enter after it moves the pane the row names. 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. +# SPANS, not rows, and this buffer is the one place in the suite where the two +# differ: an `@pN` row's trailing text is the pane's DIRECTORY, which is a +# look-able word of its own, so row 1 and row 3 each hold TWO stops and +# reaching the next row takes two steps. A file row's text is its content line +# (`line 1`), which resolves to nothing, so those hold one. Stepping words +# rather than rows is what makes the walk the same motion in a results buffer +# and in the middle of a paragraph, and this is the price of that. +# +# An `@pN` row moves focus like any other, which it did not use to: the STEP +# only selects now, and the look Enter runs goes to the pane by the same route +# a path takes. key n +key enter stable 700 15000 snap step1-shell snapstyle step1-shell +# past the directory on row 1, then onto row 2 +key n +stable 400 5000 key n +key enter stable 700 15000 snap step2-file +# row 3 is the shell again, both its spans, and then row 4 key n -stable 700 15000 +stable 400 5000 key n +stable 400 5000 +key n +key enter stable 700 15000 snap step4-line100 +# N is the exact inverse: the same two spans of row 3 in the other order, so +# two presses land back on its location and Enter follows it to the shell +key N +stable 400 5000 key N +key enter 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: 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 +# again, this time by clicking it: the walk above scrolled the list by one, so +# the last four screen rows are its rows 2 through 5 and row 4 is the second +# from the bottom. +press right 16 29 +release right 16 29 stable 700 15000 snap look-row diff --git a/test/snapshots/layout-close.golden b/test/snapshots/layout-close.golden index e809621e..5e4faba0 100644 --- a/test/snapshots/layout-close.golden +++ b/test/snapshots/layout-close.golden @@ -1,19 +1,19 @@ == 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 -| +| ls ls | marker.txt marker.txt | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | @@ -21,7 +21,7 @@ | | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | @@ -42,15 +42,15 @@ == snap altc grid=140x40 cursor=98,4 |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 -| +| ls ls ls | marker.txt marker.txt marker.txt | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | @@ -62,7 +62,7 @@ | | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | @@ -83,7 +83,7 @@ == snap del grid=140x40 cursor=98,4 |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 -| +| ls ls ls | marker.txt marker.txt marker.txt | | @@ -91,7 +91,7 @@ | | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | @@ -103,7 +103,7 @@ | | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | @@ -124,7 +124,7 @@ == snap exit grid=140x40 cursor=98,4 |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 -| +| ls ls ls | marker.txt marker.txt marker.txt | | @@ -144,7 +144,7 @@ | | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | @@ -165,7 +165,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 -| +| ls ls | marker.txt marker.txt | | @@ -185,7 +185,7 @@ | | | /tmp/pardes-snap/layout-close/cwd New Del -| +| ls | marker.txt | | diff --git a/test/snapshots/layout-open.golden b/test/snapshots/layout-open.golden index 9631f223..cb6c5f6a 100644 --- a/test/snapshots/layout-open.golden +++ b/test/snapshots/layout-open.golden @@ -1,7 +1,7 @@ == snap before grid=100x30 cursor=2,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cwd New Del /tmp/pardes-snap/layout-open/cwd New Del -| +| ls ls | sub sub | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/layout-open/cwd New Del -| +| ls | sub | | @@ -32,11 +32,11 @@ == snap altn-left grid=100x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cwd New Del /tmp/pardes-snap/layout-open/cwd New Del -| +| ls ls | sub sub | | /tmp/pardes-snap/layout-open/cwd New Del -| +| ls | sub | | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/layout-open/cwd New Del -| +| ls | sub | | @@ -63,11 +63,11 @@ == snap altn-right grid=100x30 cursor=54,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cwd New Del /tmp/pardes-snap/layout-open/cwd New Del -| +| ls ls | sub sub | | /tmp/pardes-snap/layout-open/cwd New Del /tmp/pardes-snap/layout-open/cwd New Del -| +| ls ls | sub sub | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/layout-open/cwd New Del -| +| ls | sub | | @@ -94,11 +94,11 @@ == snap file-open grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cwd -| 1 echo 'TTY'OK +| 1 echo 'TTY'OK ls ls | sub sub | | /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cwd -| +| ls ls | sub sub | | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/layout-open/cw -| +| ls | sub | | @@ -125,22 +125,22 @@ == snap ttydir grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cwd -| 1 echo 'TTY'OK +| 1 echo 'TTY'OK ls ls | sub sub | | /tmp/pardes-snap/layout-open/cw /tmp/pardes-snap/layout-open/cwd -| +| ls ls | sub sub | | /tmp/pardes-snap/layout-open/cwd | echo 'TTY'OK -| +| echo 'TTY'OK | TTYOK | | | | /tmp/pardes-snap/layout-open/cw -| +| ls | sub | | diff --git a/test/snapshots/leader.golden b/test/snapshots/leader.golden index d58e8d6c..10907b99 100644 --- a/test/snapshots/leader.golden +++ b/test/snapshots/leader.golden @@ -189,20 +189,20 @@ | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. | 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol -| 7 SPC c n Newcol topbar -| 8 SPC d Del -| 9 SPC f c Config -| 10 SPC f f Find topbar -| 11 SPC f g Grep topbar -| 12 SPC f n New topbar -| 13 SPC f s Save -| 14 SPC h t Tutor topbar -| 15 SPC j i Forward C-i -| 16 SPC j j Last -| 17 SPC j l Jumplist -| 18 SPC j o Back C-o +| 5 SPC ? Help topbar +| 6 SPC P ClipPasteBefore +| 7 SPC R ClipReplace +| 8 SPC Y ClipYankMain +| 9 SPC c d Delcol +| 10 SPC c n Newcol topbar +| 11 SPC d Del +| 12 SPC f c Config +| 13 SPC f f Find topbar +| 14 SPC f g Grep topbar +| 15 SPC f n New topbar +| 16 SPC f s Save +| 17 SPC h t Tutor topbar +| 18 SPC j i Forward C-i == 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 @@ -228,7 +228,7 @@ | /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC h | 2 -| 3 SPC h t Tutor topbar +| 3 SPC h t Tutor topbar | 4 | | @@ -269,7 +269,7 @@ | /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC h | 2 -| 3 SPC h t Tutor topbar +| 3 SPC h t Tutor topbar | 4 | | @@ -310,7 +310,7 @@ | /tmp/pardes-snap/leader/cwd/+Help New Del | 1 pardes builtins under SPC h | 2 -| 3 SPC h t Tutor topbar +| 3 SPC h t Tutor topbar | 4 | | @@ -353,20 +353,20 @@ | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. | 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol -| 7 SPC c n Newcol topbar -| 8 SPC d Del -| 9 SPC f c Config -| 10 SPC f f Find topbar -| 11 SPC f g Grep topbar -| 12 SPC f n New topbar -| 13 SPC f s Save -| 14 SPC h t Tutor topbar -| 15 SPC j i Forward C-i -| 16 SPC j j Last -| 17 SPC j l Jumplist -| 18 SPC j o Back C-o +| 5 SPC ? Help topbar +| 6 SPC P ClipPasteBefore +| 7 SPC R ClipReplace +| 8 SPC Y ClipYankMain +| 9 SPC c d Delcol +| 10 SPC c n Newcol topbar +| 11 SPC d Del +| 12 SPC f c Config +| 13 SPC f f Find topbar +| 14 SPC f g Grep topbar +| 15 SPC f n New topbar +| 16 SPC f s Save +| 17 SPC h t Tutor topbar +| 18 SPC j i Forward C-i == 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 @@ -395,10 +395,10 @@ | 3 SPC t a Ascii | 4 SPC t b Tagbottom | 5 SPC t c Colors -| 6 SPC t d Debug topbar +| 6 SPC t d Debug topbar | 7 SPC t i PdfTint | 8 SPC t l Palette -| 9 SPC t n NextColor topbar +| 9 SPC t n NextColor topbar | 10 SPC t p Petscii | 11 SPC t r Crt | 12 SPC t s PdfSections @@ -433,10 +433,10 @@ | /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 +| 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 | | diff --git a/test/snapshots/load.golden b/test/snapshots/load.golden index 7b6bfab5..c33b79cd 100644 --- a/test/snapshots/load.golden +++ b/test/snapshots/load.golden @@ -1,7 +1,7 @@ == snap loaded grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/load/cwd New Del /tmp/pardes-snap/load/cwd New Del -| +| echo LOAD''MARK; seq 1 40 ls | LOADMARK d.txt | 1 | 2 @@ -16,7 +16,7 @@ | 11 | 12 | /tmp/pardes-snap/load/cwd New Del -| +| ls | d.txt | | diff --git a/test/snapshots/look-center.golden b/test/snapshots/look-center.golden index 199379a1..da1fbfed 100644 --- a/test/snapshots/look-center.golden +++ b/test/snapshots/look-center.golden @@ -1,7 +1,7 @@ == snap center-open grid=150x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-center/cwd/big.txt Save Ne /tmp/pardes-snap/look-center/cwd New Del /tmp/pardes-snap/look-center/cwd New Del -| 86 line 86 +| 86 line 86 ls ls | 87 line 87 big.txt big.txt | 88 line 88 | 89 line 89 @@ -16,7 +16,7 @@ | 98 line 98 | 99 line 99 | 100 line 100 /tmp/pardes-snap/look-center/cwd New Del -| 101 line 101 +| 101 line 101 ls | 102 line 102 big.txt | 103 line 103 | 104 line 104 @@ -32,7 +32,7 @@ == snap center-dedup grid=150x30 cursor=17,14 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-center/cwd/big.txt Save Ne /tmp/pardes-snap/look-center/cwd New Del /tmp/pardes-snap/look-center/cwd New Del -| 86 line 86 +| 86 line 86 ls ls | 87 line 87 big.txt big.txt | 88 line 88 | 89 line 89 @@ -47,7 +47,7 @@ | 98 line 98 | 99 line 99 | 100 line 100 /tmp/pardes-snap/look-center/cwd New Del -| 101 line 101 +| 101 line 101 ls | 102 line 102 big.txt | 103 line 103 | 104 line 104 @@ -63,7 +63,7 @@ == snap center-clamp grid=150x30 cursor=29,14 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-center/cwd/big.txt Save Ne /tmp/pardes-snap/look-center/cwd New Del /tmp/pardes-snap/look-center/cwd New Del -| 86 line 86 +| 86 line 86 ls ls | 87 line 87 big.txt big.txt | 88 line 88 | 89 line 89 @@ -78,7 +78,7 @@ | 98 line 98 | 99 line 99 | 100 line 100 /tmp/pardes-snap/look-center/cwd New Del -| 101 line 101 +| 101 line 101 ls | 102 line 102 big.txt | 103 line 103 | 104 line 104 diff --git a/test/snapshots/look-dir.golden b/test/snapshots/look-dir.golden index a29b1cf1..9ee71ba3 100644 --- a/test/snapshots/look-dir.golden +++ b/test/snapshots/look-dir.golden @@ -1,11 +1,11 @@ == snap dir-open grid=100x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-dir/cwd New Del /tmp/pardes-snap/look-dir/cwd New Del -| +| ls ls | sub top.txt sub top.txt | | /tmp/pardes-snap/look-dir/cwd/sub New Del -| +| ls | inner.txt | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/look-dir/cwd New Del -| +| ls | sub top.txt | | diff --git a/test/snapshots/look-file-1col.golden b/test/snapshots/look-file-1col.golden index 09af247f..1e957fb8 100644 --- a/test/snapshots/look-file-1col.golden +++ b/test/snapshots/look-file-1col.golden @@ -1,7 +1,7 @@ == snap file-open-1col grid=100x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-file-1col/cwd/big.txt Save /tmp/pardes-snap/look-file-1col/cwd New Del -| 26 line 26 +| 26 line 26 ls | 27 line 27 big.txt | 28 line 28 | 29 line 29 diff --git a/test/snapshots/look-file.golden b/test/snapshots/look-file.golden index b95cd54c..fa674003 100644 --- a/test/snapshots/look-file.golden +++ b/test/snapshots/look-file.golden @@ -1,7 +1,7 @@ == snap file-open grid=150x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/look-file/cwd/big.txt Save New /tmp/pardes-snap/look-file/cwd New Del /tmp/pardes-snap/look-file/cwd New Del -| 26 line 26 +| 26 line 26 ls ls | 27 line 27 big.txt big.txt | 28 line 28 | 29 line 29 @@ -16,7 +16,7 @@ | 38 line 38 | 39 line 39 | 40 line 40 /tmp/pardes-snap/look-file/cwd New Del -| 41 line 41 +| 41 line 41 ls | 42 line 42 big.txt | 43 line 43 | 44 line 44 diff --git a/test/snapshots/lookloaded.golden b/test/snapshots/lookloaded.golden index 311d7a66..1d09b582 100644 --- a/test/snapshots/lookloaded.golden +++ b/test/snapshots/lookloaded.golden @@ -1,7 +1,7 @@ == snap file-open grid=100x30 cursor=7,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd -| 26 line 26 +| 26 line 26 ls ls | 27 line 27 big.txt big.txt | 28 line 28 | 29 line 29 @@ -16,7 +16,7 @@ | 38 line 38 | 39 line 39 | 40 line 40 /tmp/pardes-snap/lookloaded/cwd -| 41 line 41 +| 41 line 41 ls | 42 line 42 big.txt | 43 line 43 | 44 line 44 @@ -32,9 +32,9 @@ == snap removed grid=100x30 cursor=37,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd -| 26 line 26 +| 26 line 26 ls ls | 27 line 27 big.txt big.txt -| 28 line 28 +| 28 line 28 rm big.txt; echo GO''NE | 29 line 29 GONE | 30 line 30 | 31 line 31 big.txt:40 big.txt:10 @@ -47,7 +47,7 @@ | 38 line 38 | 39 line 39 | 40 line 40 /tmp/pardes-snap/lookloaded/cwd -| 41 line 41 +| 41 line 41 ls | 42 line 42 big.txt | 43 line 43 | 44 line 44 @@ -63,9 +63,9 @@ == snap look-noFS grid=100x30 cursor=7,11 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd /tmp/pardes-snap/lookloaded/cwd -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 big.txt big.txt -| 3 line 3 +| 3 line 3 rm big.txt; echo GO''NE | 4 line 4 GONE | 5 line 5 | 6 line 6 big.txt:40 big.txt:10 @@ -78,7 +78,7 @@ | 13 line 13 | 14 line 14 | 15 line 15 /tmp/pardes-snap/lookloaded/cwd -| 16 line 16 +| 16 line 16 ls | 17 line 17 big.txt | 18 line 18 | 19 line 19 diff --git a/test/snapshots/lookpanes.golden b/test/snapshots/lookpanes.golden index d049ff5a..302f357e 100644 --- a/test/snapshots/lookpanes.golden +++ b/test/snapshots/lookpanes.golden @@ -1,11 +1,11 @@ == 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 -| 1 both.txt +| 1 both.txt ls | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | | /tmp/pardes-snap/lookpanes/cwd/alpha New Del -| +| ls | amark.txt both.txt pick.txt twin.txt zqonly.txt | | @@ -52,11 +52,11 @@ == 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 -| 1 both.txt +| 1 both.txt ls | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | | /tmp/pardes-snap/lookpanes/cwd/alpha New Del -| +| ls | amark.txt both.txt pick.txt twin.txt zqonly.txt | | @@ -103,11 +103,11 @@ == 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 -| 1 both.txt +| 1 both.txt ls | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | | /tmp/pardes-snap/lookpanes/cwd/alpha New Del -| +| ls | amark.txt both.txt pick.txt twin.txt zqonly.txt | | @@ -154,11 +154,11 @@ == 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 -| 1 both.txt +| 1 both.txt ls | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | | /tmp/pardes-snap/lookpanes/cwd/alpha New Del -| +| ls | amark.txt both.txt pick.txt twin.txt zqonly.txt | | @@ -205,11 +205,11 @@ == 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 -| 1 both.txt +| 1 both.txt ls | 2 b-marker alpha beta zzboot.txt zqonly.txt pick.txt twin.txt | | /tmp/pardes-snap/lookpanes/cwd/alpha New Del -| +| ls | amark.txt both.txt pick.txt twin.txt zqonly.txt | /tmp/pardes-snap/lookpanes/cwd/beta/twin.txt Save New Del | 1 TWIN-FROM-BETA diff --git a/test/snapshots/lookrange.golden b/test/snapshots/lookrange.golden index 6e292431..d1fc0bea 100644 --- a/test/snapshots/lookrange.golden +++ b/test/snapshots/lookrange.golden @@ -368,7 +368,7 @@ |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-129 #949494,#121212, 130-149 d,#121212, -|28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff, +|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-30 #bdbdbd,#080808, 31-149 d,#080808, == snap hit2 grid=150x30 cursor=17,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill @@ -431,7 +431,7 @@ |26: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 d,#080808, |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, +|29: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-30 #bdbdbd,#080808, 31-149 d,#080808, == 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 @@ -492,5 +492,5 @@ |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-129 #949494,#121212, 130-149 d,#121212, -|28: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-149 #080808,#80a0ff, +|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-30 #bdbdbd,#080808, 31-149 d,#080808, diff --git a/test/snapshots/lookrange.snap b/test/snapshots/lookrange.snap index d1a86e0c..29f88d7f 100644 --- a/test/snapshots/lookrange.snap +++ b/test/snapshots/lookrange.snap @@ -6,7 +6,8 @@ # r.txt:7:4-9 line 7, columns 4 through 9 # r.txt:3:2-5:3 line 3 column 2 through line 5 column 3 # ...and only then presses `/`, whose result rows are exactly this syntax — -# which is how n/N step to a hit with the matched text selected. +# which is how n/N select a hit and Enter lands on it with the matched text +# selected. # # `snapstyle` is the assertion that matters: the grid TEXT after a ranged look # is the same text a plain `:LINE:COL` look leaves, so the selection only shows @@ -47,8 +48,8 @@ stable 700 15000 snap stale snapstyle stale # --- and now the first consumer. The look above left r.txt focused, so `/` -# arms on it: the rows it writes carry the match's span, and n/N therefore step -# to each hit with the word itself selected. +# arms on it: the rows it writes carry the match's span, so n selects a row +# and the Enter after it goes to that hit with the word itself selected. key / text NEEDLE key enter @@ -56,15 +57,18 @@ wait 10000 r.txt:7:4-9 gg NEEDLE stable 700 15000 snap results key n +key enter stable 700 15000 snap hit1 snapstyle hit1 key n +key enter stable 700 15000 snap hit2 snapstyle hit2 -# N walks back onto the first hit, still selected +# N walks back onto the first hit; Enter looks it, still selected key N +key enter stable 700 15000 snap back snapstyle back diff --git a/test/snapshots/lsp.snap b/test/snapshots/lsp.snap index 79acaee8..2eb17735 100644 --- a/test/snapshots/lsp.snap +++ b/test/snapshots/lsp.snap @@ -36,14 +36,15 @@ key k stable 700 15000 snap hover # SPC l s lists the file's own symbols. Several rows, so it opens a +Search -# buffer — which IS the picker: n steps a row and looks it, exactly as the Find -# and `/` results already do, with no picker code of its own. +# buffer — which IS the picker: n selects a row and Enter looks it, exactly as +# the Find and `/` results already do, with no picker code of its own. key space key l key s stable 700 15000 snap symbols key n +key enter stable 700 15000 snap step # gd on something with no declaration behind it (a keyword) answers nothing, diff --git a/test/snapshots/lspcomplete.snap b/test/snapshots/lspcomplete.snap index 8b7854cd..8baa870e 100644 --- a/test/snapshots/lspcomplete.snap +++ b/test/snapshots/lspcomplete.snap @@ -87,9 +87,11 @@ snap refill key esc settle 100 # Several rows, so the buffer IS the picker and n walks it; completion does not -# jump the way a goto with one row does. The first step looks row 1 and lands -# SELECTING `verdigris` on line 2 of a.zig. +# jump the way a goto with one row does. The first step selects row 1, and the +# Enter after it looks that row and lands SELECTING `verdigris` on line 2 of +# a.zig. key n +key enter stable 700 15000 snap step # A pane the backend does not speak: same keystrokes, same dot before the diff --git a/test/snapshots/lsprelpath.golden b/test/snapshots/lsprelpath.golden index 885860b3..4fd48958 100644 --- a/test/snapshots/lsprelpath.golden +++ b/test/snapshots/lsprelpath.golden @@ -33,7 +33,7 @@ | /tmp/pardes-snap/lsprelpath/cwd/sub/+Search New Del | 1 /tmp/pardes-snap/lsprelpath/cwd/shade.zig:2:5-13 verdigris verdigris, | 2 /tmp/pardes-snap/lsprelpath/cwd/shade.zig:3:5-12 cinnabar cinnabar, -== snap abslook grid=100x34 cursor=16,6 +== snap abslook grid=100x34 cursor=19,18 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsprelpath/cwd/sub/parent.zig Save New Del | 1 const shade = @import("../shade.zig"); @@ -70,12 +70,12 @@ | 2 /tmp/pardes-snap/lsprelpath/cwd/shade.zig:3:5-12 cinnabar cinnabar, == style abslook |0: 0-56 #949494,#121212, 57-99 d,#121212, -|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, +|1: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-20 #bdbdbd,#080808, 21-27 #cf87e8,#080808,b 28-28 #bdbdbd,#080808, 29-42 #e3c78a,#080808, 43-44 #bdbdbd,#080808, 45-99 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-12 #cf87e8,#080808,b 13-38 #bdbdbd,#080808, 39-99 d,#080808, |5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-16 #cf87e8,#080808,b 17-17 #bdbdbd,#080808, 18-23 #cf87e8,#080808,b 24-29 #bdbdbd,#080808, 30-99 d,#080808, -|6: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-15 #bdbdbd,#080808, 16-99 d,#080808, +|6: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-99 d,#080808, |7: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, |8: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #bdbdbd,#080808, 8-99 d,#080808, |9: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, @@ -85,9 +85,9 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, -|16: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212, +|16: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-28 #cf87e8,#080808,b 29-30 #bdbdbd,#080808, 31-99 d,#080808, -|18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-19 #080808,#80a0ff, 20-20 #bdbdbd,#080808, 21-99 d,#080808, +|18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #bdbdbd,#080808, 11-19 #080808,#80a0ff, 20-20 #bdbdbd,#080808, 21-99 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-99 d,#080808, |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-99 d,#080808, |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, @@ -101,7 +101,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |30: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |31: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212, -|32: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 #080808,#80a0ff, +|32: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-76 #bdbdbd,#080808, 77-99 d,#080808, |33: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-74 #bdbdbd,#080808, 75-99 d,#080808, == snap subrow grid=100x34 cursor=16,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill @@ -138,7 +138,7 @@ | /tmp/pardes-snap/lsprelpath/cwd/sub/+Search New Del | 1 inner/tint.zig:2:5-9 ochre ochre, | 2 inner/tint.zig:3:5-10 indigo indigo, -== snap sublook grid=100x34 cursor=16,6 +== snap sublook grid=100x34 cursor=15,18 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/lsprelpath/cwd/sub/subdir.zig Save New Del | 1 const tint = @import("inner/tint.zig"); @@ -175,12 +175,12 @@ | 2 inner/tint.zig:3:5-10 indigo indigo, == style sublook |0: 0-56 #949494,#121212, 57-99 d,#121212, -|1: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, +|1: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-19 #bdbdbd,#080808, 20-26 #cf87e8,#080808,b 27-27 #bdbdbd,#080808, 28-43 #e3c78a,#080808, 44-45 #bdbdbd,#080808, 46-99 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-12 #cf87e8,#080808,b 13-35 #bdbdbd,#080808, 36-99 d,#080808, |5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-16 #cf87e8,#080808,b 17-17 #bdbdbd,#080808, 18-23 #cf87e8,#080808,b 24-29 #bdbdbd,#080808, 30-99 d,#080808, -|6: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-15 #bdbdbd,#080808, 16-99 d,#080808, +|6: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-15 #bdbdbd,#080808, 16-99 d,#080808, |7: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, |8: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-7 #bdbdbd,#080808, 8-99 d,#080808, |9: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, @@ -190,9 +190,9 @@ |13: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, -|16: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212, +|16: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, |17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-23 #bdbdbd,#080808, 24-27 #cf87e8,#080808,b 28-29 #bdbdbd,#080808, 30-99 d,#080808, -|18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-10 #bdbdbd,#080808, 11-15 #080808,#80a0ff, 16-16 #bdbdbd,#080808, 17-99 d,#080808, +|18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-10 #bdbdbd,#080808, 11-15 #080808,#80a0ff, 16-16 #bdbdbd,#080808, 17-99 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-17 #bdbdbd,#080808, 18-99 d,#080808, |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-8 #bdbdbd,#080808, 9-99 d,#080808, |21: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, @@ -206,7 +206,7 @@ |29: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |30: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 d,#080808, |31: 0-1 #ffffff,#262626, 2-79 #949494,#121212, 80-99 d,#121212, -|32: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 #080808,#80a0ff, +|32: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-40 #bdbdbd,#080808, 41-99 d,#080808, |33: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-43 #bdbdbd,#080808, 44-99 d,#080808, == snap clicked grid=100x34 cursor=16,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill diff --git a/test/snapshots/lsprelpath.snap b/test/snapshots/lsprelpath.snap index dce26d1e..1ff6f549 100644 --- a/test/snapshots/lsprelpath.snap +++ b/test/snapshots/lsprelpath.snap @@ -19,10 +19,10 @@ # strip that took the basename instead would produce a row that # resolves to nothing. # -# `n` is the assertion in both, not the row text: it looks row 1 and the right -# file opens with the member SELECTED on its own line. The style capture is -# where that selection shows, because focus goes back to the pane that asked, -# so the opened pane's cursor is not in the snap header. +# `n` and the Enter after it are the assertion in both, not the row text: the +# step selects row 1, the look opens the right file with the member SELECTED +# on its own line, and focus follows what opened — so the snap header's cursor +# is that pane's, and the style capture is where the selection itself shows. dirmk sub dirmk sub/inner file shade.zig pub const Shade = enum {\n verdigris,\n cinnabar,\n};\n @@ -50,6 +50,7 @@ settle 100 # An absolute row has to keep resolving — it is the spelling every row had # before this, and the one every hit outside the tree still has. key n +key enter stable 700 15000 snap abslook snapstyle abslook @@ -71,6 +72,7 @@ snap subrow key esc settle 100 key n +key enter stable 700 15000 snap sublook snapstyle sublook diff --git a/test/snapshots/modal.golden b/test/snapshots/modal.golden index 0a30d313..93ab4143 100644 --- a/test/snapshots/modal.golden +++ b/test/snapshots/modal.golden @@ -1,10 +1,10 @@ == snap top grid=100x30 cursor=2,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -29,13 +29,13 @@ | | | -== snap moved grid=100x30 cursor=5,6 +== snap moved grid=100x30 cursor=8,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -60,13 +60,13 @@ | | | -== snap xsel grid=100x30 cursor=15,6 +== snap xsel grid=100x30 cursor=48,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -96,9 +96,9 @@ |1: 0-1 #ffffff,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 #ffffff,#262626, 52-85 #949494,#121212, 86-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|4: 0-0 d,#444444, 1-1 d,#080808, 2-48 #080808,#80a0ff, 49-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |5: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|6: 0-0 d,#444444, 1-1 d,#080808, 2-15 #080808,#80a0ff, 16-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|6: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |7: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |8: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |9: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -122,13 +122,13 @@ |27: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |28: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -== snap xsel2 grid=100x30 cursor=15,7 +== snap xsel2 grid=100x30 cursor=13,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -153,13 +153,13 @@ | | | -== snap yanked grid=100x30 cursor=15,7 +== snap yanked grid=100x30 cursor=13,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -171,7 +171,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -184,13 +184,13 @@ | | | -== snap vsel grid=100x30 cursor=16,8 +== snap vsel grid=100x30 cursor=14,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -202,7 +202,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -220,11 +220,11 @@ |1: 0-1 #ffffff,#626262, 2-35 #949494,#121212, 36-49 d,#121212, 50-51 #ffffff,#262626, 52-85 #949494,#121212, 86-99 d,#121212, |2: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|5: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|6: 0-0 d,#444444, 1-1 d,#080808, 2-49 #080808,#80a0ff, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|7: 0-0 d,#444444, 1-1 d,#080808, 2-49 #080808,#80a0ff, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -|8: 0-0 d,#444444, 1-1 d,#080808, 2-16 #080808,#80a0ff, 17-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|4: 0-0 d,#444444, 1-1 d,#080808, 2-49 #080808,#80a0ff, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|5: 0-0 d,#444444, 1-1 d,#080808, 2-49 #080808,#80a0ff, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|6: 0-0 d,#444444, 1-1 d,#080808, 2-14 #080808,#80a0ff, 15-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|7: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, +|8: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |9: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |10: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |11: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, @@ -246,14 +246,14 @@ |27: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |28: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, |29: 0-0 d,#444444, 1-1 d,#080808, 2-49 #bdbdbd,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-99 #bdbdbd,#080808, -== snap typed grid=100x30 cursor=7,6 +== snap typed grid=100x30 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| -| TYPEDone two three +| TYPEDprintf 'one two three\nfour five six\nseven +| ght nine\n' +| one two three | four five six | seven eight nine | @@ -264,7 +264,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -277,13 +277,13 @@ | | | -== snap undone grid=100x30 cursor=16,8 +== snap undone grid=100x30 cursor=14,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -295,7 +295,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -308,14 +308,14 @@ | | | -== snap redone grid=100x30 cursor=7,6 +== snap redone grid=100x30 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| -| TYPEDone two three +| TYPEDprintf 'one two three\nfour five six\nseven +| ght nine\n' +| one two three | four five six | seven eight nine | @@ -326,7 +326,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | @@ -342,11 +342,11 @@ == snap bottom grid=100x30 cursor=2,9 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/modal/cwd New Del /tmp/pardes-snap/modal/cwd New Del -| +| ls ls | words.txt words.txt -| -| -| TYPEDone two three +| TYPEDprintf 'one two three\nfour five six\nseven +| ght nine\n' +| one two three | four five six | seven eight nine | @@ -357,7 +357,7 @@ | | | /tmp/pardes-snap/modal/cwd New Del -| +| ls | words.txt | | diff --git a/test/snapshots/multicursor.golden b/test/snapshots/multicursor.golden index 0e66f357..764ca170 100644 --- a/test/snapshots/multicursor.golden +++ b/test/snapshots/multicursor.golden @@ -1,7 +1,7 @@ == snap three-cursors grid=150x30 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save New /tmp/pardes-snap/multicursor/cwd New Del /tmp/pardes-snap/multicursor/cwd New Del -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 f.txt f.txt | 3 line 3 | 4 line 4 @@ -16,7 +16,7 @@ | 13 | | /tmp/pardes-snap/multicursor/cwd New Del -| +| ls | f.txt | | @@ -63,7 +63,7 @@ == snap edited-at-three grid=150x30 cursor=9,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save New /tmp/pardes-snap/multicursor/cwd New Del /tmp/pardes-snap/multicursor/cwd New Del -| 1 >>line 1 +| 1 >>line 1 ls ls | 2 >>line 2 f.txt f.txt | 3 >>line 3 | 4 line 4 @@ -78,7 +78,7 @@ | 13 | | /tmp/pardes-snap/multicursor/cwd New Del -| +| ls | f.txt | | @@ -94,7 +94,7 @@ == snap three-selections grid=150x30 cursor=8,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save New /tmp/pardes-snap/multicursor/cwd New Del /tmp/pardes-snap/multicursor/cwd New Del -| 1 >>line 1 +| 1 >>line 1 ls ls | 2 >>line 2 f.txt f.txt | 3 >>line 3 | 4 line 4 @@ -109,7 +109,7 @@ | 13 | | /tmp/pardes-snap/multicursor/cwd New Del -| +| ls | f.txt | | @@ -156,7 +156,7 @@ == snap keep-primary grid=150x30 cursor=8,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/multicursor/cwd/f.txt Save New /tmp/pardes-snap/multicursor/cwd New Del /tmp/pardes-snap/multicursor/cwd New Del -| 1 >>line 1 +| 1 >>line 1 ls ls | 2 >>line 2 f.txt f.txt | 3 >>line 3 | 4 line 4 @@ -171,7 +171,7 @@ | 13 | | /tmp/pardes-snap/multicursor/cwd New Del -| +| ls | f.txt | | diff --git a/test/snapshots/nested.golden b/test/snapshots/nested.golden index 7b9ee1b5..b685a144 100644 --- a/test/snapshots/nested.golden +++ b/test/snapshots/nested.golden @@ -66,7 +66,7 @@ | $ $(readlink /proc/$PPID/exe) nestdir | $ | /tmp/pardes-snap/nested/cwd/nestdir New Del -| +| ls | inside-nested.txt | | diff --git a/test/snapshots/psearch.golden b/test/snapshots/psearch.golden index 25af2036..a3305345 100644 --- a/test/snapshots/psearch.golden +++ b/test/snapshots/psearch.golden @@ -1,7 +1,7 @@ == snap output grid=140x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /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 | x MARK b @@ -32,7 +32,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 -| +| printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' | x MARK a | zz | x MARK b @@ -63,7 +63,7 @@ == snap results grid=140x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /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 | x MARK b @@ -94,7 +94,7 @@ == snap first grid=140x30 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /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 | x MARK b @@ -150,13 +150,13 @@ |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-119 #949494,#121212, 120-139 d,#121212, -|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-139 #080808,#80a0ff, +|27: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-24 #bdbdbd,#080808, 25-139 d,#080808, |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 -| +| printf 'x MA''RK a\nzz\nx MA''RK b\nzz\nx MA''RK c\n' | x MARK a | zz | x MARK b @@ -187,7 +187,7 @@ == snap back grid=140x30 cursor=7,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /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 | x MARK b @@ -215,10 +215,10 @@ | 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 +== snap nomatch grid=140x30 cursor=7,28 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /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 | x MARK b @@ -280,7 +280,7 @@ == snap rightsearch grid=140x30 cursor=7,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /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 | x MARK b diff --git a/test/snapshots/psearch.snap b/test/snapshots/psearch.snap index 11316ea9..1b9eac61 100644 --- a/test/snapshots/psearch.snap +++ b/test/snapshots/psearch.snap @@ -2,9 +2,10 @@ # the shell's own scrollback (the plain text view Look reads, prompt rows # hidden). Results land in a +Search OUTPUT BUFFER — a file pane with no file # behind it, so its tag has no Save — and point at `@p0:LINE:COL-ENDCOL`, the -# look target that names a live pane, since a terminal has no path. n/N walk -# the buffer and look each row, scrolling the terminal to that line of its -# scrollback and selecting the span the row names. +# look target that names a live pane, since a terminal has no path. n/N SELECT +# the next/prev row in the buffer and open nothing; Enter — the look chord — +# is what scrolls the terminal to that line of its scrollback and selects the +# span the row names. # PLACEMENT, and this script is the proof: an output buffer is NOT a document # — it is the result list of the pane that asked for it — so even here, with no # doc pane in the session for it to join, it does NOT take a column of its own. @@ -35,21 +36,27 @@ key enter wait 10000 @p0:2:3 stable 700 15000 snap results -# n looks result 1: the terminal's cursor lands on that scrollback line, on -# the matched SPAN (cols 3..6, past the leading "x ") — not the start of the -# line, and selected rather than merely parked on +# n selects result 1 and Enter looks it: the terminal's cursor lands on that +# scrollback line, on the matched SPAN (cols 3..6, past the leading "x ") — +# not the start of the line, and selected rather than merely parked on key n +key enter stable 700 15000 snap first snapstyle first key n +key enter stable 700 15000 snap second -# N walks back +# N walks back one row, Enter looks it key N +key enter stable 700 15000 snap back -# a no-match search opens an empty buffer of its own; n has nowhere to go +# a no-match search opens an empty buffer of its own — and n does not stop +# there. The walk is a RING across panes, not one buffer's rows, so with +# nothing look-able in the empty list it carries on into the one that does +# have rows and resumes it a row past where the N above left off. key / text zzqq key enter @@ -62,6 +69,12 @@ snap nomatch # so the buffer stays empty. Col 5 row 4 is the `M` of the first `x MARK a`, # in the shell's body in both modes (normal hides the prompt row, leaving it # blank, so the output rows sit at the same place either way). +# The left click first is the price of the step above: it left the cursor in +# the results buffer, and c-b is read by the ACTIVE pane — there is no tty +# behind a +Search to toggle. +press left 5 4 +release left 5 4 +stable 400 5000 key c-b stable 600 8000 press right 5 4 diff --git a/test/snapshots/respawn.golden b/test/snapshots/respawn.golden index be7be117..fe565d56 100644 --- a/test/snapshots/respawn.golden +++ b/test/snapshots/respawn.golden @@ -1,7 +1,7 @@ == snap respawn grid=100x30 cursor=4,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/respawn/cwd New Del /tmp/pardes-snap/respawn/cwd New Del -| +| ls ls | |$ /tmp/pardes-snap/respawn/cwd New Del | $ ls diff --git a/test/snapshots/restore.golden b/test/snapshots/restore.golden index dea5e81f..ee9eae46 100644 --- a/test/snapshots/restore.golden +++ b/test/snapshots/restore.golden @@ -32,8 +32,8 @@ == snap restored grid=100x30 cursor=4,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/restore/cwd New Del -| -| +| ls +| echo KEEP''ME | KEEPME | | diff --git a/test/snapshots/rsearch.golden b/test/snapshots/rsearch.golden index 953634af..99820250 100644 --- a/test/snapshots/rsearch.golden +++ b/test/snapshots/rsearch.golden @@ -1,7 +1,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/rsearch/cwd New Del -| +| ls | code.txt sub | | @@ -32,7 +32,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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/rsearch/cwd New Del -| +| ls | code.txt sub | | @@ -63,7 +63,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/rsearch/cwd New Del -| +| ls | code.txt sub | | @@ -94,7 +94,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -109,7 +109,7 @@ | 1 d1 | 2 d2 | 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del -| 4 d4 +| 4 d4 ls | 5 d5 code.txt sub | 6 d6 | @@ -125,7 +125,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -140,7 +140,7 @@ | 1 d1 | 2 d2 | 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del -| 4 d4 +| 4 d4 ls | 5 d5 code.txt sub | 6 d6 | @@ -156,7 +156,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -171,7 +171,7 @@ | 1 d1 | 2 d2 | 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del -| 4 d4 +| 4 d4 ls | 5 d5 code.txt sub | 6 d6 | @@ -187,7 +187,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -202,7 +202,7 @@ | 1 d1 | 2 d2 | 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del -| 4 d4 +| 4 d4 ls | 5 d5 code.txt sub | 6 d6 | @@ -218,7 +218,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -233,7 +233,7 @@ | 1 d1 | 2 d2 | 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del -| 4 d4 +| 4 d4 ls | 5 d5 code.txt sub | 6 d6 | @@ -249,7 +249,7 @@ == 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 -| 1 run count_x now +| 1 run count_x now ls ls | 2 open sub/dep.txt:3 here code.txt sub code.txt sub | 3 count_x again | 4 pick two words @@ -264,7 +264,7 @@ | 1 d1 | 2 d2 | 3 DEPTARGET /tmp/pardes-snap/rsearch/cwd New Del -| 4 d4 +| 4 d4 ls | 5 d5 code.txt sub | 6 d6 | diff --git a/test/snapshots/scroll.golden b/test/snapshots/scroll.golden index cd2167ba..55dd47c7 100644 --- a/test/snapshots/scroll.golden +++ b/test/snapshots/scroll.golden @@ -1,7 +1,7 @@ == snap bottom grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd New Del /tmp/pardes-snap/scroll/cwd New Del -| 188 +| 188 ls | 189 s.txt | 190 | 191 @@ -16,7 +16,7 @@ | 200 | | /tmp/pardes-snap/scroll/cwd New Del -| +| ls | s.txt | | @@ -32,7 +32,7 @@ == snap wheel3 grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd New Del /tmp/pardes-snap/scroll/cwd New Del -| 185 +| 185 ls | 186 s.txt | 187 | 188 @@ -47,7 +47,7 @@ | 197 | 198 | /tmp/pardes-snap/scroll/cwd New Del -| +| ls | s.txt | | @@ -63,7 +63,7 @@ == snap gutter-up grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd New Del /tmp/pardes-snap/scroll/cwd New Del -| 178 +| 178 ls | 179 s.txt | 180 | 181 @@ -78,7 +78,7 @@ | 190 | 191 | /tmp/pardes-snap/scroll/cwd New Del -| +| ls | s.txt | | @@ -94,7 +94,7 @@ == snap gutter-down grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd New Del /tmp/pardes-snap/scroll/cwd New Del -| 180 +| 180 ls | 181 s.txt | 182 | 183 @@ -109,7 +109,7 @@ | 192 | 193 | /tmp/pardes-snap/scroll/cwd New Del -| +| ls | s.txt | | @@ -125,7 +125,7 @@ == snap wheel-down grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scroll/cwd New Del /tmp/pardes-snap/scroll/cwd New Del -| 181 +| 181 ls | 182 s.txt | 183 | 184 @@ -140,7 +140,7 @@ | 193 | 194 | /tmp/pardes-snap/scroll/cwd New Del -| +| ls | s.txt | | diff --git a/test/snapshots/scrolloff.golden b/test/snapshots/scrolloff.golden index 90c84196..265d427d 100644 --- a/test/snapshots/scrolloff.golden +++ b/test/snapshots/scrolloff.golden @@ -1,84 +1,84 @@ == snap top grid=150x11 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save New De /tmp/pardes-snap/scrolloff/cwd New Del /tmp/pardes-snap/scrolloff/cwd New Del -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 g.txt g.txt | 3 line 3 | 4 line 4 | 5 line 5 /tmp/pardes-snap/scrolloff/cwd New Del -| 6 line 6 +| 6 line 6 ls | 7 line 7 g.txt | 8 line 8 | 9 line 9 == snap edge grid=150x11 cursor=7,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save New De /tmp/pardes-snap/scrolloff/cwd New Del /tmp/pardes-snap/scrolloff/cwd New Del -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 g.txt g.txt | 3 line 3 | 4 line 4 | 5 line 5 /tmp/pardes-snap/scrolloff/cwd New Del -| 6 line 6 +| 6 line 6 ls | 7 line 7 g.txt | 8 line 8 | 9 line 9 == snap scrolled1 grid=150x11 cursor=7,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save New De /tmp/pardes-snap/scrolloff/cwd New Del /tmp/pardes-snap/scrolloff/cwd New Del -| 2 line 2 +| 2 line 2 ls ls | 3 line 3 g.txt g.txt | 4 line 4 | 5 line 5 | 6 line 6 /tmp/pardes-snap/scrolloff/cwd New Del -| 7 line 7 +| 7 line 7 ls | 8 line 8 g.txt | 9 line 9 | 10 line 10 == snap jdown grid=150x11 cursor=7,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save New De /tmp/pardes-snap/scrolloff/cwd New Del /tmp/pardes-snap/scrolloff/cwd New Del -| 6 line 6 +| 6 line 6 ls ls | 7 line 7 g.txt g.txt | 8 line 8 | 9 line 9 | 10 line 10 /tmp/pardes-snap/scrolloff/cwd New Del -| 11 line 11 +| 11 line 11 ls | 12 line 12 g.txt | 13 line 13 | 14 line 14 == snap end grid=150x11 cursor=7,9 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save New De /tmp/pardes-snap/scrolloff/cwd New Del /tmp/pardes-snap/scrolloff/cwd New Del -| 33 line 33 +| 33 line 33 ls ls | 34 line 34 g.txt g.txt | 35 line 35 | 36 line 36 | 37 line 37 /tmp/pardes-snap/scrolloff/cwd New Del -| 38 line 38 +| 38 line 38 ls | 39 line 39 g.txt | 40 line 40 | 41 == snap kup grid=150x11 cursor=7,5 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save New De /tmp/pardes-snap/scrolloff/cwd New Del /tmp/pardes-snap/scrolloff/cwd New Del -| 29 line 29 +| 29 line 29 ls ls | 30 line 30 g.txt g.txt | 31 line 31 | 32 line 32 | 33 line 33 /tmp/pardes-snap/scrolloff/cwd New Del -| 34 line 34 +| 34 line 34 ls | 35 line 35 g.txt | 36 line 36 | 37 line 37 == snap top2 grid=150x11 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/scrolloff/cwd/g.txt Save New De /tmp/pardes-snap/scrolloff/cwd New Del /tmp/pardes-snap/scrolloff/cwd New Del -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 g.txt g.txt | 3 line 3 | 4 line 4 | 5 line 5 /tmp/pardes-snap/scrolloff/cwd New Del -| 6 line 6 +| 6 line 6 ls | 7 line 7 g.txt | 8 line 8 | 9 line 9 diff --git a/test/snapshots/selarg.golden b/test/snapshots/selarg.golden index 174ead70..5c81a3a0 100644 --- a/test/snapshots/selarg.golden +++ b/test/snapshots/selarg.golden @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/selarg/cwd New Del -| +| ls | s.txt | | @@ -33,7 +33,7 @@ |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selarg/cwd New Del /tmp/pardes-snap/selarg/cwd New Del | ZZARG ZZVEE ./c.sh -| +| ./c.sh ZZARG | CHORDARG:ZZARG | | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/selarg/cwd New Del -| +| ls | s.txt | | @@ -64,9 +64,9 @@ |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/selarg/cwd New Del /tmp/pardes-snap/selarg/cwd New Del | ZZARG ZZVEE ./c.sh -| +| ./c.sh ZZARG | CHORDARG:ZZARG -| +| ./c.sh ZZVEE | CHORDARG:ZZVEE | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/selarg/cwd New Del -| +| ls | s.txt | | diff --git a/test/snapshots/shellset.golden b/test/snapshots/shellset.golden index 5cf503f7..8753d0d3 100644 --- a/test/snapshots/shellset.golden +++ b/test/snapshots/shellset.golden @@ -43,7 +43,7 @@ == snap fallback-shell grid=90x20 cursor=49,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shellset/cwd/cmd.txt Save /tmp/pardes-snap/shellset/cwd New Del -| 1 Shell zznosuchshell +| 1 Shell zznosuchshell ls | cmd.txt zmarkfile.txt | | diff --git a/test/snapshots/shrinktag.golden b/test/snapshots/shrinktag.golden index 2ab4565c..bde1836e 100644 --- a/test/snapshots/shrinktag.golden +++ b/test/snapshots/shrinktag.golden @@ -1,7 +1,7 @@ == snap before grid=100x30 cursor=2,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd New Del /tmp/pardes-snap/shrinktag/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/shrinktag/cwd New Del -| +| ls | w.txt | | @@ -32,8 +32,8 @@ == snap shrunk grid=100x30 cursor=2,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd New Del /tmp/pardes-snap/shrinktag/cwd New Del -| /tmp/pardes-snap/shrinktag/cwd New Del -| w.txt +| /tmp/pardes-snap/shrinktag/cwd New Del ls +| ls w.txt | w.txt | | @@ -63,8 +63,8 @@ == snap move-preview grid=100x30 cursor=2,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd New Del /tmp/pardes-snap/shrinktag/cwd New Del -| /tmp/pardes-snap/shrinktag/cwd New Del -| w.txt +| /tmp/pardes-snap/shrinktag/cwd New Del ls +| ls w.txt | w.txt | | @@ -94,7 +94,7 @@ == snap restored grid=100x30 cursor=2,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd New Del /tmp/pardes-snap/shrinktag/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/shrinktag/cwd New Del -| +| ls | w.txt | | @@ -125,7 +125,7 @@ == snap bottom-shrunk grid=100x30 cursor=2,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/shrinktag/cwd New Del /tmp/pardes-snap/shrinktag/cwd New Del -| +| ls ls | w.txt w.txt | | diff --git a/test/snapshots/splitparent.golden b/test/snapshots/splitparent.golden index 281fb5ef..3cc2e6bc 100644 --- a/test/snapshots/splitparent.golden +++ b/test/snapshots/splitparent.golden @@ -1,8 +1,8 @@ == snap shrunk grid=100x30 cursor=4,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/splitparent/cwd New Del /tmp/pardes-snap/splitparent/cwd New Del -| /tmp/pardes-snap/splitparent/cwd New Del -| +| /tmp/pardes-snap/splitparent/cwd New Del ls +| ls | | | @@ -32,11 +32,11 @@ == snap swap-parent grid=100x30 cursor=4,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/splitparent/cwd New Del /tmp/pardes-snap/splitparent/cwd New Del -| /tmp/pardes-snap/splitparent/cwd New Del -| +| /tmp/pardes-snap/splitparent/cwd New Del ls +| ls | | /tmp/pardes-snap/splitparent/cwd New Del -| +| ls | | | @@ -69,11 +69,11 @@ == snap regrown grid=100x30 cursor=54,18 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/splitparent/cwd New Del /tmp/pardes-snap/splitparent/cwd New Del -| /tmp/pardes-snap/splitparent/cwd New Del -| +| /tmp/pardes-snap/splitparent/cwd New Del ls +| ls | | /tmp/pardes-snap/splitparent/cwd New Del -| +| ls | | | @@ -84,7 +84,7 @@ | | | /tmp/pardes-snap/splitparent/cwd New Del -| +| ls | | | diff --git a/test/snapshots/syntax.golden b/test/snapshots/syntax.golden index ac220610..5d6b85c7 100644 --- a/test/snapshots/syntax.golden +++ b/test/snapshots/syntax.golden @@ -1,7 +1,7 @@ == snap zig-open grid=150x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/syntax/cwd/demo.zig Save New De /tmp/pardes-snap/syntax/cwd New Del /tmp/pardes-snap/syntax/cwd New Del -| 1 const std = @import("std"); // greet +| 1 const std = @import("std"); // greet ls ls | 2 pub fn main() void { demo.zig demo.zig | 3 var x: u32 = 42; | 4 _ = x; @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/syntax/cwd New Del -| +| ls | demo.zig | | @@ -63,7 +63,7 @@ == style colors-off |0: 0-56 #949494,#121212, 57-149 d,#121212, |1: 0-1 #ffffff,#626262, 2-49 #949494,#121212, 50-51 #ffffff,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-101 #ffffff,#262626, 102-136 #949494,#121212, 137-149 d,#121212, -|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-42 #bdbdbd,#080808, 43-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, +|2: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-42 #bdbdbd,#080808, 43-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-53 #bdbdbd,#080808, 54-99 d,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-103 #bdbdbd,#080808, 104-149 d,#080808, |3: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-26 #bdbdbd,#080808, 27-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-59 #bdbdbd,#080808, 60-99 d,#080808, 100-100 d,#444444, 101-101 d,#080808, 102-109 #bdbdbd,#080808, 110-149 d,#080808, |4: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-26 #bdbdbd,#080808, 27-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, @@ -78,7 +78,7 @@ |14: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |15: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |16: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-51 #ffffff,#262626, 52-86 #949494,#121212, 87-99 d,#121212, 100-100 d,#444444, 101-149 d,#080808, -|17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, +|17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-53 #bdbdbd,#080808, 54-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |18: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-51 d,#080808, 52-59 #bdbdbd,#080808, 60-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |19: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, |20: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-49 d,#080808, 50-50 d,#444444, 51-99 d,#080808, 100-100 d,#444444, 101-149 d,#080808, diff --git a/test/snapshots/tag.golden b/test/snapshots/tag.golden index f24790d2..13cb2e72 100644 --- a/test/snapshots/tag.golden +++ b/test/snapshots/tag.golden @@ -1,7 +1,7 @@ == 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 -| +| ls ls | t.txt t.txt | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/tag/cwd New Del -| +| ls | t.txt | | @@ -32,7 +32,7 @@ == snap tag-typed grid=150x30 cursor=45,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd t.txt New Del /tmp/pardes-snap/tag/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/tag/cwd New Del -| +| ls | t.txt | | @@ -63,7 +63,7 @@ == snap tag-del grid=150x30 cursor=41,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd t New Del /tmp/pardes-snap/tag/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/tag/cwd New Del -| +| ls | t.txt | | @@ -94,7 +94,7 @@ == snap tag-exit grid=150x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tag/cwd t.txt New Del /tmp/pardes-snap/tag/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/tag/cwd New Del -| +| ls | t.txt | | @@ -125,7 +125,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 t.txt /tmp/pardes-snap/tag/cwd New Del -| 1 ZZLOOKED +| 1 ZZLOOKED ls ls | t.txt t.txt | | @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/tag/cwd New Del -| +| ls | t.txt | | diff --git a/test/snapshots/tagalign.golden b/test/snapshots/tagalign.golden index a9dda3c7..867d4c2a 100644 --- a/test/snapshots/tagalign.golden +++ b/test/snapshots/tagalign.golden @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/tagalign/cwd New Del -| +| ls | deep | | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/tagalign/cwd New Del -| +| ls | deep | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/tagalign/cwd New Del -| +| ls | deep | | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/tagalign/cwd New Del -| +| ls | deep | | @@ -125,7 +125,7 @@ == snap alone grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagalign/cwd New Del -| +| ls | deep | | diff --git a/test/snapshots/tagalign2col.golden b/test/snapshots/tagalign2col.golden index d5d22935..2db32f08 100644 --- a/test/snapshots/tagalign2col.golden +++ b/test/snapshots/tagalign2col.golden @@ -1,7 +1,7 @@ == snap onecol grid=160x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save New Del /tmp/pardes-snap/tagalign2col/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta deep | 3 gamma | @@ -32,7 +32,7 @@ == snap aligned grid=160x30 cursor=4,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save New Del /tmp/pardes-snap/tagalign2col/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta deep | 3 gamma | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/tagalign2col/cwd New Del -| +| ls | deep | | @@ -63,7 +63,7 @@ == snap widened grid=160x30 cursor=4,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/tagalign2col/cwd/deep/proj/document.txt Save New Del ╎ /tmp/pardes-snap/tagalign2col/cwd New Del -| 1 alpha ╎ +| 1 alpha ╎ ls | 2 beta ╎ deep | 3 gamma ╎ | ╎ @@ -78,7 +78,7 @@ | ╎ | ╎ | /tmp/pardes-snap/tagalign2col/cwd New Del ╎ -| ╎ +| ls ╎ | deep ╎ | ╎ | ╎ diff --git a/test/snapshots/tagbottomimage.golden b/test/snapshots/tagbottomimage.golden index 72b31809..9ba62909 100644 --- a/test/snapshots/tagbottomimage.golden +++ b/test/snapshots/tagbottomimage.golden @@ -1,7 +1,7 @@ == snap img-top grid=150x30 cursor=11,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | img /tmp/pardes-snap/tagbottomimage/cwd/pic.ppm New Del /tmp/pardes-snap/tagbottomimage/cwd New Del -| (f🬱]0V7R*%m🬶🬁G🬬tN#XR9q🬢tC#f/🬜_GR(🬞🬙tCRp$o*7^+[#H7s🬢YDZ🬝▟ +| (f🬱]0V7R*%m🬶🬁G🬬tN#XR9q🬢tC#f/🬜_GR(🬞🬙tCRp$o*7^+[#H7s🬢YDZ🬝▟ ls | iU)dSotT[r27T"\*Fh▐🬅g,🬰p🬛▙🬲&*3/9xy🬛▀0kCg▛🬱C,>C}PC06m🬝▟█ pic.ppm | "S▄;$gs,Xa▟T🬔s▖┼W▘?by🬋🬭uCR3/A3🬶lO▖▞🬃🬘╳🬟#=🬺🬕yoaJ@>4🬝🬵 | ─m!fAAD🬒jW>7JkR▄▜🬫🬞🬢FWx╲▟2ZT🬥/▖jteR?q🬶^🬅▀_@N─u4🬹🬝🬹 @@ -31,7 +31,7 @@ | 🬝🬹 == snap img-bottom grid=150x30 cursor=11,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| (f🬱]0V7R*%m🬶🬁G🬬tN#XR9q🬢tC#f/🬜_GR(🬞🬙tCRp$o*7^+[#H7s🬢YDZ🬝▟ +| (f🬱]0V7R*%m🬶🬁G🬬tN#XR9q🬢tC#f/🬜_GR(🬞🬙tCRp$o*7^+[#H7s🬢YDZ🬝▟ ls | iU)dSotT[r27T"\*Fh▐🬅g,🬰p🬛▙🬲&*3/9xy🬛▀0kCg▛🬱C,>C}PC06m🬝▟█ pic.ppm | "S▄;$gs,Xa▟T🬔s▖┼W▘?by🬋🬭uCR3/A3🬶lO▖▞🬃🬘╳🬟#=🬺🬕yoaJ@>4🬝🬵 | ─m!fAAD🬒jW>7JkR▄▜🬫🬞🬢FWx╲▟2ZT🬥/▖jteR?q🬶^🬅▀_@N─u4🬹🬝🬹 @@ -93,7 +93,7 @@ |29: 0-1 #ffffff,#626262, 2-56 #949494,#121212, 57-74 d,#121212, 75-76 #ffffff,#262626, 77-129 #949494,#121212, 130-149 d,#121212, == snap search-prompt grid=150x30 cursor=6,28 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| (f🬱]0V7R*%m🬶🬁G🬬tN#XR9q🬢tC#f/🬜_GR(🬞🬙tCRp$o*7^+[#H7s🬢YDZ🬝▟ +| (f🬱]0V7R*%m🬶🬁G🬬tN#XR9q🬢tC#f/🬜_GR(🬞🬙tCRp$o*7^+[#H7s🬢YDZ🬝▟ ls | iU)dSotT[r27T"\*Fh▐🬅g,🬰p🬛▙🬲&*3/9xy🬛▀0kCg▛🬱C,>C}PC06m🬝▟█ pic.ppm | "S▄;$gs,Xa▟T🬔s▖┼W▘?by🬋🬭uCR3/A3🬶lO▖▞🬃🬘╳🬟#=🬺🬕yoaJ@>4🬝🬵 | ─m!fAAD🬒jW>7JkR▄▜🬫🬞🬢FWx╲▟2ZT🬥/▖jteR?q🬶^🬅▀_@N─u4🬹🬝🬹 @@ -124,7 +124,7 @@ | img /tmp/pardes-snap/tagbottomimage/cwd/pic.ppm New Del /tmp/pardes-snap/tagbottomimage/cwd New Del == snap del-image grid=150x30 cursor=5,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| +| ls | pic.ppm | | diff --git a/test/snapshots/tagnav.golden b/test/snapshots/tagnav.golden index 1c9186be..075cf45d 100644 --- a/test/snapshots/tagnav.golden +++ b/test/snapshots/tagnav.golden @@ -1,7 +1,7 @@ == snap start grid=100x30 cursor=7,2 |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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -32,7 +32,7 @@ == 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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -63,7 +63,7 @@ == 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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -94,7 +94,7 @@ == 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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -125,7 +125,7 @@ == snap down-tag grid=100x30 cursor=41,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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -156,7 +156,7 @@ == 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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -171,7 +171,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -187,7 +187,7 @@ == snap up-edge grid=100x30 cursor=0,0 |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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -202,7 +202,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -218,7 +218,7 @@ == snap topbar-word grid=100x30 cursor=3,0 |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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -233,7 +233,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -249,7 +249,7 @@ == snap topbar-graphemes grid=100x30 cursor=5,0 |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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -264,7 +264,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -280,7 +280,7 @@ == 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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -295,7 +295,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -311,7 +311,7 @@ == 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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -326,7 +326,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -342,7 +342,7 @@ == snap back-to-body grid=100x30 cursor=7,2 |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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -357,7 +357,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -388,7 +388,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -404,7 +404,7 @@ == 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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -419,7 +419,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -450,7 +450,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -481,7 +481,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -512,7 +512,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -543,7 +543,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -574,7 +574,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | @@ -590,7 +590,7 @@ == snap topbar-restored grid=100x30 cursor=7,2 |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 +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -605,7 +605,7 @@ | | | /tmp/pardes-snap/tagnav/cwd New Del -| +| ls | w.txt | | diff --git a/test/snapshots/theme.golden b/test/snapshots/theme.golden index b7d8d384..d1941f9b 100644 --- a/test/snapshots/theme.golden +++ b/test/snapshots/theme.golden @@ -1,7 +1,7 @@ == snap helix grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd New Del /tmp/pardes-snap/theme/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/theme/cwd New Del -| +| ls | t.txt | | @@ -63,7 +63,7 @@ == snap dark grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd New Del /tmp/pardes-snap/theme/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/theme/cwd New Del -| +| ls | t.txt | | @@ -125,7 +125,7 @@ == snap acme grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd New Del /tmp/pardes-snap/theme/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/theme/cwd New Del -| +| ls | t.txt | | @@ -187,7 +187,7 @@ == snap colors-off grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd New Del /tmp/pardes-snap/theme/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -202,7 +202,7 @@ | | | /tmp/pardes-snap/theme/cwd New Del -| +| ls | t.txt | | @@ -218,7 +218,7 @@ == style colors-off |0: 0-56 #000000,#eaffff, 57-99 d,#eaffff, |1: 0-1 #ffffff,#6e4fd0, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-51 #ffffff,#383c54, 52-85 #000000,#eaffff, 86-99 d,#eaffff, -|2: 0-99 d,#ffffea, +|2: 0-1 d,#ffffea, 2-3 #000000,#ffffea, 4-51 d,#ffffea, 52-53 #000000,#ffffea, 54-99 d,#ffffea, |3: 0-1 d,#ffffea, 2-6 #000000,#ffffea, 7-51 d,#ffffea, 52-56 #000000,#ffffea, 57-99 d,#ffffea, |4: 0-99 d,#ffffea, |5: 0-99 d,#ffffea, @@ -233,7 +233,7 @@ |14: 0-99 d,#ffffea, |15: 0-99 d,#ffffea, |16: 0-1 #ffffff,#383c54, 2-35 #000000,#eaffff, 36-49 d,#eaffff, 50-99 d,#ffffea, -|17: 0-99 d,#ffffea, +|17: 0-1 d,#ffffea, 2-3 #000000,#ffffea, 4-99 d,#ffffea, |18: 0-1 d,#ffffea, 2-6 #000000,#ffffea, 7-99 d,#ffffea, |19: 0-99 d,#ffffea, |20: 0-99 d,#ffffea, @@ -249,7 +249,7 @@ == snap generated grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/theme/cwd New Del /tmp/pardes-snap/theme/cwd New Del -| +| ls ls | t.txt t.txt | | @@ -264,7 +264,7 @@ | | | /tmp/pardes-snap/theme/cwd New Del -| +| ls | t.txt | | diff --git a/test/snapshots/themesel.golden b/test/snapshots/themesel.golden index 08d5a271..7303ea55 100644 --- a/test/snapshots/themesel.golden +++ b/test/snapshots/themesel.golden @@ -60,7 +60,7 @@ | 11 Theme andromeda | 12 Theme ao | 13 Theme ashen -== snap step-helix grid=100x30 cursor=7,2 +== snap step-helix grid=100x30 cursor=7,17 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 @@ -93,8 +93,8 @@ | 13 Theme ashen == style step-helix |0: 0-56 #949494,#121212, 57-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, +|1: 0-1 #ffffff,#262626, 2-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, |5: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-12 #bdbdbd,#080808, 13-99 d,#080808, @@ -108,8 +108,8 @@ |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-79 #949494,#121212, 80-99 d,#121212, -|17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #626262,#080808, 7-99 #080808,#80a0ff, +|16: 0-1 #ffffff,#626262, 2-79 #949494,#121212, 80-99 d,#121212, +|17: 0-0 d,#444444, 1-1 d,#080808, 2-6 #949494,#121212, 7-17 #bdbdbd,#080808, 18-99 d,#080808, |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, |20: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-16 #bdbdbd,#080808, 17-99 d,#080808, @@ -122,7 +122,7 @@ |27: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-21 #bdbdbd,#080808, 22-99 d,#080808, |28: 0-0 d,#121212, 1-1 d,#080808, 2-6 #626262,#080808, 7-14 #bdbdbd,#080808, 15-99 d,#080808, |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 +== snap step-dark grid=100x30 cursor=7,18 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 @@ -155,8 +155,8 @@ | 13 Theme ashen == style step-dark |0: 0-56 #969696,#2c2a3e, 57-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, +|1: 0-1 #ffffff,#383c54, 2-79 #969696,#2c2a3e, 80-99 d,#2c2a3e, +|2: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 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, |5: 0-0 d,#525252, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, @@ -170,9 +170,9 @@ |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-79 #969696,#2c2a3e, 80-99 d,#2c2a3e, +|16: 0-1 #ffffff,#6e4fd0, 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, +|18: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #969696,#2c2a3e, 7-99 d,d, |19: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |20: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |21: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, @@ -184,7 +184,7 @@ |27: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |28: 0-0 d,#2a2a2a, 1-1 d,d, 2-6 #5a5a5a,d, 7-99 d,d, |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 +== snap step-acme grid=100x30 cursor=7,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 @@ -217,8 +217,8 @@ | 13 Theme ashen == style step-acme |0: 0-56 #000000,#eaffff, 57-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, +|1: 0-1 #ffffff,#383c54, 2-79 #000000,#eaffff, 80-99 d,#eaffff, +|2: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 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, |5: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, @@ -232,10 +232,10 @@ |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-79 #000000,#eaffff, 80-99 d,#eaffff, +|16: 0-1 #ffffff,#6e4fd0, 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, +|19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #000000,#eaffff, 7-16 #000000,#ffffea, 17-99 d,#ffffea, |20: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea, |21: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea, |22: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-24 #000000,#ffffea, 25-99 d,#ffffea, @@ -246,7 +246,7 @@ |27: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-21 #000000,#ffffea, 22-99 d,#ffffea, |28: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-14 #000000,#ffffea, 15-99 d,#ffffea, |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 +== snap step-generated grid=100x30 cursor=7,20 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 @@ -279,8 +279,8 @@ | 13 Theme ashen == style step-generated |0: 0-56 #e0e0e0,#1e262e, 57-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, +|1: 0-1 #ffffff,#303840, 2-79 #e0e0e0,#1e262e, 80-99 d,#1e262e, +|2: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 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, |5: 0-0 d,#303840, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-12 #e0e0e0,#161e26, 13-99 d,#161e26, @@ -294,11 +294,11 @@ |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-79 #e0e0e0,#1e262e, 80-99 d,#1e262e, +|16: 0-1 #000000,#ffa060, 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, -|20: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-99 #e0e0e0,#303840, +|20: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #e0e0e0,#1e262e, 7-16 #e0e0e0,#161e26, 17-99 d,#161e26, |21: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-22 #e0e0e0,#161e26, 23-99 d,#161e26, |22: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-24 #e0e0e0,#161e26, 25-99 d,#161e26, |23: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-25 #e0e0e0,#161e26, 26-99 d,#161e26, @@ -308,7 +308,7 @@ |27: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-21 #e0e0e0,#161e26, 22-99 d,#161e26, |28: 0-0 d,#1e262e, 1-1 d,#161e26, 2-6 #303840,#161e26, 7-14 #e0e0e0,#161e26, 15-99 d,#161e26, |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 +== snap step-back grid=100x30 cursor=7,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/themesel/cwd/t.txt Save New Del | 1 line 1 @@ -341,8 +341,8 @@ | 13 Theme ashen == style step-back |0: 0-56 #000000,#eaffff, 57-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, +|1: 0-1 #ffffff,#383c54, 2-79 #000000,#eaffff, 80-99 d,#eaffff, +|2: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 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, |5: 0-1 d,#ffffea, 2-6 #999980,#ffffea, 7-12 #000000,#ffffea, 13-99 d,#ffffea, @@ -356,10 +356,10 @@ |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-79 #000000,#eaffff, 80-99 d,#eaffff, +|16: 0-1 #ffffff,#6e4fd0, 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, +|19: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #000000,#eaffff, 7-16 #000000,#ffffea, 17-99 d,#ffffea, |20: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-16 #000000,#ffffea, 17-99 d,#ffffea, |21: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-22 #000000,#ffffea, 23-99 d,#ffffea, |22: 0-0 d,#99994c, 1-1 d,#ffffea, 2-6 #999980,#ffffea, 7-24 #000000,#ffffea, 25-99 d,#ffffea, diff --git a/test/snapshots/themesel.snap b/test/snapshots/themesel.snap index d714fa84..cff136f1 100644 --- a/test/snapshots/themesel.snap +++ b/test/snapshots/themesel.snap @@ -1,10 +1,14 @@ # RULE: a results buffer is a list of things you can RUN, and its traits say -# which verb runs them. Every list before this one held LOCATIONS, so stepping -# a row with n/N Looks it. `SPC t t` (ThemeSel) opens the first one whose rows -# are COMMANDS — `Theme <name>`, exactly the line you would type — so n/N Exec -# each row instead. Walking the list therefore wears the themes as you pass -# them, and picking one is stopping on it: there is no preview state, nothing -# to confirm and nothing to cancel, because arriving already did it. +# what a ROW IS. Every list before this one held LOCATIONS — a row with a +# `path:LINE:COL` word inside it — so n/N select that word and Enter Looks it. +# `SPC t t` (ThemeSel) opens the first one whose rows are COMMANDS: `Theme +# <name>`, exactly the line you would type, with no path in it to pick out, so +# n/N select the WHOLE ROW. One motion, two grains, and the same split either +# way — the step only SELECTS, and Tab (Exec, or the middle button, which is +# the same builtin) is what RUNS what it left. Walking the list therefore +# wears nothing as you pass; the theme changes on the Tab, and picking one is +# running it and stopping. There is still no preview state, nothing to confirm +# and nothing to cancel: the row you ran is the theme you have. # # Both halves of the ring are in the buffer: the three pardes ships with come # first (helix, dark, acme), then everything tools/gen_themes.zig exported from @@ -16,25 +20,29 @@ start 30 100 t.txt wait 8000 t.txt stable 700 20000 snap boot -# SPC t t: the list lands below the pane that asked, focus stays HERE — n/N are -# read in this pane and they step the buffer they just armed. +# SPC t t: the list lands below the pane that asked, focus stays HERE — but a +# fresh output buffer is where the walk's ring starts, so the first n goes +# into the list and every one after it carries on down it. key space t t wait 10000 Theme helix stable 700 15000 snap list -# n selects row 1 and runs it: `Theme helix`, which is already the boot theme, -# so only the selection moves. That is the honest first step — an idempotent -# command has to be safe to step onto. +# n selects row 1 whole and Tab runs it: `Theme helix`, which is already the +# boot theme, so only the selection moves. That is the honest first step — an +# idempotent command has to be safe to run. key n +key tab stable 700 15000 snap step-helix snapstyle step-helix # ...and now the theme really does change under the cursor, one row at a time key n +key tab stable 700 15000 snap step-dark snapstyle step-dark key n +key tab stable 700 15000 snap step-acme snapstyle step-acme @@ -43,24 +51,27 @@ snapstyle step-acme # vendored first. That is the point of sorting: the ring is the same everywhere # whatever order the directory read handed the files over in. key n +key tab stable 700 15000 snap step-generated snapstyle step-generated -# N walks back the same way, running the row it lands on — so the theme -# rewinds too +# N walks back the same way — it is the exact inverse of n — and the Tab after +# it runs the row it lands on, so the theme rewinds too key N +key tab 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 Last, -# so it deliberately leaves this document-like output buffer open. -key space w j -stable 400 5000 +# PICKING is just stopping: the theme the last Tab ran is still on, and the +# list is closed with an explicit Del. No window move is needed to get there — +# the walk lands IN the pane it steps, so the cursor has been in the list +# since the first n. Body-normal Esc is Last, so it deliberately leaves this +# document-like output buffer open. # ...and the WHOLE ring is in there, all 228 rows: `ge` to the last line, which # only reaches `Theme zenburn` if nothing truncated the buffer on the way in. It -# is an ordinary file pane, so it scrolls like one; a motion is not a step, so -# no theme is run and the one step-back chose is still on. +# is an ordinary file pane, so it scrolls like one; a motion runs nothing and +# neither does a step, so no theme changes here and the one the last Tab chose +# is still on. key g e stable 700 15000 snap tail diff --git a/test/snapshots/tinywin.golden b/test/snapshots/tinywin.golden index 6e085aa9..36d1af12 100644 --- a/test/snapshots/tinywin.golden +++ b/test/snapshots/tinywin.golden @@ -3,16 +3,16 @@ |$ /tmp/pardes-snap/tinywin/cwd New Del | $ | /tmp/pardes-snap/tinywin/cwd New Del -| +| ls | | /tmp/pardes-snap/tinywin/cwd New Del -| +| ls | | /tmp/pardes-snap/tinywin/cwd New Del -| +| ls | | /tmp/pardes-snap/tinywin/cwd New Del -| +| ls | | | @@ -36,18 +36,18 @@ == 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 -| $ +| $ ls ls ls | /tmp/pardes-snap/tinywi -| +| ls | | /tmp/pardes-snap/tinywi -| +| ls | | /tmp/pardes-snap/tinywi -| +| ls | | /tmp/pardes-snap/tinywi -| +| ls | | | diff --git a/test/snapshots/topbarexec.golden b/test/snapshots/topbarexec.golden index ed996103..bed96fbd 100644 --- a/test/snapshots/topbarexec.golden +++ b/test/snapshots/topbarexec.golden @@ -1,7 +1,7 @@ == snap selected grid=90x20 cursor=14,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/topbarexec/cwd New Del /tmp/pardes-snap/topbarexec/cwd New Del -| +| ls ls | zmarkfile.txt zmarkfile.txt | | @@ -11,7 +11,7 @@ | | | /tmp/pardes-snap/topbarexec/cwd New Del -| +| ls | zmarkfile.txt | | @@ -22,7 +22,7 @@ == snap noarg-runs grid=90x20 cursor=14,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/topbarexec/cwd New Del /tmp/pardes-s╭────────────────────────────╮ -| │pardes resizes=1 │ +| ls ls │pardes resizes=1 │ | zmarkfile.txt zmarkfile.txt│terms 3 cols 2 │ | │active #0 43x9 │ | │scroll 0/9 │ @@ -32,7 +32,7 @@ | | | /tmp/pardes-snap/topbarexec/cwd New Del -| +| ls | zmarkfile.txt | | @@ -43,7 +43,7 @@ == snap arg-still-spliced grid=90x20 cursor=14,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/topbarexec/cwd New Del /tmp/pardes-snap/topbarexec/cwd New Del -| +| ls ls | zmarkfile.txt zmarkfile.txt | | @@ -53,7 +53,7 @@ | /tmp/pardes-snap/topbarexec/cwd/+Search New | 1 zmarkfile.txt | /tmp/pardes-snap/topbarexec/cwd New Del -| +| ls | zmarkfile.txt | | diff --git a/test/snapshots/tty.golden b/test/snapshots/tty.golden index f15afcb9..3b4d08c1 100644 --- a/test/snapshots/tty.golden +++ b/test/snapshots/tty.golden @@ -1,7 +1,7 @@ == snap tty-on grid=100x30 cursor=4,4 |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 +| $ ls ls | m.txt m.txt | $ | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/tty/cwd New Del -| +| ls | m.txt | | @@ -32,7 +32,7 @@ == snap tty-echo 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 +| $ ls ls | m.txt m.txt | $ echo SNAP''OK | SNAPOK @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/tty/cwd New Del -| +| ls | m.txt | | @@ -63,9 +63,9 @@ == snap tty-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 -| +| ls ls | m.txt m.txt -| +| echo SNAP''OK | SNAPOK | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/tty/cwd New Del -| +| ls | m.txt | | @@ -94,7 +94,7 @@ == snap shift-esc-on 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 +| $ ls ls | m.txt m.txt | $ echo SNAP''OK | SNAPOK @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/tty/cwd New Del -| +| ls | m.txt | | @@ -125,7 +125,7 @@ == 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 +| $ ls ls | m.txt m.txt | $ echo SNAP''OK | SNAPOK @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/tty/cwd New Del -| +| ls | m.txt | | @@ -156,9 +156,9 @@ == 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 -| +| ls ls | m.txt m.txt -| +| echo SNAP''OK | SNAPOK | | @@ -171,7 +171,7 @@ | | | /tmp/pardes-snap/tty/cwd New Del -| +| ls | m.txt | | diff --git a/test/snapshots/ttyclick.golden b/test/snapshots/ttyclick.golden index a2d579ec..149073f7 100644 --- a/test/snapshots/ttyclick.golden +++ b/test/snapshots/ttyclick.golden @@ -1,7 +1,7 @@ == snap tty-bodyclick grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyclick/cwd New Del /tmp/pardes-snap/ttyclick/cwd New Del -| $ ls +| $ ls ls | probe.txt probe.txt | $ | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/ttyclick/cwd New Del -| +| ls | probe.txt | | @@ -32,7 +32,7 @@ == snap tty-tagedit grid=100x30 cursor=39,1 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyclick/cwd New Del /tmp/pardes-snap/ttyclick/cwd New Del -| +| ls ls | probe.txt probe.txt | | @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/ttyclick/cwd New Del -| +| ls | probe.txt | | @@ -63,7 +63,7 @@ == snap tty-tagexit grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyclick/cwd New Del /tmp/pardes-snap/ttyclick/cwd New Del -| $ ls +| $ ls ls | probe.txt probe.txt | $ | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/ttyclick/cwd New Del -| +| ls | probe.txt | | @@ -94,7 +94,7 @@ == snap ins-bodyclick grid=100x30 cursor=11,3 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |^ /tmp/pardes-snap/ttyclick/cwd New Del /tmp/pardes-snap/ttyclick/cwd New Del -| +| ls ls | probe.txt probe.txt | | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/ttyclick/cwd New Del -| +| ls | probe.txt | | diff --git a/test/snapshots/ttyedit.golden b/test/snapshots/ttyedit.golden index 37982bb4..c0a190d8 100644 --- a/test/snapshots/ttyedit.golden +++ b/test/snapshots/ttyedit.golden @@ -1,10 +1,10 @@ == snap before grid=100x30 cursor=7,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd New Del /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls | words.txt | | @@ -32,10 +32,10 @@ == snap split grid=100x30 cursor=2,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |^ /tmp/pardes-snap/ttyedit/cwd New Del /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one t | wo three | four five six @@ -47,7 +47,7 @@ | | | /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls | words.txt | | @@ -63,10 +63,10 @@ == snap opened grid=100x30 cursor=6,8 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd New Del /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one t | wo three | OPEN @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls | words.txt | | @@ -94,10 +94,10 @@ == snap joined grid=100x30 cursor=10,7 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd New Del /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one t | wo threeOPEN | four five six @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls | words.txt | | @@ -125,10 +125,10 @@ == snap undone grid=100x30 cursor=7,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyedit/cwd New Del /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls ls | words.txt words.txt -| -| +| printf 'one two three\nfour five six\nseven ei +| ght nine\n' | one two three | four five six | seven eight nine @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/ttyedit/cwd New Del -| +| ls | words.txt | | diff --git a/test/snapshots/ttyfollow.golden b/test/snapshots/ttyfollow.golden index b21549a0..4fcc0741 100644 --- a/test/snapshots/ttyfollow.golden +++ b/test/snapshots/ttyfollow.golden @@ -1,7 +1,7 @@ == snap held-pre grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttyfollow/cwd New Del /tmp/pardes-snap/ttyfollow/cwd New Del -| 185 +| 185 ls | 186 s.txt | 187 | 188 @@ -16,7 +16,7 @@ | 197 | 198 | /tmp/pardes-snap/ttyfollow/cwd New Del -| +| ls | s.txt | | @@ -47,7 +47,7 @@ | 197 | 198 | /tmp/pardes-snap/ttyfollow/cwd New Del -| +| ls | s.txt | | @@ -78,7 +78,7 @@ | 300 | $ | /tmp/pardes-snap/ttyfollow/cwd New Del -| +| ls | s.txt | | diff --git a/test/snapshots/ttyhelp.golden b/test/snapshots/ttyhelp.golden index a580263b..7895d83e 100644 --- a/test/snapshots/ttyhelp.golden +++ b/test/snapshots/ttyhelp.golden @@ -38,28 +38,28 @@ | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. | 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol -| 7 SPC c n Newcol topbar -| 8 SPC d Del -| 9 SPC f c Config -| 10 SPC f f Find topbar -| 11 SPC f g Grep topbar -| 12 SPC f n New topbar -| 13 SPC f s Save -| 14 SPC h t Tutor topbar -| 15 SPC j i Forward C-i -| 16 SPC j j Last -| 17 SPC j l Jumplist -| 18 SPC j o Back C-o -| 19 SPC k Kill topbar -| 20 SPC l D WsDiagnostics -| 21 SPC l S WsSymbols -| 22 SPC l a CodeAction -| 23 SPC l d Diagnostics -| 24 SPC l h SelectRefs -| 25 SPC l i Lspinfo -| 26 SPC l k Hover +| 5 SPC ? Help topbar +| 6 SPC P ClipPasteBefore +| 7 SPC R ClipReplace +| 8 SPC Y ClipYankMain +| 9 SPC c d Delcol +| 10 SPC c n Newcol topbar +| 11 SPC d Del +| 12 SPC f c Config +| 13 SPC f f Find topbar +| 14 SPC f g Grep topbar +| 15 SPC f n New topbar +| 16 SPC f s Save +| 17 SPC h t Tutor topbar +| 18 SPC j i Forward C-i +| 19 SPC j j Last +| 20 SPC j l Jumplist +| 21 SPC j o Back C-o +| 22 SPC k Kill topbar +| 23 SPC l D WsDiagnostics +| 24 SPC l S WsSymbols +| 25 SPC l a CodeAction +| 26 SPC l d Diagnostics == snap leaderworks grid=100x30 cursor=7,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/ttyhelp/cwd New Del @@ -69,25 +69,25 @@ | 2 SPC and its keys, a chord, a button, the | 3 topbar - or the name, executed anywhere. | 4 -| 5 SPC ? Help topbar -| 6 SPC c d Delcol -| 7 SPC c n Newcol topbar -| 8 SPC d Del -| 9 SPC f c Config -| 10 SPC f f Find topbar -| 11 SPC f g Grep topbar -| 12 SPC f n New topbar -| 13 SPC f s Save -| 14 SPC h t Tutor topbar -| 15 SPC j i Forward C-i -| 16 SPC j j Last -| 17 SPC j l Jumplist -| 18 SPC j o Back C-o -| 19 SPC k Kill topbar -| 20 SPC l D WsDiagnostics -| 21 SPC l S WsSymbols -| 22 SPC l a CodeAction -| 23 SPC l d Diagnostics -| 24 SPC l h SelectRefs -| 25 SPC l i Lspinfo -| 26 SPC l k Hover +| 5 SPC ? Help topbar +| 6 SPC P ClipPasteBefore +| 7 SPC R ClipReplace +| 8 SPC Y ClipYankMain +| 9 SPC c d Delcol +| 10 SPC c n Newcol topbar +| 11 SPC d Del +| 12 SPC f c Config +| 13 SPC f f Find topbar +| 14 SPC f g Grep topbar +| 15 SPC f n New topbar +| 16 SPC f s Save +| 17 SPC h t Tutor topbar +| 18 SPC j i Forward C-i +| 19 SPC j j Last +| 20 SPC j l Jumplist +| 21 SPC j o Back C-o +| 22 SPC k Kill topbar +| 23 SPC l D WsDiagnostics +| 24 SPC l S WsSymbols +| 25 SPC l a CodeAction +| 26 SPC l d Diagnostics diff --git a/test/snapshots/ttylook.golden b/test/snapshots/ttylook.golden index 41e16c99..bf3785cc 100644 --- a/test/snapshots/ttylook.golden +++ b/test/snapshots/ttylook.golden @@ -1,7 +1,7 @@ == 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 -| +| ls ls | big.txt plain.txt sub big.txt plain.txt sub | | @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/ttylook/cwd New Del -| +| ls | big.txt plain.txt sub | | @@ -63,7 +63,7 @@ == 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 -| +| ls ls | big.txt plain.txt sub big.txt plain.txt sub | | @@ -78,7 +78,7 @@ | | | /tmp/pardes-snap/ttylook/cwd New Del -| +| ls | big.txt plain.txt sub | | @@ -94,7 +94,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 -| +| ls ls | big.txt plain.txt sub big.txt plain.txt sub | | @@ -109,7 +109,7 @@ | | | /tmp/pardes-snap/ttylook/cwd New Del -| +| ls | big.txt plain.txt sub | | @@ -125,7 +125,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 -| +| ls ls | nnbig.txt plain.txt sub big.txt plain.txt sub | | @@ -140,7 +140,7 @@ | | | /tmp/pardes-snap/ttylook/cwd New Del -| +| ls | big.txt plain.txt sub | | @@ -156,7 +156,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 -| +| ls ls | big.txt plain.txt sub big.txt plain.txt sub | | @@ -171,7 +171,7 @@ | | | /tmp/pardes-snap/ttylook/cwd New Del -| +| ls | big.txt plain.txt sub | | @@ -187,11 +187,11 @@ == 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 -| +| ls ls | big.txt plain.txt sub big.txt plain.txt sub | | /tmp/pardes-snap/ttylook/cwd/sub New Del -| +| ls | | | @@ -202,7 +202,7 @@ | | | /tmp/pardes-snap/ttylook/cwd New Del -| +| ls | big.txt plain.txt sub | | @@ -215,14 +215,14 @@ | | | -== snap noop grid=120x30 cursor=4,7 +== snap noop 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 -| +| ls ls | big.txt plain.txt sub big.txt plain.txt sub | | /tmp/pardes-snap/ttylook/cwd/sub New Del -| +| ls | | | @@ -233,7 +233,7 @@ | | | /tmp/pardes-snap/ttylook/cwd New Del -| +| ls | big.txt plain.txt sub | | @@ -249,11 +249,11 @@ == snap fileopen grid=120x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/ttylook/cwd/big.txt S /tmp/pardes-snap/ttylook/cwd New Del /tmp/pardes-snap/ttylook/cwd New Del -| 1 line 1 +| 1 line 1 ls ls | 2 line 2 big.txt plain.txt sub big.txt plain.txt sub | 3 line 3 | 4 line 4 /tmp/pardes-snap/ttylook/cwd/sub New D -| 5 line 5 +| 5 line 5 ls | 6 line 6 | 7 line 7 | 8 line 8 @@ -264,7 +264,7 @@ | 13 line 13 | 14 line 14 | 15 line 15 /tmp/pardes-snap/ttylook/cwd New Del -| 16 line 16 +| 16 line 16 ls | 17 line 17 big.txt plain.txt sub | 18 line 18 | 19 line 19 diff --git a/test/snapshots/ttylook.snap b/test/snapshots/ttylook.snap index cc746970..66b178d7 100644 --- a/test/snapshots/ttylook.snap +++ b/test/snapshots/ttylook.snap @@ -2,9 +2,10 @@ # whitespace-separated token that look resolves — several per line, so the # greet ls row hops big.txt -> plain.txt -> sub — moving the cursor to the # token start and opening NOTHING. Return looks the selection (dir -> shell -# +ls there, file -> pane) and navigation continues in what opened. The first -# n wraps from the prompt row to the first token; insert-mode n still types; -# with nothing lookable n is a no-op. +# +ls there, file -> pane) and focus follows what opened. The first n wraps +# from the prompt row to the first token; insert-mode n still types; and a +# pane with nothing look-able in it never traps the walk, because the walk is +# a RING ACROSS PANES rather than a scan of the one you are in. lines big.txt 40 file plain.txt just text dirmk sub @@ -44,7 +45,10 @@ snap tok3 key enter stable 700 15000 snap diropen -# the fresh pane's dir is empty: n has nothing lookable, stays put +# the fresh pane's dir is empty, and that is not where n stops: the ring is +# spined on the panes that have LOOKED, so the step leaves this shell for the +# one it was looked out of. That pane's cursor is on its last token (`sub`), +# so the walk runs off the end and comes round to its first — big.txt. key n stable 400 5000 snap noop diff --git a/test/snapshots/ttyprompt.golden b/test/snapshots/ttyprompt.golden new file mode 100644 index 00000000..c479f463 --- /dev/null +++ b/test/snapshots/ttyprompt.golden @@ -0,0 +1,93 @@ +== snap greeted grid=100x30 cursor=4,4 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill +| /tmp/pardes-snap/ttyprompt/cwd New Del /tmp/pardes-snap/ttyprompt/cwd New Del +| ls ls +| probe.txt probe.txt +| +| +| +| +| +| +| +| +| +| +| +| +| /tmp/pardes-snap/ttyprompt/cwd New Del +| ls +| probe.txt +| +| +| +| +| +| +| +| +| +| +| +== snap in-tty grid=100x30 cursor=17,4 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill +|$ /tmp/pardes-snap/ttyprompt/cwd New Del /tmp/pardes-snap/ttyprompt/cwd New Del +| $ ls ls +| probe.txt probe.txt +| $ echo ABCDEFGH +| +| +| +| +| +| +| +| +| +| +| +| /tmp/pardes-snap/ttyprompt/cwd New Del +| ls +| probe.txt +| +| +| +| +| +| +| +| +| +| +| +== snap out-of-tty grid=100x30 cursor=17,4 +|New Newcol Find Grep Help Tutor Dump NextColor Debug Kill +| /tmp/pardes-snap/ttyprompt/cwd New Del /tmp/pardes-snap/ttyprompt/cwd New Del +| ls ls +| probe.txt probe.txt +| echo ABCDEFGH +| +| +| +| +| +| +| +| +| +| +| +| /tmp/pardes-snap/ttyprompt/cwd New Del +| ls +| probe.txt +| +| +| +| +| +| +| +| +| +| +| diff --git a/test/snapshots/ttyprompt.snap b/test/snapshots/ttyprompt.snap new file mode 100644 index 00000000..9cb377bf --- /dev/null +++ b/test/snapshots/ttyprompt.snap @@ -0,0 +1,35 @@ +# Leaving raw tty hides the shell's PROMPT and keeps the command typed at it. +# +# The two share one grid row, so blanking the row used to take the command with +# the prompt and a shell out of tty read as output only. OSC 133 marks the row +# CELL by cell, so config.tty_blank = .prompt cuts the prompt's own columns and +# left-hugs what is left: the command lands at column 0, in line with the +# output under it, rather than in a bay of blanks the prompt used to fill. +# +# `.prompt_and_input` is the old behaviour and blanks the whole row; it is a +# comptime choice, so what THIS script pins is the default. +file probe.txt marker +start 30 100 -n 3 +wait 8000 probe.txt +stable 700 20000 +# the greeting `ls` was typed at a prompt and already shows the rule: the +# command is there, the prompt in front of it is not +snap greeted +# into tty and type a command WITHOUT submitting it, so the shell is sitting at +# a prompt with input on it — the case the old behaviour erased +key c-b +stable 600 8000 +text echo ABCDEFGH +stable 600 8000 +snap in-tty +# ...and out: the prompt goes, `echo ABCDEFGH` stays, hugging the left edge +key c-b +stable 600 8000 +snap out-of-tty +# The columns still have to reach the shell, and they do: the modal cursor's +# column on a hidden-prompt row is short by exactly the prompt's width, so +# enterTty adds it back before asking ghostty to walk the shell's own cursor +# there. That arithmetic is pinned by the "entering tty walks the shell cursor" +# unit test, which can put a pinned cursor on a known column; a click here +# cannot, because leaving tty unpins and a body click on a terminal does not +# pin it again. diff --git a/test/snapshots/tutor.golden b/test/snapshots/tutor.golden index 8bfb47fe..9973f04b 100644 --- a/test/snapshots/tutor.golden +++ b/test/snapshots/tutor.golden @@ -1,7 +1,7 @@ == 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 -| 1 +| 1 ls ls | 2 PARDES TUTO↩ | R | 3 tmux + vi + acme, fro↩ @@ -16,7 +16,7 @@ | 8 | 9 | 10 ==========================================↩ /tmp/pardes-snap/tutor/cwd New Del -| ======================= +| ======================= ls | 11 = INTRODUCTION ↩ | = | 12 ==========================================↩ diff --git a/test/snapshots/winch.golden b/test/snapshots/winch.golden index 125aae6d..cc613460 100644 --- a/test/snapshots/winch.golden +++ b/test/snapshots/winch.golden @@ -1,7 +1,7 @@ == snap storm grid=100x30 cursor=4,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/winch/cwd New Del /tmp/pardes-snap/winch/cwd New Del -| $ ls +| $ ls ls | $ for i in $(seq 600); do kill -WINCH $PPID; don | e; echo SUR''VIVED | SURVIVED @@ -16,7 +16,7 @@ | | | /tmp/pardes-snap/winch/cwd New Del -| +| ls | | | @@ -32,7 +32,7 @@ == snap resized grid=106x34 cursor=4,6 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill |$ /tmp/pardes-snap/winch/cwd New Del /tmp/pardes-snap/winch/cwd New Del -| $ ls +| $ ls ls | $ for i in $(seq 600); do kill -WINCH $PPID; done; | echo SUR''VIVED | SURVIVED @@ -49,7 +49,7 @@ | | | /tmp/pardes-snap/winch/cwd New Del -| +| ls | | | diff --git a/test/snapshots/windownav.golden b/test/snapshots/windownav.golden index ab8b76ec..0b27a26d 100644 --- a/test/snapshots/windownav.golden +++ b/test/snapshots/windownav.golden @@ -1,7 +1,7 @@ == snap start grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -32,7 +32,7 @@ == snap to-term grid=100x30 cursor=54,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -63,7 +63,7 @@ == snap back-to-file grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -94,7 +94,7 @@ == snap esc-to-term grid=100x30 cursor=54,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -125,7 +125,7 @@ == snap esc-back-to-file grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -156,7 +156,7 @@ == snap altn grid=100x30 cursor=4,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -171,7 +171,7 @@ | | | /tmp/pardes-snap/windownav/cwd New Del -| +| ls | w.txt | | @@ -187,7 +187,7 @@ == snap up grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -202,7 +202,7 @@ | | | /tmp/pardes-snap/windownav/cwd New Del -| +| ls | w.txt | | @@ -218,7 +218,7 @@ == snap right grid=100x30 cursor=54,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -233,7 +233,7 @@ | | | /tmp/pardes-snap/windownav/cwd New Del -| +| ls | w.txt | | @@ -249,7 +249,7 @@ == snap left grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -264,7 +264,7 @@ | | | /tmp/pardes-snap/windownav/cwd New Del -| +| ls | w.txt | | @@ -280,7 +280,7 @@ == snap down grid=100x30 cursor=4,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -295,7 +295,7 @@ | | | /tmp/pardes-snap/windownav/cwd New Del -| +| ls | w.txt | | @@ -311,7 +311,7 @@ == snap toggle-doc grid=100x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -326,7 +326,7 @@ | | | /tmp/pardes-snap/windownav/cwd New Del -| +| ls | w.txt | | @@ -342,7 +342,7 @@ == snap toggle-back grid=100x30 cursor=4,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windownav/cwd/w.txt Save New De /tmp/pardes-snap/windownav/cwd New Del -| 1 alpha +| 1 alpha ls | 2 beta w.txt | 3 gamma | @@ -357,7 +357,7 @@ | | | /tmp/pardes-snap/windownav/cwd New Del -| +| ls | w.txt | | diff --git a/test/snapshots/windowops.golden b/test/snapshots/windowops.golden index 0f7e38f4..4101fa86 100644 --- a/test/snapshots/windowops.golden +++ b/test/snapshots/windowops.golden @@ -1,7 +1,7 @@ == snap hover-v grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del ╎ /tmp/pardes-snap/windowops/cwd New Del -| ╎ +| ls ╎ ls | w.txt ╎ w.txt | ╎ | ╎ @@ -16,7 +16,7 @@ | ╎ | ╎ | /tmp/pardes-snap/windowops/cwd New Del ╎ -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -32,7 +32,7 @@ == snap hover-h grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -47,7 +47,7 @@ | |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | @@ -63,7 +63,7 @@ == snap border-drag grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New De╎ /tmp/pardes-snap/windowops/cwd New Del -| ╎ +| ls ╎ ls | w.txt ╎ w.txt | ╎ | ╎ @@ -78,7 +78,7 @@ | ╎ | ╎ | /tmp/pardes-snap/windowops/cwd New De╎ -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -94,7 +94,7 @@ == snap border-done grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New De╎ /tmp/pardes-snap/windowops/cwd New Del -| ╎ +| ls ╎ ls | w.txt ╎ w.txt | ╎ | ╎ @@ -109,7 +109,7 @@ | ╎ | ╎ | /tmp/pardes-snap/windowops/cwd New De╎ -| ╎ +| ls ╎ | w.txt ╎ | ╎ | ╎ @@ -125,7 +125,7 @@ == snap hborder-done grid=100x30 cursor=4,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -136,7 +136,7 @@ | |╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | @@ -156,7 +156,7 @@ == snap move-preview grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -167,7 +167,7 @@ | | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | @@ -187,7 +187,7 @@ == snap moved grid=100x30 cursor=4,15 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -198,7 +198,7 @@ | | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | @@ -218,7 +218,7 @@ == snap altn grid=100x30 cursor=4,19 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -229,11 +229,11 @@ | | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | @@ -249,7 +249,7 @@ == snap focus-right grid=100x30 cursor=44,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -260,11 +260,11 @@ | | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | @@ -280,7 +280,7 @@ == snap debug-on grid=100x30 cursor=44,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/c╭────────────────────────────╮ -| │pardes resizes=1 │ +| ls ls │pardes resizes=1 │ | w.txt w.txt │terms 4 cols 2 │ | │active #2 58x28 │ | │scroll 0/28 │ @@ -291,11 +291,11 @@ | | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | @@ -342,7 +342,7 @@ == snap debug-off grid=100x30 cursor=44,4 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill | /tmp/pardes-snap/windowops/cwd New Del /tmp/pardes-snap/windowops/cwd New Del -| +| ls ls | w.txt w.txt | | @@ -353,11 +353,11 @@ | | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | /tmp/pardes-snap/windowops/cwd New Del -| +| ls | w.txt | | |