From 0f810dc4d687810256bf76c1461d5fe199bba2e5 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 27 Nov 2015 13:50:10 +0300 Subject: [PATCH] RootIndex correction: compute custom handlers for module to which module dependency belong, not for module which it points to --- .../src/com/intellij/openapi/roots/impl/RootIndex.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java index 8aba0dd03ecf..6dda1df689b2 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java @@ -239,10 +239,10 @@ public class RootIndex { Graph graph = new Graph(); MultiMap roots = MultiMap.createSmart(); - Map> handlersMap = ContainerUtil.newHashMap(); for (final Module module : ModuleManager.getInstance(myProject).getModules()) { final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module); + List 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 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)); }