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
|
@ -364,7 +364,7 @@ impl Render for ProjectSearchView {
|
|||
None
|
||||
}
|
||||
} else {
|
||||
Some(self.landing_text_minor(window).into_any_element())
|
||||
Some(self.landing_text_minor(window, cx).into_any_element())
|
||||
};
|
||||
|
||||
let page_content = page_content.map(|text| div().child(text));
|
||||
|
@ -1231,7 +1231,7 @@ impl ProjectSearchView {
|
|||
self.active_match_index.is_some()
|
||||
}
|
||||
|
||||
fn landing_text_minor(&self, window: &mut Window) -> impl IntoElement {
|
||||
fn landing_text_minor(&self, window: &mut Window, cx: &App) -> impl IntoElement {
|
||||
let focus_handle = self.focus_handle.clone();
|
||||
v_flex()
|
||||
.gap_1()
|
||||
|
@ -1249,6 +1249,7 @@ impl ProjectSearchView {
|
|||
&ToggleFilters,
|
||||
&focus_handle,
|
||||
window,
|
||||
cx,
|
||||
))
|
||||
.on_click(|_event, window, cx| {
|
||||
window.dispatch_action(ToggleFilters.boxed_clone(), cx)
|
||||
|
@ -1263,6 +1264,7 @@ impl ProjectSearchView {
|
|||
&ToggleReplace,
|
||||
&focus_handle,
|
||||
window,
|
||||
cx,
|
||||
))
|
||||
.on_click(|_event, window, cx| {
|
||||
window.dispatch_action(ToggleReplace.boxed_clone(), cx)
|
||||
|
@ -1277,6 +1279,7 @@ impl ProjectSearchView {
|
|||
&ToggleRegex,
|
||||
&focus_handle,
|
||||
window,
|
||||
cx,
|
||||
))
|
||||
.on_click(|_event, window, cx| {
|
||||
window.dispatch_action(ToggleRegex.boxed_clone(), cx)
|
||||
|
@ -1291,6 +1294,7 @@ impl ProjectSearchView {
|
|||
&ToggleCaseSensitive,
|
||||
&focus_handle,
|
||||
window,
|
||||
cx,
|
||||
))
|
||||
.on_click(|_event, window, cx| {
|
||||
window.dispatch_action(ToggleCaseSensitive.boxed_clone(), cx)
|
||||
|
@ -1305,6 +1309,7 @@ impl ProjectSearchView {
|
|||
&ToggleWholeWord,
|
||||
&focus_handle,
|
||||
window,
|
||||
cx,
|
||||
))
|
||||
.on_click(|_event, window, cx| {
|
||||
window.dispatch_action(ToggleWholeWord.boxed_clone(), cx)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue