diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 2fd742c5ae..5b6e410ae9 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -352,11 +352,11 @@ "alt-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection "ctrl-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection "ctrl-f2": "editor::SelectAllMatches", // Select all occurrences of current word - "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], - "ctrl-shift-down": ["editor::SelectNext", { "replace_newest": false }], // Add selection to Next Find Match - "ctrl-shift-up": ["editor::SelectPrevious", { "replace_newest": false }], - "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }], - "ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }], + "ctrl-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand + "ctrl-shift-down": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch + "ctrl-shift-up": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch + "ctrl-k ctrl-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch / find_under_expand_skip + "ctrl-k ctrl-shift-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch "ctrl-k ctrl-i": "editor::Hover", "ctrl-/": ["editor::ToggleComments", { "advance_downwards": false }], "ctrl-u": "editor::UndoSelection", diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index 034ac3b8a2..4b59db20a5 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -489,12 +489,15 @@ "alt-shift-down": "editor::DuplicateLineDown", "ctrl-shift-right": "editor::SelectLargerSyntaxNode", // Expand Selection "ctrl-shift-left": "editor::SelectSmallerSyntaxNode", // Shrink Selection - "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // Add selection to Next Find Match + "cmd-d": ["editor::SelectNext", { "replace_newest": false }], // editor.action.addSelectionToNextFindMatch / find_under_expand "cmd-shift-l": "editor::SelectAllMatches", // Select all occurrences of current selection "cmd-f2": "editor::SelectAllMatches", // Select all occurrences of current word - "ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": false }], - "cmd-k cmd-d": ["editor::SelectNext", { "replace_newest": true }], - "cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }], + "cmd-k cmd-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch / find_under_expand_skip + // macOS binds `ctrl-cmd-d` to Show Dictionary which breaks these two binds + // To use `ctrl-cmd-d` or `ctrl-k ctrl-cmd-d` in Zed you must execute this command and then restart: + // defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 70 'enabled' + "ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch + "cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch "cmd-k cmd-i": "editor::Hover", "cmd-/": ["editor::ToggleComments", { "advance_downwards": false }], "cmd-u": "editor::UndoSelection", diff --git a/assets/keymaps/linux/sublime_text.json b/assets/keymaps/linux/sublime_text.json index 258b8a5629..c3f56350b9 100644 --- a/assets/keymaps/linux/sublime_text.json +++ b/assets/keymaps/linux/sublime_text.json @@ -37,6 +37,8 @@ "ctrl-shift-a": "editor::SelectLargerSyntaxNode", "ctrl-shift-d": "editor::DuplicateSelection", "alt-f3": "editor::SelectAllMatches", // find_all_under + // "ctrl-f3": "", // find_under (cancels any selections) + // "cmd-alt-shift-g": "" // find_under_prev (cancels any selections) "f9": "editor::SortLinesCaseSensitive", "ctrl-f9": "editor::SortLinesCaseInsensitive", "f12": "editor::GoToDefinition", diff --git a/assets/keymaps/macos/sublime_text.json b/assets/keymaps/macos/sublime_text.json index d3929af9e9..6251ae0ccd 100644 --- a/assets/keymaps/macos/sublime_text.json +++ b/assets/keymaps/macos/sublime_text.json @@ -38,6 +38,8 @@ "cmd-shift-a": "editor::SelectLargerSyntaxNode", "cmd-shift-d": "editor::DuplicateSelection", "ctrl-cmd-g": "editor::SelectAllMatches", // find_all_under + // "cmd-alt-g": "", // find_under (cancels any selections) + // "cmd-alt-shift-g": "" // find_under_prev (cancels any selections) "f5": "editor::SortLinesCaseSensitive", "ctrl-f5": "editor::SortLinesCaseInsensitive", "shift-f12": "editor::FindAllReferences",