Keymap changes for `editor::JoinLines` (cherry-pick #14136) (#14234)

gcp-cherry-pick-bot[bot] created 2 years ago

Cherry-picked Keymap changes for `editor::JoinLines` (#14136)

Change summary

assets/keymaps/default-linux.json      | 2 +-
assets/keymaps/macos/sublime_text.json | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)

Detailed changes

assets/keymaps/default-linux.json

@@ -397,7 +397,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",

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"