MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-973 Rider core must not depend on VCS log

Browse Source 
GitOrigin-RevId: 6cf69c467a27dbc72c5379c5575cf7ac9b6496db
This commit is contained in:
Vladimir Krivosheev
2024-04-08 10:36:41 +02:00
committed by intellij-monorepo-bot
parent a7e4a7e894
commit 05bb3ecfdb
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/core-impl/src/com/intellij/ide/plugins/ModuleGraph.kt
View File

@@ -77,20 +77,18 @@ internal fun createModuleGraph(plugins: Collection<IdeaPluginDescriptorImpl>): M
collectDirectDependenciesInOldFormat(module, moduleMap, result)
collectDirectDependenciesInNewFormat(module, moduleMap, result)
if (module.pluginId != PluginManagerCore.CORE_ID) {
// Check modules as well, for example, intellij.diagram.impl.vcs.
// We are not yet ready to recommend adding a dependency on extracted VCS modules since the coordinates are not finalized.
if (doesDependOnPluginAlias(module, VCS_ALIAS_ID)) {
moduleMap.get("intellij.platform.vcs.dvcs.impl")?.let { result.add(it) }
moduleMap.get("intellij.platform.vcs.log.impl")?.let { result.add(it) }
}
// Check modules as well, for example, intellij.diagram.impl.vcs.
// We are not yet ready to recommend adding a dependency on extracted VCS modules since the coordinates are not finalized.
if ((module.pluginId != PluginManagerCore.CORE_ID || module.moduleName != null) && doesDependOnPluginAlias(module, VCS_ALIAS_ID)) {
moduleMap.get("intellij.platform.vcs.dvcs.impl")?.let { result.add(it) }
moduleMap.get("intellij.platform.vcs.log.impl")?.let { result.add(it) }
}
if (module.moduleName != null) {
// add main as implicit dependency
val main = moduleMap.get(module.pluginId.idString)!!
assert(main !== module)
result.add(main)
}
if (module.moduleName != null && module.pluginId != PluginManagerCore.CORE_ID) {
// add main as implicit dependency
val main = moduleMap.get(module.pluginId.idString)!!
assert(main !== module)
result.add(main)
}
if (!result.isEmpty()) {

4
platform/core-impl/src/com/intellij/ide/plugins/cl/PluginClassLoader.kt
View File

@@ -83,6 +83,7 @@ class PluginClassLoader(
private val edtTime = AtomicLong()
private val backgroundTime = AtomicLong()
private val loadedClassCounter = AtomicInteger()
@Suppress("SSBasedInspection")
private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + CoroutineName(pluginId.idString))
private val _resolveScopeManager = resolveScopeManager ?: defaultResolveScopeManager
@@ -479,7 +480,8 @@ ${if (exception == null) "" else exception.message}""")
return "${javaClass.simpleName}(" +
"plugin=$pluginDescriptor, " +
"packagePrefix=$packagePrefix, " +
"state=${if (state == PluginAwareClassLoader.ACTIVE) "active" else "unload in progress"}" +
"state=${if (state == PluginAwareClassLoader.ACTIVE) "active" else "unload in progress"}, " +
"parents=${parents.joinToString()}, " +
")"
}