CPP-434 Split [python-community-plugin] into [python-community-core-plugin] and [python-community-java-plugin]

python/build/python_plugin_build.gant

@@ -101,7 +101,8 @@ target(name: "compile", description: "Compile module python") {
       include(name: "resources")
       include(name: "src")
       include(name: "gen")
-      include(name: "pluginSrc")
+      include(name: "pluginCore")
+      include(name: "pluginJava")
       include(name: "pydevSrc")
       include(name: "openapi/src")
       include(name: "psi-api/src")
@@ -167,8 +168,9 @@ target(name: "compile", description: "Compile module python") {
   //copy plugin.xml
   ant.mkdir(dir: "${classesDir}/META-INF")
   ant.copy(todir: "${classesDir}/META-INF") {
-    fileset(file: "${pluginHome}/pluginSrc/META-INF/python-plugin-core.xml")
-    fileset(file: "${pluginHome}/pluginResources/META-INF/*.xml")
+    fileset(file: "${pluginHome}/pluginCore/META-INF/python-community-plugin-core.xml")
+    fileset(file: "${pluginHome}/pluginJava/META-INF/python-community-plugin-java.xml")
+    fileset(file: "${pluginHome}/pluginResources/META-INF/plugin.xml")
     fileset(file: "${pluginHome}/build/python-plugin-dependencies.xml")
   }
 

python/edu/course-creator-intellij-py/course-creator-intellij-py.iml

@@ -10,7 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="interactive-learning-intellij" />
     <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="python-community-plugin" />
+    <orderEntry type="module" module-name="python-community-plugin-core" />
+    <orderEntry type="module" module-name="python-community-plugin-java" />
     <orderEntry type="module" module-name="course-creator" />
     <orderEntry type="module" module-name="course-creator-python" />
     <orderEntry type="module" module-name="main" />

python/edu/interactive-learning-intellij-py/interactive-learning-intellij-py.iml

@@ -10,7 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="python-community-plugin" />
+    <orderEntry type="module" module-name="python-community-plugin-core" />
+    <orderEntry type="module" module-name="python-community-plugin-java" />
     <orderEntry type="module" module-name="interactive-learning" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="interactive-learning-intellij" />

python/main_idea_python_plugin.iml

@@ -5,7 +5,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="community-main" />
-    <orderEntry type="module" module-name="python-community-plugin" />
+    <orderEntry type="module" module-name="python-community-plugin-core" />
+    <orderEntry type="module" module-name="python-community-plugin-java" />
     <orderEntry type="module" module-name="python-plugin-tests" />
   </component>
 </module>

python/pluginCore/META-INF/python-community-plugin-core.xml

@@ -17,13 +17,6 @@
     <stacktrace.fold substring="*sys-package-mgr*:"/>
   </extensions>
 
-  <extensions defaultExtensionNs="Pythonid">
-    <importResolver implementation="com.jetbrains.python.psi.impl.PyJavaImportResolver"/>
-    <typeProvider implementation="com.jetbrains.python.psi.impl.PyJavaTypeProvider"/>
-    <pySuperMethodsSearch implementation="com.jetbrains.python.psi.impl.PyJavaSuperMethodsSearchExecutor"/>
-    <importCandidateProvider implementation="com.jetbrains.python.psi.impl.PyJavaImportCandidateProvider"/>
-  </extensions>
-
   <application-components>
     <component>
       <implementation-class>com.jetbrains.python.facet.PythonSdkTableListener</implementation-class>

python/pluginCore/python-community-plugin-core.iml

@@ -8,10 +8,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-api" />
-    <orderEntry type="module" module-name="python-community" />
-    <orderEntry type="module" module-name="idea-ui" />
-    <orderEntry type="module" module-name="platform-impl" exported="" />
-    <orderEntry type="module" module-name="openapi" />
     <orderEntry type="module" module-name="lang-impl" />
+    <orderEntry type="module" module-name="idea-ui" />
+    <orderEntry type="module" module-name="openapi" />
+    <orderEntry type="module" module-name="python-community" />
   </component>
 </module>

python/pluginJava/META-INF/python-community-plugin-java.xml

@@ -0,0 +1,10 @@
+<idea-plugin version="2">
+  <!-- Components and extensions declared in this file work ONLY in the Python plugin,
+       both Community and Professional versions. -->
+  <extensions defaultExtensionNs="Pythonid">
+    <importResolver implementation="com.jetbrains.python.psi.impl.PyJavaImportResolver"/>
+    <typeProvider implementation="com.jetbrains.python.psi.impl.PyJavaTypeProvider"/>
+    <pySuperMethodsSearch implementation="com.jetbrains.python.psi.impl.PyJavaSuperMethodsSearchExecutor"/>
+    <importCandidateProvider implementation="com.jetbrains.python.psi.impl.PyJavaImportCandidateProvider"/>
+  </extensions>
+</idea-plugin>

python/pluginJava/python-community-plugin-java.iml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="lang-api" />
+    <orderEntry type="module" module-name="java-psi-api" />
+    <orderEntry type="module" module-name="python-psi-api" />
+    <orderEntry type="module" module-name="python-community" />
+    <orderEntry type="module" module-name="java-indexing-api" />
+  </component>
+</module>

python/pluginResources/META-INF/plugin.xml

@@ -21,7 +21,8 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
 
   <vendor url="https://www.jetbrains.com/pycharm/">JetBrains</vendor>
   <xi:include href="/META-INF/python-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/python-plugin-core.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/*)"/>
 
   <!-- 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

python/python-community-plugin-resources.iml

@@ -11,7 +11,8 @@
     <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="IntelliLang-java" scope="RUNTIME" />
-    <orderEntry type="module" module-name="python-community-plugin" />
+    <orderEntry type="module" module-name="python-community-plugin-core" />
+    <orderEntry type="module" module-name="python-community-plugin-java" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="module" module-name="IntelliLang-xml" scope="RUNTIME" />
   </component>

python/python-plugin-tests.iml

@@ -14,10 +14,10 @@
     <orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="IntelliLang-java" scope="RUNTIME" />
-    <orderEntry type="module" module-name="python-community-plugin" />
+    <orderEntry type="module" module-name="python-community-plugin-core" />
+    <orderEntry type="module" module-name="python-community-plugin-java" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="module" module-name="IntelliLang-xml" scope="RUNTIME" />
     <orderEntry type="module" module-name="python-community-plugin-resources" scope="RUNTIME" />
   </component>
-</module>
-
+</module>