IDEA-120629 PluginManager doesn't handle dependencies for plugins specified with idea.load.plugins.id system property.

This commit is contained in:
Anna Kozlova
2014-02-12 15:07:27 +01:00
parent bee6616d77
commit aa96d2f5ff
@@ -987,9 +987,13 @@ public class PluginManagerCore {
map.put(pluginDescriptor.getPluginId(), pluginDescriptor);
}
addModulesAsDependents(map);
final IdeaPluginDescriptor descriptorFromProperty = map.get(PluginId.getId(pluginId));
shouldLoad = descriptorFromProperty != null && isDependent(descriptorFromProperty, descriptor.getPluginId(), map,
checkModuleDependencies);
for (String id : pluginIds) {
final IdeaPluginDescriptor descriptorFromProperty = map.get(PluginId.getId(id));
if (descriptorFromProperty != null && isDependent(descriptorFromProperty, descriptor.getPluginId(), map, checkModuleDependencies)) {
shouldLoad = true;
break;
}
}
}
} else {
shouldLoad = !getDisabledPlugins().contains(idString) &&