From 00a06ef9b998bc13d52bb13bdeb550b4c3d7804b Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Wed, 7 Aug 2019 19:52:36 +0900
Subject: [PATCH] Debugger: Move "Show Kotlin variables" check button to the
 Debugger settings menu (KT-30909)

---
 idea/resources/META-INF/jvm.xml     | 17 +++++------------
 idea/resources/META-INF/jvm.xml.183 | 17 +++++------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/idea/resources/META-INF/jvm.xml b/idea/resources/META-INF/jvm.xml
index 3d5c4b6d738..47b9eb8b00a 100644
--- a/idea/resources/META-INF/jvm.xml
+++ b/idea/resources/META-INF/jvm.xml
@@ -54,18 +54,11 @@
                 text="Report as incompatible API">
         </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"
-            />
-        </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 8ba116c5793..3b3c723d1ea 100644
--- a/idea/resources/META-INF/jvm.xml.183
+++ b/idea/resources/META-INF/jvm.xml.183
@@ -59,18 +59,11 @@
                 text="Report as incompatible API">
         </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"
-            />
-        </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">