Display case-sensitive keybindings for vim commands (#24322)
This Pull Request tackles the issue outline in #14287 by changing the way `KeyBinding`s for vim mode are displayed in the command palette. It's worth pointing out that this whole thing was pretty much implemented by Conrad Irwin during a pairing session, I just tried to clean up some other changes introduced for a different issue, while improving some comments. Here's a quick list of the changes introduced: - Update `KeyBinding` with a new `vim_mode` field to determine whether the keybinding should be displayed in vim mode. - Update the way `KeyBinding` is rendered, so as to detect if the keybinding is for vim mode, if it is, only display keys in uppercase if they require the shift key. - Introduce a new global state – `VimStyle(bool)` - use to determine whether `vim_mode` should be enabled or disabled when creating a new `KeyBinding` struct. This global state is automatically set by the `vim` crate whenever vim mode is enabled or disabled. - Since the app's context is now required when building a `KeyBinding` , update a lot of callers to correctly pass this context. And before and after screenshots, for comparison: | before | after | |--------|-------| | <img width="1050" alt="SCR-20250205-tyeq" src="https://github.com/user-attachments/assets/e577206d-2a3d-4e06-a96f-a98899cc15c0" /> | <img width="1050" alt="SCR-20250205-tylh" src="https://github.com/user-attachments/assets/ebbf70a9-e838-4d32-aee5-0ffde94d65fb" /> | Closes #14287 Release Notes: - Fix rendering of vim commands to preserve case sensitivity --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
parent
14289b5a6e
commit
e0fc767c11
30 changed files with 236 additions and 165 deletions
|
@ -43,10 +43,10 @@ impl Tooltip {
|
|||
let title = title.into();
|
||||
let action = action.boxed_clone();
|
||||
move |window, cx| {
|
||||
cx.new(|_| Self {
|
||||
cx.new(|cx| Self {
|
||||
title: title.clone(),
|
||||
meta: None,
|
||||
key_binding: KeyBinding::for_action(action.as_ref(), window),
|
||||
key_binding: KeyBinding::for_action(action.as_ref(), window, cx),
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
@ -58,10 +58,10 @@ impl Tooltip {
|
|||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) -> AnyView {
|
||||
cx.new(|_| Self {
|
||||
cx.new(|cx| Self {
|
||||
title: title.into(),
|
||||
meta: None,
|
||||
key_binding: KeyBinding::for_action(action, window),
|
||||
key_binding: KeyBinding::for_action(action, window, cx),
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
@ -73,10 +73,10 @@ impl Tooltip {
|
|||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) -> AnyView {
|
||||
cx.new(|_| Self {
|
||||
cx.new(|cx| Self {
|
||||
title: title.into(),
|
||||
meta: None,
|
||||
key_binding: KeyBinding::for_action_in(action, focus_handle, window),
|
||||
key_binding: KeyBinding::for_action_in(action, focus_handle, window, cx),
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
@ -88,10 +88,10 @@ impl Tooltip {
|
|||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) -> AnyView {
|
||||
cx.new(|_| Self {
|
||||
cx.new(|cx| Self {
|
||||
title: title.into(),
|
||||
meta: Some(meta.into()),
|
||||
key_binding: action.and_then(|action| KeyBinding::for_action(action, window)),
|
||||
key_binding: action.and_then(|action| KeyBinding::for_action(action, window, cx)),
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
@ -104,11 +104,11 @@ impl Tooltip {
|
|||
window: &mut Window,
|
||||
cx: &mut App,
|
||||
) -> AnyView {
|
||||
cx.new(|_| Self {
|
||||
cx.new(|cx| Self {
|
||||
title: title.into(),
|
||||
meta: Some(meta.into()),
|
||||
key_binding: action
|
||||
.and_then(|action| KeyBinding::for_action_in(action, focus_handle, window)),
|
||||
.and_then(|action| KeyBinding::for_action_in(action, focus_handle, window, cx)),
|
||||
})
|
||||
.into()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue