MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "IDEA-58896 Multi-stroke keys partly broken"

Browse Source 
This reverts commit 7e6bac9903.
This commit is contained in:
Alexey Pegov
2010-09-25 12:45:52 +04:00
parent 8234527ab9
commit 53698a1230
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
+6 -6
View File
@@ -219,7 +219,7 @@ public class KeymapImpl implements Keymap, ExternalizableScheme {
}
list.add(shortcut);
if (checkParentShortcut && myParent != null && areShortcutsEqual(getParentShortcuts(actionId), list.toArray(new Shortcut[list.size()]))) {
if (checkParentShortcut && myParent != null && areShortcutsEqual(getParentShortcuts(actionId), getShortcuts(actionId))) {
myActionId2ListOfShortcuts.remove(actionId);
}
myKeystroke2ListOfIds = null;
@@ -494,6 +494,11 @@ public class KeymapImpl implements Keymap, ExternalizableScheme {
}
public Shortcut[] getShortcuts(String actionId) {
KeymapManagerEx keymapManager = getKeymapManager();
if (keymapManager.getBoundActions().contains(actionId)) {
return getShortcuts(keymapManager.getActionBinding(actionId));
}
LinkedHashSet<Shortcut> shortcuts = myActionId2ListOfShortcuts.get(actionId);
if (shortcuts == null) {
@@ -501,11 +506,6 @@ public class KeymapImpl implements Keymap, ExternalizableScheme {
return getParentShortcuts(actionId);
}
else {
KeymapManagerEx keymapManager = getKeymapManager();
if (keymapManager.getBoundActions().contains(actionId)) {
return getShortcuts(keymapManager.getActionBinding(actionId));
}
return ourEmptyShortcutsArray;
}
}