IDEA-144343 diff: fix shortcut under mac
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 27 Aug 2015 17:02:21 +0000 (20:02 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Thu, 27 Aug 2015 17:05:46 +0000 (20:05 +0300)
Ctrl converted into Meta during import from default keymap. Meta+Tab is system shortcut.

platform/platform-resources/src/idea/Keymap_Mac.xml
platform/platform-resources/src/idea/Keymap_MacClassic.xml
platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java

index 20bc6853f4b86b422549325be929ca9c634b0bb9..c443858dd875f54fc7998ad387f0406bdbb7d6f6 100644 (file)
       <keyboard-shortcut first-keystroke="ctrl TAB"/>
       <keyboard-shortcut first-keystroke="ctrl shift TAB"/>
     </action>
+    <action id="Diff.FocusOppositePane">
+      <keyboard-shortcut first-keystroke="control TAB"/>
+    </action>
+    <action id="Diff.FocusOppositePaneAndScroll">
+      <keyboard-shortcut first-keystroke="control shift TAB"/>
+    </action>
     <action id="Vcs.QuickListPopupAction">
       <keyboard-shortcut first-keystroke="ctrl V" />
     </action>
index 90bebb9b242cf770ca4c6ee557bbc38b8107c0ee..101e6dfb4c37bc1d38a3ab86ed17fae9be243eff 100644 (file)
       <keyboard-shortcut first-keystroke="ctrl TAB"/>
       <keyboard-shortcut first-keystroke="ctrl shift TAB"/>
     </action>
+    <action id="Diff.FocusOppositePane">
+      <keyboard-shortcut first-keystroke="control TAB"/>
+    </action>
+    <action id="Diff.FocusOppositePaneAndScroll">
+      <keyboard-shortcut first-keystroke="control shift TAB"/>
+    </action>
     <action id="Vcs.QuickListPopupAction">
       <keyboard-shortcut first-keystroke="ctrl V" />
     </action>
index 7e82afffdbc2acb4738e6cea1bd806ffe543e7ae..bd53a43138a49f6f5a08aaf4ab9c97e130a143f8 100644 (file)
@@ -141,6 +141,8 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "meta BACK_SPACE",          "EditorDeleteLine", "$Delete"},
     { "control DOWN",             "ShowContent", "EditorLookupDown", "MethodDown"},
     { "control UP",               "EditorLookupUp", "MethodUp"},
+    { "control TAB",              "Switcher", "Diff.FocusOppositePane"},
+    { "shift control TAB",        "Switcher", "Diff.FocusOppositePaneAndScroll"},
     { "meta R",                   "Refresh", "Rerun", "Replace", "org.jetbrains.plugins.ruby.rails.console.ReloadSources"},
     { "control O",                "ExportToTextFile", "OverrideMethods", },
     { "control ENTER",            "Generate", "NewElement"},
@@ -161,6 +163,8 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "control UP",               "EditorLookupUp", "MethodUp"},
     { "control ENTER",            "Generate", "NewElement"},
     { "control F5",               "Refresh", "Rerun"},
+    { "control TAB",              "Switcher", "Diff.FocusOppositePane"},
+    { "shift control TAB",        "Switcher", "Diff.FocusOppositePaneAndScroll"},
     { "meta 1",                   "ActivateProjectToolWindow", "FileChooser.GotoHome", "DuplicatesForm.SendToLeft"},
     { "meta 2",                   "ActivateFavoritesToolWindow", "FileChooser.GotoProject", "DuplicatesForm.SendToRight"},
     { "meta 3",                   "ActivateFindToolWindow", "FileChooser.GotoModule"},