From 07513c676492b106d211a702c05c7dc3287348b7 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 1 Mar 2019 19:37:41 +0300
Subject: [PATCH] java: register simple AnalyzeStacktraceAction in
 JavaIdePlugin.xml and override it with UnscrambleAction in JavaActions.xml

This is needed to properly register UnscrambleAction in Java plugin in other IDEs (IDEA-195719) because all of them have AnalyzeStacktraceAction registered by the same ID.
---
 resources/src/META-INF/JavaIdePlugin.xml | 1 +
 resources/src/idea/JavaActions.xml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/src/META-INF/JavaIdePlugin.xml b/resources/src/META-INF/JavaIdePlugin.xml
index 76a06aed1ee9..97fda118cc1e 100644
--- a/resources/src/META-INF/JavaIdePlugin.xml
+++ b/resources/src/META-INF/JavaIdePlugin.xml
@@ -118,6 +118,7 @@
       <action id="PopupHector" class="com.intellij.codeInsight.daemon.impl.PopupHectorAction"/>
       <action id="ViewOfflineInspection" class="com.intellij.codeInspection.actions.ViewOfflineResultsAction"/>
     </group>
+    <action id="Unscramble" class="com.intellij.unscramble.AnalyzeStacktraceAction"/>
   </actions>
 
   <xi:include href="/idea/JavaActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index fc8d84d5931d..c003b7ab3742 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -334,7 +334,7 @@
       <reference id="SliceBackward"/>
       <reference id="SliceForward"/>
       <separator/>
-      <action id="Unscramble" class="com.intellij.unscramble.UnscrambleAction"/>
+      <action id="Unscramble" class="com.intellij.unscramble.UnscrambleAction" overrides="true"/>
       <add-to-group group-id="AnalyzeMenu" anchor="last"/>
     </group>