Tweak DebuggerInfo

Author: qwwdfsad

kotlinx-coroutines-core/jvm/src/debug/internal/DebugProbesImpl.kt

@@ -107,6 +107,10 @@ internal object DebugProbesImpl {
             .toList()
     }
 
+    /*
+     * Internal (JVM-public) method used by IDEA debugger.
+     * It is equivalent to dumpCoroutines, but returns serializable (and thus less typed) objects.
+     */
     public fun dumpDebuggerInfo() = dumpCoroutinesInfo().map { DebuggerInfo(it) }
 
     public fun dumpCoroutines(out: PrintStream): Unit = synchronized(out) {

kotlinx-coroutines-core/jvm/src/debug/internal/DebuggerInfo.kt

@@ -2,19 +2,25 @@
  * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
-@file:Suppress("PropertyName", "NO_EXPLICIT_VISIBILITY_IN_API_MODE")
+@file:Suppress("UNUSED")
 
 package kotlinx.coroutines.debug.internal
 
 import java.io.Serializable
 import kotlin.coroutines.*
-import kotlin.coroutines.jvm.internal.*
+import kotlinx.coroutines.*
 
+/*
+ * This class represents all the data required by IDEA debugger.
+ * It is serializable in order to speedup JDWP interactions
+ */
 internal class DebuggerInfo(source: DebugCoroutineInfo) : Serializable {
-    public val name: String? = source.context[kotlinx.coroutines.CoroutineName]?.name
+    public val coroutineId: Long? = source.context[CoroutineId]?.id
+    public val dispatcher: String? = source.context[ContinuationInterceptor].toString()
+    public val name: String? = source.context[CoroutineName]?.name
     public val state: String = source.state
-    public val lastObservedThreadState = source.lastObservedThread?.state
+    public val lastObservedThreadState: String? = source.lastObservedThread?.state?.toString()
     public val lastObservedThreadName = source.lastObservedThread?.name
-    public val lastObservedStackTrace = source.lastObservedStackTrace()
-    public val sequenceNumber = source.sequenceNumber
+    public val lastObservedStackTrace: List<StackTraceElement> = source.lastObservedStackTrace()
+    public val sequenceNumber: Long = source.sequenceNumber
 }

kotlinx-coroutines-debug/test/RunningThreadStackMergeTest.kt

@@ -179,7 +179,6 @@ class RunningThreadStackMergeTest : DebugTestBase() {
         awaitCoroutineStarted()
         val info = DebugProbesImpl.dumpDebuggerInfo().find { it.state == "RUNNING" }
         assertNotNull(info)
-        @Suppress("INVISIBLE_MEMBER") // IDEA bug
         assertNotNull(info.lastObservedThreadName)
         coroutineBlocker.await()
     }