diff --git a/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt b/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt index c5812de65776..7bf8f4b5809f 100644 --- a/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt +++ b/platform/bootstrap/src/com/intellij/platform/bootstrap/ModuleBasedProductLoadingStrategy.kt @@ -264,7 +264,7 @@ internal class ModuleBasedProductLoadingStrategy(internal val moduleRepository: .also { descriptor -> descriptor?.contentModules?.forEach { module -> if (module.packagePrefix == null) { - val moduleName = module.moduleName + val moduleName = module.moduleId module.jarFiles = moduleRepository.getModule(RuntimeModuleId.module(moduleName)).resourceRootPaths } } diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt b/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt index 7553dbe35b9c..f150787f2a7e 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/ClassLoaderConfigurator.kt @@ -144,17 +144,17 @@ class ClassLoaderConfigurator( } else { val mimicJarUrlConnection = module.vendor == PluginManagerCore.VENDOR_JETBRAINS - && (module.moduleName == "intellij.rider.test.cases" - || module.moduleName == "intellij.rider.plugins.efCore.test.cases" - || module.moduleName == "intellij.rider.plugins.for.tea.test.cases" - || module.moduleName == "intellij.rider.plugins.fsharp.test.cases" - || module.moduleName == "intellij.rider.plugins.godot.test.cases" - || module.moduleName == "intellij.rider.plugins.unity.test.cases" - || module.moduleName == "intellij.rider.plugins.unreal.link.test.cases" - || module.moduleName == "intellij.rider.test.cases.qodana" - || module.moduleName == "intellij.rider.test.cases.supplementary" - || module.moduleName == "intellij.rider.test.cases.consoles" - || module.moduleName == "intellij.rider.test.cases.rdct") + && (module.moduleId == "intellij.rider.test.cases" + || module.moduleId == "intellij.rider.plugins.efCore.test.cases" + || module.moduleId == "intellij.rider.plugins.for.tea.test.cases" + || module.moduleId == "intellij.rider.plugins.fsharp.test.cases" + || module.moduleId == "intellij.rider.plugins.godot.test.cases" + || module.moduleId == "intellij.rider.plugins.unity.test.cases" + || module.moduleId == "intellij.rider.plugins.unreal.link.test.cases" + || module.moduleId == "intellij.rider.test.cases.qodana" + || module.moduleId == "intellij.rider.test.cases.supplementary" + || module.moduleId == "intellij.rider.test.cases.consoles" + || module.moduleId == "intellij.rider.test.cases.rdct") module.pluginClassLoader = PluginClassLoader( classPath = ClassPath(customJarFiles, DEFAULT_CLASSLOADER_CONFIGURATION, resourceFileFactory, mimicJarUrlConnection), parents = dependencies, @@ -426,7 +426,7 @@ private fun getPackagePrefixesLoadedBySeparateClassLoaders(descriptor: PluginMai throw PluginException("Package is not specified (module=$module)", module.pluginId) } } - result.add("$packagePrefix." to module.moduleName) + result.add("$packagePrefix." to module.moduleId) } return result } diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorExtensions.kt b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorExtensions.kt index eaf98294dc67..c1786d468cfa 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorExtensions.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorExtensions.kt @@ -7,7 +7,7 @@ import org.jetbrains.annotations.ApiStatus @get:ApiStatus.Experimental val IdeaPluginDescriptor.contentModuleName: String? - get() = (this as? ContentModuleDescriptor)?.moduleName + get() = (this as? ContentModuleDescriptor)?.moduleId @get:ApiStatus.Experimental val IdeaPluginDescriptor.isRequiredContentModule: Boolean diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt index f1afed26cc55..1204a86c3ac1 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.kt @@ -199,7 +199,7 @@ sealed class IdeaPluginDescriptorImpl( LOG.warnInProduction(PluginException(buildString { append("Plugin descriptor for ") when (this@logUnexpectedElement) { - is ContentModuleDescriptor -> append("content module '${moduleName}' of plugin '${pluginId}'") + is ContentModuleDescriptor -> append("content module '${moduleId}' of plugin '${pluginId}'") is DependsSubDescriptor -> append("'depends' sub-descriptor '${descriptorPath}' of plugin '${pluginId}'") is PluginMainDescriptor -> error("not intended") } @@ -594,7 +594,7 @@ class ContentModuleDescriptor( moduleLoadingRule: ModuleLoadingRule, private val descriptorPath: String ): PluginModuleDescriptor(raw) { - val moduleName: String = moduleName + val moduleId: String = moduleName val moduleLoadingRule: ModuleLoadingRule = moduleLoadingRule override val useCoreClassLoader: Boolean @@ -609,10 +609,10 @@ class ContentModuleDescriptor( override fun getResourceBundleBaseName(): String? = resourceBundleBaseName override fun toString(): String = - "ContentModuleDescriptor(moduleName=$moduleName" + + "ContentModuleDescriptor(moduleName=$moduleId" + (if (moduleLoadingRule == ModuleLoadingRule.OPTIONAL) "" else ", loadingRule=$moduleLoadingRule") + (if (packagePrefix == null) "" else ", package=$packagePrefix") + - (if (descriptorPath == "$moduleName.xml") "" else ", descriptorPath=$descriptorPath") + + (if (descriptorPath == "$moduleId.xml") "" else ", descriptorPath=$descriptorPath") + ") <- $parent" init { diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt index e92c235a3477..e62af51caa6c 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt @@ -41,7 +41,7 @@ internal fun createModulesWithDependenciesAndAdditionalEdges(plugins: Collection modules.add(module) for (subModule in module.contentModules) { modules.add(subModule) - moduleMap.put(subModule.moduleName, subModule) + moduleMap.put(subModule.moduleId, subModule) for (pluginAlias in subModule.pluginAliases) { moduleMap.put(pluginAlias.idString, subModule) } @@ -288,7 +288,7 @@ private fun collectDirectDependenciesInNewFormat( can be loaded or not. */ for (item in module.contentModules) { if (item.moduleLoadingRule.required) { - val descriptor = idMap.get(item.moduleName) + val descriptor = idMap.get(item.moduleId) if (descriptor != null) { additionalEdges.add(descriptor) } diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt index e66c177af4a2..7f285f8a7822 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt @@ -488,10 +488,10 @@ object PluginManagerCore { }.toMap() val fullContentModuleIdMap = HashMap() for (descriptor in loadingResult.getIncompleteIdMap().values) { - descriptor.contentModules.associateByTo(fullContentModuleIdMap) { it.moduleName } + descriptor.contentModules.associateByTo(fullContentModuleIdMap) { it.moduleId } } for (descriptor in idMap.values) { - descriptor.contentModules.associateByTo(fullContentModuleIdMap) { it.moduleName } + descriptor.contentModules.associateByTo(fullContentModuleIdMap) { it.moduleId } } if (initContext.checkEssentialPlugins && !idMap.containsKey(CORE_ID)) { @@ -579,7 +579,7 @@ object PluginManagerCore { val pluginsToLoad = LinkedHashSet(rootPluginsToLoad.size) val contentModuleIdMap = HashMap() for (descriptor in descriptors) { - descriptor.contentModules.associateByTo(contentModuleIdMap) { it.moduleName } + descriptor.contentModules.associateByTo(contentModuleIdMap) { it.moduleId } } for (id in rootPluginsToLoad) { val descriptor = idMap[id] ?: continue @@ -630,7 +630,7 @@ object PluginManagerCore { corePlugin.contentModules .filter { it.moduleLoadingRule.required && !it.isMarkedForLoading } if (disabledModulesOfCorePlugin.isNotEmpty()) { - throw EssentialPluginMissingException(disabledModulesOfCorePlugin.map { it.moduleName }) + throw EssentialPluginMissingException(disabledModulesOfCorePlugin.map { it.moduleId }) } } var missing: MutableList>? = null diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginSet.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginSet.kt index 8347dea87784..9ccd6f635dd9 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginSet.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginSet.kt @@ -89,11 +89,11 @@ class PluginSet internal constructor( val enabledPluginIds = enabledPlugins.mapTo(HashSet()) { it.pluginId } for (plugin in allPlugins) { if (plugin.pluginId !in enabledPluginIds) { - plugin.contentModules.associateByTo(result, ContentModuleDescriptor::moduleName) + plugin.contentModules.associateByTo(result, ContentModuleDescriptor::moduleId) } } for (plugin in enabledPlugins) { - plugin.contentModules.associateByTo(result, ContentModuleDescriptor::moduleName) + plugin.contentModules.associateByTo(result, ContentModuleDescriptor::moduleId) } return result } diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt index 407ae2771d70..eaf1fbbb6ef3 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt @@ -97,7 +97,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) val enabledRequiredContentModules = HashMap() val disabledModuleToProblematicPlugin = HashMap() for (incompletePlugin in incompletePlugins) { - incompletePlugin.contentModules.associateByTo(disabledModuleToProblematicPlugin, { it.moduleName }, { incompletePlugin.pluginId }) + incompletePlugin.contentModules.associateByTo(disabledModuleToProblematicPlugin, { it.moduleId }, { incompletePlugin.pluginId }) } val moduleIncompatibleWithCurrentMode = getModuleIncompatibleWithCurrentProductMode(currentProductModeEvaluator) val usedPackagePrefixes = HashMap() @@ -106,15 +106,15 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) fun registerLoadingError(plugin: IdeaPluginDescriptorImpl, disabledModule: ContentModuleDescriptor) { loadingErrors.add(createCannotLoadError( descriptor = plugin, - dependencyPluginId = disabledModuleToProblematicPlugin.get(disabledModule.moduleName) ?: PluginId.getId(disabledModule.moduleName), + dependencyPluginId = disabledModuleToProblematicPlugin.get(disabledModule.moduleId) ?: PluginId.getId(disabledModule.moduleId), errors = emptyMap(), isNotifyUser = !plugin.isImplementationDetail)) } m@ for (module in sortedModulesWithDependencies.modules) { - if (module is ContentModuleDescriptor && module.moduleName == moduleIncompatibleWithCurrentMode) { + if (module is ContentModuleDescriptor && module.moduleId == moduleIncompatibleWithCurrentMode) { module.isMarkedForLoading = false - logMessages.add("Module ${module.moduleName} is disabled because it is not compatible with the current product mode") + logMessages.add("Module ${module.moduleId} is disabled because it is not compatible with the current product mode") continue } @@ -130,7 +130,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) } } else if (!module.isRequiredContentModule && !enabledPluginIds.containsKey(module.pluginId)) { - disabledModuleToProblematicPlugin.put(module.moduleName, module.pluginId) + disabledModuleToProblematicPlugin.put(module.moduleId, module.pluginId) continue } @@ -138,7 +138,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) if (!enabledModuleV2Ids.containsKey(ref.name) && !enabledRequiredContentModules.containsKey(ref.name)) { logMessages.add("Module ${module.contentModuleName ?: module.pluginId} is not enabled because dependency ${ref.name} is not available") if (module is ContentModuleDescriptor) { - disabledModuleToProblematicPlugin.put(module.moduleName, disabledModuleToProblematicPlugin.get(ref.name) ?: PluginId.getId(ref.name)) + disabledModuleToProblematicPlugin.put(module.moduleId, disabledModuleToProblematicPlugin.get(ref.name) ?: PluginId.getId(ref.name)) } continue@m } @@ -147,7 +147,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) if (!enabledPluginIds.containsKey(ref.id)) { logMessages.add("Module ${module.contentModuleName ?: module.pluginId} is not enabled because dependency ${ref.id} is not available") if (module is ContentModuleDescriptor) { - disabledModuleToProblematicPlugin.put(module.moduleName, ref.id) + disabledModuleToProblematicPlugin.put(module.moduleId, ref.id) } continue@m } @@ -170,10 +170,10 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) is PluginMainDescriptor -> { if (module.pluginId != PluginManagerCore.CORE_ID) { for (contentModule in module.contentModules) { - if (contentModule.moduleLoadingRule.required && !enabledRequiredContentModules.containsKey(contentModule.moduleName)) { + if (contentModule.moduleLoadingRule.required && !enabledRequiredContentModules.containsKey(contentModule.moduleId)) { module.isMarkedForLoading = false - if (isDisabledDueToPackagePrefixConflict.containsKey(contentModule.moduleName)) { - val alreadyRegistered = isDisabledDueToPackagePrefixConflict[contentModule.moduleName]!! + if (isDisabledDueToPackagePrefixConflict.containsKey(contentModule.moduleId)) { + val alreadyRegistered = isDisabledDueToPackagePrefixConflict[contentModule.moduleId]!! loadingErrors.add(PluginPackagePrefixConflict(module, contentModule, alreadyRegistered)) } else { registerLoadingError(module, contentModule) @@ -193,18 +193,18 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) if (module.pluginId != PluginManagerCore.CORE_ID) { for (contentModule in module.contentModules) { if (contentModule.moduleLoadingRule.required) { - val requiredContentModule = enabledRequiredContentModules.remove(contentModule.moduleName)!! - markModuleAsEnabled(contentModule.moduleName, requiredContentModule) + val requiredContentModule = enabledRequiredContentModules.remove(contentModule.moduleId)!! + markModuleAsEnabled(contentModule.moduleId, requiredContentModule) } } } } is ContentModuleDescriptor -> { if (module.isRequiredContentModule && module.pluginId != PluginManagerCore.CORE_ID) { - enabledRequiredContentModules.put(module.moduleName, module) + enabledRequiredContentModules.put(module.moduleId, module) } else { - markModuleAsEnabled(module.moduleName, module) + markModuleAsEnabled(module.moduleId, module) } } } @@ -213,7 +213,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) val corePlugin = enabledPluginIds.get(PluginManagerCore.CORE_ID) if (corePlugin != null) { for (moduleItem in corePlugin.contentModules) { - if (moduleItem.moduleLoadingRule.required && !enabledModuleV2Ids.containsKey(moduleItem.moduleName)) { + if (moduleItem.moduleLoadingRule.required && !enabledModuleV2Ids.containsKey(moduleItem.moduleId)) { moduleItem.isMarkedForLoading = false registerLoadingError(corePlugin, moduleItem) } @@ -265,7 +265,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) val java11Shim = Java11Shim.INSTANCE fun isPluginModuleEnabled(module: PluginModuleDescriptor): Boolean { if (module !is ContentModuleDescriptor) return module.isMarkedForLoading - return enabledModuleV2Ids[module.moduleName] === module + return enabledModuleV2Ids[module.moduleId] === module } return PluginSet( diff --git a/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt b/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt index b3b6bc8106e6..f4f78edbaf76 100644 --- a/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt +++ b/platform/ide-core-impl/src/com/intellij/ui/icons/CoreIconManager.kt @@ -256,7 +256,7 @@ class CoreIconManager : IconManager, CoreAwareIconManager { return plugin.classLoader } else { - return plugin.contentModules.firstOrNull { it.moduleName == moduleId }?.classLoader + return plugin.contentModules.firstOrNull { it.moduleId == moduleId }?.classLoader } } diff --git a/platform/lang-impl/src/com/intellij/internal/DumpPluginDescriptorsAction.kt b/platform/lang-impl/src/com/intellij/internal/DumpPluginDescriptorsAction.kt index d7c43e8a14a1..be8f4ad587a5 100644 --- a/platform/lang-impl/src/com/intellij/internal/DumpPluginDescriptorsAction.kt +++ b/platform/lang-impl/src/com/intellij/internal/DumpPluginDescriptorsAction.kt @@ -137,7 +137,7 @@ private class PluginDescriptionDumper(val coroutineScope: CoroutineScope) { writeArrayFieldStart("modules") for (module in modules) { writeStartObject() - writeStringField("name", module.moduleName) + writeStringField("name", module.moduleId) val isEnabled = module in PluginManagerCore.getPluginSet().getEnabledModules() writeBooleanField("enabled", isEnabled) if (isEnabled) { diff --git a/platform/platform-impl/bootstrap/src/com/intellij/openapi/application/PluginAutoUpdater.kt b/platform/platform-impl/bootstrap/src/com/intellij/openapi/application/PluginAutoUpdater.kt index 8620702b0da8..33b760d63fb3 100644 --- a/platform/platform-impl/bootstrap/src/com/intellij/openapi/application/PluginAutoUpdater.kt +++ b/platform/platform-impl/bootstrap/src/com/intellij/openapi/application/PluginAutoUpdater.kt @@ -134,7 +134,7 @@ object PluginAutoUpdater { // checks mostly duplicate what is written in com.intellij.ide.plugins.PluginInstaller.installFromDisk. FIXME, I guess val enabledPluginsAndModulesIds: Set = currentDescriptors.getIdMap().flatMap { entry -> val desc = entry.value - listOf(desc.pluginId.idString) + desc.pluginAliases.map { it.idString } + desc.contentModules.map { it.moduleName } // FIXME content module aliases are not accounted + listOf(desc.pluginId.idString) + desc.pluginAliases.map { it.idString } + desc.contentModules.map { it.moduleId } // FIXME content module aliases are not accounted }.toSet() for ((id, updateDesc) in updates) { val existingDesc = currentDescriptors.getIdMap()[id] ?: currentDescriptors.getIncompleteIdMap()[id] diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/BundledPluginsLister.kt b/platform/platform-impl/src/com/intellij/ide/plugins/BundledPluginsLister.kt index f4b99e50107e..c0b984ea6b9b 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/BundledPluginsLister.kt +++ b/platform/platform-impl/src/com/intellij/ide/plugins/BundledPluginsLister.kt @@ -64,7 +64,7 @@ private class BundledPluginsLister : ModernApplicationStarter() { } for (module in plugin.contentModules) { layout.add(LayoutItemDescriptor( - name = module.moduleName, + name = module.moduleId, kind = if (plugin.pluginId == PluginManagerCore.CORE_ID) { ProductInfoLayoutItemKind.productModuleV2 } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt index bf1b12f12511..475c3ecaf1d6 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt +++ b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt @@ -328,7 +328,7 @@ object DynamicPlugins { checkUnloadActions(module)?.let { return it } for (moduleRef in module.contentModules) { - if (pluginSet.isModuleEnabled(moduleRef.moduleName)) { + if (pluginSet.isModuleEnabled(moduleRef.moduleId)) { checkCanUnloadWithoutRestart(module = moduleRef, parentModule = module, optionalDependencyPluginId = null, @@ -999,7 +999,7 @@ object DynamicPlugins { classLoaderConfigurator = classLoaderConfigurator, pluginSet = pluginSet).filter { descriptorImpl -> when (descriptorImpl) { - is ContentModuleDescriptor if !pluginSet.isModuleEnabled(descriptorImpl.moduleName) -> false + is ContentModuleDescriptor if !pluginSet.isModuleEnabled(descriptorImpl.moduleId) -> false is PluginMainDescriptor if !pluginSet.isPluginEnabled(descriptorImpl.pluginId) -> false else -> true } @@ -1251,7 +1251,7 @@ private fun processDependenciesOnPlugin( val wantedIds = HashSet(1 + dependencyTarget.contentModules.size) wantedIds.add(dependencyTarget.pluginId.idString) for (module in dependencyTarget.contentModules) { - wantedIds.add(module.moduleName) + wantedIds.add(module.moduleId) } // FIXME plugin aliases probably missing? diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionIndexLoader.kt b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionIndexLoader.kt index 1a0fcbf820a2..ad3ec71a8e67 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionIndexLoader.kt +++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionIndexLoader.kt @@ -210,7 +210,7 @@ private fun processSearchableOptions(processor: MySearchableOptionProcessor) { continue } - val classifier = if (module !is ContentModuleDescriptor) "p-${module.pluginId.idString}" else "m-${module.moduleName}" + val classifier = if (module !is ContentModuleDescriptor) "p-${module.pluginId.idString}" else "m-${module.moduleId}" val fileName = "$classifier-${SearchableOptionsRegistrar.SEARCHABLE_OPTIONS_XML_NAME}.json" val data = classLoader.getResourceAsBytes(fileName, false) diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/ClassLoaderConfiguratorTest.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/ClassLoaderConfiguratorTest.kt index 60a83b356d84..9e77b93ef6c9 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/ClassLoaderConfiguratorTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/ClassLoaderConfiguratorTest.kt @@ -70,7 +70,7 @@ internal class ClassLoaderConfiguratorTest { createModuleDescriptor("com.foo.bar"), ) sortDependenciesInPlace(modules) - assertThat(modules.map { it.moduleName }).containsExactly("com.foo.bar", "com.foo") + assertThat(modules.map { it.moduleId }).containsExactly("com.foo.bar", "com.foo") } @Test diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.kt index d0b3f1b18185..2158c8977905 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTest.kt @@ -388,7 +388,7 @@ class PluginDescriptorTest { assertThat(descriptor.pluginId.idString).isEqualTo("bar") assertThat(descriptor.resourceBundleBaseName).isEqualTo("resourceBundle") assertThat(descriptor.contentModules).hasSize(3) - assertThat(descriptor.contentModules).allMatch { it.resourceBundleBaseName == it.moduleName } + assertThat(descriptor.contentModules).allMatch { it.resourceBundleBaseName == it.moduleId } } @Test diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTestUtils.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTestUtils.kt index 885004cbc815..08c9975f1ab5 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTestUtils.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginDescriptorTestUtils.kt @@ -43,7 +43,7 @@ fun ObjectAssert.isNotMarkedEnabled() = apply { } fun ObjectAssert.hasExactlyEnabledContentModules(vararg ids: String) = apply { - extracting { it.contentModules.mapNotNull { it.takeIf { it.isEnabled }?.moduleName } } + extracting { it.contentModules.mapNotNull { it.takeIf { it.isEnabled }?.moduleId } } .asList() .containsExactly(*ids) } diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginManagerTest.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginManagerTest.kt index 69fe70c628a1..166f4a6c5791 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginManagerTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginManagerTest.kt @@ -276,7 +276,7 @@ class PluginManagerTest { for (descriptor in loadPluginResult.pluginSet.getEnabledModules()) { text.append(if (descriptor.isEnabled()) "+ " else " ").append(descriptor.getPluginId().idString) if (descriptor is ContentModuleDescriptor) { - text.append(" | ").append(descriptor.moduleName) + text.append(" | ").append(descriptor.moduleId) } text.append('\n') } diff --git a/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java b/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java index de7403141217..5c7dd942800b 100644 --- a/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java +++ b/platform/remote-driver/core/src/com/intellij/driver/impl/Invoker.java @@ -9,8 +9,6 @@ import com.intellij.openapi.application.impl.ApplicationInfoImpl; import com.intellij.openapi.client.ClientKind; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.PluginId; -import com.intellij.openapi.progress.CeProcessCanceledException; -import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.BuildNumber; import com.intellij.openapi.util.ClearableLazyValue; @@ -442,7 +440,7 @@ public class Invoker implements InvokerMBean { List modules = IdeaPluginDescriptorImplKt.getContentModules((IdeaPluginDescriptorImpl)plugin); for (var module : modules) { - if (Objects.equals(moduleId, module.getModuleName())) { + if (Objects.equals(moduleId, module.getModuleId())) { return requireNonNull(module.getPluginClassLoader()); } } diff --git a/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt b/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt index a82971944ee6..8e9ea689fba4 100644 --- a/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt +++ b/platform/service-container/src/com/intellij/serviceContainer/ComponentManagerImpl.kt @@ -1438,7 +1438,7 @@ internal fun doLoadClass(name: String, pluginDescriptor: PluginDescriptor, check catch (e: ClassNotFoundException) { if (checkCoreSubModules && pluginDescriptor.pluginId == PluginManagerCore.CORE_ID && pluginDescriptor is IdeaPluginDescriptorImpl) { for (module in pluginDescriptor.contentModules) { - if (module.packagePrefix == null && !module.moduleName.startsWith("intellij.libraries.")) { + if (module.packagePrefix == null && !module.moduleId.startsWith("intellij.libraries.")) { val pluginClassLoader = module.classLoader as? PluginAwareClassLoader ?: continue pluginClassLoader.loadClassInsideSelf(name)?.let { assert(it.isAnnotationPresent(InternalIgnoreDependencyViolation::class.java)) diff --git a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java index 4aef50320ef2..910fd7a1d6b3 100644 --- a/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java +++ b/plugins/performanceTesting/core/src/com/jetbrains/performancePlugin/commands/RunServiceInPlugin.java @@ -33,7 +33,7 @@ public class RunServiceInPlugin extends RunClassInPlugin { List modules = IdeaPluginDescriptorImplKt.getContentModules((IdeaPluginDescriptorImpl)plugin); if (!modules.isEmpty()) { for (var module : modules) { - if (myClazzName.contains(module.getModuleName())) { + if (myClazzName.contains(module.getModuleId())) { loader = module.getClassLoader(); } }