From a81957355d64c3bb14fe3d396469c80fde49e350 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Mon, 29 Sep 2025 16:33:28 +0200 Subject: [PATCH] [plugin model] cleanup: get rid of functions which convert PluginModuleId to PluginId and vice-versa (IJPL-206556) This is needed to avoid hacks after adding a 'namespace' property to PluginModuleId. GitOrigin-RevId: 809839baaab9c865249724c836e402c7895e0398 --- .../src/com/intellij/ide/plugins/PluginModuleId.kt | 7 ------- .../src/com/intellij/ide/plugins/PluginSetBuilder.kt | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginModuleId.kt b/platform/core-impl/src/com/intellij/ide/plugins/PluginModuleId.kt index df961b166959..9f625e655c2a 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginModuleId.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginModuleId.kt @@ -2,7 +2,6 @@ package com.intellij.ide.plugins import com.intellij.ide.plugins.PluginModuleId.Companion.getId -import com.intellij.openapi.extensions.PluginId import com.intellij.openapi.util.IntellijInternalApi import com.intellij.util.containers.CollectionFactory import org.jetbrains.annotations.ApiStatus @@ -45,11 +44,5 @@ class PluginModuleId private constructor(val id: String) { /** shorthand for [getId] in kotlin */ operator fun invoke(id: String): PluginModuleId = getId(id) - - @Deprecated("plugin and module id namespaces are separate") - fun PluginId.asPluginModuleId(): PluginModuleId = getId(idString) - - @Deprecated("plugin and module id namespaces are separate") - fun PluginModuleId.asPluginId(): PluginId = PluginId.getId(id) } } \ No newline at end of file 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 0187440f7d45..4d3a8810ba22 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt @@ -4,7 +4,6 @@ package com.intellij.ide.plugins import com.intellij.core.CoreBundle -import com.intellij.ide.plugins.PluginModuleId.Companion.asPluginId import com.intellij.openapi.extensions.PluginId import com.intellij.util.containers.Java11Shim import com.intellij.util.graph.DFSTBuilder @@ -106,7 +105,7 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) loadingErrors.add(createCannotLoadError( descriptor = plugin, dependencyPluginId = disabledModuleToProblematicPlugin.get(disabledModule.moduleId) - ?: disabledModule.moduleId.asPluginId(), + ?: disabledModule.parent.pluginId, errors = emptyMap(), isNotifyUser = !plugin.isImplementationDetail)) }