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

[platform] cleanup ModuleBasedProductLoadingStrategy

Browse Source 
GitOrigin-RevId: c0a7bd2c763a2a2f0e716b858ddd8a38edd73ba9
This commit is contained in:
Vladimir Koshelev
2024-08-09 08:29:39 +01:00
committed by intellij-monorepo-bot
parent e6d2119369
commit 513cca7ef4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt
View File

@@ -267,9 +267,10 @@ internal class ModuleBasedProductLoadingStrategy(internal val moduleRepository:
descriptor?.content?.modules?.forEach { module ->
val requireDescriptor = module.requireDescriptor()
if (requireDescriptor.packagePrefix == null) {
requireDescriptor.jarFiles = includedModules.single {
it.moduleDescriptor.moduleId.stringId == requireDescriptor.moduleName
}.moduleDescriptor.resourceRootPaths
val moduleName = requireDescriptor.moduleName
if (moduleName != null) {
requireDescriptor.jarFiles = moduleRepository.getModule(RuntimeModuleId.module(moduleName)).resourceRootPaths
}
}
}
}
@@ -296,7 +297,7 @@ internal class ModuleBasedProductLoadingStrategy(internal val moduleRepository:
pool = zipFilePool,
)
}
val modulesWithJarFiles = descriptor?.content?.modules?.mapNotNull { it.requireDescriptor().jarFiles }?.flatten()
val modulesWithJarFiles = descriptor?.content?.modules?.flatMap { it.requireDescriptor().jarFiles ?: emptyList() }
descriptor?.jarFiles = allResourceRootsList.filter { modulesWithJarFiles == null || it !in modulesWithJarFiles }
return descriptor
}