MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-234358 refactoring: get rid of unnecessary calls of RuntimeModuleId.raw outside the generator

Browse Source 
This is needed to store namespaces in RuntimeModuleId.

GitOrigin-RevId: 8cbf901406d68aa13ba387505aa29d2f905ff1d5
This commit is contained in:
Nikolay Chashnikov
2026-02-10 22:15:36 +00:00
committed by intellij-monorepo-bot
parent 5aaa2d2b8c
commit e146a61379
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt
+2 -2
View File
@@ -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? {
platform/bootstrap/src/com/intellij/platform/bootstrap/RunningFromSourceModuleBasedPathResolver.kt
+1 -1
View File
@@ -34,7 +34,7 @@ internal class RunningFromSourceModuleBasedPathResolver(
}
override fun resolveCustomModuleClassesRoots(moduleId: PluginModuleId): List<Path> {
val moduleDescriptor = moduleRepository.resolveModule(RuntimeModuleId.raw(moduleId.name)).resolvedModule
val moduleDescriptor = moduleRepository.resolveModule(RuntimeModuleId.module(moduleId.name)).resolvedModule
return moduleDescriptor?.resourceRootPaths ?: emptyList()
}
}
platform/runtime/product/src/serialization/impl/PluginXmlReader.kt
+1 -1
View File
@@ -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))
}
}
}
platform/runtime/product/src/serialization/impl/ProductModulesXmlSerializer.java
+1 -1
View File
@@ -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));