[keybinding] Duplicate keybinding for opening the preferences widget …

…and deleting file on navigator Fixes: #8202 Made keybindings not duplicated for opening the preferences widget and deleting file on navigator on MacOS Signed-off-by: Min-young Yang <didalsdud@gmail.com>
eclipse-theia · Aug 3, 2020 · f803fc0 · f803fc0
1 parent f673eb4
commit f803fc0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/packages/navigator/src/browser/navigator-contribution.ts b/packages/navigator/src/browser/navigator-contribution.ts
@@ -442,16 +442,9 @@ export class FileNavigatorContribution extends AbstractViewContribution<FileNavi
 
         registry.registerKeybinding({
             command: WorkspaceCommands.FILE_DELETE.id,
-            keybinding: 'del',
+            keybinding: isOSX ? 'cmd+backspace' : 'del',
             context: NavigatorKeybindingContexts.navigatorActive
         });
-        if (isOSX) {
-            registry.registerKeybinding({
-                command: WorkspaceCommands.FILE_DELETE.id,
-                keybinding: 'cmd+backspace',
-                context: NavigatorKeybindingContexts.navigatorActive
-            });
-        }
 
         registry.registerKeybinding({
             command: WorkspaceCommands.FILE_RENAME.id,

diff --git a/packages/preferences/src/browser/preferences-contribution.ts b/packages/preferences/src/browser/preferences-contribution.ts
@@ -130,16 +130,9 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
     }
 
     registerKeybindings(keybindings: KeybindingRegistry): void {
-        if (isOSX && !isFirefox) {
-            keybindings.registerKeybinding({
-                command: CommonCommands.OPEN_PREFERENCES.id,
-                keybinding: 'cmd+,'
-            });
-        }
-
         keybindings.registerKeybinding({
             command: CommonCommands.OPEN_PREFERENCES.id,
-            keybinding: 'ctrl+,',
+            keybinding: (isOSX && !isFirefox) ? 'cmd+,' : 'ctrl+,'
         });
     }