From e146a61379002f0f201abd87be9443976a03d85e Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Tue, 10 Feb 2026 18:09:44 +0100 Subject: [PATCH] IJPL-234358 refactoring: get rid of unnecessary calls of RuntimeModuleId.raw outside the generator This is needed to store namespaces in RuntimeModuleId. GitOrigin-RevId: 8cbf901406d68aa13ba387505aa29d2f905ff1d5 --- .../platform/bootstrap/ModuleBasedProductLoadingStrategy.kt | 4 ++-- .../bootstrap/RunningFromSourceModuleBasedPathResolver.kt | 2 +- .../runtime/product/src/serialization/impl/PluginXmlReader.kt | 2 +- .../src/serialization/impl/ProductModulesXmlSerializer.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt b/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt index 1447679cf7d2..ca4aee339b15 100644 --- a/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt +++ b/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt @@ -295,7 +295,7 @@ internal class ModuleBasedProductLoadingStrategy(internal val moduleRepository: val repositoryData = repositoryDataMap[path] ?: return@async null val mainModuleId = repositoryData.mainPluginModuleId ?: return@async null try { - val mainModule = moduleRepository.getModule(RuntimeModuleId.raw(mainModuleId)) + val mainModule = moduleRepository.getModule(RuntimeModuleId.module(mainModuleId)) /* It would be probably better to reuse PluginModuleGroup here, and load information about additional modules from plugin.xml. However, currently this won't work because plugin model v2 requires that there is an XML configuration file for each module @@ -437,7 +437,7 @@ internal class ModuleBasedProductLoadingStrategy(internal val moduleRepository: } override fun isOptionalProductModule(moduleId: String): Boolean { - return productModules.mainModuleGroup.optionalModuleIds.contains(RuntimeModuleId.raw(moduleId)) + return productModules.mainModuleGroup.optionalModuleIds.contains(RuntimeModuleId.module(moduleId)) } override fun findProductContentModuleClassesRoot(moduleId: PluginModuleId, moduleDir: Path): Path? { diff --git a/platform/bootstrap/src/com/intellij/platform/bootstrap/RunningFromSourceModuleBasedPathResolver.kt b/platform/bootstrap/src/com/intellij/platform/bootstrap/RunningFromSourceModuleBasedPathResolver.kt index d29a67704fc2..925ab73deff5 100644 --- a/platform/bootstrap/src/com/intellij/platform/bootstrap/RunningFromSourceModuleBasedPathResolver.kt +++ b/platform/bootstrap/src/com/intellij/platform/bootstrap/RunningFromSourceModuleBasedPathResolver.kt @@ -34,7 +34,7 @@ internal class RunningFromSourceModuleBasedPathResolver( } override fun resolveCustomModuleClassesRoots(moduleId: PluginModuleId): List { - val moduleDescriptor = moduleRepository.resolveModule(RuntimeModuleId.raw(moduleId.name)).resolvedModule + val moduleDescriptor = moduleRepository.resolveModule(RuntimeModuleId.module(moduleId.name)).resolvedModule return moduleDescriptor?.resourceRootPaths ?: emptyList() } } diff --git a/platform/runtime/product/src/serialization/impl/PluginXmlReader.kt b/platform/runtime/product/src/serialization/impl/PluginXmlReader.kt index 86a9153e8787..18edcacb9676 100644 --- a/platform/runtime/product/src/serialization/impl/PluginXmlReader.kt +++ b/platform/runtime/product/src/serialization/impl/PluginXmlReader.kt @@ -61,7 +61,7 @@ fun loadPluginModules( "on-demand" -> RuntimeModuleLoadingRule.ON_DEMAND else -> RuntimeModuleLoadingRule.OPTIONAL } - modules.add(RawIncludedRuntimeModule(RuntimeModuleId.raw(moduleName), loadingRule)) + modules.add(RawIncludedRuntimeModule(RuntimeModuleId.module(moduleName), loadingRule)) } } } diff --git a/platform/runtime/product/src/serialization/impl/ProductModulesXmlSerializer.java b/platform/runtime/product/src/serialization/impl/ProductModulesXmlSerializer.java index 199a31175bf0..6e6a9d551ca1 100644 --- a/platform/runtime/product/src/serialization/impl/ProductModulesXmlSerializer.java +++ b/platform/runtime/product/src/serialization/impl/ProductModulesXmlSerializer.java @@ -73,7 +73,7 @@ public final class ProductModulesXmlSerializer { if (moduleName == null || moduleName.isEmpty()) { throw new XMLStreamException("Module name is not specified"); } - RuntimeModuleId moduleId = RuntimeModuleId.raw(moduleName); + RuntimeModuleId moduleId = RuntimeModuleId.module(moduleName); if ("main-root-modules".equals(secondLevelTag)) { assert loadingRule != null; rootMainGroupModules.add(new RawIncludedRuntimeModule(moduleId, loadingRule));