From 9c8182d9293d41c2c9b7acb78d5a94ce6b6870f8 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Thu, 17 Nov 2016 19:07:48 +0100
Subject: [PATCH] Make Python plugin for IDEA compatible with CLion and Rider

(cherry picked from commit d238ce95813f05ba9744e6a124242f2c23d0ca69)
(cherry picked from commit e4bdab382c0868715e05873bd14ee61f31865c29)
---
 python/pluginResources/META-INF/plugin.xml     |  6 ++++--
 .../META-INF/python-plugin-minor-ide.xml       | 10 ++++++++++
 python/python-community-plugin.iml             | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 python/pluginResources/META-INF/python-plugin-minor-ide.xml
 create mode 100644 python/python-community-plugin.iml

diff --git a/python/pluginResources/META-INF/plugin.xml b/python/pluginResources/META-INF/plugin.xml
index 41e58fe864ed..c1dfd919b7ae 100644
--- a/python/pluginResources/META-INF/plugin.xml
+++ b/python/pluginResources/META-INF/plugin.xml
@@ -16,13 +16,15 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
 ]]></description>
 
   <version>@@PYCHARM_VERSION@@</version>
-  <depends>com.intellij.modules.java</depends>
 
 
   <vendor url="https://www.jetbrains.com/pycharm/">JetBrains</vendor>
   <xi:include href="/META-INF/python-core-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/python-community-plugin-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-community-plugin-java.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
+  <depends optional="true" config-file="python-community-plugin-java.xml">com.intellij.modules.java</depends>
+  <depends optional="true" config-file="python-plugin-minor-ide.xml">com.intellij.modules.clion</depends>
+  <depends optional="true" config-file="python-plugin-minor-ide.xml">com.intellij.modules.rider</depends>
 
   <!-- Two different versions of this file exist: one is used when building from sources (when auxiliary
      plugins are loaded as separate plugins) and another is used for the real release build (when auxiliary
diff --git a/python/pluginResources/META-INF/python-plugin-minor-ide.xml b/python/pluginResources/META-INF/python-plugin-minor-ide.xml
new file mode 100644
index 000000000000..a63bada1c531
--- /dev/null
+++ b/python/pluginResources/META-INF/python-plugin-minor-ide.xml
@@ -0,0 +1,10 @@
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
+  <xi:include href="/META-INF/python-community-configure-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
+  <extensions defaultExtensionNs="com.intellij">
+    <projectConfigurable groupId="build" groupWeight="118"
+                         id="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"
+                         displayName="Python Interpreter"
+                         instance="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"/>
+  </extensions>
+</idea-plugin>
diff --git a/python/python-community-plugin.iml b/python/python-community-plugin.iml
new file mode 100644
index 000000000000..f51d7a64a722
--- /dev/null
+++ b/python/python-community-plugin.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="idea" />
+    <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="xml" />
+    <orderEntry type="module" module-name="python-community-plugin-core" exported="" />
+    <orderEntry type="module" module-name="python-community-plugin-java" exported="" />
+    <orderEntry type="module" module-name="python-community" exported="" />
+    <orderEntry type="module" module-name="python-community-plugin-resources" exported="" />
+    <orderEntry type="module" module-name="python-community-configure" exported="" />
+  </component>
+</module>
\ No newline at end of file