IDEA-194169 New SE: Keyboard shortcut settings

platform/lang-impl/src/com/intellij/ide/actions/SetShortcutAction.java

@@ -27,7 +27,6 @@ public class SetShortcutAction extends AnAction implements DumbAware {
     if (seDialog == null) {
       return;
     }
-    seDialog.cancel();
 
     KeymapManager km = KeymapManager.getInstance();
     Keymap activeKeymap = km != null ? km.getActiveKeymap() : null;
@@ -41,6 +40,7 @@ public class SetShortcutAction extends AnAction implements DumbAware {
       return;
     }
 
+    seDialog.cancel();
     String id = ActionManager.getInstance().getId(action);
     KeymapPanel.addKeyboardShortcut(id, ActionShortcutRestrictions.getInstance().getForActionId(id), activeKeymap, component);
   }
@@ -56,6 +56,13 @@ public class SetShortcutAction extends AnAction implements DumbAware {
       return;
     }
 
+    KeymapManager km = KeymapManager.getInstance();
+    Keymap activeKeymap = km != null ? km.getActiveKeymap() : null;
+    if (activeKeymap == null) {
+      presentation.setEnabled(false);
+      return;
+    }
+
     AnAction action = e.getData(SELECTED_ACTION);
     Component component = e.getData(PlatformDataKeys.CONTEXT_COMPONENT);
     presentation.setEnabled(action != null && component != null);

platform/platform-resources/src/idea/PlatformActions.xml

@@ -896,9 +896,6 @@
     <action id="MarkNotificationsAsRead" class="com.intellij.notification.impl.actions.MarkAllNotificationsAsReadAction"/>
     <action class="com.intellij.ide.actions.SelectInProjectViewAction" id="SelectInProjectView" text="Select in Project View" />
 
-    <action id="SetShortcutAction"
-            class="com.intellij.ide.actions.SetShortcutAction"
-            use-shortcut-of="ShowIntentionActions"
-    />
+    <action id="SetShortcutAction" class="com.intellij.ide.actions.SetShortcutAction" use-shortcut-of="ShowIntentionActions"/>
   </actions>
 </idea-plugin>