diff: do not use "CompareDirs" as reference shortcut
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Fri, 6 Feb 2015 10:32:10 +0000 (13:32 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Fri, 6 Feb 2015 10:32:10 +0000 (13:32 +0300)
* use CompareTwoFiles action
* this fixes unassigned shortcuts, as use-shortcut-of does not support recursive usage (yet?)

platform/platform-resources/src/idea/LangActions.xml
platform/platform-resources/src/idea/VcsActions.xml

index 7e7f71aabdc208dcaf955e6bdb596d18e55cfc29..eb649da603af960f62d7472268106ffa56f9eee8 100644 (file)
 
     <group>
       <action class="com.intellij.execution.testframework.actions.ViewAssertEqualsDiffAction"
 
     <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>
       <separator/>
       <add-to-group anchor="first" group-id="TestTreePopupMenu"/>
     </group>
index fcbc746c0a0a74b0c080a0df1a8bcf7c0942385c..7e291944633e34c7971ae1d853a7a8fca9587324 100644 (file)
       <reference ref="EditSource"/>
       <reference ref="$Delete"/>
       <action id="Diff.UpdatedFiles" class="com.intellij.openapi.vcs.update.ShowUpdatedDiffAction"
       <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">
     </group>
 
     <group id="Vcs.MessageActionGroup">