From d9a6e423598507e3fcdab158684ae61ba6c7a561 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 2 Jun 2020 18:07:05 +0200 Subject: [PATCH] Report correct plugin ID in unload failure messages from ActionManagerImpl GitOrigin-RevId: 93bd9bb8f70f701a1e2c3bfa7a40b3d3c946b6a2 --- .../src/com/intellij/ide/plugins/DynamicPlugins.kt | 2 +- .../intellij/openapi/actionSystem/impl/ActionManagerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt index 198020d6c4d4..cc00d15d3857 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt +++ b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt @@ -223,7 +223,7 @@ object DynamicPlugins { val pluginId = loadedPluginDescriptor?.pluginId ?: baseDescriptor?.pluginId checkNoComponentsOrServiceOverrides(pluginId, descriptor)?.let { return it } - ActionManagerImpl.checkUnloadActions(descriptor)?.let { return it } + ActionManagerImpl.checkUnloadActions(pluginId, descriptor)?.let { return it } descriptor.pluginDependencies?.forEach { dependency -> if (isPluginOrModuleLoaded(dependency.id)) { diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java index 9d8941c55724..e6569fb6056f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java @@ -1113,7 +1113,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab } @ApiStatus.Internal - public static @Nullable String checkUnloadActions(@NotNull IdeaPluginDescriptorImpl pluginDescriptor) { + public static @Nullable String checkUnloadActions(PluginId pluginId, @NotNull IdeaPluginDescriptorImpl pluginDescriptor) { List elements = pluginDescriptor.getActionDescriptionElements(); if (elements == null) { return null; @@ -1122,7 +1122,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab if (!element.getName().equals(ACTION_ELEMENT_NAME) && !(element.getName().equals(GROUP_ELEMENT_NAME) && canUnloadGroup(element)) && !element.getName().equals(REFERENCE_ELEMENT_NAME)) { - return "Plugin " + pluginDescriptor.getPluginId() + " is not unload-safe because of action element " + element.getName(); + return "Plugin " + pluginId + " is not unload-safe because of action element " + element.getName(); } } return null;