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

[platform] avoids loading incompatible plugins

Browse Source 
... even if 'idea.load.plugins.category' property is specified
This commit is contained in:
Roman Shevchenko
2018-04-11 19:22:27 +02:00
parent ba73ed5ac5
commit bd9dffd341
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+19 -21
View File
@@ -1190,31 +1190,29 @@ public class PluginManagerCore {
if (loadPluginCategory != null) {
reasonToNotLoad = loadPluginCategory.equals(descriptor.getCategory()) ? null : "Plugin category doesn't match 'idea.load.plugins.category' value";
}
else {
if (pluginIds != null) {
reasonToNotLoad = pluginIds.contains(idString) ? null : "'idea.load.plugins.id' doesn't contain this plugin id";
if (reasonToNotLoad != null) {
Map<PluginId,IdeaPluginDescriptor> map = new THashMap<>();
for (IdeaPluginDescriptor pluginDescriptor : loaded) {
map.put(pluginDescriptor.getPluginId(), pluginDescriptor);
}
addModulesAsDependents(map);
for (String id : pluginIds) {
IdeaPluginDescriptor descriptorFromProperty = map.get(PluginId.getId(id));
if (descriptorFromProperty != null && isDependent(descriptorFromProperty, descriptor.getPluginId(), map, checkModuleDependencies)) {
reasonToNotLoad = null;
break;
}
else if (pluginIds != null) {
reasonToNotLoad = pluginIds.contains(idString) ? null : "'idea.load.plugins.id' doesn't contain this plugin id";
if (reasonToNotLoad != null) {
Map<PluginId, IdeaPluginDescriptor> map = new THashMap<>();
for (IdeaPluginDescriptor pluginDescriptor : loaded) {
map.put(pluginDescriptor.getPluginId(), pluginDescriptor);
}
addModulesAsDependents(map);
for (String id : pluginIds) {
IdeaPluginDescriptor descriptorFromProperty = map.get(PluginId.getId(id));
if (descriptorFromProperty != null && isDependent(descriptorFromProperty, descriptor.getPluginId(), map, checkModuleDependencies)) {
reasonToNotLoad = null;
break;
}
}
}
else {
reasonToNotLoad = getDisabledPlugins().contains(idString) ? "Plugin is disabled" : null;
}
}
else {
reasonToNotLoad = getDisabledPlugins().contains(idString) ? "Plugin is disabled" : null;
}
if (reasonToNotLoad == null && descriptor instanceof IdeaPluginDescriptorImpl && isIncompatible(descriptor)) {
reasonToNotLoad = "Plugin since-build or until-build don't match this product's build number";
}
if (reasonToNotLoad == null && descriptor instanceof IdeaPluginDescriptorImpl && isIncompatible(descriptor)) {
reasonToNotLoad = "Plugin since-build or until-build don't match this product's build number";
}
return reasonToNotLoad;