private List pycharmImplementationModules() { //modules to put into pycharm.jar
return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources",
- "python-ide-community", "python-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
+ "python-ide-community", "python-community-configure", "python-openapi", "python-psi-api", "platform-main"].flatten()
}
private List modules() {
private List pycharmImplementationModules() { //modules to put into pycharm.jar
return [platformImplementationModules, "dom-impl", "python-community", "python-community-ide-resources",
- "python-ide-community", "python-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
+ "python-ide-community", "python-community-configure", "python-educational", "python-openapi", "python-psi-api", "platform-main"].flatten()
}
private List modules() {
<orderEntry type="module" module-name="lang-impl" />
<orderEntry type="module" module-name="python-community-ide-resources" />
<orderEntry type="module" module-name="python-community" />
+ <orderEntry type="module" module-name="python-community-configure" />
<orderEntry type="module" module-name="platform-impl" />
<orderEntry type="module" module-name="python-ide-community" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="library" scope="TEST" name="JUnit3" level="project" />
<orderEntry type="module" module-name="educational" />
<orderEntry type="module" module-name="python-educational" />
- <orderEntry type="module" module-name="python-configure" />
</component>
</module>
\ No newline at end of file
<orderEntry type="module" module-name="platform-impl" />
<orderEntry type="module" module-name="python-community-ide-resources" />
<orderEntry type="module" module-name="python-community" />
- <orderEntry type="module" module-name="python-configure" />
+ <orderEntry type="module" module-name="python-community-configure" />
<orderEntry type="module" module-name="lang-api" />
<orderEntry type="module" module-name="lang-impl" />
<orderEntry type="library" name="Guava" level="project" />
<xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)">
<xi:fallback/>
</xi:include>
- <xi:include href="/META-INF/python-configure.xml" xpointer="xpointer(/idea-plugin/*)"/>
+ <xi:include href="/META-INF/python-community-configure-ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
<application-components>
<component>
<idea-plugin version="2" url="https://confluence.jetbrains.com/display/PYH/">
- <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
+ <!-- Components and extensions declared in this file work ONLY in PyCharm and CLion Python plugin, not in Standard Python plugin.
Both Community and Professional editions. -->
- <!-- Components and extensions declared in this file work in CLion Python Plugin to configure Python toolchain -->
-
<extensions defaultExtensionNs="com.intellij">
<projectService serviceInterface="com.jetbrains.python.configuration.PyConfigurableInterpreterList"
serviceImplementation="com.jetbrains.python.configuration.PyConfigurableInterpreterList"/>
<!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin.
Both Community and Professional editions. -->
- <xi:include href="/META-INF/python-configure-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+ <xi:include href="/META-INF/python-community-configure-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
<extensions defaultExtensionNs="com.intellij">
<projectConfigurable groupId="project"
id="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"
import com.intellij.openapi.options.ex.Settings;
import com.intellij.ui.ClickListener;
import com.intellij.ui.components.JBLabel;
-import com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurableProvider;
import com.intellij.openapi.project.Project;
-import com.jetbrains.python.configuration.PyDependenciesConfigurable;
/**
* @author Sergey.Malenkov