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

RootIndex correction: compute custom handlers for module to which module dependency belong, not for module which it points to

Browse Source
This commit is contained in:
nik
2015-11-27 13:54:59 +03:00
parent a4ccd3f72e
commit 0f810dc4d6
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
+1 -6
View File
@@ -239,10 +239,10 @@ public class RootIndex {
Graph graph = new Graph();
MultiMap<VirtualFile, Node> roots = MultiMap.createSmart();
Map<Module, List<OrderEnumerationHandler>> handlersMap = ContainerUtil.newHashMap();
for (final Module module : ModuleManager.getInstance(myProject).getModules()) {
final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module);
List<OrderEnumerationHandler> handlers = OrderEnumeratorBase.getCustomHandlers(module);
for (OrderEntry orderEntry : moduleRootManager.getOrderEntries()) {
if (orderEntry instanceof ModuleOrderEntry) {
ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)orderEntry;
@@ -265,11 +265,6 @@ public class RootIndex {
roots.putValue(sourceRoot, node);
}
}
List<OrderEnumerationHandler> handlers = handlersMap.get(depModule);
if (handlers == null) {
handlers = OrderEnumeratorBase.getCustomHandlers(depModule);
handlersMap.put(depModule, handlers);
}
boolean shouldRecurse = en.shouldRecurse(moduleOrderEntry, handlers);
node.myEdges.add(new Edge(module, moduleOrderEntry, shouldRecurse));
}