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

IDEA-161881 IllegalArgumentException: Argument for @NotNull parameter 'keymap' of com/intellij/openapi/keymap/impl/ui/ActionsTree.reset must not be null

Browse Source
This commit is contained in:
Sergey Malenkov
2016-10-12 18:48:52 +03:00
parent e7e3609113
commit 2dae26057a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
+9 -1
View File
@@ -668,10 +668,18 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
myNonEnglishKeyboardSupportOption.setSelected(KeyboardSettingsExternalizable.getInstance().isNonEnglishKeyboardSupportEnabled());
}
Keymap activeKeymap = KeymapManagerEx.getInstanceEx().getActiveKeymap();
Keymap selectedKeymap = null;
List<Keymap> list = getManagerKeymaps();
for (Keymap keymap : list) {
if (selectedKeymap == null && keymap == KeymapManagerEx.getInstanceEx().getActiveKeymap()) {
if (activeKeymap == keymap) {
// select active keymap if it is present
selectedKeymap = keymap;
break;
}
if (selectedKeymap == null || KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP.equals(keymap.getName())) {
// select MacOS X keymap if default keymap is filtered out
// select first keymap if MacOS X keymap is not present
selectedKeymap = keymap;
}
}