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

(CoroutineDebugger) fix for debugger agent for 1.3.6 version and up

Browse Source
This commit is contained in:
Vladimir Ilmov
2020-06-19 18:48:55 +02:00
parent c638043aee
commit 230f2f5ce0
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-coroutine/src/org/jetbrains/kotlin/idea/debugger/coroutine/DebuggerConnection.kt
+4 -8
View File
@@ -46,17 +46,12 @@ class DebuggerConnection(
val kotlinxCoroutinesCore = params.classPath?.pathList?.firstOrNull { it.contains("kotlinx-coroutines-core") } val kotlinxCoroutinesCore = params.classPath?.pathList?.firstOrNull { it.contains("kotlinx-coroutines-core") }
val kotlinxCoroutinesDebug = params.classPath?.pathList?.firstOrNull { it.contains("kotlinx-coroutines-debug") } val kotlinxCoroutinesDebug = params.classPath?.pathList?.firstOrNull { it.contains("kotlinx-coroutines-debug") }
val mode = when { if (kotlinxCoroutinesCore != null) {
kotlinxCoroutinesCore != null -> {
val coreVersion = determineCoreVersionMode(kotlinxCoroutinesCore) val coreVersion = determineCoreVersionMode(kotlinxCoroutinesCore)
if (coreVersion == CoroutineDebuggerMode.DISABLED && kotlinxCoroutinesDebug != null) val mode = if (coreVersion == CoroutineDebuggerMode.DISABLED && kotlinxCoroutinesDebug != null)
CoroutineDebuggerMode.VERSION_UP_TO_1_3_5 CoroutineDebuggerMode.VERSION_UP_TO_1_3_5
else else
CoroutineDebuggerMode.DISABLED coreVersion
}
kotlinxCoroutinesDebug != null -> CoroutineDebuggerMode.VERSION_UP_TO_1_3_5
else -> CoroutineDebuggerMode.DISABLED
}
when (mode) { when (mode) {
CoroutineDebuggerMode.VERSION_1_3_6_AND_UP -> initializeCoroutineAgent(params, kotlinxCoroutinesCore) CoroutineDebuggerMode.VERSION_1_3_6_AND_UP -> initializeCoroutineAgent(params, kotlinxCoroutinesCore)
@@ -64,6 +59,7 @@ class DebuggerConnection(
else -> log.debug("CoroutineDebugger disabled.") else -> log.debug("CoroutineDebugger disabled.")
} }
} }
}
connect() connect()
} }