diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 1bd8e41ad16f5f6ad7ffc90f3d7176c3c60c5d0b..0d948e648494818c9971df2a437b6b9e7670e73b 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -319,7 +319,7 @@ "alt-8": ["pane::ActivateItem", 7], "alt-9": ["pane::ActivateItem", 8], "alt-0": "pane::ActivateLastItem", - "ctrl-pageup": "pane::ActivatePrevItem", + "ctrl-pageup": "pane::ActivatePreviousItem", "ctrl-pagedown": "pane::ActivateNextItem", "ctrl-shift-pageup": "pane::SwapItemLeft", "ctrl-shift-pagedown": "pane::SwapItemRight", diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index 779b63070d731fab7a4b1314ab16f986d5a35b62..3f289b90b69c39f758345fbb45615e30af1e1930 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -458,8 +458,8 @@ "context": "Pane", "use_key_equivalents": true, "bindings": { - "alt-cmd-left": "pane::ActivatePrevItem", - "cmd-{": "pane::ActivatePrevItem", + "alt-cmd-left": "pane::ActivatePreviousItem", + "cmd-{": "pane::ActivatePreviousItem", "alt-cmd-right": "pane::ActivateNextItem", "cmd-}": "pane::ActivateNextItem", "ctrl-shift-pageup": "pane::SwapItemLeft", diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.json index 7fd4ebeafade9512b00e19dfa57eef1af55f8abb..93483a7f96eac10e9c6784cd0444edfc43a6e7e7 100644 --- a/assets/keymaps/linux/jetbrains.json +++ b/assets/keymaps/linux/jetbrains.json @@ -2,7 +2,7 @@ { "bindings": { "ctrl-alt-s": "zed::OpenSettings", - "ctrl-{": "pane::ActivatePrevItem", + "ctrl-{": "pane::ActivatePreviousItem", "ctrl-}": "pane::ActivateNextItem" } }, diff --git a/assets/keymaps/linux/sublime_text.json b/assets/keymaps/linux/sublime_text.json index 71c04b83cbec1fce63d026bf6917fa69b712bd31..ec86b329611890836a6288279d73da45089eb7f4 100644 --- a/assets/keymaps/linux/sublime_text.json +++ b/assets/keymaps/linux/sublime_text.json @@ -1,9 +1,9 @@ [ { "bindings": { - "ctrl-{": "pane::ActivatePrevItem", + "ctrl-{": "pane::ActivatePreviousItem", "ctrl-}": "pane::ActivateNextItem", - "ctrl-pageup": "pane::ActivatePrevItem", + "ctrl-pageup": "pane::ActivatePreviousItem", "ctrl-pagedown": "pane::ActivateNextItem", "ctrl-1": [ "workspace::ActivatePane", diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json index 59a2ad87cd6d91c84308ecfdbd905100c9871af3..497cebc6ec1068178dcc16cdb5e4e130210b67c3 100644 --- a/assets/keymaps/macos/jetbrains.json +++ b/assets/keymaps/macos/jetbrains.json @@ -1,7 +1,7 @@ [ { "bindings": { - "cmd-{": "pane::ActivatePrevItem", + "cmd-{": "pane::ActivatePreviousItem", "cmd-}": "pane::ActivateNextItem" } }, diff --git a/assets/keymaps/macos/sublime_text.json b/assets/keymaps/macos/sublime_text.json index ea55baba3ef33b4691ea63554838c1757d5a9d74..03f8dd4f022c935b5182045d9ad55223b59a7b37 100644 --- a/assets/keymaps/macos/sublime_text.json +++ b/assets/keymaps/macos/sublime_text.json @@ -1,9 +1,9 @@ [ { "bindings": { - "cmd-{": "pane::ActivatePrevItem", + "cmd-{": "pane::ActivatePreviousItem", "cmd-}": "pane::ActivateNextItem", - "ctrl-pageup": "pane::ActivatePrevItem", + "ctrl-pageup": "pane::ActivatePreviousItem", "ctrl-pagedown": "pane::ActivateNextItem", "ctrl-1": [ "workspace::ActivatePane", diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index ee2ac1aef66f74c56f5af21532ab25435d2313bd..bffe1c70995f1fcb12c5392a0ca064b74b6f0ad8 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -97,9 +97,9 @@ } ], "*": "vim::MoveToNext", - "#": "vim::MoveToPrev", + "#": "vim::MoveToPrevious", "n": "vim::MoveToNextMatch", - "shift-n": "vim::MoveToPrevMatch", + "shift-n": "vim::MoveToPreviousMatch", "%": "vim::Matching", "] }": [ "vim::UnmatchedForward", @@ -191,7 +191,7 @@ "g g": "vim::StartOfDocument", "g h": "editor::Hover", "g t": "pane::ActivateNextItem", - "g shift-t": "pane::ActivatePrevItem", + "g shift-t": "pane::ActivatePreviousItem", "g d": "editor::GoToDefinition", "g shift-d": "editor::GoToDeclaration", "g y": "editor::GoToTypeDefinition", @@ -227,7 +227,7 @@ } ], "g #": [ - "vim::MoveToPrev", + "vim::MoveToPrevious", { "partial_word": true } @@ -438,7 +438,7 @@ "g w": "vim::PushRewrap", "g q": "vim::PushRewrap", "ctrl-pagedown": "pane::ActivateNextItem", - "ctrl-pageup": "pane::ActivatePrevItem", + "ctrl-pageup": "pane::ActivatePreviousItem", "insert": "vim::InsertBefore", // tree-sitter related commands "[ x": "vim::SelectLargerSyntaxNode", @@ -493,7 +493,7 @@ } ], "#": [ - "vim::MoveToPrev", + "vim::MoveToPrevious", { "partial_word": true } @@ -1139,8 +1139,8 @@ "ctrl-w =": "vim::ResetPaneSizes", "ctrl-w g t": "pane::ActivateNextItem", "ctrl-w ctrl-g t": "pane::ActivateNextItem", - "ctrl-w g shift-t": "pane::ActivatePrevItem", - "ctrl-w ctrl-g shift-t": "pane::ActivatePrevItem", + "ctrl-w g shift-t": "pane::ActivatePreviousItem", + "ctrl-w ctrl-g shift-t": "pane::ActivatePreviousItem", "ctrl-w w": "workspace::ActivateNextPane", "ctrl-w ctrl-w": "workspace::ActivateNextPane", "ctrl-w p": "workspace::ActivatePreviousPane", diff --git a/crates/migrator/src/migrator.rs b/crates/migrator/src/migrator.rs index 5be667e3dbddf5996cb484cde5b0f0064fee0521..4d0007802fffea9190082c6588ea20e987539603 100644 --- a/crates/migrator/src/migrator.rs +++ b/crates/migrator/src/migrator.rs @@ -482,6 +482,9 @@ static STRING_REPLACE: LazyLock> = LazyLock::new(|| { ("file_finder::SelectPrev", "file_finder::SelectPrevious"), ("menu::SelectPrev", "menu::SelectPrevious"), ("editor::TabPrev", "editor::Backtab"), + ("pane::ActivatePrevItem", "pane::ActivatePreviousItem"), + ("vim::MoveToPrev", "vim::MoveToPrevious"), + ("vim::MoveToPrevMatch", "vim::MoveToPreviousMatch"), ]) }); diff --git a/crates/vim/src/command.rs b/crates/vim/src/command.rs index b32520664e8d84f454241c718b8468f3b92122e7..9d3fbbe8bb18afb7ddd9204ba196ef49f23099c9 100644 --- a/crates/vim/src/command.rs +++ b/crates/vim/src/command.rs @@ -784,8 +784,8 @@ fn generate_commands(_: &App) -> Vec { close_pinned: true, }), VimCommand::new(("bn", "ext"), workspace::ActivateNextItem).count(), - VimCommand::new(("bN", "ext"), workspace::ActivatePrevItem).count(), - VimCommand::new(("bp", "revious"), workspace::ActivatePrevItem).count(), + VimCommand::new(("bN", "ext"), workspace::ActivatePreviousItem).count(), + VimCommand::new(("bp", "revious"), workspace::ActivatePreviousItem).count(), VimCommand::new(("bf", "irst"), workspace::ActivateItem(0)), VimCommand::new(("br", "ewind"), workspace::ActivateItem(0)), VimCommand::new(("bl", "ast"), workspace::ActivateLastItem), @@ -794,8 +794,8 @@ fn generate_commands(_: &App) -> Vec { VimCommand::new(("tabe", "dit"), workspace::NewFile), VimCommand::new(("tabnew", ""), workspace::NewFile), VimCommand::new(("tabn", "ext"), workspace::ActivateNextItem).count(), - VimCommand::new(("tabp", "revious"), workspace::ActivatePrevItem).count(), - VimCommand::new(("tabN", "ext"), workspace::ActivatePrevItem).count(), + VimCommand::new(("tabp", "revious"), workspace::ActivatePreviousItem).count(), + VimCommand::new(("tabN", "ext"), workspace::ActivatePreviousItem).count(), VimCommand::new( ("tabc", "lose"), workspace::CloseActiveItem { diff --git a/crates/vim/src/normal/search.rs b/crates/vim/src/normal/search.rs index 23b5ab3f699b865846009d3c7032c0ea38693f9d..dcd9c2ad1c63648ca95cbe655ba30654243eda46 100644 --- a/crates/vim/src/normal/search.rs +++ b/crates/vim/src/normal/search.rs @@ -28,7 +28,7 @@ pub(crate) struct MoveToNext { #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq)] #[serde(deny_unknown_fields)] -pub(crate) struct MoveToPrev { +pub(crate) struct MoveToPrevious { #[serde(default = "default_true")] case_sensitive: bool, #[serde(default)] @@ -67,15 +67,15 @@ pub(crate) struct Replacement { is_case_sensitive: bool, } -actions!(vim, [SearchSubmit, MoveToNextMatch, MoveToPrevMatch]); -impl_actions!(vim, [FindCommand, Search, MoveToPrev, MoveToNext]); +actions!(vim, [SearchSubmit, MoveToNextMatch, MoveToPreviousMatch]); +impl_actions!(vim, [FindCommand, Search, MoveToPrevious, MoveToNext]); impl_internal_actions!(vim, [ReplaceCommand]); pub(crate) fn register(editor: &mut Editor, cx: &mut Context) { 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_prev_match); + Vim::action(editor, cx, Vim::move_to_previous_match); Vim::action(editor, cx, Vim::search); Vim::action(editor, cx, Vim::search_deploy); 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) { + fn move_to_previous( + &mut self, + action: &MoveToPrevious, + window: &mut Window, + cx: &mut Context, + ) { self.move_to_internal( Direction::Prev, action.case_sensitive, @@ -114,9 +119,9 @@ impl Vim { self.move_to_match_internal(self.search.direction, window, cx) } - fn move_to_prev_match( + fn move_to_previous_match( &mut self, - _: &MoveToPrevMatch, + _: &MoveToPreviousMatch, window: &mut Window, cx: &mut Context, ) { diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs index 18069c4a96b3b360eca0203cb45c58b4a59cf8d9..9804ed012d0ceb9f45fdba74beea104b563440fc 100644 --- a/crates/workspace/src/pane.rs +++ b/crates/workspace/src/pane.rs @@ -172,7 +172,7 @@ impl_actions!( actions!( pane, [ - ActivatePrevItem, + ActivatePreviousItem, ActivateNextItem, ActivateLastItem, AlternateFile, @@ -3148,7 +3148,7 @@ impl Render for Pane { }), ) .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); }), ) diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index 31d11104ea405ecdb66a5d105f5529ed953778f5..88a31c5e6494fc1637de1add03352eb4e98f8fab 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -3879,7 +3879,7 @@ mod tests { // From the Atom keymap use workspace::ActivatePreviousPane; // From the JetBrains keymap - use workspace::ActivatePrevItem; + use workspace::ActivatePreviousItem; app_state .fs @@ -3920,7 +3920,7 @@ mod tests { workspace.register_action(|_, _: &A, _window, _cx| {}); workspace.register_action(|_, _: &B, _window, _cx| {}); workspace.register_action(|_, _: &ActivatePreviousPane, _window, _cx| {}); - workspace.register_action(|_, _: &ActivatePrevItem, _window, _cx| {}); + workspace.register_action(|_, _: &ActivatePreviousItem, _window, _cx| {}); cx.notify(); }) .unwrap(); @@ -3969,7 +3969,7 @@ mod tests { assert_key_bindings_for( workspace.into(), cx, - vec![("backspace", &B), ("{", &ActivatePrevItem)], + vec![("backspace", &B), ("{", &ActivatePreviousItem)], line!(), ); }