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

Use correct classloader when plugin registers an action group of platform class with plugin icon (IDEA-216197)

Browse Source 
GitOrigin-RevId: 1b6da4bd3803d67c297129924c206fe3709d9d15
This commit is contained in:
Dmitry Jemerov
2019-06-14 20:07:48 +03:00
committed by intellij-monorepo-bot
parent b7099e8b7a
commit 417b5eee77
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+10 -1
View File
@@ -177,7 +177,16 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
String iconPath = stub.getIconPath();
if (iconPath != null) {
Class<? extends AnAction> actionClass = anAction.getClass();
setIconFromClass(actionClass, actionClass.getClassLoader(), iconPath, anAction.getTemplatePresentation(), stub.getPluginId());
ClassLoader classLoader = actionClass.getClassLoader();
if (stub.getPluginId() != null) {
final IdeaPluginDescriptor plugin = PluginManager.getPlugin(stub.getPluginId());
if (plugin != null) {
classLoader = plugin.getPluginClassLoader();
}
}
setIconFromClass(actionClass, classLoader, iconPath, anAction.getTemplatePresentation(), stub.getPluginId());
}
}