mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[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
This commit is contained in:
committed by
intellij-monorepo-bot
parent
6866af3d54
commit
a81957355d
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -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<PluginMainDescriptor>)
|
||||
loadingErrors.add(createCannotLoadError(
|
||||
descriptor = plugin,
|
||||
dependencyPluginId = disabledModuleToProblematicPlugin.get(disabledModule.moduleId)
|
||||
?: disabledModule.moduleId.asPluginId(),
|
||||
?: disabledModule.parent.pluginId,
|
||||
errors = emptyMap(),
|
||||
isNotifyUser = !plugin.isImplementationDetail))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user