From 449efe8694c3da4e3e7d4d89ceae9b54043b5b8d Mon Sep 17 00:00:00 2001 From: Vadim Salavatov Date: Mon, 6 Oct 2025 15:09:30 +0200 Subject: [PATCH] [plugins] refactor PluginSetBuilder: extract createCannotLoadError usage when errors is null GitOrigin-RevId: afb8bdafb4793bd349d5c2524c6e7565eee940fe --- .../intellij/ide/plugins/PluginSetBuilder.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 7e685789189e..367bb6eb3051 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginSetBuilder.kt @@ -110,11 +110,10 @@ class PluginSetBuilder(@JvmField val unsortedPlugins: Set) val isDisabledDueToPackagePrefixConflict = HashMap() fun registerLoadingError(plugin: IdeaPluginDescriptorImpl, disabledModule: ContentModuleDescriptor) { - loadingErrors.add(createCannotLoadError( + loadingErrors.add(createCannotLoadError2( descriptor = plugin, dependencyPluginId = disabledModuleToProblematicPlugin.get(disabledModule.moduleId) ?: disabledModule.parent.pluginId, - errors = emptyMap(), isNotifyUser = !plugin.isImplementationDetail)) } fun markRequiredModulesAsDisabled(plugin: PluginMainDescriptor) { @@ -362,6 +361,20 @@ private fun createCannotLoadError( } } +private fun createCannotLoadError2( + descriptor: IdeaPluginDescriptorImpl, + dependencyPluginId: PluginId, + isNotifyUser: Boolean, +): PluginNonLoadReason { + val dependencyIdString = dependencyPluginId.idString + val dependency = null + return if (dependency != null) { + PluginDependencyCannotBeLoaded(descriptor, dependencyIdString, isNotifyUser) + } else { + PluginDependencyIsNotInstalled(descriptor, dependencyIdString, isNotifyUser) + } +} + private fun getAllPluginDependencies(plugin: IdeaPluginDescriptorImpl): Sequence { return plugin.dependencies.asSequence() .filterNot { it.isOptional }