azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[coroutine][debug] incorrect merge conflicting with 00a06ef9b9

Browse Source
This commit is contained in:
Vladimir Ilmov
2019-11-20 12:14:33 +03:00
parent 137e54db05
commit 09d2bd33f8
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/META-INF/jvm.xml
+5 -9
View File
@@ -55,11 +55,6 @@
</action> </action>
<group id="Kotlin.XDebugger.Actions"> <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)--> <!-- TODO(design)-->
<action id="Kotlin.XDebugger.CoroutinesDump" <action id="Kotlin.XDebugger.CoroutinesDump"
class="org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineDumpAction" class="org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineDumpAction"
@@ -67,10 +62,11 @@
icon="/org/jetbrains/kotlin/idea/icons/kotlin.png"/> icon="/org/jetbrains/kotlin/idea/icons/kotlin.png"/>
</group> </group>
<group id="Kotlin.XDebugger.Watches.Tree.Toolbar"> <action id="Kotlin.XDebugger.ToggleKotlinVariableView"
<reference ref="Kotlin.XDebugger.ToggleKotlinVariableView"/> class="org.jetbrains.kotlin.idea.debugger.ToggleKotlinVariablesView"
<add-to-group group-id="XDebugger.Watches.Tree.Toolbar" relative-to-action="XDebugger.SwitchWatchesInVariables" anchor="after"/> text="Show Kotlin Variables Only">
</group> <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" <action id="InspectBreakpointApplicability" class="org.jetbrains.kotlin.idea.debugger.breakpoints.InspectBreakpointApplicabilityAction"
text="Inspect Breakpoint Applicability" internal="true"> text="Inspect Breakpoint Applicability" internal="true">
idea/resources/META-INF/jvm.xml.183
+8
View File
@@ -59,6 +59,14 @@
text="Report as incompatible API"> text="Report as incompatible API">
</action> </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" <action id="Kotlin.XDebugger.ToggleKotlinVariableView"
class="org.jetbrains.kotlin.idea.debugger.ToggleKotlinVariablesView" class="org.jetbrains.kotlin.idea.debugger.ToggleKotlinVariablesView"
text="Show Kotlin Variables Only"> text="Show Kotlin Variables Only">