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 06318138fe0b..656aaee4ff30 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt @@ -62,7 +62,7 @@ internal fun createModulesWithDependenciesAndAdditionalEdges(plugins: Collection // If a plugin does not include any module dependency tags in its plugin.xml, it's assumed to be a legacy plugin // and is loaded only in IntelliJ IDEA, so it may use classes from Java plugin. val implicitDep = if (hasAllModules && PluginCompatibilityUtils.isLegacyPluginWithoutPlatformAliasDependencies(module)) { - pluginIdToDescriptor.get(PluginManagerCore.JAVA_MODULE_ID) + pluginIdToDescriptor.get(PluginManagerCore.JAVA_PLUGIN_ALIAS_ID) } else null if (implicitDep != null) { if (module === implicitDep) { diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginCompatibilityUtils.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginCompatibilityUtils.kt index 862355dda8cd..2b71777cee3d 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginCompatibilityUtils.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginCompatibilityUtils.kt @@ -22,7 +22,7 @@ object PluginCompatibilityUtils { for (dependency in descriptor.dependencies) { val dependencyPluginId = dependency.pluginId if (PluginManagerCore.JAVA_PLUGIN_ID == dependencyPluginId || - PluginManagerCore.JAVA_MODULE_ID == dependencyPluginId || + PluginManagerCore.JAVA_PLUGIN_ALIAS_ID == dependencyPluginId || PluginManagerCore.looksLikePlatformPluginAlias(dependencyPluginId)) { return true } 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 69e97549adf7..c3ab059d1ef1 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt @@ -72,7 +72,8 @@ object PluginManagerCore { @JvmField val CORE_ID: PluginId = PluginId.getId(CORE_PLUGIN_ID) @JvmField val JAVA_PLUGIN_ID: PluginId = PluginId.getId("com.intellij.java") - @JvmField val JAVA_MODULE_ID: PluginId = PluginId.getId("com.intellij.modules.java") + @ApiStatus.Internal + @JvmField val JAVA_PLUGIN_ALIAS_ID: PluginId = PluginId.getId("com.intellij.modules.java") @JvmField val ALL_MODULES_MARKER: PluginId = PluginId.getId("com.intellij.modules.all") @JvmField val SPECIAL_IDEA_PLUGIN_ID: PluginId = PluginId.getId("IDEA CORE") @ApiStatus.Internal @@ -986,6 +987,9 @@ object PluginManagerCore { // + @Deprecated("The platform code should use [JAVA_PLUGIN_ALIAS_ID] instead, plugins aren't supposed to use this") + @JvmField val JAVA_MODULE_ID: PluginId = JAVA_PLUGIN_ALIAS_ID + @ApiStatus.ScheduledForRemoval @Deprecated("Use {@link PluginManager#getPluginByClass}.") @JvmStatic