diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt index 5961954e56ac..3b3bff495788 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.kt @@ -8,59 +8,11 @@ import org.jetbrains.intellij.build.io.copyDir import java.nio.file.Files object PythonCommunityPluginModules { - @JvmField - val COMMUNITY_MODULES: PersistentList = persistentListOf( - "intellij.commandInterface", - "intellij.python.community", - "intellij.python.community.communityOnly", - "intellij.python.community.core.impl", - "intellij.python.community.impl", - "intellij.python.community.impl.poetry", - "intellij.python.community.impl.installer", - "intellij.python.community.impl.huggingFace", - "intellij.python.community.impl.venv", - "intellij.python.community.services.systemPython", - "intellij.python.community.services.shared", - "intellij.python.community.services.internal.impl", - "intellij.python.community.execService", - "intellij.python.community.plugin.impl", - "intellij.python.community.plugin.java", - "intellij.python.community.plugin.minor", - "intellij.python.community.plugin.minorRider", - "intellij.python.copyright", - "intellij.python.featuresTrainer", - "intellij.python.grazie", - "intellij.python.langInjection", - "intellij.python.markdown", - "intellij.python.psi", - "intellij.python.psi.impl", - "intellij.python.pydev", - "intellij.python.sdk", - "intellij.python.terminal", - "intellij.python.ml.features", - "intellij.python.pyproject", - "intellij.python.hatch", - ) - - /** - * List of modules used in both Python plugin and Python Frontend plugin - */ - @JvmField - val PYTHON_COMMON_MODULES: PersistentList = persistentListOf( - "intellij.python.parser", - "intellij.python.ast", - "intellij.python.syntax", - "intellij.python.syntax.core" - ) const val pythonCommunityName: String = "python-ce" fun pythonCommunityPluginLayout(body: ((PluginLayout.PluginLayoutSpec) -> Unit)? = null): PluginLayout { - return pythonPlugin("intellij.python.community.plugin", pythonCommunityName, COMMUNITY_MODULES) { spec -> - PYTHON_COMMON_MODULES.forEach { - spec.withModule(it, "python-common.jar") - } - + return pythonPlugin("intellij.python.community.plugin", pythonCommunityName, emptyList()) { spec -> body?.invoke(spec) spec.withProjectLibrary("XmlRPC") } diff --git a/python/installer/resources/intellij.python.community.impl.installer.xml b/python/installer/resources/intellij.python.community.impl.installer.xml new file mode 100644 index 000000000000..667b0ab366f2 --- /dev/null +++ b/python/installer/resources/intellij.python.community.impl.installer.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/python/openapi/resources/intellij.python.community.xml b/python/openapi/resources/intellij.python.community.xml new file mode 100644 index 000000000000..3c839daa79d6 --- /dev/null +++ b/python/openapi/resources/intellij.python.community.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/python/pluginCore/plugin-content.yaml b/python/pluginCore/plugin-content.yaml index 6f5c457efecb..b24078ae2e13 100644 --- a/python/pluginCore/plugin-content.yaml +++ b/python/pluginCore/plugin-content.yaml @@ -28,26 +28,32 @@ module: intellij.python.community.impl files: - name: $MAVEN_REPOSITORY$/completion/ml/python/features/ml-completion-prev-exprs-models/1/ml-completion-prev-exprs-models-1.jar +- name: lib/python-ce-frontend.jar + contentModules: + - name: intellij.python.parser + - name: intellij.python.ast + - name: intellij.python.syntax.core + - name: intellij.python.syntax - name: lib/python-ce.jar modules: - - name: intellij.python.community - - name: intellij.python.community.core.impl - - name: intellij.python.community.impl - - name: intellij.python.community.impl.poetry - - name: intellij.python.community.impl.installer - - name: intellij.python.community.impl.venv - - name: intellij.python.community.services.systemPython - - name: intellij.python.community.services.shared - - name: intellij.python.community.services.internal.impl - - name: intellij.python.community.execService - - name: intellij.python.psi - - name: intellij.python.psi.impl - - name: intellij.python.pydev - - name: intellij.python.sdk - - name: intellij.python.pyproject - - name: intellij.python.hatch - name: intellij.python.community.plugin contentModules: + - name: intellij.python.psi + - name: intellij.python.psi.impl + - name: intellij.python.sdk + - name: intellij.python.pyproject + - name: intellij.python.community.impl.poetry + - name: intellij.python.community.core.impl + - name: intellij.python.community + - name: intellij.python.community.impl + - name: intellij.python.community.execService + - name: intellij.python.community.impl.installer + - name: intellij.python.pydev + - name: intellij.python.community.impl.venv + - name: intellij.python.hatch + - name: intellij.python.community.services.shared + - name: intellij.python.community.services.internal.impl + - name: intellij.python.community.services.systemPython - name: intellij.python.community.plugin.minor - name: intellij.python.community.plugin.minorRider - name: intellij.python.community.communityOnly @@ -62,18 +68,12 @@ - name: intellij.python.markdown - name: intellij.python.ml.features - name: intellij.python.terminal -- name: lib/python-common.jar - modules: - - name: intellij.python.parser - - name: intellij.python.ast - - name: intellij.python.syntax - - name: intellij.python.syntax.core - name: lib/tuweni-toml.jar library: tuweni-toml files: - name: $MAVEN_REPOSITORY$/org/apache/tuweni/tuweni-toml/2/tuweni-toml-2.jar - name: $MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4/antlr4-runtime-4.jar - reason: <- intellij.python.community.impl + reason: <- intellij.python.pyproject - name: lib/xmlrpc.jar library: XmlRPC files: diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml index 5c8f9b0f3674..ad5c58bf6cbc 100644 --- a/python/pluginCore/resources/META-INF/plugin.xml +++ b/python/pluginCore/resources/META-INF/plugin.xml @@ -30,15 +30,28 @@ The Python plug-in provides smart editing for Python scripts. The feature set of - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -56,1051 +69,4 @@ The Python plug-in provides smart editing for Python scripts. The feature set of - - messages.PyBundle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml new file mode 100644 index 000000000000..8d9b46bfa6a9 --- /dev/null +++ b/python/pluginResources/intellij.python.community.impl.xml @@ -0,0 +1,1052 @@ + + + + + + + messages.PyBundle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/python/poetry/intellij.python.community.impl.poetry.iml b/python/poetry/intellij.python.community.impl.poetry.iml index 8b79b3f9480c..bd8ab171c85a 100644 --- a/python/poetry/intellij.python.community.impl.poetry.iml +++ b/python/poetry/intellij.python.community.impl.poetry.iml @@ -3,6 +3,7 @@ + @@ -10,5 +11,6 @@ + \ No newline at end of file diff --git a/python/poetry/resources/intellij.python.community.impl.poetry.xml b/python/poetry/resources/intellij.python.community.impl.poetry.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/python/poetry/resources/intellij.python.community.impl.poetry.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/python/pydevSrc/resources/intellij.python.pydev.xml b/python/pydevSrc/resources/intellij.python.pydev.xml new file mode 100644 index 000000000000..3d2734fc5e0b --- /dev/null +++ b/python/pydevSrc/resources/intellij.python.pydev.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/python/python-core-impl/intellij.python.community.core.impl.iml b/python/python-core-impl/intellij.python.community.core.impl.iml index 86038efa0d13..777921dea8ba 100644 --- a/python/python-core-impl/intellij.python.community.core.impl.iml +++ b/python/python-core-impl/intellij.python.community.core.impl.iml @@ -3,6 +3,7 @@ + diff --git a/python/python-core-impl/resources/intellij.python.community.core.impl.xml b/python/python-core-impl/resources/intellij.python.community.core.impl.xml new file mode 100644 index 000000000000..4c4c4851db87 --- /dev/null +++ b/python/python-core-impl/resources/intellij.python.community.core.impl.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/python/python-exec-service/resources/intellij.python.community.execService.xml b/python/python-exec-service/resources/intellij.python.community.execService.xml new file mode 100644 index 000000000000..755e20f098fe --- /dev/null +++ b/python/python-exec-service/resources/intellij.python.community.execService.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/python/python-hatch/resources/intellij.python.hatch.xml b/python/python-hatch/resources/intellij.python.hatch.xml new file mode 100644 index 000000000000..f3c2582340d6 --- /dev/null +++ b/python/python-hatch/resources/intellij.python.hatch.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/python/python-parser/resources/META-INF/PythonParser.xml b/python/python-parser/resources/META-INF/PythonParser.xml deleted file mode 100644 index 2718fb745ed6..000000000000 --- a/python/python-parser/resources/META-INF/PythonParser.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/python/python-psi-api/intellij.python.psi.iml b/python/python-psi-api/intellij.python.psi.iml index 448f65ed8848..8ebc687200a3 100644 --- a/python/python-psi-api/intellij.python.psi.iml +++ b/python/python-psi-api/intellij.python.psi.iml @@ -19,5 +19,6 @@ + \ No newline at end of file diff --git a/python/python-psi-api/resources/META-INF/PythonPsi.xml b/python/python-psi-api/resources/intellij.python.psi.xml similarity index 97% rename from python/python-psi-api/resources/META-INF/PythonPsi.xml rename to python/python-psi-api/resources/intellij.python.psi.xml index dfe7f9ef1e9b..517d25c745c6 100644 --- a/python/python-psi-api/resources/META-INF/PythonPsi.xml +++ b/python/python-psi-api/resources/intellij.python.psi.xml @@ -1,4 +1,7 @@ + + + - - + + + diff --git a/python/python-pyproject/intellij.python.pyproject.iml b/python/python-pyproject/intellij.python.pyproject.iml index bd87de5d6618..20a9c0e38427 100644 --- a/python/python-pyproject/intellij.python.pyproject.iml +++ b/python/python-pyproject/intellij.python.pyproject.iml @@ -5,6 +5,7 @@ + diff --git a/python/python-pyproject/resources/intellij.python.pyproject.xml b/python/python-pyproject/resources/intellij.python.pyproject.xml new file mode 100644 index 000000000000..59c82e140c26 --- /dev/null +++ b/python/python-pyproject/resources/intellij.python.pyproject.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/python/python-sdk/intellij.python.sdk.iml b/python/python-sdk/intellij.python.sdk.iml index 437437ded9fa..d424260a47b7 100644 --- a/python/python-sdk/intellij.python.sdk.iml +++ b/python/python-sdk/intellij.python.sdk.iml @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/python/python-sdk/resources/META-INF/PythonSdk.xml b/python/python-sdk/resources/intellij.python.sdk.xml similarity index 90% rename from python/python-sdk/resources/META-INF/PythonSdk.xml rename to python/python-sdk/resources/intellij.python.sdk.xml index 6af7ee1f3680..b29fa8cc5097 100644 --- a/python/python-sdk/resources/META-INF/PythonSdk.xml +++ b/python/python-sdk/resources/intellij.python.sdk.xml @@ -1,4 +1,7 @@ + + + - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/python/python-syntax/resources/META-INF/PythonSyntax.xml b/python/python-syntax/resources/META-INF/PythonSyntax.xml deleted file mode 100644 index 9b0ef92316b6..000000000000 --- a/python/python-syntax/resources/META-INF/PythonSyntax.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/python/python-venv/resources/intellij.python.community.impl.venv.xml b/python/python-venv/resources/intellij.python.community.impl.venv.xml new file mode 100644 index 000000000000..36af444a2be8 --- /dev/null +++ b/python/python-venv/resources/intellij.python.community.impl.venv.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/python/services/internal-impl/intellij.python.community.services.internal.impl.iml b/python/services/internal-impl/intellij.python.community.services.internal.impl.iml index 9282b7000457..cb97d5ca0fd3 100644 --- a/python/services/internal-impl/intellij.python.community.services.internal.impl.iml +++ b/python/services/internal-impl/intellij.python.community.services.internal.impl.iml @@ -5,6 +5,7 @@ + diff --git a/python/services/internal-impl/resources/intellij.python.community.services.internal.impl.xml b/python/services/internal-impl/resources/intellij.python.community.services.internal.impl.xml new file mode 100644 index 000000000000..c7bc06aba5fa --- /dev/null +++ b/python/services/internal-impl/resources/intellij.python.community.services.internal.impl.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/python/services/shared/intellij.python.community.services.shared.iml b/python/services/shared/intellij.python.community.services.shared.iml index 74a1868809de..9c6586132fd7 100644 --- a/python/services/shared/intellij.python.community.services.shared.iml +++ b/python/services/shared/intellij.python.community.services.shared.iml @@ -3,6 +3,7 @@ + diff --git a/python/services/shared/resources/intellij.python.community.services.shared.xml b/python/services/shared/resources/intellij.python.community.services.shared.xml new file mode 100644 index 000000000000..6a692dada8a8 --- /dev/null +++ b/python/services/shared/resources/intellij.python.community.services.shared.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/python/services/system-python/intellij.python.community.services.systemPython.iml b/python/services/system-python/intellij.python.community.services.systemPython.iml index e7bf1af8038f..448239398c97 100644 --- a/python/services/system-python/intellij.python.community.services.systemPython.iml +++ b/python/services/system-python/intellij.python.community.services.systemPython.iml @@ -6,6 +6,7 @@ + diff --git a/python/services/system-python/resources/intellij.python.community.services.systemPython.xml b/python/services/system-python/resources/intellij.python.community.services.systemPython.xml new file mode 100644 index 000000000000..1ff52b802085 --- /dev/null +++ b/python/services/system-python/resources/intellij.python.community.services.systemPython.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file