smit created
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/Aassets/keymaps/default-linux.json | 2 +-
assets/keymaps/default-macos.json | 4 ++--
assets/keymaps/linux/jetbrains.json | 2 +-
assets/keymaps/linux/sublime_text.json | 4 ++--
assets/keymaps/macos/jetbrains.json | 2 +-
assets/keymaps/macos/sublime_text.json | 4 ++--
assets/keymaps/vim.json | 16 ++++++++--------
crates/migrator/src/migrator.rs | 3 +++
crates/vim/src/command.rs | 8 ++++----
crates/vim/src/normal/search.rs | 21 +++++++++++++--------
crates/workspace/src/pane.rs | 4 ++--
crates/zed/src/zed.rs | 6 +++---
12 files changed, 42 insertions(+), 34 deletions(-)
@@ -272,7 +272,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",
@@ -355,8 +355,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",
@@ -2,7 +2,7 @@
{
"bindings": {
"ctrl-alt-s": "zed::OpenSettings",
- "ctrl-{": "pane::ActivatePrevItem",
+ "ctrl-{": "pane::ActivatePreviousItem",
"ctrl-}": "pane::ActivateNextItem"
}
},
@@ -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", 0],
"ctrl-2": ["workspace::ActivatePane", 1],
@@ -1,7 +1,7 @@
[
{
"bindings": {
- "cmd-{": "pane::ActivatePrevItem",
+ "cmd-{": "pane::ActivatePreviousItem",
"cmd-}": "pane::ActivateNextItem"
}
},
@@ -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", 0],
"ctrl-2": ["workspace::ActivatePane", 1],
@@ -62,9 +62,9 @@
"g /": "pane::DeploySearch",
"?": ["vim::Search", { "backwards": true }],
"*": "vim::MoveToNext",
- "#": "vim::MoveToPrev",
+ "#": "vim::MoveToPrevious",
"n": "vim::MoveToNextMatch",
- "shift-n": "vim::MoveToPrevMatch",
+ "shift-n": "vim::MoveToPreviousMatch",
"%": "vim::Matching",
"] }": ["vim::UnmatchedForward", { "char": "}" }],
"[ {": ["vim::UnmatchedBackward", { "char": "{" }],
@@ -106,7 +106,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",
@@ -126,7 +126,7 @@
"g shift-a": "editor::FindAllReferences", // zed specific
"g space": "editor::OpenExcerpts", // zed specific
"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 down": ["vim::Down", { "display_lines": true }],
"g k": ["vim::Up", { "display_lines": true }],
@@ -231,7 +231,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",
@@ -272,7 +272,7 @@
"shift-s": "vim::SubstituteLine",
"~": "vim::ChangeCase",
"*": ["vim::MoveToNext", { "partial_word": true }],
- "#": ["vim::MoveToPrev", { "partial_word": true }],
+ "#": ["vim::MoveToPrevious", { "partial_word": true }],
"ctrl-a": "vim::Increment",
"ctrl-x": "vim::Decrement",
"g ctrl-a": ["vim::Increment", { "step": true }],
@@ -620,8 +620,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",
@@ -482,6 +482,9 @@ static STRING_REPLACE: LazyLock<HashMap<&str, &str>> = 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"),
])
});
@@ -784,8 +784,8 @@ fn generate_commands(_: &App) -> Vec<VimCommand> {
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> {
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 {
@@ -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>) {
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<Self>) {
+ fn move_to_previous(
+ &mut self,
+ action: &MoveToPrevious,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) {
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<Self>,
) {
@@ -172,7 +172,7 @@ impl_actions!(
actions!(
pane,
[
- ActivatePrevItem,
+ ActivatePreviousItem,
ActivateNextItem,
ActivateLastItem,
AlternateFile,
@@ -3203,7 +3203,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);
}),
)
@@ -3884,7 +3884,7 @@ mod tests {
// From the Atom keymap
use workspace::ActivatePreviousPane;
// From the JetBrains keymap
- use workspace::ActivatePrevItem;
+ use workspace::ActivatePreviousItem;
app_state
.fs
@@ -3925,7 +3925,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();
@@ -3974,7 +3974,7 @@ mod tests {
assert_key_bindings_for(
workspace.into(),
cx,
- vec![("backspace", &B), ("{", &ActivatePrevItem)],
+ vec![("backspace", &B), ("{", &ActivatePreviousItem)],
line!(),
);
}