From edf1d19ecce7738faa8c8b8888005a40319d9160 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 21 Feb 2014 15:36:36 +0400 Subject: [PATCH] don't load modules from disabled plugins --- .../intellij/ide/plugins/PluginManagerCore.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java index 8af3475c04b8..10759ebf812f 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java @@ -1059,14 +1059,6 @@ public class PluginManagerCore { List brokenPluginsList = new ArrayList(); for (IdeaPluginDescriptorImpl descriptor : pluginDescriptors) { - final List modules = descriptor.getModules(); - if (modules != null) { - for (String module : modules) { - if (!ourModulesToContainingPlugins.containsKey(module)) { - ourModulesToContainingPlugins.put(module, descriptor); - } - } - } boolean skipped = shouldSkipPlugin(descriptor, pluginDescriptors); @@ -1078,6 +1070,14 @@ public class PluginManagerCore { } if (!skipped) { + final List modules = descriptor.getModules(); + if (modules != null) { + for (String module : modules) { + if (!ourModulesToContainingPlugins.containsKey(module)) { + ourModulesToContainingPlugins.put(module, descriptor); + } + } + } result.add(descriptor); } else {