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

Report correct plugin ID in unload failure messages from ActionManagerImpl

Browse Source 
GitOrigin-RevId: 93bd9bb8f70f701a1e2c3bfa7a40b3d3c946b6a2
This commit is contained in:
Dmitry Jemerov
2020-06-02 21:35:39 +03:00
committed by intellij-monorepo-bot
parent b1a69b9b65
commit d9a6e42359
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt
+1 -1
View File
@@ -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)) {
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+2 -2
View File
@@ -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<Element> 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;