From 34be1c7cd08efbf8efce56b4dae699aa1efa3c4f Mon Sep 17 00:00:00 2001
From: Vadim Salavatov <vadim.salavatov@jetbrains.com>
Date: Wed, 22 Oct 2025 19:07:35 +0200
Subject: [PATCH] [startup] IJPL-213802 fix: delegate content module loading to
 the ModuleBasedLoadingStrategy for JBC

GitOrigin-RevId: e1401b0500be3ae7bb4fa68c3e5f1349e7580b11
---
 .../src/com/intellij/ide/plugins/PluginDescriptorLoader.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginDescriptorLoader.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginDescriptorLoader.kt
index a9be458d0f14..18b369ef0050 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginDescriptorLoader.kt
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginDescriptorLoader.kt
@@ -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,