diff --git a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/XCoroutinesStackTraceTestGenerated.java b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/XCoroutinesStackTraceTestGenerated.java index 8b6614eb0f3..e0d92f91886 100644 --- a/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/XCoroutinesStackTraceTestGenerated.java +++ b/idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/XCoroutinesStackTraceTestGenerated.java @@ -37,4 +37,9 @@ public class XCoroutinesStackTraceTestGenerated extends AbstractXCoroutinesStack public void testCoroutineSuspendFun136() throws Exception { runTest("idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/coroutineSuspendFun136.kt"); } + + @TestMetadata("suspendMain.kt") + public void testSuspendMain() throws Exception { + runTest("idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.kt"); + } } diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.kt b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.kt new file mode 100644 index 00000000000..9dfd3412e83 --- /dev/null +++ b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.kt @@ -0,0 +1,16 @@ +package continuation + +// ATTACH_LIBRARY: maven(org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.3.4)-javaagent + +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch + +suspend fun main() = coroutineScope { + launch { + delay(1000) + println("bye") + } + //Breakpoint! + println("hello") +} \ No newline at end of file diff --git a/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out new file mode 100644 index 00000000000..792ce207276 --- /dev/null +++ b/idea/jvm-debugger/jvm-debugger-test/testData/xcoroutines/suspendMain.out @@ -0,0 +1,27 @@ +LineBreakpoint created at suspendMain.kt:15 +Run Java +Connected to the target VM +suspendMain.kt:15 +Thread stack trace: + invokeSuspend:15, SuspendMainKt$main$2 (continuation) + ($result, $this$coroutineScope, this) +CoroutineNameIdState(name=coroutine, id=-1, state=UNKNOWN, dispatcher=null) + startUndispatchedOrReturn:91, UndispatchedKt (kotlinx.coroutines.intrinsics) + ($i$a$-undispatchedResult-UndispatchedKt$startUndispatchedOrReturn$2, $i$f$undispatchedResult, $this$startUndispatchedOrReturn, $this$undispatchedResult$iv, block, receiver) + coroutineScope:177, CoroutineScopeKt (kotlinx.coroutines) + ($completion, $i$a$-suspendCoroutineUninterceptedOrReturn-CoroutineScopeKt$coroutineScope$2, block, coroutine, uCont) + main:9, SuspendMainKt (continuation) + ($completion) + invokeSuspend:86, IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$1 (kotlin.coroutines.intrinsics) + ($i$a$-createCoroutineFromSuspendFunction-IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$1, it, result, this) + resumeWith:33, BaseContinuationImpl (kotlin.coroutines.jvm.internal) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) + startCoroutine:114, ContinuationKt (kotlin.coroutines) + ($this$startCoroutine, completion) + runSuspend:19, RunSuspendKt (kotlin.coroutines.jvm.internal) + (block, run) +Disconnected from the target VM + +Process finished with exit code 0 +hello +bye diff --git a/tests/mute-common.csv b/tests/mute-common.csv index 0ab11e3a236..4edcc4ef3bb 100644 --- a/tests/mute-common.csv +++ b/tests/mute-common.csv @@ -61,6 +61,8 @@ org.jetbrains.kotlin.idea.debugger.test.AsyncStackTraceTestGenerated.testAsyncLa org.jetbrains.kotlin.idea.debugger.test.AsyncStackTraceTestGenerated.testAsyncSimple, redesign test AsyncStackTraces org.jetbrains.kotlin.idea.debugger.test.KotlinSteppingTestGenerated.StepOver.testStepOverInlinedLambdaStdlib, fails after advancing bootstrap KT-37879 org.jetbrains.kotlin.incremental.IncrementalJsKlibCompilerRunnerTestGenerated.ClassHierarchyAffected.testMethodRemoved, FO in klib required -org.jetbrains.kotlin.idea.debugger.test.XCoroutinesStackTraceTestGenerated.testCoroutineSuspendFun135, running test on SNAPSHOT version +org.jetbrains.kotlin.idea.debugger.test.XCoroutinesStackTraceTestGenerated.testCoroutineSuspendFun136, running test on SNAPSHOT version org.jetbrains.kotlin.idea.debugger.test.XCoroutinesStackTraceTestGenerated.testCoroutineSuspendFun, unstable +org.jetbrains.kotlin.idea.debugger.test.XCoroutinesStackTraceTestGenerated.testSuspendMain, unstable org.jetbrains.kotlin.idea.debugger.test.ContinuationStackTraceTestGenerated.testSuspendLambda, unstable +org.jetbrains.kotlin.idea.debugger.test.ContinuationStackTraceTestGenerated.testSuspendFun, unstable in 201/202