From 198889ab8f78b12c9881a20309a792e419ba1386 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Sat, 8 Aug 2026 10:44:56 -0300 Subject: Esc alternates between the last two panes; Toggleterm is gone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Esc ran Toggleterm, which hopped between the newest DOC and the newest TERMINAL. That distinction never earned its keep. It made Esc unpredictable — which of three panes you landed on depended on their kinds, not on where you had been — and it could not alternate between two files at all, which is the case you hit most. Editing two files, Esc did nothing. The replacement already existed. Last (SPC j j) is "the pane you were in before this one, whichever it was": it walks the jump stack for the newest entry naming a different pane and restores its line and column. So Esc, and Shift-Esc in tty, now run Last, and Toggleterm is deleted rather than renamed — a third implementation of "go to the other pane" was the thing to avoid. SPC w t goes with it; the w group is the four directional moves, and the jump group already had SPC j j. Held down, Esc alternates. Two files, a file and its shell, a file and a +Search — all the same, because Last has no notion of kind to get wrong. This depends on the swap in the same series: Last reads the stack backwards, and until hopping stopped appending, the pane you came from could fall off it. windownav.snap needed only its keys and prose changed — its golden did not move at all, which is the useful evidence here: for the one scenario the old builtin handled well, Last produces an identical focus sequence. Coverage for what it did not handle is new: a unit test opens a second FILE by looking its name and asserts Esc alternates between two panes of the SAME kind, which is the case that used to be a no-op. Docs follow: tutor.txt, docs/helix-keys.md, docs/design.typ, and the builtin index goldens, which are now one row shorter. 75/75 snapshots, both unit suites, and the macOS ABI build all pass. --- test/snapshots/cmdword.golden | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'test/snapshots/cmdword.golden') diff --git a/test/snapshots/cmdword.golden b/test/snapshots/cmdword.golden index 56436881..f5d6f003 100644 --- a/test/snapshots/cmdword.golden +++ b/test/snapshots/cmdword.golden @@ -1,6 +1,6 @@ == snap opened grid=120x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -31,7 +31,7 @@ | == snap atexec grid=120x30 cursor=7,2 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -46,7 +46,7 @@ | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -62,7 +62,7 @@ | == snap atlook grid=120x30 cursor=4,22 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -77,7 +77,7 @@ | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -93,7 +93,7 @@ | == snap lookword grid=120x30 cursor=7,10 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -101,14 +101,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -124,7 +124,7 @@ | == snap nested grid=120x30 cursor=4,24 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -132,14 +132,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del +| /tmp/pardes-snap/cmdword/cwd New Del | echo ZZ''E | | ZZE @@ -153,9 +153,9 @@ | | | -== snap execword grid=120x30 cursor=42,16 +== snap execword grid=120x30 cursor=104,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -163,14 +163,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del Exec +| /tmp/pardes-snap/cmdword/cwd New Del Exec | echo ZZ''E | | ZZE @@ -184,9 +184,9 @@ | | | -== snap tagcmd grid=120x30 cursor=56,16 +== snap tagcmd grid=120x30 cursor=118,16 |New Newcol Find Grep Help Tutor Dump NextColor Debug Kill -| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/cmds.txt Save New Del | 1 @`echo ZZ''E` @`echo ZZ''L` Look p.txt @`Look .` | | @@ -194,14 +194,14 @@ | | | -| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del +| /tmp/pardes-snap/cmdword/cwd/p.txt Save New Del | 1 just text | | | | | -| /tmp/pardes-snap/cmdword/cwd New Del Exec @`echo ZZ''T` +| /tmp/pardes-snap/cmdword/cwd New Del Exec @`echo ZZ''T` | echo ZZ''E | | ZZE -- cgit v1.3