Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keymap: Update Prev to Previous follow-up (#25931)

Browse source 
Follow-up for https://github.com/zed-industries/zed/pull/25909

Add three more action replacements:

```
1. "pane::ActivatePrevItem" -> "pane::ActivatePreviousItem"
2. "vim::MoveToPrev" -> "vim::MoveToPrevious"
3. "vim:MoveToPrevMatch" -> "vim:MoveToPreviousMatch" 
```

Release Notes:

- N/A
This commit is contained in:
smit 2025-03-03 21:19:25 +05:30 • committed by GitHub
parent 466be14b56
commit 8bb2739e28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 42 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/keymaps/default-linux.json
View file

@ -272,7 +272,7 @@
"alt-8": ["pane::ActivateItem", 7], "alt-8": ["pane::ActivateItem", 7],
"alt-9": ["pane::ActivateItem", 8], "alt-9": ["pane::ActivateItem", 8],
"alt-0": "pane::ActivateLastItem", "alt-0": "pane::ActivateLastItem",
"ctrl-pageup": "pane::ActivatePrevItem", "ctrl-pageup": "pane::ActivatePreviousItem",
"ctrl-pagedown": "pane::ActivateNextItem", "ctrl-pagedown": "pane::ActivateNextItem",
"ctrl-shift-pageup": "pane::SwapItemLeft", "ctrl-shift-pageup": "pane::SwapItemLeft",
"ctrl-shift-pagedown": "pane::SwapItemRight", "ctrl-shift-pagedown": "pane::SwapItemRight",

4
assets/keymaps/default-macos.json
View file

@ -355,8 +355,8 @@
"context": "Pane", "context": "Pane",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"alt-cmd-left": "pane::ActivatePrevItem", "alt-cmd-left": "pane::ActivatePreviousItem",
"cmd-{": "pane::ActivatePrevItem", "cmd-{": "pane::ActivatePreviousItem",
"alt-cmd-right": "pane::ActivateNextItem", "alt-cmd-right": "pane::ActivateNextItem",
"cmd-}": "pane::ActivateNextItem", "cmd-}": "pane::ActivateNextItem",
"ctrl-shift-pageup": "pane::SwapItemLeft", "ctrl-shift-pageup": "pane::SwapItemLeft",

2
assets/keymaps/linux/jetbrains.json
View file

@ -2,7 +2,7 @@
{ {
"bindings": { "bindings": {
"ctrl-alt-s": "zed::OpenSettings", "ctrl-alt-s": "zed::OpenSettings",
"ctrl-{": "pane::ActivatePrevItem", "ctrl-{": "pane::ActivatePreviousItem",
"ctrl-}": "pane::ActivateNextItem" "ctrl-}": "pane::ActivateNextItem"
} }
}, },

4
assets/keymaps/linux/sublime_text.json
View file

@ -1,9 +1,9 @@
[ [
{ {
"bindings": { "bindings": {
"ctrl-{": "pane::ActivatePrevItem", "ctrl-{": "pane::ActivatePreviousItem",
"ctrl-}": "pane::ActivateNextItem", "ctrl-}": "pane::ActivateNextItem",
"ctrl-pageup": "pane::ActivatePrevItem", "ctrl-pageup": "pane::ActivatePreviousItem",
"ctrl-pagedown": "pane::ActivateNextItem", "ctrl-pagedown": "pane::ActivateNextItem",
"ctrl-1": ["workspace::ActivatePane", 0], "ctrl-1": ["workspace::ActivatePane", 0],
"ctrl-2": ["workspace::ActivatePane", 1], "ctrl-2": ["workspace::ActivatePane", 1],

2
assets/keymaps/macos/jetbrains.json
View file

@ -1,7 +1,7 @@
[ [
{ {
"bindings": { "bindings": {
"cmd-{": "pane::ActivatePrevItem", "cmd-{": "pane::ActivatePreviousItem",
"cmd-}": "pane::ActivateNextItem" "cmd-}": "pane::ActivateNextItem"
} }
}, },

4
assets/keymaps/macos/sublime_text.json
View file

@ -1,9 +1,9 @@
[ [
{ {
"bindings": { "bindings": {
"cmd-{": "pane::ActivatePrevItem", "cmd-{": "pane::ActivatePreviousItem",
"cmd-}": "pane::ActivateNextItem", "cmd-}": "pane::ActivateNextItem",
"ctrl-pageup": "pane::ActivatePrevItem", "ctrl-pageup": "pane::ActivatePreviousItem",
"ctrl-pagedown": "pane::ActivateNextItem", "ctrl-pagedown": "pane::ActivateNextItem",
"ctrl-1": ["workspace::ActivatePane", 0], "ctrl-1": ["workspace::ActivatePane", 0],
"ctrl-2": ["workspace::ActivatePane", 1], "ctrl-2": ["workspace::ActivatePane", 1],

16
assets/keymaps/vim.json
View file

@ -62,9 +62,9 @@
"g /": "pane::DeploySearch", "g /": "pane::DeploySearch",
"?": ["vim::Search", { "backwards": true }], "?": ["vim::Search", { "backwards": true }],
"*": "vim::MoveToNext", "*": "vim::MoveToNext",
"#": "vim::MoveToPrev", "#": "vim::MoveToPrevious",
"n": "vim::MoveToNextMatch", "n": "vim::MoveToNextMatch",
"shift-n": "vim::MoveToPrevMatch", "shift-n": "vim::MoveToPreviousMatch",
"%": "vim::Matching", "%": "vim::Matching",
"] }": ["vim::UnmatchedForward", { "char": "}" }], "] }": ["vim::UnmatchedForward", { "char": "}" }],
"[ {": ["vim::UnmatchedBackward", { "char": "{" }], "[ {": ["vim::UnmatchedBackward", { "char": "{" }],
@ -106,7 +106,7 @@
"g g": "vim::StartOfDocument", "g g": "vim::StartOfDocument",
"g h": "editor::Hover", "g h": "editor::Hover",
"g t": "pane::ActivateNextItem", "g t": "pane::ActivateNextItem",
"g shift-t": "pane::ActivatePrevItem", "g shift-t": "pane::ActivatePreviousItem",
"g d": "editor::GoToDefinition", "g d": "editor::GoToDefinition",
"g shift-d": "editor::GoToDeclaration", "g shift-d": "editor::GoToDeclaration",
"g y": "editor::GoToTypeDefinition", "g y": "editor::GoToTypeDefinition",
@ -126,7 +126,7 @@
"g shift-a": "editor::FindAllReferences", // zed specific "g shift-a": "editor::FindAllReferences", // zed specific
"g space": "editor::OpenExcerpts", // zed specific "g space": "editor::OpenExcerpts", // zed specific
"g *": ["vim::MoveToNext", { "partial_word": true }], "g *": ["vim::MoveToNext", { "partial_word": true }],
"g #": ["vim::MoveToPrev", { "partial_word": true }], "g #": ["vim::MoveToPrevious", { "partial_word": true }],
"g j": ["vim::Down", { "display_lines": true }], "g j": ["vim::Down", { "display_lines": true }],
"g down": ["vim::Down", { "display_lines": true }], "g down": ["vim::Down", { "display_lines": true }],
"g k": ["vim::Up", { "display_lines": true }], "g k": ["vim::Up", { "display_lines": true }],
@ -231,7 +231,7 @@
"g w": "vim::PushRewrap", "g w": "vim::PushRewrap",
"g q": "vim::PushRewrap", "g q": "vim::PushRewrap",
"ctrl-pagedown": "pane::ActivateNextItem", "ctrl-pagedown": "pane::ActivateNextItem",
"ctrl-pageup": "pane::ActivatePrevItem", "ctrl-pageup": "pane::ActivatePreviousItem",
"insert": "vim::InsertBefore", "insert": "vim::InsertBefore",
// tree-sitter related commands // tree-sitter related commands
"[ x": "vim::SelectLargerSyntaxNode", "[ x": "vim::SelectLargerSyntaxNode",
@ -272,7 +272,7 @@
"shift-s": "vim::SubstituteLine", "shift-s": "vim::SubstituteLine",
"~": "vim::ChangeCase", "~": "vim::ChangeCase",
"*": ["vim::MoveToNext", { "partial_word": true }], "*": ["vim::MoveToNext", { "partial_word": true }],
"#": ["vim::MoveToPrev", { "partial_word": true }], "#": ["vim::MoveToPrevious", { "partial_word": true }],
"ctrl-a": "vim::Increment", "ctrl-a": "vim::Increment",
"ctrl-x": "vim::Decrement", "ctrl-x": "vim::Decrement",
"g ctrl-a": ["vim::Increment", { "step": true }], "g ctrl-a": ["vim::Increment", { "step": true }],
@ -620,8 +620,8 @@
"ctrl-w =": "vim::ResetPaneSizes", "ctrl-w =": "vim::ResetPaneSizes",
"ctrl-w g t": "pane::ActivateNextItem", "ctrl-w g t": "pane::ActivateNextItem",
"ctrl-w ctrl-g t": "pane::ActivateNextItem", "ctrl-w ctrl-g t": "pane::ActivateNextItem",
"ctrl-w g shift-t": "pane::ActivatePrevItem", "ctrl-w g shift-t": "pane::ActivatePreviousItem",
"ctrl-w ctrl-g shift-t": "pane::ActivatePrevItem", "ctrl-w ctrl-g shift-t": "pane::ActivatePreviousItem",
"ctrl-w w": "workspace::ActivateNextPane", "ctrl-w w": "workspace::ActivateNextPane",
"ctrl-w ctrl-w": "workspace::ActivateNextPane", "ctrl-w ctrl-w": "workspace::ActivateNextPane",
"ctrl-w p": "workspace::ActivatePreviousPane", "ctrl-w p": "workspace::ActivatePreviousPane",

3
crates/migrator/src/migrator.rs
View file

@ -482,6 +482,9 @@ static STRING_REPLACE: LazyLock<HashMap<&str, &str>> = LazyLock::new(|| {
("file_finder::SelectPrev", "file_finder::SelectPrevious"), ("file_finder::SelectPrev", "file_finder::SelectPrevious"),
("menu::SelectPrev", "menu::SelectPrevious"), ("menu::SelectPrev", "menu::SelectPrevious"),
("editor::TabPrev", "editor::Backtab"), ("editor::TabPrev", "editor::Backtab"),
("pane::ActivatePrevItem", "pane::ActivatePreviousItem"),
("vim::MoveToPrev", "vim::MoveToPrevious"),
("vim::MoveToPrevMatch", "vim::MoveToPreviousMatch"),
]) ])
}); });

8
crates/vim/src/command.rs
View file

@ -784,8 +784,8 @@ fn generate_commands(_: &App) -> Vec<VimCommand> {
close_pinned: true, close_pinned: true,
}), }),
VimCommand::new(("bn", "ext"), workspace::ActivateNextItem).count(), VimCommand::new(("bn", "ext"), workspace::ActivateNextItem).count(),
VimCommand::new(("bN", "ext"), workspace::ActivatePrevItem).count(), VimCommand::new(("bN", "ext"), workspace::ActivatePreviousItem).count(),
VimCommand::new(("bp", "revious"), workspace::ActivatePrevItem).count(), VimCommand::new(("bp", "revious"), workspace::ActivatePreviousItem).count(),
VimCommand::new(("bf", "irst"), workspace::ActivateItem(0)), VimCommand::new(("bf", "irst"), workspace::ActivateItem(0)),
VimCommand::new(("br", "ewind"), workspace::ActivateItem(0)), VimCommand::new(("br", "ewind"), workspace::ActivateItem(0)),
VimCommand::new(("bl", "ast"), workspace::ActivateLastItem), VimCommand::new(("bl", "ast"), workspace::ActivateLastItem),
@ -794,8 +794,8 @@ fn generate_commands(_: &App) -> Vec<VimCommand> {
VimCommand::new(("tabe", "dit"), workspace::NewFile), VimCommand::new(("tabe", "dit"), workspace::NewFile),
VimCommand::new(("tabnew", ""), workspace::NewFile), VimCommand::new(("tabnew", ""), workspace::NewFile),
VimCommand::new(("tabn", "ext"), workspace::ActivateNextItem).count(), VimCommand::new(("tabn", "ext"), workspace::ActivateNextItem).count(),
VimCommand::new(("tabp", "revious"), workspace::ActivatePrevItem).count(), VimCommand::new(("tabp", "revious"), workspace::ActivatePreviousItem).count(),
VimCommand::new(("tabN", "ext"), workspace::ActivatePrevItem).count(), VimCommand::new(("tabN", "ext"), workspace::ActivatePreviousItem).count(),
VimCommand::new( VimCommand::new(
("tabc", "lose"), ("tabc", "lose"),
workspace::CloseActiveItem { workspace::CloseActiveItem {

21
crates/vim/src/normal/search.rs
View file

@ -28,7 +28,7 @@ pub(crate) struct MoveToNext {
#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq)] #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
pub(crate) struct MoveToPrev { pub(crate) struct MoveToPrevious {
#[serde(default = "default_true")] #[serde(default = "default_true")]
case_sensitive: bool, case_sensitive: bool,
#[serde(default)] #[serde(default)]
@ -67,15 +67,15 @@ pub(crate) struct Replacement {
is_case_sensitive: bool, is_case_sensitive: bool,
} }
actions!(vim, [SearchSubmit, MoveToNextMatch, MoveToPrevMatch]); actions!(vim, [SearchSubmit, MoveToNextMatch, MoveToPreviousMatch]);
impl_actions!(vim, [FindCommand, Search, MoveToPrev, MoveToNext]); impl_actions!(vim, [FindCommand, Search, MoveToPrevious, MoveToNext]);
impl_internal_actions!(vim, [ReplaceCommand]); impl_internal_actions!(vim, [ReplaceCommand]);
pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) { pub(crate) fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
Vim::action(editor, cx, Vim::move_to_next); Vim::action(editor, cx, Vim::move_to_next);
Vim::action(editor, cx, Vim::move_to_prev); Vim::action(editor, cx, Vim::move_to_previous);
Vim::action(editor, cx, Vim::move_to_next_match); Vim::action(editor, cx, Vim::move_to_next_match);
Vim::action(editor, cx, Vim::move_to_prev_match); Vim::action(editor, cx, Vim::move_to_previous_match);
Vim::action(editor, cx, Vim::search); Vim::action(editor, cx, Vim::search);
Vim::action(editor, cx, Vim::search_deploy); Vim::action(editor, cx, Vim::search_deploy);
Vim::action(editor, cx, Vim::find_command); Vim::action(editor, cx, Vim::find_command);
@ -94,7 +94,12 @@ impl Vim {
) )
} }
fn move_to_prev(&mut self, action: &MoveToPrev, window: &mut Window, cx: &mut Context<Self>) { fn move_to_previous(
&mut self,
action: &MoveToPrevious,
window: &mut Window,
cx: &mut Context<Self>,
) {
self.move_to_internal( self.move_to_internal(
Direction::Prev, Direction::Prev,
action.case_sensitive, action.case_sensitive,
@ -114,9 +119,9 @@ impl Vim {
self.move_to_match_internal(self.search.direction, window, cx) self.move_to_match_internal(self.search.direction, window, cx)
} }
fn move_to_prev_match( fn move_to_previous_match(
&mut self, &mut self,
_: &MoveToPrevMatch, _: &MoveToPreviousMatch,
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {

4
crates/workspace/src/pane.rs
View file

@ -172,7 +172,7 @@ impl_actions!(
actions!( actions!(
pane, pane,
[ [
ActivatePrevItem, ActivatePreviousItem,
ActivateNextItem, ActivateNextItem,
ActivateLastItem, ActivateLastItem,
AlternateFile, AlternateFile,
@ -3203,7 +3203,7 @@ impl Render for Pane {
}), }),
) )
.on_action( .on_action(
cx.listener(|pane: &mut Pane, _: &ActivatePrevItem, window, cx| { cx.listener(|pane: &mut Pane, _: &ActivatePreviousItem, window, cx| {
pane.activate_prev_item(true, window, cx); pane.activate_prev_item(true, window, cx);
}), }),
) )

6
crates/zed/src/zed.rs
View file

@ -3884,7 +3884,7 @@ mod tests {
// From the Atom keymap // From the Atom keymap
use workspace::ActivatePreviousPane; use workspace::ActivatePreviousPane;
// From the JetBrains keymap // From the JetBrains keymap
use workspace::ActivatePrevItem; use workspace::ActivatePreviousItem;
app_state app_state
.fs .fs
@ -3925,7 +3925,7 @@ mod tests {
workspace.register_action(|_, _: &A, _window, _cx| {}); workspace.register_action(|_, _: &A, _window, _cx| {});
workspace.register_action(|_, _: &B, _window, _cx| {}); workspace.register_action(|_, _: &B, _window, _cx| {});
workspace.register_action(|_, _: &ActivatePreviousPane, _window, _cx| {}); workspace.register_action(|_, _: &ActivatePreviousPane, _window, _cx| {});
workspace.register_action(|_, _: &ActivatePrevItem, _window, _cx| {}); workspace.register_action(|_, _: &ActivatePreviousItem, _window, _cx| {});
cx.notify(); cx.notify();
}) })
.unwrap(); .unwrap();
@ -3974,7 +3974,7 @@ mod tests {
assert_key_bindings_for( assert_key_bindings_for(
workspace.into(), workspace.into(),
cx, cx,
vec![("backspace", &B), ("{", &ActivatePrevItem)], vec![("backspace", &B), ("{", &ActivatePreviousItem)],
line!(), line!(),
); );
} }