[pycharm] finish community migration to v2

# Conflicts:
#	community/python/pluginCore/resources/META-INF/plugin.xml

GitOrigin-RevId: e4d6969fd15a3fddc4d6a03491fb9f9634285edf

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<String> = 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<String> = 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")
     }

python/installer/resources/intellij.python.community.impl.installer.xml

@@ -0,0 +1,6 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.python.sdk"/>
+    <module name="intellij.python.community"/>
+  </dependencies>
+</idea-plugin>

python/openapi/resources/intellij.python.community.xml

@@ -0,0 +1,5 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.python.psi"/>
+  </dependencies>
+</idea-plugin>

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:

python/poetry/intellij.python.community.impl.poetry.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -10,5 +11,6 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.python.sdk" />
   </component>
 </module>

python/poetry/resources/intellij.python.community.impl.poetry.xml

@@ -0,0 +1,2 @@
+<idea-plugin>
+</idea-plugin>

python/pydevSrc/resources/intellij.python.pydev.xml

@@ -0,0 +1,6 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.python.psi"/>
+    <module name="intellij.python.syntax.core"/>
+  </dependencies>
+</idea-plugin>

python/python-core-impl/intellij.python.community.core.impl.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />

python/python-core-impl/resources/intellij.python.community.core.impl.xml

@@ -0,0 +1,6 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+</idea-plugin>

python/python-exec-service/resources/intellij.python.community.execService.xml

@@ -0,0 +1,8 @@
+<idea-plugin package="com.intellij.python.community.execService">
+  <dependencies>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+  
+</idea-plugin>

python/python-hatch/resources/intellij.python.hatch.xml

@@ -0,0 +1,7 @@
+<idea-plugin package="com.intellij.python.hatch">
+  <dependencies>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.community.execService"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+</idea-plugin>

python/python-parser/resources/META-INF/PythonParser.xml

@@ -1,25 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <fileType name="Python"
-              language="Python"
-              extensions="py;pyw"
-              hashBangs="python"
-              implementationClass="com.jetbrains.python.PythonFileType"
-              fieldName="INSTANCE"/>
-    <fileType name="PythonStub"
-              language="PythonStub"
-              extensions="pyi"
-              implementationClass="com.jetbrains.python.pyi.PyiFileType"
-              fieldName="INSTANCE"/>
-    <registryKey key="python.ast.leaves.incremental.reparse" defaultValue="false"
-                 description="Enables incremental reparse for Python leaf elements (string literals, identifiers, comments)"/>
-  </extensions>
-  <extensionPoints>
-    <extensionPoint qualifiedName="Pythonid.dialectsTokenSetContributor"
-                    interface="com.jetbrains.python.PythonDialectsTokenSetContributor"
-                    dynamic="true"/>
-  </extensionPoints>
-  <extensions defaultExtensionNs="Pythonid">
-    <dialectsTokenSetContributor implementation="com.jetbrains.python.PythonTokenSetContributor"/>
-  </extensions>
-</idea-plugin>

python/python-psi-api/intellij.python.psi.iml

@@ -19,5 +19,6 @@
     <orderEntry type="module" module-name="intellij.python.ast" exported="" />
     <orderEntry type="module" module-name="intellij.python.syntax.core" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

python/python-psi-api/resources/intellij.python.psi.xml

@@ -1,4 +1,7 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.python.syntax.core"/>
+  </dependencies>
   <extensionPoints>
     <extensionPoint qualifiedName="Pythonid.pyReferenceResolveProvider"
                     interface="com.jetbrains.python.psi.resolve.PyReferenceResolveProvider"

python/python-psi-impl/resources/intellij.python.psi.impl.xml

@@ -1,6 +1,7 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <xi:include href="/META-INF/PythonSyntaxCore.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <dependencies>
+    <module name="intellij.python.psi"/>
+  </dependencies>
 
   <extensions defaultExtensionNs="com.intellij">
     <readWriteAccessDetector implementation="com.jetbrains.python.findUsages.PyReadWriteAccessDetector"/>

python/python-pyproject/intellij.python.pyproject.iml

@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

python/python-pyproject/resources/intellij.python.pyproject.xml

@@ -0,0 +1,7 @@
+<idea-plugin package="com.intellij.python.pyproject">
+  <dependencies>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+</idea-plugin>

python/python-sdk/intellij.python.sdk.iml

@@ -36,5 +36,6 @@
     <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.eel.impl" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
   </component>
 </module>

python/python-sdk/resources/intellij.python.sdk.xml

@@ -1,4 +1,7 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.python.psi.impl"/>
+  </dependencies>
   <extensionPoints>
     <extensionPoint qualifiedName="Pythonid.pythonSdkFlavor" interface="com.jetbrains.python.sdk.flavors.PythonSdkFlavor" dynamic="true"/>
     <extensionPoint qualifiedName="Pythonid.pythonFlavorProvider"

python/python-syntax-core/resources/META-INF/PythonSyntaxCore.xml

