From 09d2bd33f82ae2c1a41909148e58f5f53fbbb9b0 Mon Sep 17 00:00:00 2001
From: Vladimir Ilmov <vladimir.ilmov@jetbrains.com>
Date: Wed, 20 Nov 2019 12:14:33 +0300
Subject: [PATCH] [coroutine][debug] incorrect merge conflicting with
 00a06ef9b998bc13d52bb13bdeb550b4c3d7804b

---
 idea/resources/META-INF/jvm.xml     | 14 +++++---------
 idea/resources/META-INF/jvm.xml.183 |  8 ++++++++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/idea/resources/META-INF/jvm.xml b/idea/resources/META-INF/jvm.xml
index 5cd86f07984..37ba495e926 100644
--- a/idea/resources/META-INF/jvm.xml
+++ b/idea/resources/META-INF/jvm.xml
@@ -55,11 +55,6 @@
         </action>
 
         <group id="Kotlin.XDebugger.Actions">
-            <action id="Kotlin.XDebugger.ToggleKotlinVariableView"
-                    class="org.jetbrains.kotlin.idea.debugger.ToggleKotlinVariablesView"
-                    icon="/org/jetbrains/kotlin/idea/icons/kotlin.png"
-                    text="Show Kotlin variables only"
-            />
 <!--            TODO(design)-->
             <action id="Kotlin.XDebugger.CoroutinesDump"
                 class="org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineDumpAction"
@@ -67,10 +62,11 @@
             icon="/org/jetbrains/kotlin/idea/icons/kotlin.png"/>
         </group>
 
-        <group id="Kotlin.XDebugger.Watches.Tree.Toolbar">
-            <reference ref="Kotlin.XDebugger.ToggleKotlinVariableView"/>
-            <add-to-group group-id="XDebugger.Watches.Tree.Toolbar" relative-to-action="XDebugger.SwitchWatchesInVariables" anchor="after"/>
-        </group>
+        <action id="Kotlin.XDebugger.ToggleKotlinVariableView"
+                class="org.jetbrains.kotlin.idea.debugger.ToggleKotlinVariablesView"
+                text="Show Kotlin Variables Only">
+            <add-to-group group-id="XDebugger.Settings" relative-to-action="XDebugger.Inline" anchor="after"/>
+        </action>
 
         <action id="InspectBreakpointApplicability" class="org.jetbrains.kotlin.idea.debugger.breakpoints.InspectBreakpointApplicabilityAction"
                 text="Inspect Breakpoint Applicability" internal="true">
diff --git a/idea/resources/META-INF/jvm.xml.183 b/idea/resources/META-INF/jvm.xml.183
index c6591a0b127..0fb4cc1c662 100644
--- a/idea/resources/META-INF/jvm.xml.183
+++ b/idea/resources/META-INF/jvm.xml.183
@@ -59,6 +59,14 @@
                 text="Report as incompatible API">
         </action>
 
+        <group id="Kotlin.XDebugger.Actions">
+<!--            TODO(design)-->
+            <action id="Kotlin.XDebugger.CoroutinesDump"
+                class="org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineDumpAction"
+            text="Get Coroutines Dump"
+            icon="/org/jetbrains/kotlin/idea/icons/kotlin.png"/>
+        </group>
+
         <action id="Kotlin.XDebugger.ToggleKotlinVariableView"
                 class="org.jetbrains.kotlin.idea.debugger.ToggleKotlinVariablesView"
                 text="Show Kotlin Variables Only">