From e570450c59034458d93aadb5a0478d05e966f09b Mon Sep 17 00:00:00 2001 From: Vladimir Ilmov Date: Wed, 8 Jan 2020 11:53:50 +0100 Subject: [PATCH] coroutine debugger logic moved to jvm-debugger-coroutine module --- idea/build.gradle.kts | 1 + .../jvm-debugger-coroutine/build.gradle.kts | 22 +++++++++++++ .../CoroutineAsyncStackTraceProvider.kt | 6 ++-- .../CoroutineDebugConfigurationExtension.kt} | 4 +-- ...routineDebugConfigurationExtension.kt.193} | 4 +-- .../CoroutineDebuggerContentInfo.kt | 2 +- .../CoroutineProjectConnectionListener.kt | 8 ++--- .../command/BuildCoroutineNodeCommand.kt | 2 +- .../CoroutineBuildCreationFrameCommand.kt | 6 ++-- .../command/CoroutineBuildFrameCommand.kt | 6 ++-- .../coroutine}/command/CoroutineBuilder.kt | 16 +++++----- .../coroutine}/command/CoroutineDumpAction.kt | 13 ++++---- .../command/RefreshCoroutinesTreeCommand.kt | 14 ++++----- .../data/CoroutineAsyncStackFrameItem.kt | 2 +- .../coroutine}/data/CoroutineInfoData.kt | 4 +-- .../coroutine}/data/SyntheticStackFrame.kt | 2 +- .../coroutine}/data/TreeNodeDescriptorImpl.kt | 2 +- .../debugger/coroutine}/data/descriptors.kt | 4 +-- .../proxy/AsyncStackTraceContext.kt | 6 ++-- .../proxy/CoroutineDebugProbesProxy.kt} | 12 +++---- .../coroutine}/proxy/LookupContinuation.kt | 4 +-- .../coroutine}/proxy/ManagerThreadExecutor.kt | 2 +- .../idea/debugger/coroutine}/util/KUtils.kt | 4 +-- .../debugger/coroutine}/util/Providers.kt | 2 +- .../idea/debugger/coroutine}/util/Utils.java | 4 +-- .../coroutine}/view/CoroutineDumpPanel.kt | 4 +-- .../view/CoroutineViewDebugSessionListener.kt | 4 +-- .../coroutine}/view/CoroutinesDebuggerTree.kt | 18 +++++------ .../coroutine}/view/CoroutinesPanel.kt | 4 +-- .../coroutine}/view/SimpleColoredTextIcon.kt | 4 +-- .../coroutine}/view/XCoroutineView.kt | 31 +++++++++---------- .../jvm-debugger-test/build.gradle.kts | 1 + .../test/AbstractAsyncStackTraceTest.kt | 2 +- .../test/AbstractCoroutineDumpTest.kt | 8 ++--- idea/resources/META-INF/jvm.xml | 6 ++-- prepare/idea-plugin/build.gradle.kts | 1 + settings.gradle | 1 + 37 files changed, 129 insertions(+), 107 deletions(-) create mode 100644 idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/CoroutineAsyncStackTraceProvider.kt (92%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt} (90%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt.193 => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.193} (90%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/CoroutineDebuggerContentInfo.kt (92%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/CoroutineProjectConnectionListener.kt (96%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/command/BuildCoroutineNodeCommand.kt (95%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/command/CoroutineBuildCreationFrameCommand.kt (83%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/command/CoroutineBuildFrameCommand.kt (96%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/command/CoroutineBuilder.kt (94%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/command/CoroutineDumpAction.kt (88%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/command/RefreshCoroutinesTreeCommand.kt (83%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/data/CoroutineAsyncStackFrameItem.kt (89%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/data/CoroutineInfoData.kt (88%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/data/SyntheticStackFrame.kt (96%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/data/TreeNodeDescriptorImpl.kt (98%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/data/descriptors.kt (96%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/proxy/AsyncStackTraceContext.kt (96%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/CoroutinesDebugProbesProxy.kt => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/CoroutineDebugProbesProxy.kt} (96%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/proxy/LookupContinuation.kt (96%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/proxy/ManagerThreadExecutor.kt (97%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/util/KUtils.kt (92%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/util/Providers.kt (95%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/util/Utils.java (91%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/view/CoroutineDumpPanel.kt (98%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/view/CoroutineViewDebugSessionListener.kt (95%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/view/CoroutinesDebuggerTree.kt (81%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/view/CoroutinesPanel.kt (91%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/view/SimpleColoredTextIcon.kt (97%) rename idea/jvm-debugger/{jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines => jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine}/view/XCoroutineView.kt (91%) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 8404463cd68..012aa9a6db1 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -75,6 +75,7 @@ dependencies { compile(project(":idea:jvm-debugger:jvm-debugger-core")) compile(project(":idea:jvm-debugger:jvm-debugger-evaluation")) compile(project(":idea:jvm-debugger:jvm-debugger-sequence")) + compile(project(":idea:jvm-debugger:jvm-debugger-coroutine")) compile(project(":j2k")) compile(project(":idea:idea-j2k")) compile(project(":idea:formatter")) diff --git a/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts new file mode 100644 index 00000000000..cae70c883be --- /dev/null +++ b/idea/jvm-debugger/jvm-debugger-coroutine/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + compile(project(":idea:jvm-debugger:jvm-debugger-core")) + + compileOnly(intellijDep()) + + Platform[192].orHigher { + compileOnly(intellijPluginDep("java")) + } + + testCompile(project(":kotlin-test:kotlin-test-junit")) + testCompile(commonDep("junit:junit")) +} + +sourceSets { + "main" { projectDefault() } + "test" { none() } +} \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineAsyncStackTraceProvider.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineAsyncStackTraceProvider.kt similarity index 92% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineAsyncStackTraceProvider.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineAsyncStackTraceProvider.kt index 3a40a134d9e..c89a492f85c 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineAsyncStackTraceProvider.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineAsyncStackTraceProvider.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines +package org.jetbrains.kotlin.idea.debugger.coroutine import com.intellij.debugger.engine.* import com.intellij.debugger.engine.evaluation.EvaluationContextImpl @@ -11,8 +11,8 @@ import com.intellij.debugger.jdi.StackFrameProxyImpl import com.intellij.xdebugger.frame.XSuspendContext import com.sun.jdi.* import org.jetbrains.kotlin.idea.debugger.* -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineAsyncStackFrameItem -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.AsyncStackTraceContext +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineAsyncStackFrameItem +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.AsyncStackTraceContext import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext class CoroutineAsyncStackTraceProvider : AsyncStackTraceProvider { diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt similarity index 90% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt index 9be67bb6bec..5077c47f7c3 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt @@ -2,7 +2,7 @@ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines +package org.jetbrains.kotlin.idea.debugger.coroutine import com.intellij.execution.RunConfigurationExtension import com.intellij.execution.configurations.DebuggingRunnerData @@ -14,7 +14,7 @@ import com.intellij.execution.configurations.RunnerSettings * Installs coroutines debug agent and coroutines tab if `kotlinx-coroutines-debug` dependency is found */ @Suppress("IncompatibleAPI") -class CoroutinesDebugConfigurationExtension : RunConfigurationExtension() { +class CoroutineDebugConfigurationExtension : RunConfigurationExtension() { override fun isApplicableFor(configuration: RunConfigurationBase<*>) = coroutineDebuggerEnabled() diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt.193 b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.193 similarity index 90% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt.193 rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.193 index 9d54e256c42..15871ccf7ed 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutinesDebugConfigurationExtension.kt.193 +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebugConfigurationExtension.kt.193 @@ -2,7 +2,7 @@ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines +package org.jetbrains.kotlin.idea.debugger.coroutine import com.intellij.execution.RunConfigurationExtension import com.intellij.execution.configurations.DebuggingRunnerData @@ -14,7 +14,7 @@ import com.intellij.execution.configurations.RunnerSettings * Installs coroutines debug agent and coroutines tab if `kotlinx-coroutines-debug` dependency is found */ @Suppress("IncompatibleAPI") -class CoroutinesDebugConfigurationExtension : RunConfigurationExtension() { +class CoroutineDebugConfigurationExtension : RunConfigurationExtension() { override fun isApplicableFor(configuration: RunConfigurationBase<*>) = coroutineDebuggerEnabled() diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineDebuggerContentInfo.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebuggerContentInfo.kt similarity index 92% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineDebuggerContentInfo.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebuggerContentInfo.kt index 6762af5e434..97085182e0c 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineDebuggerContentInfo.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineDebuggerContentInfo.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines +package org.jetbrains.kotlin.idea.debugger.coroutine import org.jetbrains.annotations.NonNls diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineProjectConnectionListener.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineProjectConnectionListener.kt similarity index 96% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineProjectConnectionListener.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineProjectConnectionListener.kt index b72cd165563..68fd29900a3 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/CoroutineProjectConnectionListener.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineProjectConnectionListener.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines +package org.jetbrains.kotlin.idea.debugger.coroutine import com.intellij.debugger.DebuggerInvocationUtil import com.intellij.debugger.actions.ThreadDumpAction @@ -31,9 +31,9 @@ import com.intellij.util.messages.MessageBusConnection import com.intellij.xdebugger.* import com.intellij.xdebugger.impl.XDebugSessionImpl import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.debugger.coroutines.util.* -import org.jetbrains.kotlin.idea.debugger.coroutines.view.CoroutinesPanel -import org.jetbrains.kotlin.idea.debugger.coroutines.view.XCoroutineView +import org.jetbrains.kotlin.idea.debugger.coroutine.util.* +import org.jetbrains.kotlin.idea.debugger.coroutine.view.CoroutinesPanel +import org.jetbrains.kotlin.idea.debugger.coroutine.view.XCoroutineView import java.util.concurrent.atomic.AtomicInteger import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/BuildCoroutineNodeCommand.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/BuildCoroutineNodeCommand.kt similarity index 95% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/BuildCoroutineNodeCommand.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/BuildCoroutineNodeCommand.kt index 741cf057165..bcb94c27470 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/BuildCoroutineNodeCommand.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/BuildCoroutineNodeCommand.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.command +package org.jetbrains.kotlin.idea.debugger.coroutine.command import com.intellij.debugger.DebuggerInvocationUtil import com.intellij.debugger.engine.events.DebuggerContextCommandImpl diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuildCreationFrameCommand.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuildCreationFrameCommand.kt similarity index 83% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuildCreationFrameCommand.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuildCreationFrameCommand.kt index 515e4c4b1a5..aba5deff067 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuildCreationFrameCommand.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuildCreationFrameCommand.kt @@ -3,13 +3,13 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.command +package org.jetbrains.kotlin.idea.debugger.coroutine.command import com.intellij.debugger.impl.DebuggerContextImpl import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl import com.intellij.debugger.ui.impl.watch.NodeManagerImpl -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CreationFramesDescriptor -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineCreatedStackFrameDescriptor +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CreationFramesDescriptor +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineCreatedStackFrameDescriptor @Deprecated("moved to XCoroutineView") class CoroutineBuildCreationFrameCommand( diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuildFrameCommand.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuildFrameCommand.kt similarity index 96% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuildFrameCommand.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuildFrameCommand.kt index 86f21b62f4d..e1d095da892 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuildFrameCommand.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuildFrameCommand.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.command +package org.jetbrains.kotlin.idea.debugger.coroutine.command import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.JavaStackFrame @@ -14,8 +14,8 @@ import com.intellij.debugger.jdi.StackFrameProxyImpl import com.intellij.debugger.jdi.ThreadReferenceProxyImpl import com.intellij.debugger.memory.utils.StackFrameItem import com.intellij.debugger.ui.impl.watch.* -import org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineAsyncStackTraceProvider -import org.jetbrains.kotlin.idea.debugger.coroutines.data.* +import org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineAsyncStackTraceProvider +import org.jetbrains.kotlin.idea.debugger.coroutine.data.* @Deprecated("Moved to XCoroutineView") class CoroutineBuildFrameCommand( diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuilder.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt similarity index 94% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuilder.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt index c88960c54cb..56224f9651f 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineBuilder.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineBuilder.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.command +package org.jetbrains.kotlin.idea.debugger.coroutine.command import com.intellij.debugger.DebuggerManagerEx import com.intellij.debugger.engine.* @@ -22,13 +22,13 @@ import com.intellij.xdebugger.frame.XStackFrame import com.intellij.xdebugger.frame.XSuspendContext import com.sun.jdi.* import org.jetbrains.kotlin.idea.debugger.* -import org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineAsyncStackTraceProvider -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData -import org.jetbrains.kotlin.idea.debugger.coroutines.data.SuspendStackFrameDescriptor -import org.jetbrains.kotlin.idea.debugger.coroutines.data.SyntheticStackFrame -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.AsyncStackTraceContext -import org.jetbrains.kotlin.idea.debugger.coroutines.util.EmptyStackFrameDescriptor -import org.jetbrains.kotlin.idea.debugger.coroutines.util.logger +import org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineAsyncStackTraceProvider +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.data.SuspendStackFrameDescriptor +import org.jetbrains.kotlin.idea.debugger.coroutine.data.SyntheticStackFrame +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.AsyncStackTraceContext +import org.jetbrains.kotlin.idea.debugger.coroutine.util.EmptyStackFrameDescriptor +import org.jetbrains.kotlin.idea.debugger.coroutine.util.logger import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineDumpAction.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineDumpAction.kt similarity index 88% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineDumpAction.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineDumpAction.kt index 946139c0160..3ea4b1ff922 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/CoroutineDumpAction.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/CoroutineDumpAction.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.command +package org.jetbrains.kotlin.idea.debugger.coroutine.command import com.intellij.debugger.DebuggerManagerEx import com.intellij.debugger.engine.events.SuspendContextCommandImpl @@ -24,11 +24,10 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.util.text.DateFormatUtil import com.intellij.xdebugger.impl.XDebuggerManagerImpl import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.debugger.coroutines.view.CoroutineDumpPanel -import org.jetbrains.kotlin.idea.debugger.coroutines.coroutineDebuggerEnabled -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.CoroutinesDebugProbesProxy -import org.jetbrains.kotlin.idea.debugger.coroutines.util.logger +import org.jetbrains.kotlin.idea.debugger.coroutine.view.CoroutineDumpPanel +import org.jetbrains.kotlin.idea.debugger.coroutine.coroutineDebuggerEnabled +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.CoroutineDebugProbesProxy @Suppress("ComponentNotRegistered") class CoroutineDumpAction : AnAction(), AnAction.TransparentUpdate { @@ -41,7 +40,7 @@ class CoroutineDumpAction : AnAction(), AnAction.TransparentUpdate { val process = context.debugProcess ?: return process.managerThread.schedule(object : SuspendContextCommandImpl(context.suspendContext) { override fun contextAction() { - val states = CoroutinesDebugProbesProxy(context.suspendContext ?: return) + val states = CoroutineDebugProbesProxy(context.suspendContext ?: return) .dumpCoroutines() if (states.isOk()) { val message = KotlinBundle.message("debugger.session.tab.coroutine.message.error") diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/RefreshCoroutinesTreeCommand.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/RefreshCoroutinesTreeCommand.kt similarity index 83% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/RefreshCoroutinesTreeCommand.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/RefreshCoroutinesTreeCommand.kt index ed58ea1091d..cdc1b79f623 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/command/RefreshCoroutinesTreeCommand.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/command/RefreshCoroutinesTreeCommand.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.command +package org.jetbrains.kotlin.idea.debugger.coroutine.command import com.intellij.debugger.DebuggerInvocationUtil import com.intellij.debugger.engine.SuspendContextImpl @@ -14,11 +14,11 @@ import com.intellij.debugger.impl.DebuggerSession import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl import com.intellij.debugger.ui.impl.watch.NodeManagerImpl import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineDescriptorData -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.CoroutinesDebugProbesProxy -import org.jetbrains.kotlin.idea.debugger.coroutines.util.ProjectNotification -import org.jetbrains.kotlin.idea.debugger.coroutines.view.CoroutinesDebuggerTree +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineDescriptorData +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.CoroutineDebugProbesProxy +import org.jetbrains.kotlin.idea.debugger.coroutine.util.ProjectNotification +import org.jetbrains.kotlin.idea.debugger.coroutine.view.CoroutinesDebuggerTree @Deprecated("moved to XCoroutineView") class RefreshCoroutinesTreeCommand( @@ -32,7 +32,7 @@ class RefreshCoroutinesTreeCommand( val root = nodeManagerImpl.defaultNode val suspendContext: SuspendContextImpl? = suspendContext if (context.debuggerSession is DebuggerSession && suspendContext is SuspendContextImpl && !suspendContext.isResumed) { - var infoCache = CoroutinesDebugProbesProxy(suspendContext).dumpCoroutines() + var infoCache = CoroutineDebugProbesProxy(suspendContext).dumpCoroutines() if (infoCache.isOk()) { val evaluationContext = evaluationContext(suspendContext) for (state in infoCache.cache) { diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/CoroutineAsyncStackFrameItem.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/CoroutineAsyncStackFrameItem.kt similarity index 89% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/CoroutineAsyncStackFrameItem.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/CoroutineAsyncStackFrameItem.kt index 5cc6e16ded2..750c3e31b65 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/CoroutineAsyncStackFrameItem.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/CoroutineAsyncStackFrameItem.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.data +package org.jetbrains.kotlin.idea.debugger.coroutine.data import com.intellij.debugger.jdi.GeneratedLocation import com.intellij.debugger.memory.utils.StackFrameItem diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/CoroutineInfoData.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/CoroutineInfoData.kt similarity index 88% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/CoroutineInfoData.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/CoroutineInfoData.kt index 24e6b7b0c37..aefbd057d76 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/CoroutineInfoData.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/CoroutineInfoData.kt @@ -3,10 +3,10 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.data +package org.jetbrains.kotlin.idea.debugger.coroutine.data import com.sun.jdi.* -import org.jetbrains.kotlin.idea.debugger.coroutines.command.CoroutineStackFrameItem +import org.jetbrains.kotlin.idea.debugger.coroutine.command.CoroutineStackFrameItem /** * Represents state of a coroutine. diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/SyntheticStackFrame.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/SyntheticStackFrame.kt similarity index 96% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/SyntheticStackFrame.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/SyntheticStackFrame.kt index ea3fe066f55..d14f8ec5429 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/SyntheticStackFrame.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/SyntheticStackFrame.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.data +package org.jetbrains.kotlin.idea.debugger.coroutine.data import com.intellij.debugger.engine.JavaStackFrame import com.intellij.debugger.ui.impl.watch.StackFrameDescriptorImpl diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/TreeNodeDescriptorImpl.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/TreeNodeDescriptorImpl.kt similarity index 98% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/TreeNodeDescriptorImpl.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/TreeNodeDescriptorImpl.kt index 74bc3963b82..e37882c87c1 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/TreeNodeDescriptorImpl.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/TreeNodeDescriptorImpl.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.data +package org.jetbrains.kotlin.idea.debugger.coroutine.data import com.intellij.debugger.engine.evaluation.EvaluateException import com.intellij.debugger.engine.evaluation.EvaluationContextImpl diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/descriptors.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/descriptors.kt similarity index 96% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/descriptors.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/descriptors.kt index 0ca2aea0a4b..0fe94ed7268 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/data/descriptors.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/data/descriptors.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.data +package org.jetbrains.kotlin.idea.debugger.coroutine.data import com.intellij.debugger.engine.evaluation.EvaluationContextImpl import com.intellij.debugger.impl.descriptors.data.DescriptorData @@ -14,7 +14,7 @@ import com.intellij.debugger.memory.utils.StackFrameItem import com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl import com.intellij.openapi.project.Project import com.sun.jdi.* -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.LookupContinuation +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.LookupContinuation import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext @Deprecated("moved to XCoroutineView") diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/AsyncStackTraceContext.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/AsyncStackTraceContext.kt similarity index 96% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/AsyncStackTraceContext.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/AsyncStackTraceContext.kt index f846cf17425..394fcca417e 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/AsyncStackTraceContext.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/AsyncStackTraceContext.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.proxy +package org.jetbrains.kotlin.idea.debugger.coroutine.proxy import com.intellij.debugger.DebuggerContext import com.intellij.debugger.engine.JavaValue @@ -15,9 +15,9 @@ import com.intellij.xdebugger.frame.XNamedValue import com.sun.jdi.* import org.jetbrains.kotlin.codegen.coroutines.CONTINUATION_VARIABLE_NAME import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext -import org.jetbrains.kotlin.idea.debugger.coroutines.util.logger +import org.jetbrains.kotlin.idea.debugger.coroutine.util.logger import org.jetbrains.kotlin.idea.debugger.SUSPEND_LAMBDA_CLASSES -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineAsyncStackFrameItem +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineAsyncStackFrameItem import org.jetbrains.kotlin.idea.debugger.isSubtype import org.jetbrains.kotlin.idea.debugger.safeVisibleVariableByName diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/CoroutinesDebugProbesProxy.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/CoroutineDebugProbesProxy.kt similarity index 96% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/CoroutinesDebugProbesProxy.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/CoroutineDebugProbesProxy.kt index 23ddc57f70d..02f1babc407 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/CoroutinesDebugProbesProxy.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/CoroutineDebugProbesProxy.kt @@ -2,20 +2,20 @@ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.proxy +package org.jetbrains.kotlin.idea.debugger.coroutine.proxy import com.intellij.debugger.engine.SuspendContextImpl import com.intellij.debugger.engine.evaluation.EvaluationContextImpl import com.intellij.debugger.jdi.StackFrameProxyImpl import com.intellij.xdebugger.frame.XSuspendContext import com.sun.jdi.* -import org.jetbrains.kotlin.idea.debugger.coroutines.command.CoroutineBuilder -import org.jetbrains.kotlin.idea.debugger.coroutines.view.CoroutineInfoCache -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData -import org.jetbrains.kotlin.idea.debugger.coroutines.util.logger +import org.jetbrains.kotlin.idea.debugger.coroutine.command.CoroutineBuilder +import org.jetbrains.kotlin.idea.debugger.coroutine.view.CoroutineInfoCache +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.util.logger import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext -class CoroutinesDebugProbesProxy(val suspendContext: XSuspendContext) { +class CoroutineDebugProbesProxy(val suspendContext: XSuspendContext) { private val log by logger private var executionContext: ExecutionContext = executionContext() diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/LookupContinuation.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/LookupContinuation.kt similarity index 96% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/LookupContinuation.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/LookupContinuation.kt index 81505c409d5..afe023bafdd 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/LookupContinuation.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/LookupContinuation.kt @@ -3,10 +3,10 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.proxy +package org.jetbrains.kotlin.idea.debugger.coroutine.proxy import com.sun.jdi.* -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext import org.jetbrains.kotlin.idea.debugger.isSubtype diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/ManagerThreadExecutor.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/ManagerThreadExecutor.kt similarity index 97% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/ManagerThreadExecutor.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/ManagerThreadExecutor.kt index c896ba0e158..1fbd75b1a1c 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/proxy/ManagerThreadExecutor.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/proxy/ManagerThreadExecutor.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.proxy +package org.jetbrains.kotlin.idea.debugger.coroutine.proxy import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.SuspendContextImpl diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/KUtils.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/KUtils.kt similarity index 92% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/KUtils.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/KUtils.kt index bc139d83d69..062da87bc73 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/KUtils.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/KUtils.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.util +package org.jetbrains.kotlin.idea.debugger.coroutine.util import com.intellij.debugger.jdi.StackFrameProxyImpl import com.intellij.debugger.ui.impl.watch.MethodsTracker @@ -15,7 +15,7 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.xdebugger.XDebuggerUtil import com.intellij.xdebugger.XSourcePosition import com.intellij.xdebugger.impl.XDebuggerManagerImpl -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.ApplicationThreadExecutor +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.ApplicationThreadExecutor fun getPosition(stackTraceElement: StackTraceElement, project: Project): XSourcePosition? { val psiFacade = JavaPsiFacade.getInstance(project) diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/Providers.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/Providers.kt similarity index 95% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/Providers.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/Providers.kt index e1b4dc6487c..4c96a449f7b 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/Providers.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/Providers.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.util +package org.jetbrains.kotlin.idea.debugger.coroutine.util import com.intellij.openapi.diagnostic.Logger import com.intellij.xdebugger.XDebugSession diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/Utils.java b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/Utils.java similarity index 91% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/Utils.java rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/Utils.java index edab9a5ebbd..5c484c9a2c5 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/util/Utils.java +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/util/Utils.java @@ -3,9 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.util; - -import com.intellij.xdebugger.XSourcePosition; +package org.jetbrains.kotlin.idea.debugger.coroutine.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutineDumpPanel.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineDumpPanel.kt similarity index 98% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutineDumpPanel.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineDumpPanel.kt index 3b82351de12..389d795501c 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutineDumpPanel.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineDumpPanel.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.view +package org.jetbrains.kotlin.idea.debugger.coroutine.view import com.intellij.codeInsight.highlighting.HighlightManager import com.intellij.execution.ui.ConsoleView @@ -32,7 +32,7 @@ import com.intellij.ui.components.JBList import com.intellij.unscramble.AnalyzeStacktraceUtil import com.intellij.util.PlatformIcons import com.intellij.util.ui.EmptyIcon -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData import java.awt.BorderLayout import java.awt.Color import java.awt.datatransfer.StringSelection diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutineViewDebugSessionListener.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineViewDebugSessionListener.kt similarity index 95% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutineViewDebugSessionListener.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineViewDebugSessionListener.kt index dc43631ee9c..a552bc37411 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutineViewDebugSessionListener.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineViewDebugSessionListener.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.view +package org.jetbrains.kotlin.idea.debugger.coroutine.view import com.intellij.debugger.engine.SuspendContextImpl import com.intellij.openapi.application.ApplicationManager @@ -12,7 +12,7 @@ import com.intellij.xdebugger.XDebugSessionListener import com.intellij.xdebugger.frame.XSuspendContext import com.intellij.xdebugger.impl.ui.DebuggerUIUtil import com.sun.jdi.request.EventRequest -import org.jetbrains.kotlin.idea.debugger.coroutines.util.logger +import org.jetbrains.kotlin.idea.debugger.coroutine.util.logger class CoroutineViewDebugSessionListener( private val session: XDebugSession, diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutinesDebuggerTree.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutinesDebuggerTree.kt similarity index 81% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutinesDebuggerTree.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutinesDebuggerTree.kt index ee899222073..6bc3531f805 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutinesDebuggerTree.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutinesDebuggerTree.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.view +package org.jetbrains.kotlin.idea.debugger.coroutine.view import com.intellij.debugger.DebuggerBundle import com.intellij.debugger.engine.events.DebuggerCommandImpl @@ -15,14 +15,14 @@ import com.intellij.debugger.ui.impl.watch.* import com.intellij.debugger.ui.tree.StackFrameDescriptor import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.debugger.coroutines.command.CoroutineBuildCreationFrameCommand -import org.jetbrains.kotlin.idea.debugger.coroutines.command.CoroutineBuildFrameCommand -import org.jetbrains.kotlin.idea.debugger.coroutines.command.RefreshCoroutinesTreeCommand -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineDescriptorImpl -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CreationFramesDescriptor -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.ManagerThreadExecutor -import org.jetbrains.kotlin.idea.debugger.coroutines.util.logger +import org.jetbrains.kotlin.idea.debugger.coroutine.command.CoroutineBuildCreationFrameCommand +import org.jetbrains.kotlin.idea.debugger.coroutine.command.CoroutineBuildFrameCommand +import org.jetbrains.kotlin.idea.debugger.coroutine.command.RefreshCoroutinesTreeCommand +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineDescriptorImpl +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CreationFramesDescriptor +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.ManagerThreadExecutor +import org.jetbrains.kotlin.idea.debugger.coroutine.util.logger import java.util.* /** diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutinesPanel.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutinesPanel.kt similarity index 91% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutinesPanel.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutinesPanel.kt index 5ffdfe72fd9..3578fabe960 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/CoroutinesPanel.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutinesPanel.kt @@ -5,7 +5,7 @@ @file:Suppress("DEPRECATION") -package org.jetbrains.kotlin.idea.debugger.coroutines.view +package org.jetbrains.kotlin.idea.debugger.coroutine.view import com.intellij.debugger.actions.DebuggerActions import com.intellij.debugger.impl.DebuggerStateManager @@ -13,7 +13,7 @@ import com.intellij.debugger.ui.impl.ThreadsPanel import com.intellij.debugger.ui.impl.watch.DebuggerTree import com.intellij.openapi.actionSystem.* import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineDebuggerActions +import org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineDebuggerActions /** * Added into ui in [CoroutineProjectConnectionListener.registerCoroutinesPanel] diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/SimpleColoredTextIcon.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/SimpleColoredTextIcon.kt similarity index 97% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/SimpleColoredTextIcon.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/SimpleColoredTextIcon.kt index 95a87897083..6d4e8848de4 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/SimpleColoredTextIcon.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/SimpleColoredTextIcon.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.view +package org.jetbrains.kotlin.idea.debugger.coroutine.view import com.intellij.debugger.impl.DebuggerUtilsEx import com.intellij.debugger.settings.ThreadsViewSettings @@ -19,7 +19,7 @@ import com.intellij.xdebugger.impl.ui.DebuggerUIUtil import com.intellij.xdebugger.impl.ui.XDebuggerUIConstants import com.sun.jdi.Location import com.sun.jdi.ReferenceType -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData import javax.swing.Icon class SimpleColoredTextIcon(val icon: Icon?, val hasChildrens: Boolean) { diff --git a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/XCoroutineView.kt b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XCoroutineView.kt similarity index 91% rename from idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/XCoroutineView.kt rename to idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XCoroutineView.kt index 4ae06f00834..96aa444ccc6 100644 --- a/idea/jvm-debugger/jvm-debugger-core/src/org/jetbrains/kotlin/idea/debugger/coroutines/view/XCoroutineView.kt +++ b/idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XCoroutineView.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.debugger.coroutines.view +package org.jetbrains.kotlin.idea.debugger.coroutine.view import com.intellij.debugger.DebuggerManagerEx import com.intellij.debugger.engine.DebugProcessImpl @@ -32,18 +32,18 @@ import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl import com.sun.jdi.ClassType import javaslang.control.Either import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineAsyncStackTraceProvider -import org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineDebuggerContentInfo -import org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineDebuggerContentInfo.Companion.XCOROUTINE_POPUP_ACTION_GROUP -import org.jetbrains.kotlin.idea.debugger.coroutines.command.* -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData -import org.jetbrains.kotlin.idea.debugger.coroutines.data.SuspendStackFrameDescriptor -import org.jetbrains.kotlin.idea.debugger.coroutines.data.SyntheticStackFrame -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.ApplicationThreadExecutor -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.AsyncStackTraceContext -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.CoroutinesDebugProbesProxy -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.ManagerThreadExecutor -import org.jetbrains.kotlin.idea.debugger.coroutines.util.* +import org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineAsyncStackTraceProvider +import org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineDebuggerContentInfo +import org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineDebuggerContentInfo.Companion.XCOROUTINE_POPUP_ACTION_GROUP +import org.jetbrains.kotlin.idea.debugger.coroutine.command.* +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.data.SuspendStackFrameDescriptor +import org.jetbrains.kotlin.idea.debugger.coroutine.data.SyntheticStackFrame +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.ApplicationThreadExecutor +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.AsyncStackTraceContext +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.CoroutineDebugProbesProxy +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.ManagerThreadExecutor +import org.jetbrains.kotlin.idea.debugger.coroutine.util.* import org.jetbrains.kotlin.idea.debugger.evaluate.ExecutionContext import java.awt.event.KeyAdapter import java.awt.event.KeyEvent @@ -52,7 +52,6 @@ import java.awt.event.MouseEvent class XCoroutineView(val project: Project, val session: XDebugSession) : Disposable, XDebugSessionListenerProvider, CreateContentParamsProvider { - private var needToRestoreState: Boolean = false val log by logger val splitter = OnePixelSplitter("SomeKey", 0.25f) val panel = XDebuggerTreePanel(project, session.debugProcess.editorsProvider, this, null, XCOROUTINE_POPUP_ACTION_GROUP, null) @@ -139,7 +138,7 @@ class XCoroutineView(val project: Project, val session: XDebugSession) : override fun computeChildren(node: XCompositeNode) { managerThreadExecutor.on(suspendContext).schedule { - val debugProbesProxy = CoroutinesDebugProbesProxy(suspendContext) + val debugProbesProxy = CoroutineDebugProbesProxy(suspendContext) var coroutineCache = debugProbesProxy.dumpCoroutines() if (coroutineCache.isOk()) { @@ -164,7 +163,7 @@ class XCoroutineView(val project: Project, val session: XDebugSession) : override fun computeChildren(node: XCompositeNode) { managerThreadExecutor.on(suspendContext).schedule { - val debugProbesProxy = CoroutinesDebugProbesProxy(suspendContext) + val debugProbesProxy = CoroutineDebugProbesProxy(suspendContext) val children = XValueChildrenList() debugProbesProxy.frameBuilder().build(infoData) val creationStack = mutableListOf() diff --git a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts index 80c595547c5..f6d32ca604e 100644 --- a/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts +++ b/idea/jvm-debugger/jvm-debugger-test/build.gradle.kts @@ -9,6 +9,7 @@ dependencies { testCompile(project(":idea:jvm-debugger:jvm-debugger-core")) testCompile(project(":idea:jvm-debugger:jvm-debugger-evaluation")) testCompile(project(":idea:jvm-debugger:jvm-debugger-sequence")) + testCompile(project(":idea:jvm-debugger:jvm-debugger-coroutine")) testCompile(project(":compiler:backend")) testCompile(files("${System.getProperty("java.home")}/../lib/tools.jar")) testCompile(project(":kotlin-test:kotlin-test-junit")) diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractAsyncStackTraceTest.kt b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractAsyncStackTraceTest.kt index 6f36cbd1337..a84554a7244 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractAsyncStackTraceTest.kt +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractAsyncStackTraceTest.kt @@ -10,7 +10,7 @@ import com.intellij.debugger.engine.JavaValue import com.intellij.debugger.memory.utils.StackFrameItem import com.intellij.execution.process.ProcessOutputTypes import com.intellij.openapi.extensions.Extensions -import org.jetbrains.kotlin.idea.debugger.coroutines.CoroutineAsyncStackTraceProvider +import org.jetbrains.kotlin.idea.debugger.coroutine.CoroutineAsyncStackTraceProvider import org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferences import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.getSafe diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt index b964ae65831..1d96c1d1774 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractCoroutineDumpTest.kt @@ -11,14 +11,14 @@ import com.intellij.jarRepository.JarRepositoryManager import com.intellij.jarRepository.RemoteRepositoryDescription import org.jetbrains.idea.maven.aether.ArtifactKind import org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor -import org.jetbrains.kotlin.idea.debugger.coroutines.data.CoroutineInfoData -import org.jetbrains.kotlin.idea.debugger.coroutines.proxy.CoroutinesDebugProbesProxy +import org.jetbrains.kotlin.idea.debugger.coroutine.data.CoroutineInfoData +import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.CoroutineDebugProbesProxy import org.jetbrains.kotlin.idea.debugger.test.preference.DebuggerPreferences abstract class AbstractCoroutineDumpTest : KotlinDescriptorTestCaseWithStepping() { override fun doMultiFileTest(files: TestFiles, preferences: DebuggerPreferences) { doOnBreakpoint { - val infoCache = CoroutinesDebugProbesProxy(this).dumpCoroutines() + val infoCache = CoroutineDebugProbesProxy(this).dumpCoroutines() try { if (infoCache.isOk()) try { @@ -34,7 +34,7 @@ abstract class AbstractCoroutineDumpTest : KotlinDescriptorTestCaseWithStepping( } doOnBreakpoint { - val infoCache = CoroutinesDebugProbesProxy(this).dumpCoroutines() + val infoCache = CoroutineDebugProbesProxy(this).dumpCoroutines() try { if (infoCache.isOk()) try { diff --git a/idea/resources/META-INF/jvm.xml b/idea/resources/META-INF/jvm.xml index c06617aaf3d..99a974c682f 100644 --- a/idea/resources/META-INF/jvm.xml +++ b/idea/resources/META-INF/jvm.xml @@ -57,7 +57,7 @@ @@ -90,7 +90,7 @@ - + @@ -111,7 +111,7 @@ - + diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index a1e3fd37ed3..6ff5903e9ad 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -33,6 +33,7 @@ val projectsToShadow by extra(listOf( ":idea:jvm-debugger:jvm-debugger-util", ":idea:jvm-debugger:jvm-debugger-core", ":idea:jvm-debugger:jvm-debugger-evaluation", + ":idea:jvm-debugger:jvm-debugger-coroutine", ":idea:jvm-debugger:jvm-debugger-sequence", ":idea:scripting-support", ":idea:idea-j2k", diff --git a/settings.gradle b/settings.gradle index dd96c3d0132..0515bcda76b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -159,6 +159,7 @@ include ":kotlin-build-common", ":idea:jvm-debugger:jvm-debugger-core", ":idea:jvm-debugger:jvm-debugger-evaluation", ":idea:jvm-debugger:jvm-debugger-sequence", + ":idea:jvm-debugger:jvm-debugger-coroutine", ":idea:jvm-debugger:jvm-debugger-test", ":idea:scripting-support", ":libraries:tools:new-project-wizard",