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

IDEA-209769 Transitive optional plugin XML dependency does not work 2

Browse Source 
Honor non-optional dependencies too.

GitOrigin-RevId: e884d8d5ad33e411e951f3b892ee878763166fba
This commit is contained in:
Gregory.Shrago
2019-10-02 09:03:49 +00:00
committed by intellij-monorepo-bot
parent b97057a2de
commit 262d6c0e3d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+14 -5
View File
@@ -1165,8 +1165,17 @@ public class PluginManagerCore {
return dep != null && dep.isEnabled();
};
for (IdeaPluginDescriptorImpl descriptor : result) {
for (IdeaPluginDescriptorImpl d : optionalDescriptorRecursively(descriptor, enabledCondition)) {
descriptor.mergeOptionalConfig(d);
for (IdeaPluginDescriptorImpl dep : optionalDescriptorRecursively(descriptor, enabledCondition)) {
boolean requiredDepMissing = false;
for (PluginId depId : dep.getDependentPluginIds()) {
if (!enabledCondition.value(depId) &&
ArrayUtil.indexOf(dep.getOptionalDependentPluginIds(), depId) == -1) {
requiredDepMissing = true;
break;
}
}
if (requiredDepMissing) continue;
descriptor.mergeOptionalConfig(dep);
}
}
}
@@ -1666,15 +1675,15 @@ public class PluginManagerCore {
withOptionalDeps
? allDeps
.append(optionalDescriptorRecursively(descriptor, Conditions.alwaysTrue())
.flatten(d -> JBIterable.of(d.getOptionalDependentPluginIds())))
.unique()
.flatten(d -> JBIterable.of(d.getDependentPluginIds())))
: allDeps
.filter(id -> ArrayUtil.indexOf(descriptor.getOptionalDependentPluginIds(), id) == -1);
return selectedDeps.filterMap(id -> {
JBIterable<PluginId> convertedDeps = selectedDeps.filterMap(id -> {
IdeaPluginDescriptorImpl plugin = idMap.get(id);
if (plugin == descriptor) return null;
return plugin != null && convertModulesToPlugins && isModuleDependency(id) ? plugin.getPluginId() : id;
});
return convertedDeps.unique();
});
this.idMap = idMap;
}