MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 10:20:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

[coroutines-debug]: Fixed exception in Coroutine Panel when opening the coroutine tree.

Browse Source 
Fixes IDEA-350284


Merge-request: IJ-MR-138254
Merged-by: Maria Sokolova <maria.sokolova@jetbrains.com>

GitOrigin-RevId: fa4fa69296add26a282c5ce1b4b82bcc95256d17
This commit is contained in:
Maria Sokolova
2024-06-28 17:42:10 +00:00
committed by intellij-monorepo-bot
parent 997640f4ac
commit b8839cab8b
1 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
plugins/kotlin/jvm-debugger/coroutines/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/CoroutineView.kt
View File

@@ -177,13 +177,14 @@ class CoroutineView(project: Project, javaDebugProcess: JavaDebugProcess) :
val jobs = XValueChildrenList()
val coroutines = XValueChildrenList()
this.coroutines.forEach { coroutine ->
val isCurrent = coroutine.isRunningOnCurrentThread(suspendContext)
if (coroutine.jobHierarchy.isNotEmpty()) {
var parent: JobContainer? = null
coroutine.jobHierarchy.reversed().forEach {
parent = jobNodes.computeIfAbsent(it) { jobDetails ->
val coroutineName = jobToCoroutineInfo[jobDetails]?.descriptor?.formatName()
val jobName = (if (coroutineName != null) "\"$coroutineName\":" else "") + jobDetails
JobContainer(suspendContext, jobName, coroutine.isRunningOnCurrentThread(suspendContext)).also { jobContainer ->
JobContainer(suspendContext, jobName, isCurrent).also { jobContainer ->
if (parent == null) {
jobs.add(jobContainer)
}
@@ -195,7 +196,7 @@ class CoroutineView(project: Project, javaDebugProcess: JavaDebugProcess) :
}
jobNodes[coroutine.jobHierarchy[0]]!!.addCoroutine(coroutine)
} else {
coroutines.add(FramesContainer(coroutine, suspendContext, ""))
coroutines.add(FramesContainer(coroutine, suspendContext, isCurrent, ""))
}
}
@@ -227,21 +228,23 @@ class CoroutineView(project: Project, javaDebugProcess: JavaDebugProcess) :
override fun computeChildren(node: XCompositeNode) {
node.setAlreadySorted(true)
debugProcess.invokeInSuspendContext(suspendContext) { suspendContext ->
val children = XValueChildrenList()
val children = XValueChildrenList()
jobs.forEach {
children.add(it)
}
jobs.forEach {
children.add(it)
}
coroutines.forEach {
val isCurrent = it.isRunningOnCurrentThread(suspendContext)
children.add(FramesContainer(it, suspendContext, isCurrent, jobName))
}
coroutines.forEach {
children.add(FramesContainer(it, suspendContext, jobName))
}
if (children.size() > 0) {
node.addChildren(children, true)
} else {
node.addChildren(XValueChildrenList.singleton(InfoNode("coroutine.view.fetching.not_found")), true)
if (children.size() > 0) {
node.addChildren(children, true)
} else {
node.addChildren(XValueChildrenList.singleton(InfoNode("coroutine.view.fetching.not_found")), true)
}
}
}
}
@@ -251,19 +254,21 @@ class CoroutineView(project: Project, javaDebugProcess: JavaDebugProcess) :
val coroutines: List<CoroutineInfoData>
) : RendererContainer(renderer.renderNoIconNode(KotlinDebuggerCoroutinesBundle.message("coroutine.view.node.dispatchers"))) {
override fun computeChildren(node: XCompositeNode) {
val children = XValueChildrenList()
val groups = coroutines.groupBy { it.descriptor.dispatcher }
for (dispatcher in groups.keys) {
// Mark the group that contains a running coroutine with a tick
val coroutines = groups[dispatcher]
val isCurrent = coroutines?.any { it.isRunningOnCurrentThread(suspendContext) } ?: false
children.add(CoroutineContainer(suspendContext, dispatcher ?: EMPTY_DISPATCHER_NAME, isCurrent, coroutines))
}
debugProcess.invokeInSuspendContext(suspendContext) { suspendContext ->
val children = XValueChildrenList()
val groups = coroutines.groupBy { it.descriptor.dispatcher }
for (dispatcher in groups.keys) {
// Mark the group that contains a running coroutine with a tick
val coroutines = groups[dispatcher]
val isCurrent = coroutines?.any { it.isRunningOnCurrentThread(suspendContext) } ?: false
children.add(CoroutineContainer(suspendContext, dispatcher ?: EMPTY_DISPATCHER_NAME, isCurrent, coroutines))
}
if (children.size() > 0) {
node.addChildren(children, true)
} else {
node.addChildren(XValueChildrenList.singleton(InfoNode("coroutine.view.fetching.not_found")), true)
if (children.size() > 0) {
node.addChildren(children, true)
} else {
node.addChildren(XValueChildrenList.singleton(InfoNode("coroutine.view.fetching.not_found")), true)
}
}
}
}
@@ -275,14 +280,17 @@ class CoroutineView(project: Project, javaDebugProcess: JavaDebugProcess) :
private val coroutines: List<CoroutineInfoData>?
) : RendererContainer(renderer.renderThreadGroup(groupName, isCurrent)) {
override fun computeChildren(node: XCompositeNode) {
val children = XValueChildrenList()
coroutines?.forEach {
children.add(FramesContainer(it, suspendContext, groupName))
}
if (children.size() > 0) {
node.addChildren(children, true)
} else {
node.addChildren(XValueChildrenList.singleton(InfoNode("coroutine.view.fetching.not_found")), true)
debugProcess.invokeInSuspendContext(suspendContext) { suspendContext ->
val children = XValueChildrenList()
coroutines?.forEach {
val isCurrent = it.isRunningOnCurrentThread(suspendContext)
children.add(FramesContainer(it, suspendContext, isCurrent, groupName))
}
if (children.size() > 0) {
node.addChildren(children, true)
} else {
node.addChildren(XValueChildrenList.singleton(InfoNode("coroutine.view.fetching.not_found")), true)
}
}
}
}
@@ -294,8 +302,9 @@ class CoroutineView(project: Project, javaDebugProcess: JavaDebugProcess) :
inner class FramesContainer(
private val infoData: CoroutineInfoData,
private val suspendContext: SuspendContextImpl,
isCurrent: Boolean,
parentGroupNameToHideFromContext: String,
) : RendererContainer(renderer.render(infoData, infoData.isRunningOnCurrentThread(suspendContext), parentGroupNameToHideFromContext)) {
) : RendererContainer(renderer.render(infoData, isCurrent, parentGroupNameToHideFromContext)) {
override fun computeChildren(node: XCompositeNode) {
node.setAlreadySorted(true)