From 6adb3a3749b5bcde53e221b3f839fccee3e5308d Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 17 Feb 2014 12:36:09 +0400
Subject: [PATCH] 'ruby' and 'python' modules included into Ruby/Python plugins
 to allow writing plugins for both RubyMine/PyCharm and IDEA with Ruby/Python
 plugin

---
 .../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, 5 insertions(+), 7 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 004920feb151..42cf2192351e 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -1056,11 +1056,9 @@ public class PluginManagerCore {
     final List<IdeaPluginDescriptorImpl> result = new ArrayList<IdeaPluginDescriptorImpl>();
     final HashMap<String, String> disabledPluginNames = new HashMap<String, String>();
     for (IdeaPluginDescriptorImpl descriptor : pluginDescriptors) {
-      if (descriptor.getPluginId().getIdString().equals(CORE_PLUGIN_ID)) {
-        final List<String> modules = descriptor.getModules();
-        if (modules != null) {
-          ourAvailableModules.addAll(modules);
-        }
+      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 975422e0fdfc..34731356c845 100644
--- a/plugins/IntelliLang/src/META-INF/plugin.xml
+++ b/plugins/IntelliLang/src/META-INF/plugin.xml
@@ -11,7 +11,6 @@
   <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 7a4a9c694cda..c46c2d296049 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -24,7 +24,6 @@
   </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 88ee58b7ec33..f97820ddc739 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -3,6 +3,8 @@
 
   <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"/>