From d0400aaf033a703a037f8fe5400bbc896db985da Mon Sep 17 00:00:00 2001 From: Parker Loflin Date: Sat, 14 Nov 2026 11:34:19 +0000 Subject: [PATCH] gpui: Match keystrokes before context predicates (#66634) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary `Keymap::resolve_bindings_for_input` now matches keystrokes before evaluating context predicates. Keystroke matching is cheaper and rejects most bindings. Both checks are just pure filters so lookup results are identical. Avg time per `Keymap::bindings_for_input` call over 48 common keystrokes in editor context. Windows 11 Ryzen 7 9800X3D. | Keymap | Before | After | |---|---|---| | Linux | 15.5 µs | 1.26 µs | | Linux + vim (normal mode) | 41.4 µs | 3.05 µs | | Windows | 14.6 µs | 1.20 µs | | Windows + vim (normal mode) | 41.5 µs | 2.97 µs | ## Testing Windows 11, with and without vim mode: typing, `ctrl-s`, `ctrl-shift-p` hints, `ctrl-k ctrl-c`, `ctrl-k z`, buffer search `enter` and `escape`, and vim `i`, `escape`, `dd`, `gg`, `G`, `ciw`, `v d`. No issues found. - `cargo test -p gpui --features test-support`: pass. - `cargo test -p vim -p which_key`: pass. - `cargo test -p zed -- keymap emacs keybinding`: pass. - Lookup results match before and after for every bound keystroke sequence and prefix, across 13 context stacks and the Linux, Windows, and macOS keymaps, with and without vim. ## Self-review - [x] I've reviewed my diff for quality, security, reliability, and performance. - [x] UI changes follow the [checklist](https://zed.dev/docs/development/ui-checklist). - [x] Tests cover the new or changed behavior. Release Notes: - N/A - [GPUI] Improved keybinding lookup performance. --- crates/gpui/src/keymap.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs index 6283fe6b968..a7a32116184 100644 --- a/crates/gpui/src/keymap.rs +++ b/crates/gpui/src/keymap.rs @@ -199,10 +199,10 @@ impl Keymap { let mut pending_bindings = SmallVec::<[(BindingIndex, &KeyBinding); 1]>::new(); for (ix, binding) in keymap_bindings { - let Some(depth) = self.binding_enabled(binding, context_stack) else { + let Some(pending) = binding.match_keystrokes(input) else { continue; }; - let Some(pending) = binding.match_keystrokes(input) else { + let Some(depth) = self.binding_enabled(binding, context_stack) else { continue; };