From 74fcddb3d0e270b3b57163a22b22a3ec3d65f2f7 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 11 Feb 2014 13:20:51 +0400
Subject: [PATCH] changes reverted

---
 .../src/com/intellij/ide/plugins/PluginManagerCore.java   | 8 +++++---
 plugins/IntelliLang/src/META-INF/plugin.xml               | 1 +
 python/src/META-INF/pycharm-core.xml                      | 1 +
 python/src/META-INF/python-core.xml                       | 2 --
 4 files changed, 7 insertions(+), 5 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 5f1e1faf7bf1..80f5b54a5409 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -1011,9 +1011,11 @@ public class PluginManagerCore {
     final List<IdeaPluginDescriptorImpl> result = new ArrayList<IdeaPluginDescriptorImpl>();
     final HashMap<String, String> disabledPluginNames = new HashMap<String, String>();
     for (IdeaPluginDescriptorImpl descriptor : pluginDescriptors) {
-      final List<String> modules = descriptor.getModules();
-      if (modules != null) {
-        ourAvailableModules.addAll(modules);
+      if (descriptor.getPluginId().getIdString().equals(CORE_PLUGIN_ID)) {
+        final List<String> modules = descriptor.getModules();
+        if (modules != null) {
+          ourAvailableModules.addAll(modules);
+        }
       }
 
       if (!shouldSkipPlugin(descriptor, pluginDescriptors)) {
diff --git a/plugins/IntelliLang/src/META-INF/plugin.xml b/plugins/IntelliLang/src/META-INF/plugin.xml
index 34731356c845..975422e0fdfc 100644
--- a/plugins/IntelliLang/src/META-INF/plugin.xml
+++ b/plugins/IntelliLang/src/META-INF/plugin.xml
@@ -11,6 +11,7 @@
   <depends optional="true" config-file="intellilang-xml-support.xml">com.intellij.modules.xml</depends>
   <depends optional="true" config-file="intellilang-js-support.xml">JavaScript</depends>
   <depends optional="true" config-file="intellilang-python-support.xml">com.intellij.modules.python</depends>
+  <depends optional="true" config-file="intellilang-python-support.xml">Pythonid</depends>
 
   <extensionPoints>
     <extensionPoint name="languageSupport" interface="org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport"/>
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml
index c46c2d296049..7a4a9c694cda 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -24,6 +24,7 @@
   </project-components>
 
   <module value="com.intellij.modules.xml"/>
+  <module value="com.intellij.modules.python"/>
 
   <extensions defaultExtensionNs="com.intellij">
     <projectViewPane implementation="com.intellij.ide.projectView.impl.ProjectViewPane"/>
diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index b491021a632f..447e59b79d80 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -3,8 +3,6 @@
 
   <resource-bundle>com.jetbrains.python.PyBundle</resource-bundle>
 
-  <module value="com.intellij.modules.python"/>
-
   <extensions defaultExtensionNs="com.intellij">
     <nameSuggestionProvider implementation="com.jetbrains.python.refactoring.PyNameSuggestionProvider"/>
     <methodNavigationOffsetProvider implementation="com.jetbrains.python.codeInsight.PyMethodNavigationOffsetProvider"/>