Skip to content

fix(keymap): keep which-key popup working in diff panes - #586

Open
jchenatcpacket wants to merge 1 commit into
esmuellert:mainfrom
jchenatcpacket:fix/which-key-trigger-order
Open

jchenatcpacket wants to merge 1 commit into
esmuellert:mainfrom
jchenatcpacket:fix/which-key-trigger-order

Conversation

@jchenatcpacket

Copy link
Copy Markdown

which-key installs a buffer-local nowait trigger on each buffer. Neovim only honors nowait when that mapping is found before any longer mapping sharing its prefix, and buffer-local mappings are searched newest first. The diff panes show buffers which-key had already attached to, so codediff's later hs/hu/hr/b/e mappings made wait the full 'timeoutlen' and the popup never appeared in time.

After installing or restoring a mapping, ask which-key (when loaded) to rebuild that buffer, batched once per tick. This is what which-key does itself on LspAttach; it re-adds the trigger as the newest mapping.

Fix diagnosed and implemented by Claude (Claude Code).

which-key installs a buffer-local nowait <leader> trigger on each buffer.
Neovim only honors nowait when that mapping is found before any longer
mapping sharing its prefix, and buffer-local mappings are searched newest
first. The diff panes show buffers which-key had already attached to, so
codediff's later <leader>hs/hu/hr/b/e mappings made <leader> wait the full
'timeoutlen' and the popup never appeared in time.

After installing or restoring a mapping, ask which-key (when loaded) to
rebuild that buffer, batched once per tick. This is what which-key does
itself on LspAttach; it re-adds the trigger as the newest mapping.

Fix diagnosed and implemented by Claude (Claude Code).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant