MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Plugin option dependency should support EP registration

Browse Source
This commit is contained in:
Roman Chernyatchik
2011-12-06 00:56:05 +03:00
parent bb6fa1107e
commit cb6d299569
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/platform-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
View File

@@ -540,6 +540,13 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
myExtensions.addAll(descriptor.myExtensions);
}
if (myExtensionsPoints == null) {
myExtensionsPoints = descriptor.myExtensionsPoints;
}
else if (descriptor.myExtensionsPoints != null) {
myExtensionsPoints.addAll(descriptor.myExtensionsPoints);
}
if (myActionsElements == null) {
myActionsElements = descriptor.myActionsElements;
}