From 41d2c526383c06af58cbfe38ddd48c79d414c35d Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Tue, 25 Jun 2024 11:21:44 -0700 Subject: [PATCH] Adjust keybindings for deletion in the project panel (#13326) - Improve compatibility keybindings (Atom, JetBrains, TextMate) - Revert MacOS cmd+backspace regression. Should trash without prompting (like MacOS) Co-authored-by: Peter Tripp --- assets/keymaps/atom.json | 8 ++++++++ assets/keymaps/default-linux.json | 5 +++-- assets/keymaps/default-macos.json | 4 +++- assets/keymaps/jetbrains.json | 4 ++++ assets/keymaps/textmate.json | 10 +++++++++- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/assets/keymaps/atom.json b/assets/keymaps/atom.json index 078dabd19208d5a642bba6f80d6b98eac95dfe94..6a453ab3a9e78413fffe40c2aedb01a6d9451a32 100644 --- a/assets/keymaps/atom.json +++ b/assets/keymaps/atom.json @@ -70,6 +70,14 @@ { "context": "ProjectPanel", "bindings": { + "a": "project_panel::NewFile", + "shift-a": "project_panel::NewDirectory", + "f2": "project_panel::Rename", + "backspace": ["project_panel::Trash", { "skip_prompt": false }], + "shift-d": "project_panel::Duplicate", + "cmd-x": "project_panel::Cut", + "cmd-c": "project_panel::Copy", + "cmd-v": "project_panel::Paste", "ctrl-[": "project_panel::CollapseSelectedEntry", "ctrl-b": "project_panel::CollapseSelectedEntry", "alt-b": "project_panel::CollapseSelectedEntry", diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index f9e1d13b5187bad938bfb8871664a52d5e884792..42896ebd04ce475039673e021328f2e9559cc190 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -587,8 +587,9 @@ "alt-ctrl-shift-c": "project_panel::CopyRelativePath", "f2": "project_panel::Rename", "enter": "project_panel::Rename", - "backspace": "project_panel::Trash", - "delete": "project_panel::Trash", + "backspace": ["project_panel::Trash", { "skip_prompt": false }], + "shift-delete": ["project_panel::Delete", { "skip_prompt": false }], + "delete": ["project_panel::Trash", { "skip_prompt": false }], "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }], "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }], "alt-ctrl-r": "project_panel::RevealInFinder", diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index 7a5f1b2f1fc99bb3e87f7465901291ab3ec52e2c..92dc390189e528d173a6e7546fd237d375434f2f 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -605,6 +605,7 @@ "left": "project_panel::CollapseSelectedEntry", "right": "project_panel::ExpandSelectedEntry", "cmd-n": "project_panel::NewFile", + "cmd-d": "project_panel::Duplicate", "alt-cmd-n": "project_panel::NewDirectory", "cmd-x": "project_panel::Cut", "cmd-c": "project_panel::Copy", @@ -614,8 +615,9 @@ "enter": "project_panel::Rename", "backspace": ["project_panel::Trash", { "skip_prompt": false }], "delete": ["project_panel::Trash", { "skip_prompt": false }], - "cmd-backspace": ["project_panel::Delete", { "skip_prompt": false }], + "cmd-backspace": ["project_panel::Trash", { "skip_prompt": true }], "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }], + "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }], "alt-cmd-r": "project_panel::RevealInFinder", "alt-shift-f": "project_panel::NewSearchInDirectory", "shift-down": "menu::SelectNext", diff --git a/assets/keymaps/jetbrains.json b/assets/keymaps/jetbrains.json index c099d60578827eab4f7e848ac7e7692a237207e0..ce37629b975b63eb51ceafadcca38461cfb5ef88 100644 --- a/assets/keymaps/jetbrains.json +++ b/assets/keymaps/jetbrains.json @@ -94,6 +94,10 @@ "context": "ProjectPanel", "bindings": { "enter": "project_panel::Open", + "cmd-backspace": ["project_panel::Trash", { "skip_prompt": false }], + "backspace": ["project_panel::Trash", { "skip_prompt": false }], + "delete": ["project_panel::Trash", { "skip_prompt": false }], + "shift-delete": ["project_panel::Delete", { "skip_prompt": false }], "shift-f6": "project_panel::Rename" } } diff --git a/assets/keymaps/textmate.json b/assets/keymaps/textmate.json index c3947dc3ce3c94c8853cdafa30b985c64f9b3515..77250acc389b7fc09c8014969a2eccfa59803be5 100644 --- a/assets/keymaps/textmate.json +++ b/assets/keymaps/textmate.json @@ -87,7 +87,15 @@ }, { "context": "ProjectPanel", - "bindings": {} + "bindings": { + "cmd-backspace": ["project_panel::Trash", { "skip_prompt": true }], + "cmd-d": "project_panel::Duplicate", + "cmd-n": "project_panel::NewFolder", + "return": "project_panel::Rename", + "cmd-c": "project_panel::Copy", + "cmd-v": "project_panel::Paste", + "cmd-alt-c": "project_panel::CopyPath" + } }, { "context": "Dock",