From cdd9b36a8af0dcb911e2b6121c5915ed5f0f2d99 Mon Sep 17 00:00:00 2001 From: Liu Xiang Date: Fri, 17 Aug 2018 12:40:19 +0800 Subject: [PATCH] Don't add keyboard shortcuts if user-customized shortcuts configured --- .../TabNumberIndicatorAppComponent.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/khande/idea/plugin/tabnumberindicator/TabNumberIndicatorAppComponent.java b/src/com/khande/idea/plugin/tabnumberindicator/TabNumberIndicatorAppComponent.java index 348cc1d..9b96afa 100644 --- a/src/com/khande/idea/plugin/tabnumberindicator/TabNumberIndicatorAppComponent.java +++ b/src/com/khande/idea/plugin/tabnumberindicator/TabNumberIndicatorAppComponent.java @@ -19,6 +19,7 @@ import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.KeyboardShortcut; +import com.intellij.openapi.actionSystem.Shortcut; import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.keymap.Keymap; import com.intellij.openapi.keymap.ex.KeymapManagerEx; @@ -72,9 +73,12 @@ private void addSwitchTabAction(@NotNull final ActionManager actionManager, @Not keyCode = KeyEvent.VK_0 + (tabIndex + 1) % 10; } - KeyboardShortcut keyboardShortcut = new KeyboardShortcut(KeyStroke.getKeyStroke(keyCode, - InputEvent.ALT_DOWN_MASK), null); - activeKeymap.addShortcut(actionId, keyboardShortcut); + Shortcut[] existingShortcuts = activeKeymap.getShortcuts(actionId); + if (existingShortcuts == null || existingShortcuts.length == 0) { + KeyboardShortcut keyboardShortcut = new KeyboardShortcut(KeyStroke.getKeyStroke(keyCode, + InputEvent.ALT_DOWN_MASK), null); + activeKeymap.addShortcut(actionId, keyboardShortcut); + } switchTabActionGroup.add(switchTabAction); actionManager.registerAction(actionId, switchTabAction);