diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index ca9ca0e86730399a9810d78184e77be20cadb98b..5a1a011a7e0a0814e9578b4fe517aee1c081619b 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -343,9 +343,9 @@ "alt-ctrl-f12": "editor::GoToTypeDefinitionSplit", "alt-shift-f12": "editor::FindAllReferences", "ctrl-m": "editor::MoveToEnclosingBracket", - "ctrl-shift-\\": "editor::MoveToEnclosingBracket", - "ctrl-shift-[": "editor::Fold", - "ctrl-shift-]": "editor::UnfoldLines", + "ctrl-|": "editor::MoveToEnclosingBracket", + "ctrl-{": "editor::Fold", + "ctrl-}": "editor::UnfoldLines", "ctrl-k ctrl-l": "editor::ToggleFold", "ctrl-k ctrl-[": "editor::FoldRecursive", "ctrl-k ctrl-]": "editor::UnfoldRecursive", diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index 0f708dfc473169984b758a8bf46616a1212c6781..93650e338b16f6a1c3cb55d4a72c6206499c2fec 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -465,7 +465,7 @@ "ctrl-9": ["pane::ActivateItem", 8], "ctrl-0": "pane::ActivateLastItem", "ctrl--": "pane::GoBack", - "ctrl-shift--": "pane::GoForward", + "ctrl-_": "pane::GoForward", "cmd-shift-f": "pane::DeploySearch" } }, diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.json index cc0f8ad332710c1c0605a690b4c3ddec4fc69e72..39f9c98d9d4b5ca39f591fec90f2b36eab9f2274 100644 --- a/assets/keymaps/linux/jetbrains.json +++ b/assets/keymaps/linux/jetbrains.json @@ -2,8 +2,8 @@ { "bindings": { "ctrl-alt-s": "zed::OpenSettings", - "ctrl-shift-[": "pane::ActivatePrevItem", - "ctrl-shift-]": "pane::ActivateNextItem" + "ctrl-{": "pane::ActivatePrevItem", + "ctrl-}": "pane::ActivateNextItem" } }, { diff --git a/assets/keymaps/linux/sublime_text.json b/assets/keymaps/linux/sublime_text.json index 0a5a22c0728c24cc2f4e76ba1e25238471f9afab..3e61cc7c9dbe767a87628c8cf75f2eb21b030f6a 100644 --- a/assets/keymaps/linux/sublime_text.json +++ b/assets/keymaps/linux/sublime_text.json @@ -1,8 +1,8 @@ [ { "bindings": { - "ctrl-shift-[": "pane::ActivatePrevItem", - "ctrl-shift-]": "pane::ActivateNextItem", + "ctrl-{": "pane::ActivatePrevItem", + "ctrl-}": "pane::ActivateNextItem", "ctrl-pageup": "pane::ActivatePrevItem", "ctrl-pagedown": "pane::ActivateNextItem", "ctrl-1": ["workspace::ActivatePane", 0], @@ -14,15 +14,15 @@ "ctrl-7": ["workspace::ActivatePane", 6], "ctrl-8": ["workspace::ActivatePane", 7], "ctrl-9": ["workspace::ActivatePane", 8], - "ctrl-shift-1": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }], - "ctrl-shift-2": ["workspace::MoveItemToPane", { "destination": 1 }], - "ctrl-shift-3": ["workspace::MoveItemToPane", { "destination": 2 }], - "ctrl-shift-4": ["workspace::MoveItemToPane", { "destination": 3 }], - "ctrl-shift-5": ["workspace::MoveItemToPane", { "destination": 4 }], - "ctrl-shift-6": ["workspace::MoveItemToPane", { "destination": 5 }], - "ctrl-shift-7": ["workspace::MoveItemToPane", { "destination": 6 }], - "ctrl-shift-8": ["workspace::MoveItemToPane", { "destination": 7 }], - "ctrl-shift-9": ["workspace::MoveItemToPane", { "destination": 8 }] + "ctrl-!": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }], + "ctrl-@": ["workspace::MoveItemToPane", { "destination": 1 }], + "ctrl-#": ["workspace::MoveItemToPane", { "destination": 2 }], + "ctrl-$": ["workspace::MoveItemToPane", { "destination": 3 }], + "ctrl-%": ["workspace::MoveItemToPane", { "destination": 4 }], + "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }], + "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }], + "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }], + "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }] } }, { diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json index 152660b817067a2112f64d2f7ee132ad507f7cc9..66c2262b85425481003d8bfe0d516b3050aa679b 100644 --- a/assets/keymaps/macos/jetbrains.json +++ b/assets/keymaps/macos/jetbrains.json @@ -1,8 +1,8 @@ [ { "bindings": { - "cmd-shift-[": "pane::ActivatePrevItem", - "cmd-shift-]": "pane::ActivateNextItem" + "cmd-{": "pane::ActivatePrevItem", + "cmd-}": "pane::ActivateNextItem" } }, { diff --git a/assets/keymaps/macos/sublime_text.json b/assets/keymaps/macos/sublime_text.json index 77162a7cc7e89cfe42fe2964fb207c4fc831731d..445de8899072384ac5ed6c9a0ee4e65073cf006a 100644 --- a/assets/keymaps/macos/sublime_text.json +++ b/assets/keymaps/macos/sublime_text.json @@ -1,8 +1,8 @@ [ { "bindings": { - "cmd-shift-[": "pane::ActivatePrevItem", - "cmd-shift-]": "pane::ActivateNextItem", + "cmd-{": "pane::ActivatePrevItem", + "cmd-}": "pane::ActivateNextItem", "ctrl-pageup": "pane::ActivatePrevItem", "ctrl-pagedown": "pane::ActivateNextItem", "ctrl-1": ["workspace::ActivatePane", 0], @@ -14,15 +14,15 @@ "ctrl-7": ["workspace::ActivatePane", 6], "ctrl-8": ["workspace::ActivatePane", 7], "ctrl-9": ["workspace::ActivatePane", 8], - "ctrl-shift-1": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }], - "ctrl-shift-2": ["workspace::MoveItemToPane", { "destination": 1 }], - "ctrl-shift-3": ["workspace::MoveItemToPane", { "destination": 2 }], - "ctrl-shift-4": ["workspace::MoveItemToPane", { "destination": 3 }], - "ctrl-shift-5": ["workspace::MoveItemToPane", { "destination": 4 }], - "ctrl-shift-6": ["workspace::MoveItemToPane", { "destination": 5 }], - "ctrl-shift-7": ["workspace::MoveItemToPane", { "destination": 6 }], - "ctrl-shift-8": ["workspace::MoveItemToPane", { "destination": 7 }], - "ctrl-shift-9": ["workspace::MoveItemToPane", { "destination": 8 }] + "ctrl-!": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }], + "ctrl-@": ["workspace::MoveItemToPane", { "destination": 1 }], + "ctrl-#": ["workspace::MoveItemToPane", { "destination": 2 }], + "ctrl-$": ["workspace::MoveItemToPane", { "destination": 3 }], + "ctrl-%": ["workspace::MoveItemToPane", { "destination": 4 }], + "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }], + "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }], + "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }], + "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }] } }, { diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index f64b66b1a9d5544e446adb2f16f01f599f425046..adb1d2b03f490dd0c445cd490bf9914b0fcd8f61 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -3964,7 +3964,7 @@ mod tests { assert_key_bindings_for( workspace.into(), cx, - vec![("backspace", &B), ("[", &ActivatePrevItem)], + vec![("backspace", &B), ("{", &ActivatePrevItem)], line!(), ); }