vcs: remove VcsActions.xml -> lvcs.xml dependency
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Tue, 3 Nov 2020 00:01:55 +0000 (03:01 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Thu, 5 Nov 2020 14:25:17 +0000 (14:25 +0000)
[lvcs.impl] depends on [vcs.impl]. so it creates cyclic dependency.
This also fixes LightEdit, where [vcs.impl] is loaded, but [lvcs.impl] is not.

GitOrigin-RevId: 3fda84907b84e6ef4a971a2eacfa8b3b06b52fcb

platform/lvcs-impl/resources/META-INF/lvcs.xml
platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
platform/vcs-impl/resources/META-INF/VcsActions.xml

index 0165ea90953507c3aec0908f8b54f07d1a3ae4e0..f9f07b8ad28d923dab634896d3866fda0ba36a55 100644 (file)
       <keyboard-shortcut first-keystroke="alt shift C" keymap="$default"/>
       <add-to-group group-id="ViewRecentActions" anchor="last"/>
     </action>
+
+    <group id="LocalHistory.Vcs.Operations.Popup.Group">
+      <separator key="separator.Local.History.text"/>
+      <reference id="LocalHistory.ShowHistory"/>
+      <reference id="LocalHistory.PutLabel"/>
+      <add-to-group group-id="Vcs.Operations.Popup" anchor="after" relative-to-action="ShowAnnotateOperationsPopupGroup"/>
+    </group>
   </actions>
   <extensions defaultExtensionNs="com.intellij">
     <undoProvider implementation="com.intellij.openapi.command.impl.FileUndoProvider"/>
index 76a882fd89378df1300218e16d11961abb4aa76a..5ccbfb87769355d22441304b8586b3e5c9f21e8a 100644 (file)
     <applicationInitializedListener implementation="com.intellij.openapi.fileTypes.impl.associate.OSFileAssociationStartupConfigurator"/>
   </extensions>
 
-  <xi:include href="/META-INF/lvcs.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="/META-INF/VCS.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/VCS.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="/META-INF/lvcs.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
 
index dacd68fdbb49bc6c28d76577b3cf6602b9dda12c..0e4ee43945aeeecaf7da7df0a951008c2038cff2 100644 (file)
       </group>
       <separator/>
       <group class="com.intellij.openapi.vcs.actions.ShowAnnotateOperationsPopup$Group" popup="true" id="ShowAnnotateOperationsPopupGroup"/>
-      <separator key="separator.Local.History.text"/>
-      <reference id="LocalHistory.ShowHistory"/>
-      <reference id="LocalHistory.PutLabel"/>
     </group>
 
   </actions>