mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[startup] IJPL-213802 fix: delegate content module loading to the ModuleBasedLoadingStrategy for JBC
GitOrigin-RevId: e1401b0500be3ae7bb4fa68c3e5f1349e7580b11
This commit is contained in:
committed by
intellij-monorepo-bot
parent
47f47df552
commit
34be1c7cd0
@@ -865,6 +865,7 @@ fun loadCorePlugin(
|
||||
useCoreClassLoader = useCoreClassLoader,
|
||||
reader = reader,
|
||||
isRunningFromSourcesWithoutDevBuild = isRunningFromSources && !isInDevServerMode,
|
||||
useModuleDirAsParent = false,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -894,6 +895,7 @@ internal fun loadCoreProductPlugin(
|
||||
useCoreClassLoader: Boolean,
|
||||
reader: XMLStreamReader2,
|
||||
isRunningFromSourcesWithoutDevBuild: Boolean,
|
||||
useModuleDirAsParent: Boolean = true,
|
||||
): PluginMainDescriptor {
|
||||
val dataLoader = object : DataLoader {
|
||||
override val emptyDescriptorIfCannotResolve: Boolean
|
||||
@@ -913,7 +915,7 @@ internal fun loadCoreProductPlugin(
|
||||
descriptor = descriptor,
|
||||
pathResolver = pathResolver,
|
||||
moduleDir = libDir,
|
||||
useModuleDirAsParent = true,
|
||||
useModuleDirAsParent = useModuleDirAsParent,
|
||||
loadingContext = loadingContext,
|
||||
dataLoader = dataLoader,
|
||||
isRunningFromSourcesWithoutDevBuild = isRunningFromSourcesWithoutDevBuild,
|
||||
|
||||
Reference in New Issue
Block a user