Revert "Fix Python plugin for Clion (PY-23544)"

This reverts commit 6823362cca5210a494988bdf0a03446f76a7ba2c.

diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy
index fc6790e5bc2f218b9dd7f96fcb8017b8ccd28f19..7956d2f39df4838bcb8b39abaf578444a1a33cc8 100644 (file)
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonPluginPropertiesBase.groovy
@@ -32,7 +32,6 @@ abstract class PythonPluginPropertiesBase extends PyCharmPropertiesBase {
     "python-community-plugin-core",
     "python-community-plugin-java",
     "python-community-configure",
-    "python-community-plugin-minor",
     "python-psi-api",
     "python-pydev",
     "python-community",

diff --git a/python/pluginMinor/META-INF/python-community-plugin-minor.xml b/python/pluginMinor/META-INF/python-community-plugin-minor.xml
index ef0bbf03ed27ef5b6c3519c6f6ab24df20d8e348..fc8c624ceb350c39fbc38103d6e1a297f5aae256 100644 (file)
--- a/python/pluginMinor/META-INF/python-community-plugin-minor.xml
+++ b/python/pluginMinor/META-INF/python-community-plugin-minor.xml
@@ -1,15 +1,15 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" url="https://confluence.jetbrains.com/display/PYH/">
   <!-- Components and extensions declared in this file work ONLY in the Python plugin for minor IDEs -->
 
-  <xi:include href="/META-INF/python-community-configure-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/python-community-plugin-core.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.minor.sdk.PyPluginSdkModuleConfigurable"/>
+                         instance="com.jetbrains.python.sdk.PyPluginSdkModuleConfigurable"/>
 
-    <facetType implementation="com.jetbrains.python.minor.facet.PythonFacetType"/>
+    <facetType implementation="com.jetbrains.python.facet.PythonFacetType"/>
   </extensions>
 
 </idea-plugin>
\ No newline at end of file

diff --git a/python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacet.java b/python/pluginMinor/com/jetbrains/python/facet/PythonFacet.java
similarity index 91%
rename from python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacet.java
rename to python/pluginMinor/com/jetbrains/python/facet/PythonFacet.java
index ab37a5da81012bd8523ef832ef38817873ed21ff..7eeeb6d002972286c0a43269bd3a9ab6cae00e9e 100644 (file)
--- a/python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacet.java
+++ b/python/pluginMinor/com/jetbrains/python/facet/PythonFacet.java
@@ -13,14 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.minor.facet;
+package com.jetbrains.python.facet;
 
 import com.intellij.facet.Facet;
 import com.intellij.facet.FacetType;
 import com.intellij.facet.FacetTypeId;
 import com.intellij.openapi.module.Module;
-import com.jetbrains.python.facet.LibraryContributingFacet;
-import com.jetbrains.python.facet.PythonFacetUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java b/python/pluginMinor/com/jetbrains/python/facet/PythonFacetType.java
similarity index 97%
rename from python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java
rename to python/pluginMinor/com/jetbrains/python/facet/PythonFacetType.java
index 7025a90e723e07651a4f7179a8249a42d09d27f9..223d7e84869db641528a219fdea0139cdccd0059 100644 (file)
--- a/python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java
+++ b/python/pluginMinor/com/jetbrains/python/facet/PythonFacetType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.minor.facet;
+package com.jetbrains.python.facet;
 
 import com.intellij.facet.Facet;
 import com.intellij.facet.FacetConfiguration;
@@ -29,7 +29,6 @@ import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.openapi.util.text.StringUtil;
-import com.jetbrains.python.facet.PythonFacetSettings;
 import com.jetbrains.python.sdk.PythonSdkType;
 import icons.PythonIcons;
 import org.jdom.Element;

diff --git a/python/pluginMinor/com/jetbrains/python/minor/sdk/PyPluginSdkModuleConfigurable.kt b/python/pluginMinor/com/jetbrains/python/sdk/PyPluginSdkModuleConfigurable.kt
similarity index 94%
rename from python/pluginMinor/com/jetbrains/python/minor/sdk/PyPluginSdkModuleConfigurable.kt
rename to python/pluginMinor/com/jetbrains/python/sdk/PyPluginSdkModuleConfigurable.kt
index 835d9ec6c1560981d40ac6f6bbee0af4a819f6cf..930c8cf7693e1c2251fe8bef1f32e62b8a865caa 100644 (file)
--- a/python/pluginMinor/com/jetbrains/python/minor/sdk/PyPluginSdkModuleConfigurable.kt
+++ b/python/pluginMinor/com/jetbrains/python/sdk/PyPluginSdkModuleConfigurable.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.minor.sdk
+package com.jetbrains.python.sdk
 
 import com.intellij.facet.FacetManager
 import com.intellij.openapi.application.ApplicationManager
@@ -23,9 +23,9 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.projectRoots.Sdk
 import com.jetbrains.python.configuration.PyActiveSdkConfigurable
 import com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable
+import com.jetbrains.python.facet.PythonFacet
+import com.jetbrains.python.facet.PythonFacetType
 import com.jetbrains.python.facet.PythonFacetUtil
-import com.jetbrains.python.minor.facet.PythonFacet
-import com.jetbrains.python.minor.facet.PythonFacetType
 
 /**
  * @author traff