From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Fri, 6 Feb 2015 10:32:10 +0000 (+0300)
Subject: diff: do not use "CompareDirs" as reference shortcut
X-Git-Tag: phpstorm/140.2253~2^2~2
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=cf6ef13b76937283e7c7d753ae3cc9dc3df3b162

diff: do not use "CompareDirs" as reference shortcut

* use CompareTwoFiles action
* this fixes unassigned shortcuts, as use-shortcut-of does not support recursive usage (yet?)
---

diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 7e7f71aabdc2..eb649da603af 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -850,7 +850,7 @@
 
     <group>
       <action class="com.intellij.execution.testframework.actions.ViewAssertEqualsDiffAction"
-              text="View assertEquals Difference" id="openAssertEqualsDiff" use-shortcut-of="CompareDirs"/>
+              text="View assertEquals Difference" id="openAssertEqualsDiff" use-shortcut-of="CompareTwoFiles"/>
       <separator/>
       <add-to-group anchor="first" group-id="TestTreePopupMenu"/>
     </group>
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index fcbc746c0a0a..7e291944633e 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -229,7 +229,7 @@
       <reference ref="EditSource"/>
       <reference ref="$Delete"/>
       <action id="Diff.UpdatedFiles" class="com.intellij.openapi.vcs.update.ShowUpdatedDiffAction"
-              use-shortcut-of="CompareDirs" icon="AllIcons.Actions.Diff"/>
+              use-shortcut-of="CompareTwoFiles" icon="AllIcons.Actions.Diff"/>
     </group>
 
     <group id="Vcs.MessageActionGroup">