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

[plugin model] cleanup: rename PluginManagerCore.JAVA_MODULE_ID to JAVA_PLUGIN_ALIAS_ID to avoid confusion

Browse Source 
GitOrigin-RevId: 00643179d94c9ada457b36c325c75595f4e39d36
This commit is contained in:
Nikolay Chashnikov
2025-09-30 16:18:22 +00:00
committed by intellij-monorepo-bot
parent 3a462749b6
commit 06286325bc
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt
+1 -1
View File
@@ -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) {
platform/core-impl/src/com/intellij/ide/plugins/PluginCompatibilityUtils.kt
+1 -1
View File
@@ -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
}
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.kt
+5 -1
View File
@@ -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 {
//<editor-fold desc="Deprecated stuff.">
@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