JetBrains keymap: Add escape key binding to cancel in auto_height mode#45306
Merged
SomeoneToIgnore merged 1 commit intozed-industries:mainfrom Feb 5, 2026
Merged
Conversation
Member
|
Thanks! |
Contributor
Contributor
|
Looks like this needs a rebase. |
auto-merge was automatically disabled
February 5, 2026 09:26
Head branch was pushed to by a user without write access
e428e6b to
55f7722
Compare
Contributor
Author
Done |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes issue #45299 where the Escape key does not cancel/dismiss the inline assist prompt when using the JetBrains keymap. The issue occurred because the escape key was bound to editor::ToggleFocus for editors in auto_height mode (which includes the inline assistant) instead of editor::Cancel.
Changes:
- Split the compound context condition for escape key bindings in JetBrains keymap
- Added specific
escape: editor::Cancelbinding forEditor && mode == auto_heightcontext - Applied changes consistently to both macOS and Linux JetBrains keymaps
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| assets/keymaps/macos/jetbrains.json | Removed auto_height mode from general dock/workspace escape binding and added dedicated binding with editor::Cancel for auto_height editors |
| assets/keymaps/linux/jetbrains.json | Removed auto_height mode from general dock/workspace escape binding and added dedicated binding with editor::Cancel for auto_height editors |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
rtfeldman
pushed a commit
that referenced
this pull request
Feb 5, 2026
#45306) Closes [#45299](#45299) Release Notes: - Fix Escape key does not cancel/dismiss inline assist with Jetbrains keymap Recording: https://github.com/user-attachments/assets/766a9954-2d32-4f43-b81d-acba1cb8e133
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #45299
Release Notes:
Recording:
Zed.Escape.mp4