From de78eb44b1eb4f15136342250d55eeb4a2d3794b Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Thu, 11 Jul 2024 15:14:25 +0000 Subject: [PATCH] Keymap changes for `editor::JoinLines` (#14136) - Linux (default) add ctrl-shift-j - Linux (default) remove ctrl-j - Conflicted with: `"ctrl-j": "workspace::ToggleBottomDock",` - MacOS (sublime) add cmd-shift-j --- assets/keymaps/default-linux.json | 2 +- assets/keymaps/macos/sublime_text.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 44d7ad293f..11b8b5bd30 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -398,7 +398,7 @@ "bindings": { "ctrl-shift-k": "editor::DeleteLine", "ctrl-shift-d": "editor::DuplicateLineDown", - "ctrl-j": "editor::JoinLines", + "ctrl-shift-j": "editor::JoinLines", "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart", "ctrl-alt-h": "editor::DeleteToPreviousSubwordStart", "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd", diff --git a/assets/keymaps/macos/sublime_text.json b/assets/keymaps/macos/sublime_text.json index d3df972028..40ac28a096 100644 --- a/assets/keymaps/macos/sublime_text.json +++ b/assets/keymaps/macos/sublime_text.json @@ -27,6 +27,7 @@ "ctrl-,": "editor::GoToPrevHunk", "cmd-k cmd-u": "editor::ConvertToUpperCase", "cmd-k cmd-l": "editor::ConvertToLowerCase", + "cmd-shift-j": "editor::JoinLines", "shift-alt-m": "markdown::OpenPreviewToTheSide", "ctrl-backspace": "editor::DeleteToPreviousWordStart", "ctrl-delete": "editor::DeleteToNextWordEnd"