MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 6823362cca.
This commit is contained in:
Alexey Utkin
2017-04-05 13:51:52 +03:00
parent 87c82adb83
commit 058f15bbfe
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/pluginMinor/META-INF/python-community-plugin-minor.xml
View File

@@ -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>

4
python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacet.java → python/pluginMinor/com/jetbrains/python/facet/PythonFacet.java
View File

@@ -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;
/**

3
python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java → python/pluginMinor/com/jetbrains/python/facet/PythonFacetType.java
View File

@@ -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;

6
python/pluginMinor/com/jetbrains/python/minor/sdk/PyPluginSdkModuleConfigurable.kt → python/pluginMinor/com/jetbrains/python/sdk/PyPluginSdkModuleConfigurable.kt
View File

@@ -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