From fdc8925947d9cede45dd1fd1e4dd3daeb49c3260 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Wed, 27 Sep 2017 09:21:17 +0300
Subject: [PATCH] IDEA-178503 change shortcuts to switch method overloads

fix shortcut conflicts on macOS
---
 platform/platform-resources/src/keymaps/Mac OS X.xml       | 7 -------
 .../src/com/intellij/keymap/KeymapsTestCase.java           | 2 ++
 resources/src/META-INF/IdeaPlugin.xml                      | 7 +++++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/platform/platform-resources/src/keymaps/Mac OS X.xml b/platform/platform-resources/src/keymaps/Mac OS X.xml
index 5c8c0793a187..247e1c6255c3 100644
--- a/platform/platform-resources/src/keymaps/Mac OS X.xml	
+++ b/platform/platform-resources/src/keymaps/Mac OS X.xml	
@@ -389,11 +389,4 @@
   <action id="EmojiAndSymbols">
     <keyboard-shortcut first-keystroke="control meta SPACE"/>
   </action>
-
-  <action id="MethodOverloadSwitchUp">
-    <keyboard-shortcut first-keystroke="control P"/>
-  </action>
-  <action id="MethodOverloadSwitchDown">
-    <keyboard-shortcut first-keystroke="control N"/>
-  </action>
 </keymap>
diff --git a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
index 84f47737335d..b78508240add 100644
--- a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
@@ -124,6 +124,8 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
     { "alt DOWN",                 "EditorUnSelectWord", "Arrangement.Rule.Match.Condition.Move.Down"},
     { "alt UP",                   "EditorSelectWord", "Arrangement.Rule.Match.Condition.Move.Up"},
     { "ctrl m",                   "EditorMatchBrace", "Vcs.ShowMessageHistory"},
+    { "control P",                "EditorUp", "MethodOverloadSwitchUp"},
+    { "control N",                "EditorDown", "MethodOverloadSwitchDown"},
     });
     put("Mac OS X", new String[][] {
     { "BACK_SPACE",               "$Delete", "EditorBackSpace", "Images.Thumbnails.UpFolder"},
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index e44a51622943..bd48fb79c7c6 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -17,6 +17,11 @@
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 
+  <actions>
+    <action id="MethodOverloadSwitchUp" class="com.intellij.codeInsight.editorActions.JavaMethodOverloadSwitchUpAction"/>
+    <action id="MethodOverloadSwitchDown" class="com.intellij.codeInsight.editorActions.JavaMethodOverloadSwitchDownAction" />
+  </actions>
+
   <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/idea/RichPlatformPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <module value="com.intellij.modules.java"/>
@@ -2074,8 +2079,6 @@
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </action>
 
-    <action id="MethodOverloadSwitchUp" class="com.intellij.codeInsight.editorActions.JavaMethodOverloadSwitchUpAction"/>
-    <action id="MethodOverloadSwitchDown" class="com.intellij.codeInsight.editorActions.JavaMethodOverloadSwitchDownAction" />
   </actions>
 
 </idea-plugin>