MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

[debugger] Coroutine agent attach regression fix: CoroutineAgentConnector logic should only be applied to ModuleBasedConfigurations

Browse Source 
IDEA-378969

(cherry picked from commit 67e16dc6b30c774b9dc2c4596e6b413300999bcb)


(cherry picked from commit 50a1447db02fbf74751e15af8099878bb72b79ca)

IJ-CR-175180

GitOrigin-RevId: 0bf9b9cbc6a1bd8d7347739b1232a3fbee41d90f
This commit is contained in:
Maria Sokolova
2025-09-08 13:05:11 +02:00
committed by intellij-monorepo-bot
parent dcb6914323
commit e4fe1122ff
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/kotlin/jvm-debugger/coroutines/src/org/jetbrains/kotlin/idea/debugger/coroutine/CoroutineAgentConnector.kt
View File

@@ -51,30 +51,23 @@ internal object CoroutineAgentConnector {
}
private fun getKotlinxCoroutinesJarsFromClasspath(project: Project, configuration: RunConfigurationBase<*>?): List<String> {
// This logic of attaching coroutine debug agent is only applicable to ModuleBasedConfigurations, see IDEA-378969
if (configuration !is ModuleBasedConfiguration<*, *>) return emptyList()
// First, check if any modules corresponding to the given run configuration have loaded the kotlinx.coroutines.debug.internal package,
// if none, then the coroutines debug agent should not be applied.
// This is important for a case when a project contains both Kotlin and Java modules, Kotlin modules may contain coroutines dependency,
// though when a Java run configuration is chosen, the coroutine agent should not be applied.
// In case no run configuration is provided or if it's not module-based, then search the whole project for the package.
val coroutinesPsiPackage = JavaPsiFacade.getInstance(project).findPackage(KOTLINX_COROUTINES_DEBUG_INTERNAL_PACKAGE) ?: return emptyList()
return if (configuration != null && configuration is ModuleBasedConfiguration<*, *>) {
configuration.modules.flatMap { module ->
val moduleScope = GlobalSearchScope.union(
listOf(
GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module),
module.getModuleRuntimeScope(true),
)
return configuration.modules.flatMap { module ->
val moduleScope = GlobalSearchScope.union(
listOf(
GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module),
module.getModuleRuntimeScope(true),
)
coroutinesPsiPackage.getDirectories(moduleScope).mapNotNull {
JarFileSystem.getInstance().getVirtualFileForJar(it.virtualFile)?.path
}
)
coroutinesPsiPackage.getDirectories(moduleScope).mapNotNull {
JarFileSystem.getInstance().getVirtualFileForJar(it.virtualFile)?.path
}
} else {
coroutinesPsiPackage.getDirectories()
.mapNotNull {
JarFileSystem.getInstance().getVirtualFileForJar(it.virtualFile)?.path
}
}
}