@@ -1,20 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceImplementation="com.jetbrains.python.codeInsight.PyCodeInsightSettings"/>
-    <lang.whiteSpaceFormattingStrategy language="Python"
-                                       implementationClass="com.jetbrains.python.formatter.PyWhiteSpaceFormattingStrategy"/>
-
-    <moduleService serviceImplementation="com.jetbrains.python.documentation.PyDocumentationSettings$ModuleService"/>
-    <applicationService serviceImplementation="com.jetbrains.python.documentation.PyDocumentationSettings$AppService"/>
-    <applicationService serviceInterface="com.jetbrains.python.PythonCodeStyleService"
-                        serviceImplementation="com.jetbrains.python.PythonCodeStyleServiceImpl"/>
-
-    <lang.formatter language="Python" implementationClass="com.jetbrains.python.formatter.PythonFormattingModelBuilder"/>
-    <preFormatProcessor implementation="com.jetbrains.python.formatter.PyPreFormatProcessor"/>
-    <postFormatProcessor implementation="com.jetbrains.python.formatter.PyTrailingCommasPostFormatProcessor"/>
-    <postFormatProcessor implementation="com.jetbrains.python.formatter.PyTrailingBlankLinesPostFormatProcessor"/>
-    <postFormatProcessor implementation="com.jetbrains.python.formatter.PyFromImportPostFormatProcessor"/>
-
-    <highlightRangeExtension implementation="com.jetbrains.python.validation.PyHighlightingAnnotator"/>
-  </extensions>
-</idea-plugin>

python/python-syntax/resources/META-INF/PythonSyntax.xml

@@ -1,27 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <editor.backspaceModeOverride language="Python" implementationClass="com.intellij.codeInsight.editorActions.SmartBackspaceDisabler"/>
-    <enterHandlerDelegate implementation="com.jetbrains.python.editor.PythonEnterHandler"/>
-    <enterHandlerDelegate implementation="com.jetbrains.python.editor.PyEnterAtIndentHandler" order="first"/>
-    <quoteHandler fileType="Python" className="com.jetbrains.python.editor.PythonQuoteHandler"/>
-    <langCodeStyleSettingsProvider implementation="com.jetbrains.python.formatter.PyLanguageCodeStyleSettingsProvider"/>
-    <lang.braceMatcher language="Python" implementationClass="com.jetbrains.python.PyBraceMatcher"/>
-    <editorHighlighterProvider filetype="Python" implementationClass="com.jetbrains.python.PyEditorHighlighterProvider"/>
-    <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyWordSelectionHandler"/>
-    <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyLiteralSelectionHandler"/>
-    <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyStatementSelectionHandler"/>
-    <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyListSelectionHandler"/>
-    <extendWordSelectionHandler implementation="com.jetbrains.python.editor.selectWord.PyCommaSelectionHandler"/>
-    <basicWordSelectionFilter implementation="com.jetbrains.python.editor.selectWord.PyBasicWordSelectionFilter"/>
-    <typedHandler implementation="com.jetbrains.python.codeInsight.PyKeywordTypedHandler" id="pyCommaAfterKwd"/>
-    <typedHandler implementation="com.jetbrains.python.editor.PythonSpaceHandler"/>
-    <backspaceHandlerDelegate implementation="com.jetbrains.python.codeInsight.editorActions.PyTripleQuoteBackspaceDelegate"/>
-    <annotator language="Python" implementationClass="com.jetbrains.python.validation.PyCompositeAnnotator"/>
-  </extensions>
-  <extensions defaultExtensionNs="Pythonid">
-    <pyAnnotator implementation="com.jetbrains.python.validation.PyHighlightingAnnotator"/>
-  </extensions>
-  <extensionPoints>
-    <extensionPoint qualifiedName="Pythonid.pyAnnotator" interface="com.jetbrains.python.validation.PyAnnotatorBase" dynamic="true"/>
-  </extensionPoints>
-</idea-plugin>

python/python-venv/resources/intellij.python.community.impl.venv.xml

@@ -0,0 +1,7 @@
+<idea-plugin package="com.intellij.python.community.impl.venv">
+  <dependencies>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.community.execService"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+</idea-plugin>

python/services/internal-impl/intellij.python.community.services.internal.impl.iml

@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

python/services/internal-impl/resources/intellij.python.community.services.internal.impl.xml

@@ -0,0 +1,7 @@
+<idea-plugin package="com.intellij.python.community.services.internal.impl">
+  <dependencies>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+</idea-plugin>

python/services/shared/intellij.python.community.services.shared.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />

python/services/shared/resources/intellij.python.community.services.shared.xml

@@ -0,0 +1,7 @@
+<idea-plugin package="com.intellij.python.community.services.shared">
+  <dependencies>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+</idea-plugin>

python/services/system-python/intellij.python.community.services.systemPython.iml

@@ -6,6 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

python/services/system-python/resources/intellij.python.community.services.systemPython.xml

@@ -0,0 +1,7 @@
+<idea-plugin package="com.intellij.python.community.services.systemPython">
+  <dependencies>
+    <module name="intellij.python.community"/>
+    <module name="intellij.python.psi.impl"/>
+    <module name="intellij.python.sdk"/>
+  </dependencies>
+</idea-plugin>